Skip to content

Commit

Permalink
Merge pull request #1770 from WHOIGit/main
Browse files Browse the repository at this point in the history 
Updating Irminger branch with latest changes from oceanobservatories
  • Loading branch information
@reedan88
reedan88 authored Feb 13, 2025
2 parents 1c3eaa0 + c590886 commit 89b3627
Show file tree
Hide file tree
Showing 11 changed files with 50 additions and 14 deletions.
2 changes: 2 additions & 0 deletions calibration/CTDGVM/CGINS-CTDGVM-09014__20240618.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
serial,name,value,notes
9014,CC_calibration_date,1718668800000,sensor calibration date (milliseconds since 1970-01-01)
3 changes: 3 additions & 0 deletions calibration/DOSTAM/CGINS-DOSTAM-00029__20240216.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
29,CC_calibration_date,1708041600000,sensor calibration date (milliseconds since 1970-01-01)
29,CC_ref_salinity,0,Optode salinity setting
3 changes: 3 additions & 0 deletions calibration/DOSTAM/CGINS-DOSTAM-00570__20240610.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
570,CC_calibration_date,1717977600000,sensor calibration date (milliseconds since 1970-01-01)
570,CC_ref_salinity,0,Optode salinity setting
5 changes: 5 additions & 0 deletions calibration/FLORTM/CGINS-FLORTM-04040__20240613.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
serial,name,value,notes
4040,CC_angular_resolution,1.076,
4040,CC_depolarization_ratio,0.039,
4040,CC_measurement_wavelength,700.0,
4040,CC_scattering_angle,124.0,
2 changes: 2 additions & 0 deletions calibration/PARADM/CGINS-PARADM-50243__20240611.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
serial,name,value,notes
50243,CC_bsipar_par_scaling,1,
4 changes: 3 additions & 1 deletion cruise/CruiseInformation.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,4 +368,6 @@ VA20241012,Virginia,2024-10-12T06:00:00,2024-10-14T06:00:00,Pioneer 20d AUV depl
PH20241119,Phideaux,2024-11-19T17:00:00,2024-11-20T22:00:00,Pioneer 20e glider deployments
EK20241126,Elakha,2024-11-26T16:55:00,2024-11-26T21:27:00,Endurance glider deployment 384-17
EK20241204,Elakha,2024-12-04T16:38:00,2024-12-04T21:00:00,Endurance CSPP Deployment CE02SHSP-00038
PH20241223,Phideaux,2024-12-23T10:00:00,2024-12-23T20:00:00,Pioneer glider cp_335 recovery
PH20241223,Phideaux,2024-12-23T10:00:00,2024-12-23T20:00:00,Pioneer glider cp_335 recovery
EK20250123,Elakha,2025-01-23T16:04:00,2025-01-23T22:01:00,Endurance CSPP recovery and glider deployment
SU20250128,Pacific Surveyor,2025-01-28T16:38:00,2025-01-28T23:06:00,Endurance glider deployments
6 changes: 6 additions & 0 deletions deployment/CE05MOAS-G0917_Deploy.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,10 @@ SKQ202405S,"Whitefield, Wick, Black",ME20240528,Whitefield,CE05MOAS-G0917-02-FLO
SKQ202405S,"Whitefield, Wick, Black",ME20240528,Whitefield,CE05MOAS-G0917-03-ADCPAM000,6,1,2024-04-04T19:51:00,2024-05-28T22:54:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00917,CGINS-ADCPAM-73246,44.6362,-124.3313,,200,200,,,
SKQ202405S,"Whitefield, Wick, Black",ME20240528,Whitefield,CE05MOAS-G0917-04-DOSTAM000,6,1,2024-04-04T19:51:00,2024-05-28T22:54:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00917,CGINS-DOSTAM-00193,44.6362,-124.3313,,200,200,,,
SKQ202405S,"Whitefield, Wick, Black",ME20240528,Whitefield,CE05MOAS-G0917-05-CTDGVM000,6,1,2024-04-04T19:51:00,2024-05-28T22:54:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00917,CGINS-CTDGVM-09088,44.6362,-124.3313,,200,200,,,
EK20250123,"Pearce, Whitefield",,Pacific Surveyor crew,CE05MOAS-G0917-00-ENG000000,7,1,2025-01-23T18:28:00,2025-01-30T13:33:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00917,CGCON-GLDRCE-00917,44.6397,-124.3063,,1000,1000,,,
EK20250123,"Pearce, Whitefield",,Pacific Surveyor crew,CE05MOAS-G0917-01-PARADM000,7,1,2025-01-23T18:28:00,2025-01-30T13:33:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00917,CGINS-PARADM-50243,44.6397,-124.3063,,1000,1000,,,
EK20250123,"Pearce, Whitefield",,Pacific Surveyor crew,CE05MOAS-G0917-02-FLORTM000,7,1,2025-01-23T18:28:00,2025-01-30T13:33:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00917,CGINS-FLORTM-04040,44.6397,-124.3063,,1000,1000,,,
EK20250123,"Pearce, Whitefield",,Pacific Surveyor crew,CE05MOAS-G0917-03-ADCPAM000,7,1,2025-01-23T18:28:00,2025-01-30T13:33:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00917,CGINS-ADCPAM-73246,44.6397,-124.3063,,1000,1000,,,
EK20250123,"Pearce, Whitefield",,Pacific Surveyor crew,CE05MOAS-G0917-04-DOSTAM000,7,1,2025-01-23T18:28:00,2025-01-30T13:33:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00917,CGINS-DOSTAM-00029,44.6397,-124.3063,,1000,1000,,,
EK20250123,"Pearce, Whitefield",,Pacific Surveyor crew,CE05MOAS-G0917-05-CTDGVM000,7,1,2025-01-23T18:28:00,2025-01-30T13:33:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00917,CGINS-CTDGVM-09014,44.6397,-124.3063,,1000,1000,,,

