Skip to content

Commit 6fc9758

Browse files
shaunwbellshaunwbell
committed
merged CTD update
1 parent 451456c commit 6fc9758

File tree

58 files changed

+3866
-2638
lines changed

Some content is hidden

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

58 files changed

+3866
-2638
lines changed

‎erddap_xml/mule_erddap_dataset_products/ctds/CTD_ae1001_final_merged.xml‎

Lines changed: 44 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -111,31 +111,27 @@
111111
<dataVariable>
112112
<sourceName>BTLID</sourceName>
113113
<destinationName>BTLID</destinationName>
114-
<dataType>float</dataType>
115-
<!-- sourceAttributes>
116-
<att name="epic_code" type="int">103</att>
117-
<att name="generic_name">BTL</att>
118-
<att name="long_name">NISKIN BOTTLE NUMBER</att>
119-
<att name="name">BTL_103</att>
120-
</sourceAttributes -->
114+
<dataType>float</dataType>
121115
<addAttributes>
122-
<att name="missing_value" type="float">-9999.0</att>
123-
<att name="_FillValue" type="float">1.0e35</att>
116+
<att name="missing_value" type="float">-9999.0</att>
117+
<att name="_FillValue" type="float">1.0e35</att>
124118
<att name="colorBarMaximum" type="double">100.0</att>
125119
<att name="colorBarMinimum" type="double">0.0</att>
120+
<att name="long_name">NISKIN BOTTLE NUMBER</att>
126121
<att name="ioos_category">Statistics</att>
122+
<att name="epic_code" type="int">103</att>
127123
</addAttributes>
128-
</dataVariable>
124+
</dataVariable>
129125
<dataVariable>
130-
<sourceName>salinity_ch2</sourceName>
131-
<destinationName>salinity_ch2</destinationName>
126+
<sourceName>salinity_ch1</sourceName>
127+
<destinationName>salinity_ch1</destinationName>
132128
<dataType>float</dataType>
133129
<!-- sourceAttributes>
134-
<att name="epic_code" type="int">42</att>
130+
<att name="epic_code" type="int">41</att>
135131
<att name="fill_value" type="double">1.0E35</att>
136132
<att name="generic_name">sal</att>
137133
<att name="long_name">SALINITY (PSU)</att>
138-
<att name="name">S_42</att>
134+
<att name="name">S_41</att>
139135
<att name="units">psu</att>
140136
</sourceAttributes -->
141137
<addAttributes>
@@ -149,15 +145,15 @@
149145
</addAttributes>
150146
</dataVariable>
151147
<dataVariable>
152-
<sourceName>salinity_ch1</sourceName>
153-
<destinationName>salinity_ch1</destinationName>
148+
<sourceName>salinity_ch2</sourceName>
149+
<destinationName>salinity_ch2</destinationName>
154150
<dataType>float</dataType>
155151
<!-- sourceAttributes>
156-
<att name="epic_code" type="int">41</att>
152+
<att name="epic_code" type="int">42</att>
157153
<att name="fill_value" type="double">1.0E35</att>
158154
<att name="generic_name">sal</att>
159155
<att name="long_name">SALINITY (PSU)</att>
160-
<att name="name">S_41</att>
156+
<att name="name">S_42</att>
161157
<att name="units">psu</att>
162158
</sourceAttributes -->
163159
<addAttributes>
@@ -236,7 +232,28 @@
236232
<att name="colorBarScale">Log</att>
237233
<att name="ioos_category">Ocean Color</att>
238234
<att name="standard_name">concentration_of_chlorophyll_in_sea_water</att>
239-
<att name="units">ugrams/l</att> </addAttributes>
235+
<att name="units">ugrams/l</att>
236+
</addAttributes>
237+
</dataVariable>
238+
<dataVariable>
239+
<sourceName>par</sourceName>
240+
<destinationName>par</destinationName>
241+
<dataType>float</dataType>
242+
<!-- sourceAttributes>
243+
<att name="epic_code" type="int">905</att>
244+
<att name="fill_value" type="double">1.0E35</att>
245+
<att name="FORTRAN_format">f10.2</att>
246+
<att name="generic_name">par</att>
247+
<att name="long_name">Photosynthetic Active Radiation</att>
248+
<att name="name">PAR_905</att>
249+
</sourceAttributes -->
250+
<addAttributes>
251+
<att name="missing_value" type="float">-9999.0</att>
252+
<att name="_FillValue" type="float">1.0e35</att>
253+
<att name="ioos_category">Optical Properties</att>
254+
<att name="standard_name">spherical_photosynthetic_irradiance_in_sea_water</att>
255+
<att name="units">umol m-2 s-1</att>
256+
</addAttributes>
240257
</dataVariable>
241258
<dataVariable>
242259
<sourceName>temperature_ch1</sourceName>
@@ -342,7 +359,7 @@
342359
<att name="standard_name">moles_of_oxygen_per_unit_mass_in_sea_water</att>
343360
<att name="units">umol/kg</att>
344361
</addAttributes>
345-
</dataVariable>
362+
</dataVariable>
346363
<dataVariable>
347364
<sourceName>temperature_ch2</sourceName>
348365
<destinationName>temperature_ch2</destinationName>
@@ -365,28 +382,8 @@
365382
</addAttributes>
366383
</dataVariable>
367384
<dataVariable>
368-
<sourceName>PAR_905</sourceName>
369-
<destinationName>par</destinationName>
370-
<dataType>float</dataType>
371-
<!-- sourceAttributes>
372-
<att name="epic_code" type="int">905</att>
373-
<att name="fill_value" type="double">1.0E35</att>
374-
<att name="FORTRAN_format">f10.2</att>
375-
<att name="generic_name">par</att>
376-
<att name="long_name">Photosynthetic Active Radiation</att>
377-
<att name="name">PAR_905</att>
378-
</sourceAttributes -->
379-
<addAttributes>
380-
<att name="missing_value" type="float">-9999.0</att>
381-
<att name="_FillValue" type="float">1.0e35</att>
382-
<att name="ioos_category">Optical Properties</att>
383-
<att name="standard_name">spherical_photosynthetic_irradiance_in_sea_water</att>
384-
<att name="units">umol m-2 s-1</att>
385-
</addAttributes>
386-
</dataVariable>
387-
<dataVariable>
388-
<sourceName>Tr_904</sourceName>
389-
<destinationName>transmission</destinationName>
385+
<sourceName>transmissometry</sourceName>
386+
<destinationName>transmissometry</destinationName>
390387
<dataType>float</dataType>
391388
<!-- sourceAttributes>
392389
<att name="epic_code" type="int">904</att>
@@ -502,7 +499,7 @@
502499
</addAttributes>
503500
</dataVariable>
504501
<dataVariable>
505-
<sourceName>SI_188</sourceName>
502+
<sourceName>SI</sourceName>
506503
<destinationName>SI</destinationName>
507504
<dataType>float</dataType>
508505
<!-- sourceAttributes>
@@ -524,7 +521,7 @@
524521
</addAttributes>
525522
</dataVariable>
526523
<dataVariable>
527-
<sourceName>PO4_186</sourceName>
524+
<sourceName>PO4</sourceName>
528525
<destinationName>PO4</destinationName>
529526
<dataType>float</dataType>
530527
<!-- sourceAttributes>
@@ -546,7 +543,7 @@
546543
</addAttributes>
547544
</dataVariable>
548545
<dataVariable>
549-
<sourceName>NO2_184</sourceName>
546+
<sourceName>NO2</sourceName>
550547
<destinationName>NO2</destinationName>
551548
<dataType>float</dataType>
552549
<!-- sourceAttributes>
@@ -568,7 +565,7 @@
568565
</addAttributes>
569566
</dataVariable>
570567
<dataVariable>
571-
<sourceName>NO3_182</sourceName>
568+
<sourceName>NO3</sourceName>
572569
<destinationName>NO3</destinationName>
573570
<dataType>float</dataType>
574571
<!-- sourceAttributes>
@@ -590,7 +587,7 @@
590587
</addAttributes>
591588
</dataVariable>
592589
<dataVariable>
593-
<sourceName>NH4_189</sourceName>
590+
<sourceName>NH4</sourceName>
594591
<destinationName>NH4</destinationName>
595592
<dataType>float</dataType>
596593
<!-- sourceAttributes>

