Coord bugfix (#97)

* Fix for ADV amp/cor coordinates * Fix for RDI bottom track amp/cor coordinates
lkilcher · Apr 15, 2022 · ade3396 · ade3396
1 parent 3fbf1ce
commit ade3396
Show file tree

Hide file tree

Showing 30 changed files with 63 additions and 60 deletions.
diff --git a/dolfyn/io/base.py b/dolfyn/io/base.py
@@ -175,18 +175,22 @@ def _create_dataset(data):
                                               'dim_1': 'time_echo'})
                     ds[key] = ds[key].assign_coords({'range_echo': data['coords']['range_echo'],
                                                      'time_echo': data['coords']['time_echo']})
-                # 3- & 4-beam instrument vector data, bottom tracking
+                # ADV/ADCP instrument vector data, bottom tracking
                 elif shp[0] == vshp[0] and not any(val in key for val in tag[:2]):
                     # b/c rdi time
                     if 'bt' in key and 'time_bt' in data['coords']:
                         tg = '_bt'
                     else:
                         tg = ''
-                    ds[key] = ds[key].rename({'dim_0': 'dir',
+                    if 'amp' in key or 'corr' in key:
+                        dim0 = 'beam'
+                    else:
+                        dim0 = 'dir'
+                    ds[key] = ds[key].rename({'dim_0': dim0,
                                               'dim_1': 'time'+tg})
-                    ds[key] = ds[key].assign_coords({'dir': beam,
+                    ds[key] = ds[key].assign_coords({dim0: beam,
                                                      'time'+tg: data['coords']['time'+tg]})
-                # 4-beam instrument IMU data
+                # ADCP IMU data
                 elif shp[0] == vshp[0]-1:
                     if not any(val in key for val in tag):
                         tg = ''

diff --git a/dolfyn/io/rdi.py b/dolfyn/io/rdi.py
@@ -94,7 +94,6 @@ def _remove_gps_duplicates(dat):
     """
 
     dat['data_vars']['hdwtime_gps'] = dat['coords']['time']
-    dat['units']['hdwtime'] = 'seconds since 1970-01-01 00:00:00'
 
     # Remove duplicate timestamp values, if applicable
     dat['coords']['time_gps'], idx = np.unique(dat['coords']['time_gps'],

diff --git a/dolfyn/tests/data/RDI_withBT.nc b/dolfyn/tests/data/RDI_withBT.nc
diff --git a/dolfyn/tests/data/burst_mode01.nc b/dolfyn/tests/data/burst_mode01.nc
diff --git a/dolfyn/tests/data/vector_data01.nc b/dolfyn/tests/data/vector_data01.nc
diff --git a/dolfyn/tests/data/vector_data01.repr.txt b/dolfyn/tests/data/vector_data01.repr.txt
@@ -11,6 +11,6 @@
   - roll ('time',)
   - temp ('time',)
   - pressure ('time',)
-  - amp ('dir', 'time')
-  - corr ('dir', 'time')
+  - amp ('beam', 'time')
+  - corr ('beam', 'time')
   ... and others (see `<obj>.variables`)
diff --git a/dolfyn/tests/data/vector_data01_GN.nc b/dolfyn/tests/data/vector_data01_GN.nc
diff --git a/dolfyn/tests/data/vector_data01_avg.nc b/dolfyn/tests/data/vector_data01_avg.nc
diff --git a/dolfyn/tests/data/vector_data01_bin.nc b/dolfyn/tests/data/vector_data01_bin.nc
diff --git a/dolfyn/tests/data/vector_data01_rclean.nc b/dolfyn/tests/data/vector_data01_rclean.nc
diff --git a/dolfyn/tests/data/vector_data01_rotate_earth2principal.nc b/dolfyn/tests/data/vector_data01_rotate_earth2principal.nc
diff --git a/dolfyn/tests/data/vector_data01_rotate_inst2beam.nc b/dolfyn/tests/data/vector_data01_rotate_inst2beam.nc
diff --git a/dolfyn/tests/data/vector_data01_rotate_inst2earth.nc b/dolfyn/tests/data/vector_data01_rotate_inst2earth.nc
diff --git a/dolfyn/tests/data/vector_data01_sclean.nc b/dolfyn/tests/data/vector_data01_sclean.nc
diff --git a/dolfyn/tests/data/vector_data01_u.nc b/dolfyn/tests/data/vector_data01_u.nc
diff --git a/dolfyn/tests/data/vector_data_imu01-json.nc b/dolfyn/tests/data/vector_data_imu01-json.nc
diff --git a/dolfyn/tests/data/vector_data_imu01-json_mc.nc b/dolfyn/tests/data/vector_data_imu01-json_mc.nc
diff --git a/dolfyn/tests/data/vector_data_imu01.nc b/dolfyn/tests/data/vector_data_imu01.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_GN.nc b/dolfyn/tests/data/vector_data_imu01_GN.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_head_pitch_roll.nc b/dolfyn/tests/data/vector_data_imu01_head_pitch_roll.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_mc.nc b/dolfyn/tests/data/vector_data_imu01_mc.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_mcDeclin10.nc b/dolfyn/tests/data/vector_data_imu01_mcDeclin10.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_mcsp.nc b/dolfyn/tests/data/vector_data_imu01_mcsp.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_rotate_earth2principal.nc b/dolfyn/tests/data/vector_data_imu01_rotate_earth2principal.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_rotate_inst2beam.nc b/dolfyn/tests/data/vector_data_imu01_rotate_inst2beam.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_rotate_inst2earth.nc b/dolfyn/tests/data/vector_data_imu01_rotate_inst2earth.nc
diff --git a/dolfyn/tests/data/vmdas01.nc b/dolfyn/tests/data/vmdas01.nc
diff --git a/dolfyn/tests/data/winriver01.nc b/dolfyn/tests/data/winriver01.nc
diff --git a/dolfyn/tests/data/winriver02.nc b/dolfyn/tests/data/winriver02.nc
diff --git a/dolfyn/tests/data/winriver02_rotate_ship2earth.nc b/dolfyn/tests/data/winriver02_rotate_ship2earth.nc