store dynamic netcdf input as timeseries

Author: mjreno

autotest/test_netcdf_gwf_rch01.py

@@ -198,20 +198,17 @@ def check_output(idx, test, export, gridded_input):
     irch = getattr(rch, "irch").array
     recharge = getattr(rch, "recharge").array
     if export == "ugrid":
-        rl1 = xds["rcha_0_recharge_l1_p1"].data.flatten()
-        rl2 = xds["rcha_0_recharge_l2_p1"].data.flatten()
+        r = xds["rcha_0_recharge"].data.flatten()
     elif export == "structured":
-        rl1 = xds["rcha_0_recharge_p1"].data[0].flatten()
-        rl2 = xds["rcha_0_recharge_p1"].data[1].flatten()
+        r = xds["rcha_0_recharge"].data[0].flatten()
     if idx == 1:
         assert np.allclose(
             np.array(irch).flatten() + 1,
-            xds["rcha_0_irch_p1"].data,
+            xds["rcha_0_irch"].data,
         ), "NetCDF-irch comparison failure"
-    rarr = np.where(~np.isnan(rl1), rl1, rl2)
     assert np.allclose(
         np.array(recharge).flatten(),
-        rarr,
+        r,
     ), "NetCDF-recharge comparison failure"
 
     vlist = [

autotest/test_netcdf_gwf_rch03.py

@@ -200,19 +200,16 @@ def check_output(idx, test, export, gridded_input):
     irch = getattr(rch, "irch").array
     recharge = getattr(rch, "recharge").array
     if export == "ugrid":
-        rl1 = xds["rcha_0_recharge_l1_p1"].data.flatten()
-        rl2 = xds["rcha_0_recharge_l2_p1"].data.flatten()
+        r = xds["rcha_0_recharge"].data.flatten()
     elif export == "structured":
-        rl1 = xds["rcha_0_recharge_p1"].data[0].flatten()
-        rl2 = xds["rcha_0_recharge_p1"].data[1].flatten()
+        r = xds["rcha_0_recharge"].data[0].flatten()
     assert np.allclose(
         np.array(irch).flatten() + 1,
-        xds["rcha_0_irch_p1"].data,
+        xds["rcha_0_irch"].data.flatten(),
     ), "NetCDF-irch comparison failure"
-    rarr = np.where(~np.isnan(rl1), rl1, rl2)
     assert np.allclose(
         np.array(recharge).flatten(),
-        rarr,
+        r,
     ), "NetCDF-recharge comparison failure"
 
     vlist = [

autotest/test_netcdf_gwf_vsc03_sfr.py

@@ -225,15 +225,11 @@ def check_output(idx, test, export, gridded_input):
     irch = getattr(rch, "irch").array
     recharge = getattr(rch, "recharge").array
     aux = getattr(rch, "aux").array
-    if export == "ugrid":
-        rarr = xds["rcha-1_recharge_l1_p1"].data.flatten()
-        auxarr = xds["rcha-1_temperature_l1_p1"].data.flatten()
-    elif export == "structured":
-        rarr = xds["rcha-1_recharge_p1"].data[0].flatten()
-        auxarr = xds["rcha-1_temperature_p1"].data[0].flatten()
+    rarr = xds["rcha-1_recharge"].data[0].flatten()
+    auxarr = xds["rcha-1_temperature"][0].data.flatten()
     assert np.allclose(
         np.array(irch[0]).flatten() + 1,
-        xds["rcha-1_irch_p1"].data,
+        xds["rcha-1_irch"][0].data.flatten(),
     ), "NetCDF-irch comparison failure"
     assert np.allclose(
         np.array(recharge[0]).flatten(),

doc/mf6io/mf6ivar/dfn/gwf-ghba.dfn

@@ -48,8 +48,8 @@ description REPLACE save_flows {'{#1}': 'general-head boundary'}
 mf6internal ipakcb
 
 block options
-name tas_filerecord
-type record tas6 filein tas6_filename
+name obs_filerecord
+type record obs6 filein obs6_filename
 shape
 reader urword
 tagged true
@@ -58,15 +58,15 @@ longname
 description
 
 block options
-name tas6
+name obs6
 type keyword
 shape
 in_record true
 reader urword
 tagged true
 optional false
-longname head keyword
-description keyword to specify that record corresponds to a time-array-series file.
+longname obs keyword
+description keyword to specify that record corresponds to an observations file.
 
 block options
 name filein
@@ -79,38 +79,6 @@ optional false
 longname file keyword
 description keyword to specify that an input filename is expected next.
 
-block options
-name tas6_filename
-type string
-preserve_case true
-in_record true
-reader urword
-optional false
-tagged false
-longname file name of time series information
-description defines a time-array-series file defining a time-array series that can be used to assign time-varying values. See the ``Time-Variable Input'' section for instructions on using the time-array series capability.
-
-block options
-name obs_filerecord
-type record obs6 filein obs6_filename
-shape
-reader urword
-tagged true
-optional true
-longname
-description
-
-block options
-name obs6
-type keyword
-shape
-in_record true
-reader urword
-tagged true
-optional false
-longname obs keyword
-description keyword to specify that record corresponds to an observations file.
-
 block options
 name obs6_filename
 type string
@@ -164,7 +132,7 @@ reader readarray
 layered true
 netcdf true
 longname boundary head
-description is the boundary head. The recharge array may be defined by a time-array series (see the ``Using Time-Array Series in a Package'' section).
+description is the boundary head.
 default_value 3.e30
 
 block period
@@ -175,7 +143,7 @@ reader readarray
 layered true
 netcdf true
 longname boundary conductance
-description is the hydraulic conductance of the interface between the aquifer cell and the boundary. The recharge array may be defined by a time-array series (see the ``Using Time-Array Series in a Package'' section).
+description is the hydraulic conductance of the interface between the aquifer cell and the boundary.
 default_value 3.e30
 
 block period
@@ -186,6 +154,6 @@ reader readarray
 layered true
 netcdf true
 optional true
-longname recharge auxiliary variable iaux
-description is an array of values for auxiliary variable aux(iaux), where iaux is a value from 1 to naux, and aux(iaux) must be listed as part of the auxiliary variables.  A separate array can be specified for each auxiliary variable.  If an array is not specified for an auxiliary variable, then a value of zero is assigned.  If the value specified here for the auxiliary variable is the same as auxmultname, then the recharge array will be multiplied by this array.
+longname general-head boundary auxiliary variable iaux
+description is an array of values for auxiliary variable aux(iaux), where iaux is a value from 1 to naux, and aux(iaux) must be listed as part of the auxiliary variables.  A separate array can be specified for each auxiliary variable.  If an array is not specified for an auxiliary variable, then a value of zero is assigned.  If the value specified here for the auxiliary variable is the same as auxmultname, then the boundary head array will be multiplied by this array.
 mf6internal auxvar

src/Idm/gwf-ghbaidm.f90

@@ -17,12 +17,9 @@ module GwfGhbaInputModule
     logical :: iprpak = .false.
     logical :: iprflow = .false.
     logical :: ipakcb = .false.
-    logical :: tas_filerecord = .false.
-    logical :: tas6 = .false.
-    logical :: filein = .false.
-    logical :: tas6_filename = .false.
     logical :: obs_filerecord = .false.
     logical :: obs6 = .false.
+    logical :: filein = .false.
     logical :: obs6_filename = .false.
     logical :: mover = .false.
     logical :: export_nc = .false.
@@ -130,14 +127,14 @@ module GwfGhbaInputModule
     )
 
   type(InputParamDefinitionType), parameter :: &
-    gwfghba_tas_filerecord = InputParamDefinitionType &
+    gwfghba_obs_filerecord = InputParamDefinitionType &
     ( &
     'GWF', & ! component
     'GHBA', & ! subcomponent
     'OPTIONS', & ! block
-    'TAS_FILERECORD', & ! tag name
-    'TAS_FILERECORD', & ! fortran variable
-    'RECORD TAS6 FILEIN TAS6_FILENAME', & ! type
+    'OBS_FILERECORD', & ! tag name
+    'OBS_FILERECORD', & ! fortran variable
+    'RECORD OBS6 FILEIN OBS6_FILENAME', & ! type
     '', & ! shape
     '', & ! longname
     .false., & ! required
@@ -148,16 +145,16 @@ module GwfGhbaInputModule
     )
 
   type(InputParamDefinitionType), parameter :: &
-    gwfghba_tas6 = InputParamDefinitionType &
+    gwfghba_obs6 = InputParamDefinitionType &
     ( &
     'GWF', & ! component
     'GHBA', & ! subcomponent
     'OPTIONS', & ! block
-    'TAS6', & ! tag name
-    'TAS6', & ! fortran variable
+    'OBS6', & ! tag name
+    'OBS6', & ! fortran variable
     'KEYWORD', & ! type
     '', & ! shape
-    'head keyword', & ! longname
+    'obs keyword', & ! longname
     .true., & ! required
     .true., & ! multi-record
     .false., & ! preserve case
@@ -183,60 +180,6 @@ module GwfGhbaInputModule
     .false. & ! timeseries
     )
 
-  type(InputParamDefinitionType), parameter :: &
-    gwfghba_tas6_filename = InputParamDefinitionType &
-    ( &
-    'GWF', & ! component
-    'GHBA', & ! subcomponent
-    'OPTIONS', & ! block
-    'TAS6_FILENAME', & ! tag name
-    'TAS6_FILENAME', & ! fortran variable
-    'STRING', & ! type
-    '', & ! shape
-    'file name of time series information', & ! longname
-    .true., & ! required
-    .true., & ! multi-record
-    .true., & ! preserve case
-    .false., & ! layered
-    .false. & ! timeseries
-    )
-
-  type(InputParamDefinitionType), parameter :: &
-    gwfghba_obs_filerecord = InputParamDefinitionType &
-    ( &
-    'GWF', & ! component
-    'GHBA', & ! subcomponent
-    'OPTIONS', & ! block
-    'OBS_FILERECORD', & ! tag name
-    'OBS_FILERECORD', & ! fortran variable
-    'RECORD OBS6 FILEIN OBS6_FILENAME', & ! type
-    '', & ! shape
-    '', & ! longname
-    .false., & ! required
-    .false., & ! multi-record
-    .false., & ! preserve case
-    .false., & ! layered
-    .false. & ! timeseries
-    )
-
-  type(InputParamDefinitionType), parameter :: &
-    gwfghba_obs6 = InputParamDefinitionType &
-    ( &
-    'GWF', & ! component
-    'GHBA', & ! subcomponent
-    'OPTIONS', & ! block
-    'OBS6', & ! tag name
-    'OBS6', & ! fortran variable
-    'KEYWORD', & ! type
-    '', & ! shape
-    'obs keyword', & ! longname
-    .true., & ! required
-    .true., & ! multi-record
-    .false., & ! preserve case
-    .false., & ! layered
-    .false. & ! timeseries
-    )
-
   type(InputParamDefinitionType), parameter :: &
     gwfghba_obs6_filename = InputParamDefinitionType &
     ( &
@@ -337,7 +280,7 @@ module GwfGhbaInputModule
     'AUXVAR', & ! fortran variable
     'DOUBLE2D', & ! type
     'NAUX NODES', & ! shape
-    'recharge auxiliary variable iaux', & ! longname
+    'general-head boundary auxiliary variable iaux', & ! longname
     .false., & ! required
     .false., & ! multi-record
     .false., & ! preserve case
@@ -353,12 +296,9 @@ module GwfGhbaInputModule
     gwfghba_iprpak, &
     gwfghba_iprflow, &
     gwfghba_ipakcb, &
-    gwfghba_tas_filerecord, &
-    gwfghba_tas6, &
-    gwfghba_filein, &
-    gwfghba_tas6_filename, &
     gwfghba_obs_filerecord, &
     gwfghba_obs6, &
+    gwfghba_filein, &
     gwfghba_obs6_filename, &
     gwfghba_mover, &
     gwfghba_export_nc, &