13 changes: 7 additions & 6 deletions deployment/CE05MOAS-G1137_Deploy.csv
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
CUID_Deploy,deployedBy,CUID_Recover,recoveredBy,Reference Designator,deploymentNumber,versionNumber,startDateTime,stopDateTime,mooring.uid,node.uid,sensor.uid,lat,lon,orbit,deployment_depth,water_depth,notes,electrical.uid,assembly_template_revision
SKQ202415S,"Pearce, Whitefield",,,CE05MOAS-G1137-00-ENG000000,1,1,2024-10-04T23:11:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01137,CGCON-GLDRCE-01137,44.6445,-124.3057,,1000,1000,,,
SKQ202415S,"Pearce, Whitefield",,,CE05MOAS-G1137-01-PARADM000,1,1,2024-10-04T23:11:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01137,CGINS-PARADM-50245,44.6445,-124.3057,,1000,1000,,,
SKQ202415S,"Pearce, Whitefield",,,CE05MOAS-G1137-02-FLORTM000,1,1,2024-10-04T23:11:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01137,CGINS-FLORTM-08412,44.6445,-124.3057,,1000,1000,,,
SKQ202415S,"Pearce, Whitefield",,,CE05MOAS-G1137-03-ADCPAM000,1,1,2024-10-04T23:11:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01137,CGINS-ADCPAM-43473,44.6445,-124.3057,,1000,1000,,,
SKQ202415S,"Pearce, Whitefield",,,CE05MOAS-G1137-04-DOSTAM000,1,1,2024-10-04T23:11:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01137,CGINS-DOSTAM-00178,44.6445,-124.3057,,1000,1000,,,
SKQ202415S,"Pearce, Whitefield",,,CE05MOAS-G1137-05-CTDGVM000,1,1,2024-10-04T23:11:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01137,CGINS-CTDGVM-09036,44.6445,-124.3057,,1000,1000,,,
SKQ202415S,"Pearce, Whitefield",,Pacific Surveyor crew,CE05MOAS-G1137-00-ENG000000,1,1,2024-10-04T23:11:00,2025-01-19T00:29:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01137,CGCON-GLDRCE-01137,44.6445,-124.3057,,1000,1000,,,
SKQ202415S,"Pearce, Whitefield",,Pacific Surveyor crew,CE05MOAS-G1137-01-PARADM000,1,1,2024-10-04T23:11:00,2025-01-19T00:29:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01137,CGINS-PARADM-50245,44.6445,-124.3057,,1000,1000,,,
SKQ202415S,"Pearce, Whitefield",,Pacific Surveyor crew,CE05MOAS-G1137-02-FLORTM000,1,1,2024-10-04T23:11:00,2025-01-19T00:29:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01137,CGINS-FLORTM-08412,44.6445,-124.3057,,1000,1000,,,
SKQ202415S,"Pearce, Whitefield",,Pacific Surveyor crew,CE05MOAS-G1137-03-ADCPAM000,1,1,2024-10-04T23:11:00,2025-01-19T00:29:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01137,CGINS-ADCPAM-43473,44.6445,-124.3057,,1000,1000,,,
SKQ202415S,"Pearce, Whitefield",,Pacific Surveyor crew,CE05MOAS-G1137-04-DOSTAM000,1,1,2024-10-04T23:11:00,2025-01-19T00:29:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01137,CGINS-DOSTAM-00178,44.6445,-124.3057,,1000,1000,,,
SKQ202415S,"Pearce, Whitefield",,Pacific Surveyor crew,CE05MOAS-G1137-05-CTDGVM000,1,1,2024-10-04T23:11:00,2025-01-19T00:29:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01137,CGINS-CTDGVM-09036,44.6445,-124.3057,,1000,1000,,,

