Skip to content

Commit 7de2d46

Browse files
authored
Merge pull request #1176 from WHOIGit/main
Updating auvs branch from updated WHOIGit main
2 parents 7c35383 + 65a1196 commit 7de2d46

File tree

128 files changed

+2820
-842
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+2820
-842
lines changed

bulk/eng_bulk_load-AssetRecord.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,8 @@ CGCON-GLDROO-00538,OL000112,Sensor,1,Mobile Asset Controller for Open Ocean Glid
263263
CGCON-GLDROO-00559,OL000610,Sensor,1,Mobile Asset Controller for Open Ocean Glider,GL559 Controller,Teledyne Webb,G2 Slocum Gliders,559,,,,,Woods Hole Oceanographic Institution
264264
CGCON-GLDROO-00560,OL000137,Sensor,1,Mobile Asset Controller for Open Ocean Glider,GL560 Controller,Teledyne Webb,G2 Slocum Gliders,560,,,,,Woods Hole Oceanographic Institution
265265
CGCON-GLDROO-00561,OL000138,Sensor,1,Mobile Asset Controller for Open Ocean Glider,GL561 Controller,Teledyne Webb,G2 Slocum Gliders,561,,,,,Woods Hole Oceanographic Institution
266+
CGCON-GLDROO-00898,,Sensor,1,Mobile Asset Controller for Open Ocean Glider,GL898 Controller,Teledyne Webb,G3 Slocum Gliders,898,,,,,Woods Hole Oceanographic Institution
267+
CGCON-GLDROO-00899,,Sensor,1,Mobile Asset Controller for Open Ocean Glider,GL899 Controller,Teledyne Webb,G3 Slocum Gliders,899,,,,,Woods Hole Oceanographic Institution
266268
CGCON-GWFPGX-10401,A00630.1,Sensor,0,Global Wire-Following Profiler Controller,WFP GLOBAL Electronics #1,McLane,MMP 210-3512,ML13104-01,,20140115,0,,Woods Hole Oceanographic Institution
267269
CGCON-GWFPGX-10402,A00631.1,Sensor,0,Global Wire-Following Profiler Controller,WFP GLOBAL Electronics #1,McLane,MMP 210-3512,ML13104-02,,20140115,0,,Woods Hole Oceanographic Institution
268270
CGCON-GWFPGX-10403,A00632.1,Sensor,0,Global Wire-Following Profiler Controller,WFP GLOBAL Electronics #1,McLane,MMP 210-3512,ML13104-03,,20140115,0,,Woods Hole Oceanographic Institution

bulk/node_bulk_load-AssetRecord.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ CGVEH-GLDROO-00538,A01433,Node,1,Open Ocean Glider 538,OPEN OCEAN GLIDER,Teledyn
153153
CGVEH-GLDROO-00559,OL000606,Node,1,Open Ocean Glider 559,OPEN OCEAN GLIDER 1000M,Teledyne Webb,ASSY 4495,559,,,,,Woods Hole Oceanographic Institution
154154
CGVEH-GLDROO-00560,A01763,Node,1,Open Ocean Glider 560,OPEN OCEAN GLIDER 1000M,Teledyne Webb,ASSY 4495,560,,20140804,0,,Woods Hole Oceanographic Institution
155155
CGVEH-GLDROO-00561,OL000147,Node,1,Open Ocean Glider 561,OPEN OCEAN GLIDER 1000M,Teledyne Webb,ASSY 4495,561,,20150831,9180,,Woods Hole Oceanographic Institution
156+
CGVEH-GLDROO-00898,,Node,1,Open Ocean Glider 898,OPEN OCEAN GLIDER 1000M,Teledyne Webb,ASSY GLD-0089-D,898,,,,,Woods Hole Oceanographic Institution
157+
CGVEH-GLDROO-00899,,Node,1,Open Ocean Glider 899,OPEN OCEAN GLIDER 1000M,Teledyne Webb,ASSY GLD-0089-D,899,,,,,Woods Hole Oceanographic Institution
156158
CGVEH-GWFPGX-10401,A00630,Node,0,Global Wire-Following Profiler,WFP GLOBAL,McLane,MMP-210-3512,ML13104-01,,20140115,98735.1,,Woods Hole Oceanographic Institution
157159
CGVEH-GWFPGX-10402,A00631,Node,0,Global Wire-Following Profiler,WFP GLOBAL,McLane,MMP-210-3512,ML13104-02,,20140115,98735.1,,Woods Hole Oceanographic Institution
158160
CGVEH-GWFPGX-10403,A00632,Node,0,Global Wire-Following Profiler,WFP GLOBAL,McLane,MMP-210-3512,ML13104-03,,20140115,98735.1,,Woods Hole Oceanographic Institution

