Merge branch 'main' of https://github.com/NOAA-PMEL/EcoFOCI_AutoAnalysis

Author: shaunwbell

.github/workflows/superlinter.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       # Checks out a copy of your repository on the ubuntu-latest machine
       - name: Checkout code
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.1
         with:
           # super-linter needs the full git history to get the
           # list of files that changed across commits

erddap_xml/mule_erddap_dataset/cruise_ctds/CTD_dy1805_final_oxy.xml

@@ -1,6 +1,6 @@
 <dataset type="EDDTableFromMultidimNcFiles" datasetID="CTD_dy1805_final_oxy" active="true">
     <reloadEveryNMinutes>10080</reloadEveryNMinutes>
-    <fileDir>/home/ecofoci_data/2018/CTDcasts/dy1805/erddap/final_data/oxy/</fileDir>
+    <fileDir>/home/ecofoci_data/2018/CTDcasts/dy1805/final_data_cf/oxy/</fileDir>
     <fileNameRegex>.*\.nc</fileNameRegex>
     <recursive>true</recursive>
     <pathRegex>.*</pathRegex>
@@ -27,8 +27,8 @@
         <att name="keywords">BO_61, bottle, BTL_103, data, depth, depth2, dissolved, dissolved o2, latitude, local, micromoles, micromoles/l, niskin, number, O2, oxygen, source, statistics, time</att>        <att name="license">[standard]</att>
         <att name="sourceUrl">(local files)</att>
         <att name="standard_name_vocabulary">CF Standard Name Table v70</att>
-        <att name="summary">Winkler Titrated Oxygen Data from DY1805</att>
-        <att name="title">Winkler Titrated Oxygen Data from DY1805</att>
+        <att name="summary">Winkler Titrated Oxygen Data from DY2103</att>
+        <att name="title">Winkler Titrated Oxygen Data from DY2103</att>
     </addAttributes>
     <dataVariable>
         <sourceName>time</sourceName>
@@ -47,7 +47,7 @@
         </addAttributes>
     </dataVariable>
     <dataVariable>
-        <sourceName>depth</sourceName>
+        <sourceName>pressure</sourceName>
             <destinationName>pressure</destinationName>
             <dataType>float</dataType>            
             <addAttributes>
@@ -62,7 +62,7 @@
             </addAttributes>
         </dataVariable>
     <dataVariable>
-        <sourceName>lat</sourceName>
+        <sourceName>latitude</sourceName>
         <destinationName>latitude</destinationName>
         <dataType>float</dataType>
         <!-- sourceAttributes>
@@ -80,7 +80,7 @@
         </addAttributes>
     </dataVariable>
     <dataVariable>
-        <sourceName>lon</sourceName>
+        <sourceName>longitude</sourceName>
         <destinationName>longitude</destinationName>
         <dataType>float</dataType>
         <addAttributes>
@@ -93,7 +93,7 @@
         </addAttributes>
     </dataVariable>
     <dataVariable>
-        <sourceName>BO_61</sourceName>
+        <sourceName>O2</sourceName>
         <destinationName>bottle_oxygen</destinationName>
         <dataType>float</dataType>
         <!-- sourceAttributes>
@@ -111,7 +111,7 @@
         </addAttributes>
     </dataVariable>
     <dataVariable>
-        <sourceName>BTL_103</sourceName>
+        <sourceName>BTLID</sourceName>
         <destinationName>BTLID</destinationName>
         <dataType>float</dataType>            
         <addAttributes>
@@ -125,7 +125,7 @@
         </addAttributes>
     </dataVariable>  
         <dataVariable>
-            <sourceName>***fileName,^(\S*)\.cf\.nc,1</sourceName>
+            <sourceName>***fileName,^(\S*)\.nc,1</sourceName>
             <destinationName>profile_id</destinationName>
             <dataType>String</dataType>            
             <addAttributes>
@@ -134,7 +134,7 @@
             </addAttributes>
         </dataVariable>  
         <dataVariable>
-            <sourceName>global:WATER_DEPTH</sourceName>
+            <sourceName>global:WaterDepth</sourceName>
             <destinationName>Water_Depth</destinationName>
             <dataType>float</dataType>
             <addAttributes>
@@ -147,7 +147,7 @@
             </addAttributes>
         </dataVariable>  
         <dataVariable>
-            <sourceName>global:STATION_NAME</sourceName>
+            <sourceName>global:StationNameID</sourceName>
             <destinationName>Station_Name</destinationName>
             <dataType>String</dataType>
             <addAttributes>