Skip to content

Commit

Permalink
Merge branch 'master' into ce_glider
Browse files Browse the repository at this point in the history
  • Loading branch information
@s-pearce
s-pearce authored Jul 25, 2022
2 parents 453e7d4 + 4d01e88 commit 88b726c
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 1 deletion.
2 changes: 2 additions & 0 deletions bulk/platform_bulk_load-AssetRecord.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ CGMCE-01ISSP-00016,,Platform,0,Coastal Endurance Oregon Inshore Surface Piercing
CGMCE-01ISSP-00017,,Platform,0,Coastal Endurance Oregon Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE01ISSP,CE01ISSP-00017,,,,,Oregon State University
CGMCE-01ISSP-00018,,Platform,0,Coastal Endurance Oregon Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE01ISSP,CE01ISSP-00018,,,,,Oregon State University
CGMCE-01ISSP-00019,,Platform,0,Coastal Endurance Oregon Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE01ISSP,CE01ISSP-00019,,,,,Oregon State University
CGMCE-01ISSP-00020,,Platform,0,Coastal Endurance Oregon Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE01ISSP,CE01ISSP-00020,,,,,Oregon State University
CGMCE-02SHSM-00001,N00211,Platform,0,Coastal Endurance Oregon Shelf Surface Mooring,MOORING ENDURANCE OS PROFILER,WHOI,CE02SHSM,CE02SHSM-00001,,,,,Oregon State University
CGMCE-02SHSM-00002,N00266,Platform,0,Coastal Endurance Oregon Shelf Surface Mooring,MOORING ENDURANCE OS PROFILER,WHOI,CE02SHSM,CE02SHSM-00002,,,,,Oregon State University
CGMCE-02SHSM-00003,OL000316,Platform,0,Coastal Endurance Oregon Shelf Surface Mooring,MOORING ENDURANCE OS PROFILER,WHOI,CE02SHSM,CE02SHSM-00003,,,,,Oregon State University
Expand Down Expand Up @@ -86,6 +87,7 @@ CGMCE-02SHSP-00023,,Platform,0,Coastal Endurance Oregon Shelf Surface Piercing P
CGMCE-02SHSP-00024,,Platform,0,Coastal Endurance Oregon Shelf Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE02SHSP,CE02SHSP-00024,,,,,Oregon State University
CGMCE-02SHSP-00025,,Platform,0,Coastal Endurance Oregon Shelf Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE02SHSP,CE02SHSP-00025,,,,,Oregon State University
CGMCE-02SHSP-00026,,Platform,0,Coastal Endurance Oregon Shelf Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE02SHSP,CE02SHSP-00026,,,,,Oregon State University
CGMCE-02SHSP-00027,,Platform,0,Coastal Endurance Oregon Shelf Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE02SHSP,CE02SHSP-00027,,,,,Oregon State University
CGMCE-04OSSM-00001,N00212,Platform,0,Coastal Endurance Oregon Offshore Surface Mooring,MOORING ENDURANCE OS SURFACE,WHOI,CE04OSSM,CE04OSSM-00001,,,,,Oregon State University
CGMCE-04OSSM-00002,OL000385,Platform,0,Coastal Endurance Oregon Offshore Surface Mooring,MOORING ENDURANCE OS SURFACE,WHOI,CE04OSSM,CE04OSSM-00002,,,,,Oregon State University
CGMCE-04OSSM-00003,,Platform,0,Coastal Endurance Oregon Offshore Surface Mooring,MOORING ENDURANCE OS SURFACE,WHOI,CE04OSSM,CE04OSSM-00003,,,,,Oregon State University
Expand Down
2 changes: 1 addition & 1 deletion cruise/CruiseInformation.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,6 @@ EK20220629,Elakha,2022-06-29T15:18:00,2022-06-29T21:44:00,Endurance CSPP turn
ZP20220702,Zephyr,2022-07-02T11:00:00,2022-07-04T23:00:00,Papa 9a Glider Deployments
EK20220708,Elakha,2022-07-08T15:11:00,2022-07-08T22:03:00,Endurance CSPP turn and recovery
TS20220714,Tenacious II,2022-07-14T02:00:00,2022-07-15T04:00:00,Pioneer 18c glider deployments
EK20220715,Elakha,2022-07-15T15:13:00,2022-07-15T20:09:00,Endurance CSPP and Glider Deployments
EK20220715,Elakha,2022-07-15T15:13:00,2022-07-15T20:09:00,Endurance CE01ISSP CE02SHSP and glider ce_311 deployments
PS20220720,Pacific Storm,2022-07-20T02:00:00,2022-07-21T23:40:00,Endurance CSPP and glider operations
TN407,Thomas G. Thompson,2022-08-08T00:00:00,2022-09-16T23:59:59,Cabled (rvdata)
9 changes: 9 additions & 0 deletions deployment/CE01ISSP_Deploy.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,3 +170,12 @@ deploymentNumber,Reference Designator,sensor.uid,startDateTime,stopDateTime,lat,
19,CE01ISSP-SP001-10-PARADJ000,CGINS-PARADJ-00434,2022-04-15T21:45:00,2022-07-08T21:12:00,44.660033,-124.09595,CGMCE-01ISSP-00019,EK20220415,CGVEH-CSPPCE-00002,1,,,,,25,25,,,
19,CE01ISSP-SP001-07-SPKIRJ000,CGINS-SPKIRJ-00282,2022-04-15T21:45:00,2022-07-08T21:12:00,44.660033,-124.09595,CGMCE-01ISSP-00019,EK20220415,CGVEH-CSPPCE-00002,1,,,,,25,25,,,
19,CE01ISSP-SP001-05-VELPTJ000,CGINS-VELPTJ-11912,2022-04-15T21:45:00,2022-07-08T21:12:00,44.660033,-124.09595,CGMCE-01ISSP-00019,EK20220415,CGVEH-CSPPCE-00002,1,,,,,25,25,,,
20,CE01ISSP-SP001-00-SPPENG000,CGCON-CSPPCE-00002,2022-07-15T19:19:00,,44.658417,-124.095083,CGMCE-01ISSP-00020,EK20220715,CGVEH-CSPPCE-00002,1,,,,,25,25,,,
20,CE01ISSP-SP001-09-CTDPFJ000,CGINS-CTDPFJ-00336,2022-07-15T19:19:00,,44.658417,-124.095083,CGMCE-01ISSP-00020,EK20220715,CGVEH-CSPPCE-00002,1,,,,,25,25,,,
20,CE01ISSP-SP001-02-DOSTAJ000,CGINS-DOSTAJ-00352,2022-07-15T19:19:00,,44.658417,-124.095083,CGMCE-01ISSP-00020,EK20220715,CGVEH-CSPPCE-00002,1,,,,,25,25,,,
20,CE01ISSP-SP001-08-FLORTJ000,CGINS-FLORTJ-01519,2022-07-15T19:19:00,,44.658417,-124.095083,CGMCE-01ISSP-00020,EK20220715,CGVEH-CSPPCE-00002,1,,,,,25,25,,,
20,CE01ISSP-SP001-06-NUTNRJ000,CGINS-NUTNRJ-00425,2022-07-15T19:19:00,,44.658417,-124.095083,CGMCE-01ISSP-00020,EK20220715,CGVEH-CSPPCE-00002,1,,,,,25,25,,,
20,CE01ISSP-SP001-04-OPTAAJ000,CGINS-OPTAAJ-00283,2022-07-15T19:19:00,,44.658417,-124.095083,CGMCE-01ISSP-00020,EK20220715,CGVEH-CSPPCE-00002,1,,,,,25,25,,,
20,CE01ISSP-SP001-10-PARADJ000,CGINS-PARADJ-00434,2022-07-15T19:19:00,,44.658417,-124.095083,CGMCE-01ISSP-00020,EK20220715,CGVEH-CSPPCE-00002,1,,,,,25,25,,,
20,CE01ISSP-SP001-07-SPKIRJ000,CGINS-SPKIRJ-00282,2022-07-15T19:19:00,,44.658417,-124.095083,CGMCE-01ISSP-00020,EK20220715,CGVEH-CSPPCE-00002,1,,,,,25,25,,,
20,CE01ISSP-SP001-05-VELPTJ000,CGINS-VELPTJ-11912,2022-07-15T19:19:00,,44.658417,-124.095083,CGMCE-01ISSP-00020,EK20220715,CGVEH-CSPPCE-00002,1,,,,,25,25,,,
9 changes: 9 additions & 0 deletions deployment/CE02SHSP_Deploy.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,3 +233,12 @@ deploymentNumber,Reference Designator,sensor.uid,startDateTime,stopDateTime,lat,
26,CE02SHSP-SP001-09-PARADJ000,CGINS-PARADJ-00505,2022-06-29T18:14:00,2022-07-08T16:40:00,44.630917,-124.3024,CGMCE-02SHSP-00026,EK20220629,CGVEH-CSPPCE-00008,1,,,,,80,80,,,
26,CE02SHSP-SP001-06-SPKIRJ000,CGINS-SPKIRJ-00266,2022-06-29T18:14:00,2022-07-08T16:40:00,44.630917,-124.3024,CGMCE-02SHSP-00026,EK20220629,CGVEH-CSPPCE-00008,1,,,,,80,80,,,
26,CE02SHSP-SP001-02-VELPTJ000,CGINS-VELPTJ-12886,2022-06-29T18:14:00,2022-07-08T16:40:00,44.630917,-124.3024,CGMCE-02SHSP-00026,EK20220629,CGVEH-CSPPCE-00008,1,,,,,80,80,,,
27,CE02SHSP-SP001-00-SPPENG000,CGCON-CSPPCE-00007,2022-07-15T17:25:00,,44.634083,-124.302283,CGMCE-02SHSP-00027,EK20220715,CGVEH-CSPPCE-00007,1,,,,,80,80,,,
27,CE02SHSP-SP001-08-CTDPFJ000,CGINS-CTDPFJ-00346,2022-07-15T17:25:00,,44.634083,-124.302283,CGMCE-02SHSP-00027,EK20220715,CGVEH-CSPPCE-00007,1,,,,,80,80,,,
27,CE02SHSP-SP001-01-DOSTAJ000,CGINS-DOSTAJ-00672,2022-07-15T17:25:00,,44.634083,-124.302283,CGMCE-02SHSP-00027,EK20220715,CGVEH-CSPPCE-00007,1,,,,,80,80,,,
27,CE02SHSP-SP001-07-FLORTJ000,CGINS-FLORTJ-01207,2022-07-15T17:25:00,,44.634083,-124.302283,CGMCE-02SHSP-00027,EK20220715,CGVEH-CSPPCE-00007,1,,,,,80,80,,,
27,CE02SHSP-SP001-05-NUTNRJ000,CGINS-NUTNRJ-00870,2022-07-15T17:25:00,,44.634083,-124.302283,CGMCE-02SHSP-00027,EK20220715,CGVEH-CSPPCE-00007,1,,,,,80,80,,,
27,CE02SHSP-SP001-04-OPTAAJ000,CGINS-OPTAAJ-00138,2022-07-15T17:25:00,,44.634083,-124.302283,CGMCE-02SHSP-00027,EK20220715,CGVEH-CSPPCE-00007,1,,,,,80,80,,,
27,CE02SHSP-SP001-09-PARADJ000,CGINS-PARADJ-00504,2022-07-15T17:25:00,,44.634083,-124.302283,CGMCE-02SHSP-00027,EK20220715,CGVEH-CSPPCE-00007,1,,,,,80,80,,,
27,CE02SHSP-SP001-06-SPKIRJ000,CGINS-SPKIRJ-00281,2022-07-15T17:25:00,,44.634083,-124.302283,CGMCE-02SHSP-00027,EK20220715,CGVEH-CSPPCE-00007,1,,,,,80,80,,,
27,CE02SHSP-SP001-02-VELPTJ000,CGINS-VELPTJ-12876,2022-07-15T17:25:00,,44.634083,-124.302283,CGMCE-02SHSP-00027,EK20220715,CGVEH-CSPPCE-00007,1,,,,,80,80,,,

0 comments on commit 88b726c

Please sign in to comment.