bulk/platform_bulk_load-AssetRecord.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ CGMCE-01ISSP-00017,,Platform,0,Coastal Endurance Oregon Inshore Surface Piercing
4949
CGMCE-01ISSP-00018,,Platform,0,Coastal Endurance Oregon Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE01ISSP,CE01ISSP-00018,,,,,Oregon State University
5050
CGMCE-01ISSP-00019,,Platform,0,Coastal Endurance Oregon Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE01ISSP,CE01ISSP-00019,,,,,Oregon State University
5151
CGMCE-01ISSP-00020,,Platform,0,Coastal Endurance Oregon Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE01ISSP,CE01ISSP-00020,,,,,Oregon State University
52+
CGMCE-01ISSP-00021,,Platform,0,Coastal Endurance Oregon Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE01ISSP,CE01ISSP-00021,,,,,Oregon State University
5253
CGMCE-02SHSM-00001,N00211,Platform,0,Coastal Endurance Oregon Shelf Surface Mooring,MOORING ENDURANCE OS PROFILER,WHOI,CE02SHSM,CE02SHSM-00001,,,,,Oregon State University
5354
CGMCE-02SHSM-00002,N00266,Platform,0,Coastal Endurance Oregon Shelf Surface Mooring,MOORING ENDURANCE OS PROFILER,WHOI,CE02SHSM,CE02SHSM-00002,,,,,Oregon State University
5455
CGMCE-02SHSM-00003,OL000316,Platform,0,Coastal Endurance Oregon Shelf Surface Mooring,MOORING ENDURANCE OS PROFILER,WHOI,CE02SHSM,CE02SHSM-00003,,,,,Oregon State University