‎erddap_xml/mule_erddap_dataset_products/ctds/CTD_ae1501_final_merged.xml‎

Lines changed: 44 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -111,31 +111,27 @@
111111
<dataVariable>
112112
<sourceName>BTLID</sourceName>
113113
<destinationName>BTLID</destinationName>
114-
<dataType>float</dataType>
115-
<!-- sourceAttributes>
116-
<att name="epic_code" type="int">103</att>
117-
<att name="generic_name">BTL</att>
118-
<att name="long_name">NISKIN BOTTLE NUMBER</att>
119-
<att name="name">BTL_103</att>
120-
</sourceAttributes -->
114+
<dataType>float</dataType>
121115
<addAttributes>
122-
<att name="missing_value" type="float">-9999.0</att>
123-
<att name="_FillValue" type="float">1.0e35</att>
116+
<att name="missing_value" type="float">-9999.0</att>
117+
<att name="_FillValue" type="float">1.0e35</att>
124118
<att name="colorBarMaximum" type="double">100.0</att>
125119
<att name="colorBarMinimum" type="double">0.0</att>
120+
<att name="long_name">NISKIN BOTTLE NUMBER</att>
126121
<att name="ioos_category">Statistics</att>
122+
<att name="epic_code" type="int">103</att>
127123
</addAttributes>
128-
</dataVariable>
124+
</dataVariable>
129125
<dataVariable>
130-
<sourceName>salinity_ch2</sourceName>
131-
<destinationName>salinity_ch2</destinationName>
126+
<sourceName>salinity_ch1</sourceName>
127+
<destinationName>salinity_ch1</destinationName>
132128
<dataType>float</dataType>
133129
<!-- sourceAttributes>
134-
<att name="epic_code" type="int">42</att>
130+
<att name="epic_code" type="int">41</att>
135131
<att name="fill_value" type="double">1.0E35</att>
136132
<att name="generic_name">sal</att>
137133
<att name="long_name">SALINITY (PSU)</att>
138-
<att name="name">S_42</att>
134+
<att name="name">S_41</att>
139135
<att name="units">psu</att>
140136
</sourceAttributes -->
141137
<addAttributes>
@@ -149,15 +145,15 @@
149145
</addAttributes>
150146
</dataVariable>
151147
<dataVariable>
152-
<sourceName>salinity_ch1</sourceName>
153-
<destinationName>salinity_ch1</destinationName>
148+
<sourceName>salinity_ch2</sourceName>
149+
<destinationName>salinity_ch2</destinationName>
154150
<dataType>float</dataType>
155151
<!-- sourceAttributes>
156-
<att name="epic_code" type="int">41</att>
152+
<att name="epic_code" type="int">42</att>
157153
<att name="fill_value" type="double">1.0E35</att>
158154
<att name="generic_name">sal</att>
159155
<att name="long_name">SALINITY (PSU)</att>
160-
<att name="name">S_41</att>
156+
<att name="name">S_42</att>
161157
<att name="units">psu</att>
162158
</sourceAttributes -->
163159
<addAttributes>
@@ -236,7 +232,28 @@
236232
<att name="colorBarScale">Log</att>
237233
<att name="ioos_category">Ocean Color</att>
238234
<att name="standard_name">concentration_of_chlorophyll_in_sea_water</att>
239-
<att name="units">ugrams/l</att> </addAttributes>
235+
<att name="units">ugrams/l</att>
236+
</addAttributes>
237+
</dataVariable>
238+
<dataVariable>
239+
<sourceName>par</sourceName>
240+
<destinationName>par</destinationName>
241+
<dataType>float</dataType>
242+
<!-- sourceAttributes>
243+
<att name="epic_code" type="int">905</att>
244+
<att name="fill_value" type="double">1.0E35</att>
245+
<att name="FORTRAN_format">f10.2</att>
246+
<att name="generic_name">par</att>
247+
<att name="long_name">Photosynthetic Active Radiation</att>
248+
<att name="name">PAR_905</att>
249+
</sourceAttributes -->
250+
<addAttributes>
251+
<att name="missing_value" type="float">-9999.0</att>
252+
<att name="_FillValue" type="float">1.0e35</att>
253+
<att name="ioos_category">Optical Properties</att>
254+
<att name="standard_name">spherical_photosynthetic_irradiance_in_sea_water</att>
255+
<att name="units">umol m-2 s-1</att>
256+
</addAttributes>
240257
</dataVariable>
241258
<dataVariable>
242259
<sourceName>temperature_ch1</sourceName>
@@ -342,7 +359,7 @@
342359
<att name="standard_name">moles_of_oxygen_per_unit_mass_in_sea_water</att>
343360
<att name="units">umol/kg</att>
344361
</addAttributes>
345-
</dataVariable>
362+
</dataVariable>
346363
<dataVariable>
347364
<sourceName>temperature_ch2</sourceName>
348365
<destinationName>temperature_ch2</destinationName>
@@ -365,28 +382,8 @@
365382
</addAttributes>
366383
</dataVariable>
367384
<dataVariable>
368-
<sourceName>PAR_905</sourceName>
369-
<destinationName>par</destinationName>
370-
<dataType>float</dataType>
371-
<!-- sourceAttributes>
372-
<att name="epic_code" type="int">905</att>
373-
<att name="fill_value" type="double">1.0E35</att>
374-
<att name="FORTRAN_format">f10.2</att>
375-
<att name="generic_name">par</att>
376-
<att name="long_name">Photosynthetic Active Radiation</att>
377-
<att name="name">PAR_905</att>
378-
</sourceAttributes -->
379-
<addAttributes>
380-
<att name="missing_value" type="float">-9999.0</att>
381-
<att name="_FillValue" type="float">1.0e35</att>
382-
<att name="ioos_category">Optical Properties</att>
383-
<att name="standard_name">spherical_photosynthetic_irradiance_in_sea_water</att>
384-
<att name="units">umol m-2 s-1</att>
385-
</addAttributes>
386-
</dataVariable>
387-
<dataVariable>
388-
<sourceName>Tr_904</sourceName>
389-
<destinationName>transmission</destinationName>
385+
<sourceName>transmissometry</sourceName>
386+
<destinationName>transmissometry</destinationName>
390387
<dataType>float</dataType>
391388
<!-- sourceAttributes>
392389
<att name="epic_code" type="int">904</att>
@@ -502,7 +499,7 @@
502499
</addAttributes>
503500
</dataVariable>
504501
<dataVariable>
505-
<sourceName>SI_188</sourceName>
502+
<sourceName>SI</sourceName>
506503
<destinationName>SI</destinationName>
507504
<dataType>float</dataType>
508505
<!-- sourceAttributes>
@@ -524,7 +521,7 @@
524521
</addAttributes>
525522
</dataVariable>
526523
<dataVariable>
527-
<sourceName>PO4_186</sourceName>
524+
<sourceName>PO4</sourceName>
528525
<destinationName>PO4</destinationName>
529526
<dataType>float</dataType>
530527
<!-- sourceAttributes>
@@ -546,7 +543,7 @@
546543
</addAttributes>
547544
</dataVariable>
548545
<dataVariable>
549-
<sourceName>NO2_184</sourceName>
546+
<sourceName>NO2</sourceName>
550547
<destinationName>NO2</destinationName>
551548
<dataType>float</dataType>
552549
<!-- sourceAttributes>
@@ -568,7 +565,7 @@
568565
</addAttributes>
569566
</dataVariable>
570567
<dataVariable>
571-
<sourceName>NO3_182</sourceName>
568+
<sourceName>NO3</sourceName>
572569
<destinationName>NO3</destinationName>
573570
<dataType>float</dataType>
574571
<!-- sourceAttributes>
@@ -590,7 +587,7 @@
590587
</addAttributes>
591588
</dataVariable>
592589
<dataVariable>
593-
<sourceName>NH4_189</sourceName>
590+
<sourceName>NH4</sourceName>
594591
<destinationName>NH4</destinationName>
595592
<dataType>float</dataType>
596593
<!-- sourceAttributes>

0 commit comments

Comments
 (0)