7 changes: 6 additions & 1 deletion deployment/CE05MOAS-G1153_Deploy.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,9 @@ EK20240501,J.Whitefield,EK20240814,"Wick, Heinitz",CE05MOAS-G1153-02-FLORTM000,1
EK20240501,J.Whitefield,EK20240814,"Wick, Heinitz",CE05MOAS-G1153-03-ADCPAM000,1,1,2024-05-01T20:05:00,2024-08-14T16:18:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01153,CGINS-ADCPAM-52696,44.6332,-124.3037,,1000,1000,,,
EK20240501,J.Whitefield,EK20240814,"Wick, Heinitz",CE05MOAS-G1153-04-DOSTAM000,1,1,2024-05-01T20:05:00,2024-08-14T16:18:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01153,CGINS-DOSTAM-01125,44.6332,-124.3037,,1000,1000,,,
EK20240501,J.Whitefield,EK20240814,"Wick, Heinitz",CE05MOAS-G1153-05-CTDGVM000,1,1,2024-05-01T20:05:00,2024-08-14T16:18:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01153,CGINS-CTDGVM-09977,44.6332,-124.3037,,1000,1000,,,

SU20250128,"Pearce, Whitefield, Moran",,,CE05MOAS-G1153-00-ENG000000,2,1,2025-01-28T20:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01153,CGCON-GLDRCE-01153,44.6317,-124.3124,,1000,1000,,,
SU20250128,"Pearce, Whitefield, Moran",,,CE05MOAS-G1153-01-PARADM000,2,1,2025-01-28T20:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01153,CGINS-PARADM-50397,44.6317,-124.3124,,1000,1000,,,
SU20250128,"Pearce, Whitefield, Moran",,,CE05MOAS-G1153-02-FLORTM000,2,1,2025-01-28T20:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01153,CGINS-FLORTM-08440,44.6317,-124.3124,,1000,1000,,,
SU20250128,"Pearce, Whitefield, Moran",,,CE05MOAS-G1153-03-ADCPAM000,2,1,2025-01-28T20:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01153,CGINS-ADCPAM-52696,44.6317,-124.3124,,1000,1000,,,
SU20250128,"Pearce, Whitefield, Moran",,,CE05MOAS-G1153-04-DOSTAM000,2,1,2025-01-28T20:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01153,CGINS-DOSTAM-00570,44.6317,-124.3124,,1000,1000,,,
SU20250128,"Pearce, Whitefield, Moran",,,CE05MOAS-G1153-05-CTDGVM000,2,1,2025-01-28T20:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-01153,CGINS-CTDGVM-09977,44.6317,-124.3124,,1000,1000,,,
6 changes: 6 additions & 0 deletions deployment/CE05MOAS-GL382_Deploy.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,9 @@ STP20240618,"Wick, Heinitz, Fram",,Ron Micjan,CE05MOAS-GL382-02-FLORTM000,15,1,2
STP20240618,"Wick, Heinitz, Fram",,Ron Micjan,CE05MOAS-GL382-03-ADCPAM000,15,1,2024-06-18T19:40:00,2024-07-04T18:13:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-ADCPAM-55731,46.9826,-124.5541,,200,200,,,
STP20240618,"Wick, Heinitz, Fram",,Ron Micjan,CE05MOAS-GL382-04-DOSTAM000,15,1,2024-06-18T19:40:00,2024-07-04T18:13:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-DOSTAM-00864,46.9826,-124.5541,,200,200,,,
STP20240618,"Wick, Heinitz, Fram",,Ron Micjan,CE05MOAS-GL382-05-CTDGVM000,15,1,2024-06-18T19:40:00,2024-07-04T18:13:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-CTDGVM-09082,46.9826,-124.5541,,200,200,,,
SU20250128,"Pearce, Whitefield, Moran",,,CE05MOAS-GL382-00-ENG000000,16,1,2025-01-28T19:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGCON-GLDRCE-00382,44.6356,-124.3150,,200,200,,,
SU20250128,"Pearce, Whitefield, Moran",,,CE05MOAS-GL382-01-PARADM000,16,1,2025-01-28T19:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-PARADM-50165,44.6356,-124.3150,,200,200,,,
SU20250128,"Pearce, Whitefield, Moran",,,CE05MOAS-GL382-02-FLORTM000,16,1,2025-01-28T19:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-FLORTM-04473,44.6356,-124.3150,,200,200,,,
SU20250128,"Pearce, Whitefield, Moran",,,CE05MOAS-GL382-03-ADCPAM000,16,1,2025-01-28T19:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-ADCPAM-55731,44.6356,-124.3150,,200,200,,,
SU20250128,"Pearce, Whitefield, Moran",,,CE05MOAS-GL382-04-DOSTAM000,16,1,2025-01-28T19:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-DOSTAM-00864,44.6356,-124.3150,,200,200,,,
SU20250128,"Pearce, Whitefield, Moran",,,CE05MOAS-GL382-05-CTDGVM000,16,1,2025-01-28T19:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-CTDGVM-09082,44.6356,-124.3150,,200,200,,,
13 changes: 7 additions & 6 deletions deployment/CE05MOAS-GL384_Deploy.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,10 @@ EK20240806,Whitefield,SKQ202415S,"Pearce, Wood, Lambert, Wick, Whitefield",CE05M
EK20240806,Whitefield,SKQ202415S,"Pearce, Wood, Lambert, Wick, Whitefield",CE05MOAS-GL384-03-ADCPAM000,16,1,2024-08-06T20:00:00,2024-10-17T20:16:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-ADCPAM-42443,44.6310,-124.3064,,200,200,,,
EK20240806,Whitefield,SKQ202415S,"Pearce, Wood, Lambert, Wick, Whitefield",CE05MOAS-GL384-04-DOSTAM000,16,1,2024-08-06T20:00:00,2024-10-17T20:16:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-DOSTAM-00176,44.6310,-124.3064,,200,200,,,
EK20240806,Whitefield,SKQ202415S,"Pearce, Wood, Lambert, Wick, Whitefield",CE05MOAS-GL384-05-CTDGVM000,16,1,2024-08-06T20:00:00,2024-10-17T20:16:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-CTDGVM-09056,44.6310,-124.3064,,200,200,,,
EK20241126,Whitefield,,,CE05MOAS-GL384-00-ENG000000,17,1,2024-11-26T17:59:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGCON-GLDRCE-00384,44.6572,-124.1780,,200,200,,,
EK20241126,Whitefield,,,CE05MOAS-GL384-01-PARADM000,17,1,2024-11-26T17:59:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-PARADM-50162,44.6572,-124.1780,,200,200,,,
EK20241126,Whitefield,,,CE05MOAS-GL384-02-FLORTM000,17,1,2024-11-26T17:59:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-FLORTM-03131,44.6572,-124.1780,,200,200,,,
EK20241126,Whitefield,,,CE05MOAS-GL384-03-ADCPAM000,17,1,2024-11-26T17:59:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-ADCPAM-42443,44.6572,-124.1780,,200,200,,,
EK20241126,Whitefield,,,CE05MOAS-GL384-04-DOSTAM000,17,1,2024-11-26T17:59:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-DOSTAM-00176,44.6572,-124.1780,,200,200,,,
EK20241126,Whitefield,,,CE05MOAS-GL384-05-CTDGVM000,17,1,2024-11-26T17:59:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-CTDGVM-09056,44.6572,-124.1780,,200,200,,,
EK20241126,Whitefield,,Pacific Surveyor crew,CE05MOAS-GL384-00-ENG000000,17,1,2024-11-26T17:59:00,2025-01-18T19:13:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGCON-GLDRCE-00384,44.6572,-124.1780,,200,200,,,
EK20241126,Whitefield,,Pacific Surveyor crew,CE05MOAS-GL384-01-PARADM000,17,1,2024-11-26T17:59:00,2025-01-18T19:13:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-PARADM-50162,44.6572,-124.1780,,200,200,,,
EK20241126,Whitefield,,Pacific Surveyor crew,CE05MOAS-GL384-02-FLORTM000,17,1,2024-11-26T17:59:00,2025-01-18T19:13:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-FLORTM-03131,44.6572,-124.1780,,200,200,,,
EK20241126,Whitefield,,Pacific Surveyor crew,CE05MOAS-GL384-03-ADCPAM000,17,1,2024-11-26T17:59:00,2025-01-18T19:13:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-ADCPAM-42443,44.6572,-124.1780,,200,200,,,
EK20241126,Whitefield,,Pacific Surveyor crew,CE05MOAS-GL384-04-DOSTAM000,17,1,2024-11-26T17:59:00,2025-01-18T19:13:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-DOSTAM-00176,44.6572,-124.1780,,200,200,,,
EK20241126,Whitefield,,Pacific Surveyor crew,CE05MOAS-GL384-05-CTDGVM000,17,1,2024-11-26T17:59:00,2025-01-18T19:13:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-CTDGVM-09056,44.6572,-124.1780,,200,200,,,

0 comments on commit 89b3627

Please sign in to comment.