Abc lhf 2 (#24)

Author: skfogg

autotest/test_gwe_sfe_abc_lhf00.py

@@ -52,18 +52,18 @@
 sfr_evaprate = 0.0
 rhk = 0.0
 rwid = 1.0
-strm_temp = 20.0
+strm_temp = 11.0
 surf_Q_in = [
     [10.0],
 ]
 # sensible and latent heat flux parameter values
-wspd = 20.0
-tatm = 270.79111 # unrealistically high to drive a -1C change in stream temperature
+wspd = 126005.19379436946474 # unrealistically high to drive a -1C change
+tatm = 5.0 
 # shortwave radiation parameter values
 solr = 47880870.9  # unrealistically high to drive a 1 deg C rise in stream temperature
 shd = 1.0  # 100% shade "turns off" solar flux
 swrefl = 0.03
-rh = 100.0  # percent
+rh = 30.0  # percent
 
 # Transport related parameters
 porosity = sy  # porosity (unitless)
@@ -285,7 +285,7 @@ def build_models(idx, test):
         under_relaxation="NONE",
         inner_maximum=ninner,
         inner_dvclose=hclose,
-        rcloserecord=rclose,
+        rcloserecord=f"{rclose} strict",
         linear_acceleration="BICGSTAB",
         scaling_method="NONE",
         reordering_method="NONE",
@@ -463,7 +463,7 @@ def check_output(idx, test):
     L = (2499.64 - (2.51 * strm_temp)) * 1000
     e_w = 6.1275 * math.exp(17.2693882 * (strm_temp / (strm_temp + 273.16 - 35.86)))
     e_s = 6.1275 * math.exp(17.2693882 * (tatm / (tatm + 273.16 - 35.86)))
-    e_a = rh / 100 * e_s
+    e_a = (rh / 100) * e_s
     vap_press_deficit = e_w - e_a
     wind_function = wf_int + wf_slope * wspd
     Ev = wind_function * vap_press_deficit
@@ -484,6 +484,7 @@ def check_output(idx, test):
     df2 = pd.read_csv(fpth2)
 
     # confirm 1 deg C decrease in temp
+
     msg1 = "Python temperature change is = " + str(temp_change)
     msg2 = "MODFLOW temperature = " + str(df2.loc[0, "RCH1_OUTFTEMP"])
     msg3 = "MODFLOW temperature change is " + str(

make/makefile

@@ -102,8 +102,7 @@ ${SOURCEDIR44} \
 ${SOURCEDIR45} \
 ${SOURCEDIR46} \
 ${SOURCEDIR47} \
-${SOURCEDIR48} \
-${SOURCEDIR49} 
+${SOURCEDIR48} 
 
 .SUFFIXES: .f90 .F90 .o
 
@@ -153,10 +152,8 @@ $(OBJDIR)/swf-chdidm.o \
 $(OBJDIR)/swf-cdbidm.o \
 $(OBJDIR)/sim-tdisidm.o \
 $(OBJDIR)/sim-namidm.o \
-$(OBJDIR)/prt-prpidm.o \
 $(OBJDIR)/prt-namidm.o \
 $(OBJDIR)/prt-mipidm.o \
-$(OBJDIR)/prt-fmiidm.o \
 $(OBJDIR)/prt-disvidm.o \
 $(OBJDIR)/prt-disidm.o \
 $(OBJDIR)/olf-zdgidm.o \
@@ -177,13 +174,11 @@ $(OBJDIR)/gwt-namidm.o \
 $(OBJDIR)/gwt-mstidm.o \
 $(OBJDIR)/gwt-istidm.o \
 $(OBJDIR)/gwt-icidm.o \
-$(OBJDIR)/gwt-fmiidm.o \
 $(OBJDIR)/gwt-dspidm.o \
 $(OBJDIR)/gwt-disvidm.o \
 $(OBJDIR)/gwt-disuidm.o \
 $(OBJDIR)/gwt-disidm.o \
 $(OBJDIR)/gwt-cncidm.o \
-$(OBJDIR)/gwt-apiidm.o \
 $(OBJDIR)/gwt-advidm.o \
 $(OBJDIR)/gwf-welidm.o \
 $(OBJDIR)/gwf-welgidm.o \
@@ -210,13 +205,9 @@ $(OBJDIR)/gwf-csubidm.o \
 $(OBJDIR)/gwf-chdidm.o \
 $(OBJDIR)/gwf-chdgidm.o \
 $(OBJDIR)/gwf-buyidm.o \
-$(OBJDIR)/gwf-apiidm.o \
 $(OBJDIR)/gwe-ssmidm.o \
 $(OBJDIR)/gwe-namidm.o \
 $(OBJDIR)/gwe-icidm.o \
-$(OBJDIR)/gwe-fmiidm.o \
-$(OBJDIR)/gwe-estidm.o \
-$(OBJDIR)/gwe-eslidm.o \
 $(OBJDIR)/gwe-disvidm.o \
 $(OBJDIR)/gwe-disuidm.o \
 $(OBJDIR)/gwe-disidm.o \
@@ -298,7 +289,6 @@ $(OBJDIR)/TimeArraySeriesManager.o \
 $(OBJDIR)/PackageMover.o \
 $(OBJDIR)/Obs.o \
 $(OBJDIR)/NumericalPackage.o \
-$(OBJDIR)/Particle.o \
 $(OBJDIR)/PackageBudget.o \
 $(OBJDIR)/HeadFileReader.o \
 $(OBJDIR)/GridFileReader.o \
@@ -319,19 +309,14 @@ $(OBJDIR)/WeakSinkEvent.o \
 $(OBJDIR)/UserTimeEvent.o \
 $(OBJDIR)/TimeStepEvent.o \
 $(OBJDIR)/TimeSelect.o \
-$(OBJDIR)/TerminationEvent.o \
 $(OBJDIR)/Subcell.o \
-$(OBJDIR)/ReleaseEvent.o \
 $(OBJDIR)/prt-fmi.o \
 $(OBJDIR)/ParticleEvents.o \
 $(OBJDIR)/FeatExitEvent.o \
 $(OBJDIR)/ExitSolution.o \
 $(OBJDIR)/DroppedEvent.o \
 $(OBJDIR)/Cell.o \
 $(OBJDIR)/Method.o \
-$(OBJDIR)/CellExitEvent.o \
-$(OBJDIR)/SubcellExitEvent.o \
-$(OBJDIR)/MethodCell.o \
 $(OBJDIR)/TernarySolveUtils.o \
 $(OBJDIR)/SubcellTri.o \
 $(OBJDIR)/MethodSubcell.o \
@@ -342,6 +327,7 @@ $(OBJDIR)/TimeStepSelect.o \
 $(OBJDIR)/LinearAlgebraUtils.o \
 $(OBJDIR)/SfrCrossSectionUtils.o \
 $(OBJDIR)/MethodSubcellPool.o \
+$(OBJDIR)/MethodCell.o \
 $(OBJDIR)/CellPoly.o \
 $(OBJDIR)/CellRectQuad.o \
 $(OBJDIR)/CellRect.o \
@@ -419,6 +405,20 @@ $(OBJDIR)/swf-evp.o \
 $(OBJDIR)/swf-cdb.o \
 $(OBJDIR)/NumericalModel.o \
 $(OBJDIR)/gwf-chd.o \
+$(OBJDIR)/PbstBase.o \
+$(OBJDIR)/InterfaceMap.o \
+$(OBJDIR)/SeqVector.o \
+$(OBJDIR)/ImsLinearSettings.o \
+$(OBJDIR)/ConvergenceSummary.o \
+$(OBJDIR)/Integer2dReader.o \
+$(OBJDIR)/MethodCellTernary.o \
+$(OBJDIR)/MethodCellPollockQuad.o \
+$(OBJDIR)/MethodCellPollock.o \
+$(OBJDIR)/MethodCellPassToBot.o \
+$(OBJDIR)/VectorInterpolation.o \
+$(OBJDIR)/swf-cxs.o \
+$(OBJDIR)/CellWithNbrs.o \
+$(OBJDIR)/NumericalExchange.o \
 $(OBJDIR)/tsp-ssm.o \
 $(OBJDIR)/tsp-oc.o \
 $(OBJDIR)/tsp-obs.o \
@@ -544,7 +544,6 @@ $(OBJDIR)/NumericalSolution.o \
 $(OBJDIR)/MappedMemory.o \
 $(OBJDIR)/NCModel.o \
 $(OBJDIR)/Mf6FileStoInput.o \
-$(OBJDIR)/Mf6FileSetting.o \
 $(OBJDIR)/Mf6FileList.o \
 $(OBJDIR)/Mf6FileLayerArray.o \
 $(OBJDIR)/Mf6FileGridArray.o \