refactor(gwe-est): rename variables rhos and cps to density_solid and…

… heat_capacity_solid

autotest/test_gwe_cnd.py

@@ -93,6 +93,8 @@
 cpw = 4183.0
 rhow = 1000.0
 lhv = 2454.0
+cps = 760.0
+rhos = 1500.0
 
 # Set solver parameter values (and related)
 nouter, ninner = 100, 300
@@ -307,8 +309,8 @@ def build_models(idx, test):
         heat_capacity_water=cpw,
         density_water=rhow,
         porosity=prsity,
-        cps=760.0,
-        rhos=1500.0,
+        heat_capacity_solid=cps,
+        density_solid=rhos,
         filename=f"{gwename}.est",
     )
 

autotest/test_gwe_drycell_cnd1.py

@@ -133,6 +133,8 @@ def isMonotonic(A):
 rhow = 1000.0
 cpw = 4183.0
 lhv = 2454.0
+cps = 760.0
+rhos = 1500.0
 
 # Set solver parameter values (and related)
 nouter, ninner = 100, 300
@@ -332,8 +334,8 @@ def build_models(idx, test):
         heat_capacity_water=cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=760.0,
-        rhos=1500.0,
+        heat_capacity_solid=cps,
+        density_solid=rhos,
         pname="EST-2",
         filename=f"{gwename1}.est",
     )

autotest/test_gwe_drycell_cnd2.py

@@ -489,8 +489,8 @@ def build_models(idx, test):
         heat_capacity_water=cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=cps,
-        rhos=rhos,
+        heat_capacity_solid=cps,
+        density_solid=rhos,
         pname="EST-3",
         filename=f"{gwename}.est",
     )

autotest/test_gwe_drycell_cnd4.py

@@ -349,8 +349,8 @@ def add_gwe_model(sim, gwename):
         heat_capacity_water=cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=cps,
-        rhos=rhos,
+        heat_capacity_solid=cps,
+        density_solid=rhos,
         pname="EST",
         filename=f"{gwename}.est",
     )

autotest/test_gwe_esl01.py

@@ -271,8 +271,8 @@ def build_models(idx, test):
         heat_capacity_water=cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=cps,
-        rhos=rhos,
+        heat_capacity_solid=cps,
+        density_solid=rhos,
         pname="EST-2",
         filename=f"{gwename}.est",
     )

autotest/test_gwe_esl02.py

@@ -270,8 +270,8 @@ def build_models(idx, test):
         heat_capacity_water=cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=cps,
-        rhos=rhos,
+        heat_capacity_solid=cps,
+        density_solid=rhos,
         pname="EST-1",
         filename=f"{gwename}.est",
     )

autotest/test_gwe_esl_analyt_sln.py

@@ -336,8 +336,8 @@ def build_models(idx, test, ener_input):
         heat_capacity_water=Cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=Cps,
-        rhos=rhos,
+        heat_capacity_solid=Cps,
+        density_solid=rhos,
         pname="EST-1",
         filename=f"{gwename}.est",
     )

autotest/test_gwe_lke_conduction.py

@@ -576,8 +576,8 @@ def build_models(idx, test):
         heat_capacity_water=Cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=Cps,
-        rhos=rhos,
+        heat_capcity_solid=Cps,
+        density_solid=rhos,
         pname="MST-1",
         filename=f"{gwename}.mst",
     )

autotest/test_gwe_mve.py

@@ -568,8 +568,8 @@ def build_mf6_model(idx, ws):
         heat_capacity_water=cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=cps,
-        rhos=rhos,
+        heat_capacity_solid=cps,
+        density_solid=rhos,
         pname="EST",
         filename=f"{gwename}.est",
     )

autotest/test_gwe_mwe_conduction.py

@@ -361,8 +361,8 @@ def build_models(idx, test):
         heat_capacity_water=Cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=Cps,
-        rhos=rhos,
+        heat_capacity_solid=Cps,
+        density_solid=rhos,
         pname="MST-1",
         filename=f"{gwename}.mst",
     )

autotest/test_gwe_obs.py

@@ -135,6 +135,8 @@ def isMonotonic(A):
 # GWE related parameters
 rhow = 1000.0
 cpw = 4183.0
+cps = 760.0
+rhos = 1500.0
 lhv = 2454.0
 
 # Set solver parameter values (and related)
@@ -343,8 +345,8 @@ def build_gwe_model(sim, gwename, idx):
         heat_capacity_water=cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=760.0,
-        rhos=1500.0,
+        heat_capacity_solid=cps,
+        density_solid=rhos,
         pname="EST",
         filename=f"{gwename}.est",
     )

