Skip to content

Update Nortek reader C types #299

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

Merged
ssolson merged 5 commits into from
Mar 28, 2024
Merged

Update Nortek reader C types #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
195f508
temperature data is signed
jmcvey3 Mar 27, 2024
0bbffc7
Set pitch roll heading to signed
jmcvey3 Mar 27, 2024
6c9feb1
Revert, heading is unsigned
jmcvey3 Mar 27, 2024
5638dca
Fix ad2cp temp test
jmcvey3 Mar 27, 2024
e48e3dd
Fix awac pitch/roll data
jmcvey3 Mar 27, 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
Binary file modified examples/data/dolfyn/test_data/AWAC_test01.nc
View file
Open in desktop
Binary file not shown.
Binary file modified examples/data/dolfyn/test_data/AWAC_test01_clean.nc
View file
Open in desktop
Binary file not shown.
Binary file modified examples/data/dolfyn/test_data/AWAC_test01_earth2inst.nc
View file
Open in desktop
Binary file not shown.
Binary file modified examples/data/dolfyn/test_data/AWAC_test01_earth2principal.nc
View file
Open in desktop
Binary file not shown.
Binary file modified examples/data/dolfyn/test_data/AWAC_test01_inst2beam.nc
View file
Open in desktop
Binary file not shown.
Binary file modified examples/data/dolfyn/test_data/AWAC_test01_ud.nc
View file
Open in desktop
Binary file not shown.
Binary file modified examples/data/dolfyn/test_data/H-AWAC_test01.nc
View file
Open in desktop
Binary file not shown.
Binary file modified examples/data/dolfyn/test_data/dual_profile.nc
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions mhkit/dolfyn/io/nortek.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ def read_vec_sysdata(self):
dv["error"][c],
dv["status"][c],
ds["AnaIn"][c],
) = unpack(self.endian + "2H3hH2BH", byts[8:])
) = unpack(self.endian + "3H3h2BH", byts[8:])
self.checksum(byts)

def sci_vec_sysdata(self):
Expand Down Expand Up @@ -1085,7 +1085,7 @@ def read_awac_profile(self):
dv["status"][c],
p_lsw,
dv["temp"][c],
) = unpack(self.endian + "7HBB2H", byts[8:28])
) = unpack(self.endian + "5H2hBBHh", byts[8:28])
dv["pressure"][c] = 65536 * p_msb + p_lsw
# The nortek system integrator manual specifies an 88byte 'spare'
# field, therefore we start at 116.
Expand Down
6 changes: 3 additions & 3 deletions mhkit/dolfyn/io/nortek2_defs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ def __call__(self, array):
),
(
"temp",
"H",
"h",
[],
_LinFunc(0.01, dtype=dt32),
"degree_C",
Expand Down Expand Up @@ -233,7 +233,7 @@ def __call__(self, array):
("nominal_corr", "B", [], None, "%"),
(
"temp_press",
"B",
"b",
[],
_LinFunc(0.2, -20, dtype=dt32),
"degree_C",
Expand Down Expand Up @@ -300,7 +300,7 @@ def __call__(self, array):
),
(
"temp",
"H",
"h",
[],
_LinFunc(0.01, dtype=dt32),
"degree_C",
Expand Down