Merge branch 'master' into metbk-refdes-vocab-updates

oceanobservatories · May 28, 2024 · bb61018 · bb61018
2 parents fc3d3f6 + 3b3d5a6
commit bb61018
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/cruise/CruiseInformation.csv b/cruise/CruiseInformation.csv
@@ -342,5 +342,7 @@ EK20240308,Elakha,2024-03-08T17:20:00,2024-03-08T22:00:00,Endurance ce02shsp-000
 SKQ202405S,Sikuliaq,2024-03-29T23:00:00,2024-04-12T00:00:00,Endurance 20
 AR82,Neil Armstrong,2024-04-01T13:20:00,2024-04-21T14:02:00,Pioneer 20 (MAB)
 EK20240501,Elakha,2024-05-01T15:45:00,2024-05-01T23:56:00,Endurance glider recovery and deployments
+KH20240516,Kahuna,2024-05-16T09:00:00,2024-05-16T18:00:00,Pioneer glider cp_387 recovery
+KH20240523,Kahuna,2024-05-23T10:00:00,2024-05-23T20:00:00,Pioneer 20a glider deployments
 SKQ202408S,Sikuliaq,2024-05-28T00:00:00,2024-06-15T23:59:00,Papa 11
 AR84-01,Neil Armstrong,2024-05-31T00:00:00,2024-07-02T23:59:00,Irminger 11
diff --git a/deployment/CP15MOAS-GL379_Deploy.csv b/deployment/CP15MOAS-GL379_Deploy.csv
@@ -5,3 +5,9 @@ AR82,,AR82,,CP15MOAS-GL379-02-FLORTM000,1,1,2024-04-04T22:44:00,2024-04-18T18:30
 AR82,,AR82,,CP15MOAS-GL379-03-CTDGVM000,1,1,2024-04-04T22:44:00,2024-04-18T18:30:00,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00379,CGINS-CTDGVM-09362,36.16192,-74.70431,,1000,1000,OM,,
 AR82,,AR82,,CP15MOAS-GL379-04-DOSTAM000,1,1,2024-04-04T22:44:00,2024-04-18T18:30:00,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00379,CGINS-DOSTAM-00496,36.16192,-74.70431,,1000,1000,OM; top mount,,
 AR82,,AR82,,CP15MOAS-GL379-05-PARADM000,1,1,2024-04-04T22:44:00,2024-04-18T18:30:00,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00379,CGINS-PARADM-50328,36.16192,-74.70431,,1000,1000,OM,,
+KH20240523,,,,CP15MOAS-GL379-00-ENG000000,2,1,2024-05-23T13:32:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00379,CGCON-GLDRCP-00379,35.92208,-74.75223,,1000,1000,OM,,
+KH20240523,,,,CP15MOAS-GL379-01-ADCPAM000,2,1,2024-05-23T13:32:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00379,CGINS-ADCPAM-49016,35.92208,-74.75223,,1000,1000,OM,,
+KH20240523,,,,CP15MOAS-GL379-02-FLORTM000,2,1,2024-05-23T13:32:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00379,CGINS-FLORTM-04194,35.92208,-74.75223,,1000,1000,OM,,
+KH20240523,,,,CP15MOAS-GL379-03-CTDGVM000,2,1,2024-05-23T13:32:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00379,CGINS-CTDGVM-09030,35.92208,-74.75223,,1000,1000,OM,,
+KH20240523,,,,CP15MOAS-GL379-04-DOSTAM000,2,1,2024-05-23T13:32:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00379,CGINS-DOSTAM-00496,35.92208,-74.75223,,1000,1000,OM; top mount,,
+KH20240523,,,,CP15MOAS-GL379-05-PARADM000,2,1,2024-05-23T13:32:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00379,CGINS-PARADM-50220,35.92208,-74.75223,,1000,1000,OM,,
diff --git a/deployment/CP15MOAS-GL387_Deploy.csv b/deployment/CP15MOAS-GL387_Deploy.csv
@@ -1,7 +1,13 @@
 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
