Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle RDI's variable profile shenanigans #292

Merged
merged 14 commits into from
Mar 11, 2024
Merged

Handle RDI's variable profile shenanigans #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8369d04
Some progress
jmcvey3 Feb 21, 2024
dec2835
Handle changing cell sizes
jmcvey3 Feb 22, 2024
6765512
Clean SL data, comments
jmcvey3 Feb 22, 2024
ef857a4
Undo leaks from other PR
jmcvey3 Feb 22, 2024
7ecb72f
More cleanup
jmcvey3 Feb 22, 2024
89aff0f
Update debugger log test data
jmcvey3 Feb 22, 2024
dfcaf6a
Fix one mistake
jmcvey3 Feb 22, 2024
00added
Fix RiverPro test
jmcvey3 Feb 22, 2024
774e42a
General cleanup and organization
jmcvey3 Feb 22, 2024
18c8c05
sampling frequency bug
jmcvey3 Feb 22, 2024
4121e72
Fix fs in test data
jmcvey3 Feb 22, 2024
b1b9057
Fix more test data
jmcvey3 Feb 23, 2024
eaca51b
Fix compression bug
jmcvey3 Mar 6, 2024
190e2b9
Merge branch 'develop' of https://github.com/jmcvey3/MHKiT-Python int…
jmcvey3 Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/data/dolfyn/test_data/RDI_withBT.dolfyn.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ root - INFO - ###Leaving checkheader.
root - INFO - {'nbyte': 579, 'dat_offsets': array([ 20, 79, 144, 282, 352, 422, 492])}
root - INFO - pos 20
root - INFO - pos 20 id 0
root - WARNING - Number of cells set to 17
root - WARNING - Cell size set to 1.0
root - INFO - Read Config
root - INFO - Read Fixed
root - INFO - pos 79 id 128
Expand Down Expand Up @@ -97,5 +99,3 @@ root - INFO - n 2: 256 0100
root - DEBUG - pos: 727, pos_: 0, nbyte: 65, k: 0, byte_offset: -1
root - DEBUG - Trying to Read 256
root - INFO - Reading code 0x100...
root - INFO - Read Vel
root - INFO - success!
Binary file modified examples/data/dolfyn/test_data/RiverPro_test01.nc
View file
Open in desktop
Binary file not shown.
Binary file modified examples/data/dolfyn/test_data/dat_vm.mat
View file
Open in desktop
Binary file not shown.
Binary file modified examples/data/dolfyn/test_data/vmdas01_wh.nc
View file
Open in desktop
Binary file not shown.
Binary file modified examples/data/dolfyn/test_data/winriver01.nc
View file
Open in desktop
Binary file not shown.
Binary file modified examples/data/dolfyn/test_data/winriver02.nc
View file
Open in desktop
Binary file not shown.
Binary file modified examples/data/dolfyn/test_data/winriver02_rotate_ship2earth.nc
View file
Open in desktop
Binary file not shown.
Binary file modified examples/data/dolfyn/test_data/winriver02_transect.nc
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mhkit/dolfyn/io/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def save(ds, filename, format="NETCDF4", engine="netcdf4", compression=False, **

if compression:
# New netcdf4-c cannot compress variable length strings
if isinstance(ds[ky].data[0], str):
if ds[ky].size <= 1 or isinstance(ds[ky].data[0], str):
continue
enc[ky].update(dict(zlib=True, complevel=1))

Expand Down
Loading
Loading