autotest/test_gwe_sfe_strmbedcond.py

@@ -505,8 +505,8 @@ def build_models(idx, test):
         heat_capacity_water=Cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=Cps,
-        rhos=rhos,
+        heat_capacity_solid=Cps,
+        density_solid=rhos,
         pname="EST",
         filename=f"{gwename}.est",
     )

autotest/test_gwe_split_analyt.py

@@ -270,8 +270,8 @@ def get_gwe_model(idx, sim, gwename, gwepath, ener_input, side="right"):
         heat_capacity_water=Cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=Cps,
-        rhos=rhos,
+        heat_capacity_solid=Cps,
+        density_solid=rhos,
     )
 
     # Constant temperature goes on the left side of the left model

autotest/test_gwe_stallman.py

@@ -290,8 +290,8 @@ def build_models(idx, test):
         heat_capacity_water=cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=cps,
-        rhos=rhos,
+        heat_capacity_solid=cps,
+        density_solid=rhos,
         filename=f"{gwename}.mst",
     )
 

autotest/test_gwe_uze00.py

@@ -104,6 +104,11 @@ def temp_analyt(t, z, t0, tinfil, v, d):
 scheme = "UPSTREAM"
 dispersivity = 0.0
 prsity = 0.2
+rhow = 1000.0
+cpw = 4183.0
+lhv = 2500.0
+cps = 760.0
+rhos = 1500.0
 
 # transient uzf info
 # iuzno  cellid landflg ivertcn surfdp vks thtr thts thti eps [bndnm]
@@ -340,18 +345,15 @@ def build_models(idx, test):
     )
 
     # Instantiating MODFLOW 6 transport mass storage package
-    rhow = 1000.0
-    cpw = 4183.0
-    lhv = 2500.0
     flopy.mf6.ModflowGweest(
         gwe,
         save_flows=True,
         porosity=prsity,
         heat_capacity_water=cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=760.0,
-        rhos=1500.0,
+        heat_capacity_solid=cps,
+        density_solid=rhos,
         pname="EST",
         filename=f"{gwename}.est",
     )

autotest/test_gwe_vs_gwt.py

@@ -322,8 +322,8 @@ def build_models(idx, test):
         heat_capacity_water=cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=760.0,
-        rhos=1500.0,
+        heat_capacity_solid=cps,
+        density_solid=rhos,
         filename=f"{gwename}.est",
     )
 

autotest/test_gwegwe_exchng_with_comp2gwt.py

@@ -582,8 +582,8 @@ def add_upper_gwemodel(sim, scheme):
         heat_capacity_water=cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=cps,
-        rhos=rhos,
+        heat_capacity_solid=cps,
+        density_solid=rhos,
         pname="EST-UP",
         filename=f"{mname}.est",
     )
@@ -660,8 +660,8 @@ def add_lower_gwemodel(sim, scheme):
         heat_capacity_water=cpw,
         density_water=rhow,
         latent_heat_vaporization=lhv,
-        cps=cps,
-        rhos=rhos,
+        heat_capacity_solid=cps,
+        density_solid=rhos,
         pname="EST-LO",
         filename=f"{mname}.est",
     )

doc/mf6io/mf6ivar/dfn/gwe-est.dfn

@@ -68,20 +68,21 @@ longname aqueous phase decay rate coefficient
 description is the rate coefficient for zero-order decay for the aqueous phase of the mobile domain.  A negative value indicates heat (energy) production.  The dimensions of decay for zero-order decay is energy per length cubed per time.  Zero-order decay will have no effect on simulation results unless zero-order decay is specified in the options block.
 
 block griddata
-name cps
+name heat_capacity_solid
 type double precision
 shape (nodes)
 reader readarray
 layered true
 longname heat capacity of the aquifer material
 description is the mass-based heat capacity of dry solids (aquifer material). For example, units of J/kg/C may be used (or equivalent).
+mf6internal cps
 
 block griddata
-name rhos
+name density_solid
 type double precision
 shape (nodes)
 reader readarray
 layered true
 longname density of aquifer material
 description is a user-specified value of the density of aquifer material not considering the voids. Value will remain fixed for the entire simulation.  For example, if working in SI units, values may be entered as kilograms per cubic meter. 
-
+mf6internal rhos

doc/mf6io/mf6ivar/examples/gwe-est-example.dat

@@ -7,9 +7,9 @@ END OPTIONS
 BEGIN GRIDDATA
   POROSITY
     CONSTANT  0.1
-  CPS
+  HEAT_CAPACITY_SOLID
     CONSTANT  880.0
-  RHOS
+  DENSITY_SOLID
     CONSTANT  2650.0
 END GRIDDATA