-AR82,,,,CP15MOAS-GL387-00-ENG000000,1,1,2024-04-05T17:51:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGCON-GLDRCP-00387,35.88224,-74.83170,,350,350,MA,,
-AR82,,,,CP15MOAS-GL387-01-ADCPAM000,1,1,2024-04-05T17:51:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGINS-ADCPAM-55979,35.88224,-74.83170,,350,350,MA,,
-AR82,,,,CP15MOAS-GL387-02-FLORTM000,1,1,2024-04-05T17:51:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGINS-FLORTM-04471,35.88224,-74.83170,,350,350,MA,,
-AR82,,,,CP15MOAS-GL387-03-CTDGVM000,1,1,2024-04-05T17:51:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGINS-CTDGVM-09059,35.88224,-74.83170,,350,350,MA,,
-AR82,,,,CP15MOAS-GL387-04-DOSTAM000,1,1,2024-04-05T17:51:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGINS-DOSTAM-00310,35.88224,-74.83170,,350,350,MA; top mount,,
-AR82,,,,CP15MOAS-GL387-05-PARADM000,1,1,2024-04-05T17:51:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGINS-PARADM-50151,35.88224,-74.83170,,350,350,MA,,
+AR82,,KH20240516,,CP15MOAS-GL387-00-ENG000000,1,1,2024-04-05T17:51:00,2024-05-16T13:55:00,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGCON-GLDRCP-00387,35.88224,-74.8317,,350,350,MA,,
+AR82,,KH20240516,,CP15MOAS-GL387-01-ADCPAM000,1,1,2024-04-05T17:51:00,2024-05-16T13:55:00,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGINS-ADCPAM-55979,35.88224,-74.8317,,350,350,MA,,
+AR82,,KH20240516,,CP15MOAS-GL387-02-FLORTM000,1,1,2024-04-05T17:51:00,2024-05-16T13:55:00,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGINS-FLORTM-04471,35.88224,-74.8317,,350,350,MA,,
+AR82,,KH20240516,,CP15MOAS-GL387-03-CTDGVM000,1,1,2024-04-05T17:51:00,2024-05-16T13:55:00,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGINS-CTDGVM-09059,35.88224,-74.8317,,350,350,MA,,
+AR82,,KH20240516,,CP15MOAS-GL387-04-DOSTAM000,1,1,2024-04-05T17:51:00,2024-05-16T13:55:00,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGINS-DOSTAM-00310,35.88224,-74.8317,,350,350,MA; top mount,,
+AR82,,KH20240516,,CP15MOAS-GL387-05-PARADM000,1,1,2024-04-05T17:51:00,2024-05-16T13:55:00,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGINS-PARADM-50151,35.88224,-74.8317,,350,350,MA,,
+KH20240523,,,,CP15MOAS-GL387-00-ENG000000,2,1,2024-05-23T15:08:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGCON-GLDRCP-00387,35.94993,-74.79575,,350,350,MA,,
+KH20240523,,,,CP15MOAS-GL387-01-ADCPAM000,2,1,2024-05-23T15:08:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGINS-ADCPAM-55979,35.94993,-74.79575,,350,350,MA,,
+KH20240523,,,,CP15MOAS-GL387-02-FLORTM000,2,1,2024-05-23T15:08:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGINS-FLORTM-04471,35.94993,-74.79575,,350,350,MA,,
+KH20240523,,,,CP15MOAS-GL387-03-CTDGVM000,2,1,2024-05-23T15:08:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGINS-CTDGVM-09059,35.94993,-74.79575,,350,350,MA,,
+KH20240523,,,,CP15MOAS-GL387-04-DOSTAM000,2,1,2024-05-23T15:08:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGINS-DOSTAM-00310,35.94993,-74.79575,,350,350,MA; top mount,,
+KH20240523,,,,CP15MOAS-GL387-05-PARADM000,2,1,2024-05-23T15:08:00,,CGVCP-15MOAS-00000,CGVEH-GLDRCP-00387,CGINS-PARADM-50151,35.94993,-74.79575,,350,350,MA,,