bulk/sensor_bulk_load-AssetRecord.csv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -697,6 +697,7 @@ CGINS-CTDGVM-09364,,Sensor,1,CTD for Glider: CTDGV Series M,CTDGV for Slocum Gli
697697
CGINS-CTDGVM-09453,,Sensor,1,CTD for Glider: CTDGV Series M,CTDGV for Slocum Glider,Sea-Bird Electronics,SBE Slocum Glider Payload CTD (GP-CTD),9453,,,,,Woods Hole Oceanographic Institution
698698
CGINS-CTDGVM-09658,,Sensor,1,CTD for Glider: CTDGV Series M,CTDGV for Slocum Glider,Sea-Bird Electronics,SBE Slocum Glider Payload CTD (GP-CTD),9658,,,,,
699699
CGINS-CTDGVM-09686,,Sensor,1,CTD for Glider: CTDGV Series M,CTDGV for Slocum Glider,Sea-Bird Electronics,SBE Slocum Glider Payload CTD (GP-CTD),9686,,,,,Woods Hole Oceanographic Institution
700+
CGINS-CTDGVM-09687,,Sensor,1,CTD for Glider: CTDGV Series M,CTDGV for Slocum Glider,Sea-Bird Electronics,SBE Slocum Glider Payload CTD (GP-CTD),9687,,,,,Woods Hole Oceanographic Institution
700701
CGINS-CTDGVM-09690,,Sensor,1,CTD for Glider: CTDGV Series M,CTDGV for Slocum Glider,Sea-Bird Electronics,SBE Slocum Glider Payload CTD (GP-CTD),9690,,,,,
701702
CGINS-CTDGVM-09692,,Sensor,1,CTD for Glider: CTDGV Series M,CTDGV for Slocum Glider,Sea-Bird Electronics,SBE Slocum Glider Payload CTD (GP-CTD),9692,1.3.1,20210403,,,Oregon State University
702703
CGINS-CTDMOG-10214,A00103,Sensor,0,CTD Mooring (Inductive): CTDMO Series G,CTDMO SERIES G (37IM),Sea-Bird Electronics,SBE 37-IM,37-10214,,20121212,6400,,Woods Hole Oceanographic Institution
@@ -1254,6 +1255,7 @@ CGINS-DOSTAM-00570,,Sensor,1,Dissolved Oxygen Stable Response for Glider: DOSTA
12541255
CGINS-DOSTAM-00604,,Sensor,1,Dissolved Oxygen Stable Response for Glider: DOSTA Series M,DOSTA for Slocum Glider,Aanderaa,Optode 4831,604,,,,,
12551256
CGINS-DOSTAM-00605,,Sensor,1,Dissolved Oxygen Stable Response for Glider: DOSTA Series M,DOSTA for Slocum Glider,Aanderaa,Optode 4831,605,,,,,
12561257
CGINS-DOSTAM-00662,,Sensor,1,Dissolved Oxygen Stable Response for Glider: DOSTA Series M,DOSTA for Slocum Glider,Aanderaa,Optode 4831,662,,,,,Woods Hole Oceanographic Institution
1258+
CGINS-DOSTAM-00685,,Sensor,1,Dissolved Oxygen Stable Response for Glider: DOSTA Series M,DOSTA for Slocum Glider,Aanderaa,Optode 4831,685,,,,,Woods Hole Oceanographic Institution
12571259
CGINS-DOSTAM-00864,,Sensor,1,Dissolved Oxygen Stable Response for Glider: DOSTA Series M,DOSTA for Slocum Glider,Aanderaa,Optode 4831,864,,,,,Oregon State University
12581260
CGINS-DOSTAM-00891,,Sensor,1,Dissolved Oxygen Stable Response for Glider: DOSTA Series M,DOSTA for Slocum Glider,Aanderaa,Optode 4831,891,5.1.1,20210403,,,Oregon State University
12591261
CGINS-DOSTAM-00909,,Sensor,1,Dissolved Oxygen Stable Response for Glider: DOSTA Series M,DOSTA for Slocum Glider,Aanderaa,Optode 4831,909,,,,,
@@ -1360,6 +1362,7 @@ CGINS-FLORDM-03769,OL000148,Sensor,1,2-Wavelength Fluorometer for Glider: FLORD
13601362
CGINS-FLORDM-03770,OL000141,Sensor,1,2-Wavelength Fluorometer for Glider: FLORD Series M,FLORD for Global Slocum Glider,WET Labs,ECO Puck FLBB-SLC,3770,,,,,
13611363
CGINS-FLORDM-04027,OL000607,Sensor,1,2-Wavelength Fluorometer for Glider: FLORD Series M,FLORD for Global Slocum Glider,WET Labs,ECO Puck FLBB-SLC,4027,,,,,
13621364
CGINS-FLORDM-04095,OL000144,Sensor,1,2-Wavelength Fluorometer for Glider: FLORD Series M,FLORD for Global Slocum Glider,WET Labs,ECO Puck FLBB-SLC,4095,,,,,
1365+
CGINS-FLORDM-06989,,Sensor,1,2-Wavelength Fluorometer for Glider: FLORD Series M,FLORD for Global Slocum Glider,WET Labs,ECO Puck FLBB-SLC,6989,,,,,Woods Hole Oceanographic Institution
13631366
CGINS-FLORDM-06990,,Sensor,1,2-Wavelength Fluorometer for Glider: FLORD Series M,FLORD for Global Slocum Glider,WET Labs,ECO Puck FLBB-SLC,6990,,,,,Woods Hole Oceanographic Institution
13641367
CGINS-FLORTD-00993,A00085,Sensor,0,3-Wavelength Fluorometer: FLORT Series D,FLORT SERIES D (ECO TRIPLET-W),WET Labs,ECO Triplet-w,993,5.2,20150604,12634.25,,
13651368
CGINS-FLORTD-00994,A00084,Sensor,0,3-Wavelength Fluorometer: FLORT Series D,FLORT SERIES D (ECO TRIPLET-W),WET Labs,ECO Triplet-w,994,5.2,20150604,12634.25,,
@@ -2210,6 +2213,7 @@ CGINS-PARADM-50277,,Sensor,1,Photosynthetically Available Radiation for Glider:
22102213
CGINS-PARADM-50304,,Sensor,1,Photosynthetically Available Radiation for Glider: PARAD Series M,PARAD for Slocum Glider,Biospherical Instruments,QSP-2155,50304,,,,,
22112214
CGINS-PARADM-50319,,Sensor,1,Photosynthetically Available Radiation for Glider: PARAD Series M,PARAD for Slocum Glider,Biospherical Instruments,QSP-2155,50319,1.2,,,,
22122215
CGINS-PARADM-50324,,Sensor,1,Photosynthetically Available Radiation for Glider: PARAD Series M,PARAD for Slocum Glider,Biospherical Instruments,QSP-2155,50324,,,,,
2216+
CGINS-PARADM-50328,,Sensor,1,Photosynthetically Available Radiation for Glider: PARAD Series M,PARAD for Slocum Glider,Biospherical Instruments,QSP-2155,50328,,,,,Woods Hole Oceanographic Institution
22132217
CGINS-PARADM-50333,,Sensor,1,Photosynthetically Available Radiation for Glider: PARAD Series M,PARAD for Slocum Glider,Biospherical Instruments,QSP-2155,50333,,,,,
22142218
CGINS-PARADM-50336,,Sensor,1,Photosynthetically Available Radiation for Glider: PARAD Series M,PARAD for Slocum Glider,Biospherical Instruments,QSP-2155,50336,1.2,20210403,,,Oregon State University
22152219
CGINS-PARADN-50170,,Sensor,1,Photosynthetically Available Radiation for AUV: PARAD Series N,PARAD for Hydroid AUV,Biospherical Instruments,QSP-2155,50170,,,,CGSN AUV Instrument Pool,
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
serial,name,value,notes
2+
22846,CC_scale_factor1,0.45,constant; source_file ADCPS-L_WHLS75-1500-I_SN_22846_Configuration_Summary_2023-02-28.pdf
3+
22846,CC_scale_factor2,0.45,constant
4+
22846,CC_scale_factor3,0.45,constant
5+
22846,CC_scale_factor4,0.45,constant
6+
22846,CC_bin_size,0,in cm; return from vendor - not allocated yet
7+
22846,CC_dist_first_bin,0,in cm; return from vendor - not allocated yet
8+
22846,CC_orientation,1,1 is upward looking; 0 is downward looking
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
serial,name,value,notes
2+
22846,CC_scale_factor1,0.45,constant; GP03FLMA-00010
3+
22846,CC_scale_factor2,0.45,constant
4+
22846,CC_scale_factor3,0.45,constant
5+
22846,CC_scale_factor4,0.45,constant
6+
22846,CC_bin_size,1000,in cm
7+
22846,CC_dist_first_bin,1647,in cm
8+
22846,CC_orientation,1,1 is upward looking; 0 is downward looking
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
serial,name,value,notes
2+
23380,CC_scale_factor1,0.45,constant; source_file ADCPS-L_WHLS75-1500-I_SN_23380_Configuration_Summary_2023-02-22.pdf
3+
23380,CC_scale_factor2,0.45,constant
4+
23380,CC_scale_factor3,0.45,constant
5+
23380,CC_scale_factor4,0.45,constant
6+
23380,CC_bin_size,0,in cm; return from vendor - not allocated yet
7+
23380,CC_dist_first_bin,0,in cm; return from vendor - not allocated yet
8+
23380,CC_orientation,1,1 is upward looking; 0 is downward looking
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
serial,name,value,notes
2+
23380,CC_scale_factor1,0.45,constant; GP03FLMB-00010
3+
23380,CC_scale_factor2,0.45,constant
4+
23380,CC_scale_factor3,0.45,constant
5+
23380,CC_scale_factor4,0.45,constant
6+
23380,CC_bin_size,1000,in cm
7+
23380,CC_dist_first_bin,1647,in cm
8+
23380,CC_orientation,1,1 is upward looking; 0 is downward looking
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
serial,name,value,notes
2+
23381,CC_scale_factor1,0.45,constant; source_file ADCPS-L_WHLS75-1500-I_SN_23381_Configuration_Summary_2023-03-22.pdf
3+
23381,CC_scale_factor2,0.45,constant
4+
23381,CC_scale_factor3,0.45,constant
5+
23381,CC_scale_factor4,0.45,constant
6+
23381,CC_bin_size,0,in cm; return from vendor - not allocated yet
7+
23381,CC_dist_first_bin,0,in cm; return from vendor - not allocated yet
8+
23381,CC_orientation,1,1 is upward looking; 0 is downward looking
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
serial,name,value,notes
2+
19151,CC_scale_factor1,0.45,constant; source_file ADCPT-G_WHS150-1500-I_SN_19151_Configuration_Summary_2023-01-21.pdf
3+
19151,CC_scale_factor2,0.45,constant
4+
19151,CC_scale_factor3,0.45,constant
5+
19151,CC_scale_factor4,0.45,constant
6+
19151,CC_bin_size,0,in cm; return from vendor - not allocated yet
7+
19151,CC_dist_first_bin,0,in cm; return from vendor - not allocated yet
8+
19151,CC_orientation,1,1 is upward looking; 0 is downward looking
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
serial,name,value,notes
2+
24544,CC_scale_factor1,0.45,constant; source_file ADCPT-G_WHS150-1500-I_SN_24544_Configuration_Summary_2023-02-10.pdf
3+
24544,CC_scale_factor2,0.45,constant
4+
24544,CC_scale_factor3,0.45,constant
5+
24544,CC_scale_factor4,0.45,constant
6+
24544,CC_bin_size,0,in cm; return from vendor - not allocated yet
7+
24544,CC_dist_first_bin,0,in cm; return from vendor - not allocated yet
8+
24544,CC_orientation,1,1 is upward looking; 0 is downward looking
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
serial,name,value,notes
2+
9231,CC_calibration_date,1644105600000,sensor calibration date (milliseconds since 1970-01-01)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
serial,name,value,notes
2+
9686,CC_calibration_date,1599436800000,sensor calibration date (milliseconds since 1970-01-01)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
serial,name,value,notes
2+
9687,CC_calibration_date,1600560000000,sensor calibration date (milliseconds since 1970-01-01)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
serial,name,value,notes
2+
192,CC_calibration_date,1646784000000,sensor calibration date (milliseconds since 1970-01-01)
3+
192,CC_ref_salinity,0,Optode salinity setting
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
serial,name,value,notes
2+
323,CC_calibration_date,1645401600000,sensor calibration date (milliseconds since 1970-01-01)
3+
323,CC_ref_salinity,0,Optode salinity setting
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
serial,name,value,notes
2+
685,CC_calibration_date,1496188800000,sensor calibration date (milliseconds since 1970-01-01)
3+
685,CC_ref_salinity,0,Optode salinity setting
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
serial,name,value,notes
2+
6989,CC_angular_resolution,1.096,
3+
6989,CC_depolarization_ratio,0.039,
4+
6989,CC_measurement_wavelength,700,
5+
6989,CC_scattering_angle,140,
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
serial,name,value,notes
2+
6990,CC_angular_resolution,1.096,
3+
6990,CC_depolarization_ratio,0.039,
4+
6990,CC_measurement_wavelength,700.0,
5+
6990,CC_scattering_angle,140.0,
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
serial,name,value,notes
2+
3501,CC_angular_resolution,1.076,
3+
3501,CC_depolarization_ratio,0.039,
4+
3501,CC_measurement_wavelength,700.0,
5+
3501,CC_scattering_angle,124.0,
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
serial,name,value,notes
2+
1239,CC_angular_resolution,1.076,
3+
1239,CC_depolarization_ratio,0.039,
4+
1239,CC_measurement_wavelength,700.0,
5+
1239,CC_scattering_angle,124.0,

0 commit comments

Comments
 (0)