Merge branch 'NREL:main' into main

softwareengineerprogrammer · Nov 13, 2023 · 63d34f9 · 63d34f9
2 parents fafa8da + bbb9a17
commit 63d34f9
Show file tree

Hide file tree

Showing 11 changed files with 9,444 additions and 698 deletions.
diff --git a/src/geophires_x/Examples/cornell_heat_demand.csv b/src/geophires_x/Examples/cornell_heat_demand.csv
diff --git a/src/geophires_x/Outputs.py b/src/geophires_x/Outputs.py
@@ -301,7 +301,7 @@ def PrintOutputs(self, model: Model):
                         f.write("      Production Wellbore Heat Transmission Model = Ramey Model" + NL)
                         f.write(f"      Average Production Well Temperature Drop:        {np.average(model.wellbores.ProdTempDrop.value):10.1f} " + model.wellbores.ProdTempDrop.PreferredUnits.value + NL)
                     else:
-                        f.write(f" Wellbore Heat Transmission Model = Constant Temperature Drop:{model.wellbores.tempdropprod.value:10.1f} " + model.wellbores.tempdropprod.PreferredUnits.value + NL)
+                        f.write(f"      Wellbore Heat Transmission Model = Constant Temperature Drop:{model.wellbores.tempdropprod.value:10.1f} " + model.wellbores.tempdropprod.PreferredUnits.value + NL)
                     if model.wellbores.impedancemodelused.value:
                         f.write(f"      Total Average Pressure Drop:                     {np.average(model.wellbores.DPOverall.value):10.1f} " + model.wellbores.DPOverall.PreferredUnits.value + NL)
                         f.write(f"      Average Injection Well Pressure Drop:            {np.average(model.wellbores.DPInjWell.value):10.1f} " + model.wellbores.DPInjWell.PreferredUnits.value + NL)

diff --git a/src/geophires_x/Parameter.py b/src/geophires_x/Parameter.py
@@ -198,9 +198,9 @@ def ReadParameter(ParameterReadIn: ParameterEntry, ParamToModify, model):
     # these Parameter Types don't have units so don't do anything fancy, and ignore it if the user has supplied units
     if isinstance(ParamToModify, boolParameter) or isinstance(ParamToModify, strParameter):
         if isinstance(ParamToModify, boolParameter):
-            if 'false' in ParameterReadIn.sValue.lower():
+            if ParameterReadIn.sValue.lower() in ['0', 'false']:
                 ParamToModify.value = False
-            elif 'true' in ParameterReadIn.sValue.lower():
+            elif ParameterReadIn.sValue.lower() in ['1', 'true']:
                 ParamToModify.value = True
             else:
                 ParamToModify.value = bool(ParameterReadIn.sValue)

diff --git a/tests/examples/FIXME_example12_DH.out b/tests/examples/FIXME_example12_DH.out