Nortek Signature Reader Altimeter Update #280
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@jmcvey3 thanks for putting this fix together! Did you see the changes caused a couple errors in the dolfyn tests? |
|
@ssolson Yes, I wanted to make sure the issue was solved before going through and fixing the tests. I've updated the tests now that I've gotten the affirmative that the issue was resolved. I also threw in a fix for a bug where netcdf compression wasn't working properly. The prior code would only work with netCDF4 < 1.6.0, which isn't compatible with python 3.11. |
ssolson
reviewed
Dec 19, 2023
Comment on lines
+353
to
+360
| 'batt_alt': _VarAtts(dims=[], | ||
| dtype=np.uint16, | ||
| group='data_vars', | ||
| default_val=nan, | ||
| factor=0.1, | ||
| units='V', | ||
| long_name='Battery Voltage', | ||
| ), |
There was a problem hiding this comment.
this one doesn't have a standard_name
There was a problem hiding this comment.
Variables don't get standard names if they aren't listed in this table: https://cfconventions.org/Data/cf-standard-names/current/build/cf-standard-name-table.html
Comment on lines
+345
to
+352
| 'time_alt': _VarAtts(dims=[], | ||
| dtype=np.float64, | ||
| group='coords', | ||
| default_val=nan, | ||
| units='seconds since 1970-01-01 00:00:00 UTC', | ||
| long_name='Time', | ||
| standard_name='time', | ||
| ), |
There was a problem hiding this comment.
should this have a factor key?
There was a problem hiding this comment.
No, the factor key here is for any variables that are stored in binary in something other than their native units. Time is stored in a binary format that converts directly to "seconds since 1970"
Comment on lines
+454
to
+458
| 'AnaIn1_alt': _VarAtts(dims=[], | ||
| dtype=np.float32, | ||
| group='sys', | ||
| default_val=nan, | ||
| units='n/a', |
There was a problem hiding this comment.
Should this one have no name keys?
There was a problem hiding this comment.
This variable isn't used, so I don't add them. This is the raw ADC output, I believe
Comment on lines
+460
to
+467
| 'vel_alt': _VarAtts(dims=[4, 'n'], | ||
| dtype=np.float32, | ||
| group='data_vars', | ||
| default_val=nan, | ||
| factor=0.001, | ||
| units='m s-1', | ||
| long_name='Water Velocity', | ||
| ), |
There was a problem hiding this comment.
Same comment as above
Comment on lines
+476
to
+482
| 'quality_alt': _VarAtts(dims=[], | ||
| dtype=np.float32, | ||
| group='data_vars', | ||
| default_val=nan, | ||
| units='1', | ||
| long_name='Altimeter Quality Indicator', | ||
| ), |
There was a problem hiding this comment.
Same comment as above
Given new test data, I found that the altimeter data wasn't being labeled properly versus what Nortek software was outputting. These changes primarily handle those metadata updates, and because the metadata changes, the test files also change. |
Closed
Merged
ssolson
added a commit
that referenced
this pull request
May 8, 2024
# MHKiT v0.8.0 We're excited to announce the release of MHKiT v0.8.0, which brings a host of new features, enhancements, and bug fixes across various modules, ensuring compatibility with Python 3.10 and 3.11, and introducing full xarray support for more flexible data handling. Significant updates in the Wave and DOLfYN modules improve functionality and extend capabilities. ## Python 3.10 & 3.11 Support MHKiT now supports python 3.10 and 3.11. Support for 3.12 will follow in the next minor update. - #240 ## Wave Module ### Enhancements: **Automatic Threshold Calculation for Peaks-Over-Threshold**: We've introduced a new feature that automatically calculates the "best" threshold for identifying significant wave events. This method, originally developed by Neary, V. S., et al. in their 2020 study, has now been translated from Matlab to Python, enhancing our existing peaks-over-threshold functionality. **Wave Heights Analysis**: A new function, `wave_heights`, has been added to extract the heights of individual waves from a time series. This function uses zero up-crossing analysis to accurately measure wave heights, improving upon our previous methods which only provided the maximum value between up-crossings. **Enhanced Zero Crossing Analysis**: Building on the above, the zero crossing code previously embedded in `global_peaks` has been isolated into a helper function. This modular approach not only refines the codebase but also supports new functionalities such as calculating wave heights, zero crossing periods, and identifying crests. ### Bug Fixes: **Contour Sampling Error in Wave Contours**: A bug identified in `mhkit.wave.contours.samples_contour` has been resolved. The issue occurred when period samples defined using the maximum period resulted in values outside the interpolation range of the contour data. This was corrected by ensuring that all sampling points are within the interpolation range and adjusting the contour data selection process accordingly. - #268 - #252 - #278 ## Xarray Support MHKiT functions now fully support the use of xarray for passing and returning data. - #279 - #282 - #285 - #302 - #310 ## DOLfYN Thanks to the many user contributions and users of MHKiT the DOLFYN module include a significant number of enhancements and bug fixes. ### Enhancements: **Altimeter Support**: Enhanced the Nortek Signature Reader to add capability for reading ADCP dual profile configurations. **Data Handling Improvements**: Introduced logic to skip messy header data that can accumulate during measurements collected via Nortek software on PCs and Macs. **Instrument Noise Subtraction**: Added a function to subtract instrument noise from turbulence intensity estimation using RMS calculations, providing results that differ by approximately 1% from the existing standard deviation-based "I" property. **Improved File Handling**: Updates for RDI files to handle changing "number of cells" and variable "cell sizes," which are now bin-averaged into the largest cell size. ### Bug Fixes: **Power Spectra Calculation**: Fixed a bug where a given noise value was not being subtracted from the power spectra, and noise was inadvertently added as an input to dissipation rate calculations. **Improved Header Handling**: Allowed RDI reader to skip junk headers effectively. **Nortek Reader C Types Update**: Adjusted C types in the Nortek reader to handle below-zero water temperatures and to allow pitch and roll values to go negative. - #280 - #289 - #290 - #292 - #293 - #294 - #299 ## River & Tidal: D3D Added limits to `variable_interpolation` and added 3 array input capability to `create_points` - #271 ## Developer Experience ### Black formatting Black formatting is now enforced on all MHKiT files. This ensures consistent formatting across the MHKiT package. - #281 ### Linting & Type Hints MHKiT is in the process of enforcing pylint and adding type hints to all functions. Currently this has been achieved and is enforced in the Loads and Power modules. - #288 - #296 ### CI/CD This release introduces significant reduction in testing time for development. This is achieved by reducing the number of tests for pulls against the develop branch and only running hindcast test when changes are made to it. A bug in the hindcast CI was fixed which only ran on changes to the hindcast tests instead of the hindcast module. Additionally the wave and wind hindcast needed to be separated in 2 jobs due to the excessive time taken to run a wind cache. This created a number of follow on PRs around solidifying the logic of these job. A special case for Python 3.8, pip, and Mac OS was added to use homebrew to install NetCDF and HDF5 to get tests to pass. - #241 - #270 - #306 - #311 - #317 - #318 - #319 - #320 - #324 ### Clean Up MHKiT fixed an implementation error where functions used assert instead of built in errors for type and value checking. Additionally these PRs removed unused files, fixed typos, and created an argument which allows users to run CDIP API calls silently. - #276 - #272 - #273
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR containing fixes for Issue #277 & #284