moved observed discharge to inputs, changed file name to match predic…

…ted discharge.
USGS-R · Nov 3, 2020 · 3258c96 · 3258c96
1 parent b6af3ff
commit 3258c96
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 85 deletions.
diff --git a/2_observations.yml b/2_observations.yml
@@ -12,7 +12,6 @@ targets:
   2_observations:
     depends:
       - out_data/temperature_observations.csv
-      - out_data/flow_observations.csv
 
   # daily flow and temperature data
   out_data/temperature_observations.csv:
@@ -21,8 +20,3 @@ targets:
       var = I('wtemp(C)'),
       in_file = 'in_data/Data - ERL paper/Forcing_attrFiles/no_dam_forcing_60__days118sites.csv')
 
-  out_data/flow_observations.csv:
-    command: extract_obs(
-      out_file = target_name,
-      var = I('discharge(cfs)'),
-      in_file = 'in_data/Data - ERL paper/Forcing_attrFiles/no_dam_forcing_60__days118sites.csv')
diff --git a/3_inputs.yml b/3_inputs.yml
@@ -17,6 +17,7 @@ targets:
       - out_data/AT_basin_attributes.csv
       - out_data/weather_drivers.zip
       - out_data/pred_discharge.csv
+      - out_data/obs_discharge.csv
 
   out_data/AT_basin_attributes.csv:
     command: extract_AT_attributes(
@@ -33,3 +34,10 @@ targets:
     command: subset_pred_discharge(
       out_file = target_name,
       in_file = 'in_data/Data - ERL paper/Forcing_attrFiles/no_dam_forcing_60__days118sites.csv')
+
+  out_data/obs_discharge.csv:
+    command: extract_obs(
+      out_file = target_name,
+      var = I('discharge(cfs)'),
+      in_file = 'in_data/Data - ERL paper/Forcing_attrFiles/no_dam_forcing_60__days118sites.csv')
+
diff --git a/in_text/text_02_observations.yml b/in_text/text_02_observations.yml
@@ -3,7 +3,7 @@ title: >-
 
 
 abstract: >-
-  Mean daily temperature and discharge observations retrieved from NWIS. The temperature observations were used to train and validate all temperature models, while flow observations were used as a model input during training for a subset of the temperature models. The model training period was from 2010-10-01 to 2014-09-30, and the test period was from 2014-10-01 to 2016-09-30.
+  Mean daily temperature and discharge observations retrieved from NWIS. The temperature observations were used to train and validate all temperature models. The model training period was from 2010-10-01 to 2014-09-30, and the test period was from 2014-10-01 to 2016-09-30.
 
 cross-cites:
   -
@@ -41,39 +41,13 @@ entities:
       data-min: NA
       data-max: NA
       data-units: degrees Celsius
-  -
-    data-name: flow_observations.csv
-    data-description: Observed mean daily discharge observation retrieved from NWIS for the 118 gages used in this study. Flow observations were used as a driver in the water temperature model. The data were retrieved from NWIS and are limited to the test and training period, from 2010-10-01 through 2016-09-30.
-    attributes:
-    -
-      attr-label: site_no
-      attr-def: >-
-        USGS unique site identifier.
-      attr-defs: NA
-      data-min: NA
-      data-max: NA
-      data-units: NA
-    -
-      attr-label: datetime
-      attr-def: >-
-        Date of temperature observation.
-      attr-defs: NA
-      data-min: NA
-      data-max: NA
-      data-units: NA
-    -
-      attr-label: discharge(cfs)
-      attr-def: Observed mean daily discharge
-      attr-defs: NA
-      data-min: NA
-      data-max: NA
-      data-units: degrees Celsius
+
 
 process-date: XX
 indirect-spatial: U.S.A.
 latitude-res: 0.00001
 longitude-res: 0.00001
-data-name: Flow and water temperature observations
+data-name: Water temperature observations
 data-description: >-
-  Flow and water temperature observations used to train and validate models described in Rahmani et al. 2020.
+  Water temperature observations used to train and validate models described in Rahmani et al. 2020.
 file-format: comma seperated file format (csv)
diff --git a/in_text/text_03_inputs.yml b/in_text/text_03_inputs.yml
@@ -2,7 +2,7 @@ title: >-
   Exploring the exceptional performance of a deep learning stream temperature model and the value of streamflow data: 3 model inputs
 
 abstract: >-
-  Inputs to the deep learning models included daily weather forcing data, as well as river catchment attributes.
+  Inputs to the deep learning models included daily weather forcing data, river catchment attributes, and simulated or observed flow.
 
 cross-cites:
   -
@@ -305,6 +305,33 @@ entities:
       data-min: NA
       data-max: NA
       data-units: cubic feet per second
+  -
+    data-name: flow_observations.csv
+    data-description: Observed mean daily discharge observation retrieved from NWIS for the 118 gages used in this study. Flow observations were used as a driver in the water temperature model. The data were retrieved from NWIS and are limited to the test and training period, from 2010-10-01 through 2016-09-30.
+    attributes:
+    -
+      attr-label: site_no
+      attr-def: >-
+        USGS unique site identifier.
+      attr-defs: NA
+      data-min: NA
+      data-max: NA
+      data-units: NA
+    -
+      attr-label: datetime
+      attr-def: >-
+        Date of temperature observation.
+      attr-defs: NA
+      data-min: NA
+      data-max: NA
+      data-units: NA
+    -
+      attr-label: discharge(cfs)
+      attr-def: Observed mean daily discharge
+      attr-defs: NA
+      data-min: NA
+      data-max: NA
+      data-units: degrees Celsius
 
 build-environment: Multiple computer systems were used to generate these data, including XX. The open source languages R and Python was used on all systems, as well as XX.
 
@@ -314,5 +341,5 @@ latitude-res: 0.1
 longitude-res: 0.1
 data-name: Model driver data
 data-description: >-
-  Inputs (drivers) for the temperature models described in Rahmani et al. 2020, including weather drivers, river basin attributes, and simulated river discharge.
+  Inputs (drivers) for the temperature models described in Rahmani et al. 2020, including weather drivers, river basin attributes, and simulated and observed river discharge.
 file-format: comma seperated file format (csv)
diff --git a/out_xml/02_observations.xml b/out_xml/02_observations.xml
@@ -32,7 +32,7 @@
       </citeinfo>
     </citation>
     <descript>
-      <abstract>Mean daily temperature and discharge observations retrieved from NWIS. The temperature observations were used to train and validate all temperature models, while flow observations were used as a model input during training for a subset of the temperature models. The model training period was from 2010-10-01 to 2014-09-30, and the test period was from 2014-10-01 to 2016-09-30.</abstract>
+      <abstract>Mean daily temperature and discharge observations retrieved from NWIS. The temperature observations were used to train and validate all temperature models. The model training period was from 2010-10-01 to 2014-09-30, and the test period was from 2014-10-01 to 2016-09-30.</abstract>
       <purpose>Decision support, water quality research</purpose>
     </descript>
     <timeperd>
@@ -265,49 +265,6 @@
         </attrdomv>
       </attr>
     </detailed>
-    <detailed>
-      <enttyp>
-        <enttypl>flow_observations.csv</enttypl>
-        <enttypd>Observed mean daily discharge observation retrieved from NWIS for the 118 gages used in this study. Flow observations were used as a driver in the water temperature model. The data were retrieved from NWIS and are limited to the test and training period, from 2010-10-01 through 2016-09-30.</enttypd>
-        <enttypds>U.S. Geological Survey</enttypds>
-      </enttyp>
-      <attr>
-        <attrlabl>site_no</attrlabl>
-        <attrdef>USGS unique site identifier.</attrdef>
-        <attrdefs>NA</attrdefs>
-        <attrdomv>
-          <rdom>
-            <rdommin>NA</rdommin>
-            <rdommax>NA</rdommax>
-            <attrunit>NA</attrunit>
-          </rdom>
-        </attrdomv>
-      </attr>
-      <attr>
-        <attrlabl>datetime</attrlabl>
-        <attrdef>Date of temperature observation.</attrdef>
-        <attrdefs>NA</attrdefs>
-        <attrdomv>
-          <rdom>
-            <rdommin>NA</rdommin>
-            <rdommax>NA</rdommax>
-            <attrunit>NA</attrunit>
-          </rdom>
-        </attrdomv>
-      </attr>
-      <attr>
-        <attrlabl>discharge(cfs)</attrlabl>
-        <attrdef>Observed mean daily discharge</attrdef>
-        <attrdefs>NA</attrdefs>
-        <attrdomv>
-          <rdom>
-            <rdommin>NA</rdommin>
-            <rdommax>NA</rdommax>
-            <attrunit>degrees Celsius</attrunit>
-          </rdom>
-        </attrdomv>
-      </attr>
-    </detailed>
   </eainfo>
   <distinfo>
     <distrib>

diff --git a/out_xml/03_inputs.xml b/out_xml/03_inputs.xml
@@ -32,7 +32,7 @@
       </citeinfo>
     </citation>
     <descript>
-      <abstract>Inputs to the deep learning models included daily weather forcing data, as well as river catchment attributes.</abstract>
+      <abstract>Inputs to the deep learning models included daily weather forcing data, river catchment attributes, and simulated or observed flow.</abstract>
       <purpose>Decision support, water quality research</purpose>
     </descript>
     <timeperd>
@@ -665,6 +665,49 @@
         </attrdomv>
       </attr>
     </detailed>
+    <detailed>
+      <enttyp>
+        <enttypl>flow_observations.csv</enttypl>
+        <enttypd>Observed mean daily discharge observation retrieved from NWIS for the 118 gages used in this study. Flow observations were used as a driver in the water temperature model. The data were retrieved from NWIS and are limited to the test and training period, from 2010-10-01 through 2016-09-30.</enttypd>
+        <enttypds>U.S. Geological Survey</enttypds>
+      </enttyp>
+      <attr>
+        <attrlabl>site_no</attrlabl>
+        <attrdef>USGS unique site identifier.</attrdef>
+        <attrdefs>NA</attrdefs>
+        <attrdomv>
+          <rdom>
+            <rdommin>NA</rdommin>
+            <rdommax>NA</rdommax>
+            <attrunit>NA</attrunit>
+          </rdom>
+        </attrdomv>
+      </attr>
+      <attr>
+        <attrlabl>datetime</attrlabl>
+        <attrdef>Date of temperature observation.</attrdef>
+        <attrdefs>NA</attrdefs>
+        <attrdomv>
+          <rdom>
+            <rdommin>NA</rdommin>
+            <rdommax>NA</rdommax>
+            <attrunit>NA</attrunit>
+          </rdom>
+        </attrdomv>
+      </attr>
+      <attr>
+        <attrlabl>discharge(cfs)</attrlabl>
+        <attrdef>Observed mean daily discharge</attrdef>
+        <attrdefs>NA</attrdefs>
+        <attrdomv>
+          <rdom>
+            <rdommin>NA</rdommin>
+            <rdommax>NA</rdommax>
+            <attrunit>degrees Celsius</attrunit>
+          </rdom>
+        </attrdomv>
+      </attr>
+    </detailed>
   </eainfo>
   <distinfo>
     <distrib>

diff --git a/remake.yml b/remake.yml
@@ -96,7 +96,7 @@ targets:
 
   02_observations_sb_data:
     command: sb_replace_files(sbid_02_observations,
-      "out_data/temperature_observations.csv", "out_data/flow_observations.csv")
+      "out_data/temperature_observations.csv")
 
   02_observations_sb_xml:
     command: sb_render_post_xml(sbid_02_observations,
@@ -113,7 +113,7 @@ targets:
     command: sb_replace_files(sbid_03_inputs,
       "out_data/weather_drivers.zip",
       "out_data/AT_basin_attributes.csv",
-      "out_data/pred_discharge.csv")
+      "out_data/pred_discharge.csv", "out_data/obs_discharge.csv")
 
   05_predictions_sb_xml:
     command: sb_render_post_xml(sbid_05_predictions,