Sherrboldt/TOUGH-updates

.gitignore

@@ -134,3 +134,16 @@ SAVE
 TABLE
 rcc3.out
 tough_debug_output/
+
+# Temp
+ai.md
+regenerate-schemas.sh
+requirements_2025-08-11.txt
+src/geophires_x/CO2TAB
+src/geophires_x/Doublet.dat
+src/geophires_x/Doublet.out
+src/geophires_x/FOFT_A3616.csv
+src/geophires_x/FOFT_A36_2.csv
+src/geophires_x/GOFT_A3616___021.csv
+src/geophires_x/GOFT_A36_2___012.csv
+src/geophires_x/INFILE

src/geophires_x/.gitignore

@@ -135,4 +135,20 @@ Examples\Test2.json
 /temperature.txt
 all_messages_conf.log
 
+Doublet_default.dat
+
+FOFT_A3Q23.csv
+FOFT_A3Q28.csv
+GENER
+GOFT_A3Q23___012.csv
+GOFT_A3Q28___021.csv
+INCON
+MESH
+MESHA
+MESHB
+OUTPUT_ELEME.csv
+SAVE
+TABLE
+tough2output.out
+
 !sam_economics/Generic_400_MWe/*.json

src/geophires_x/MPFReservoir.py

@@ -26,11 +26,11 @@ def __init__(self, model: Model):
         Setting up includes giving it a name, a default value, The Unit Type (length, volume, temperature, etc)
         and Unit Name of that value, sets it as required (or not), sets allowable range,
         the error message if that range is exceeded, the ToolTip Text, and the name of teh class that created it.
-        This includes setting up temporary variables that will be available to all the class but noy read in by user,
+        This includes setting up temporary variables that will be available to all the class but not read in by user,
         or used for Output
         This also includes all Parameters that are calculated and then published using the Printouts function.
         If you choose to subclass this master class, you can do so before or after you create your own parameters.
-        If you do, you can also choose to call this method from you class,
+        If you do, you can also choose to call this method from your class,
         which will effectively add and set all these parameters to your class.
         :param model: The container class of the application, giving access to everything else, including the logger
         :type model: :class:`~geophires_x.Model.Model`

src/geophires_x/Reservoir.py

@@ -545,7 +545,7 @@ def read_parameters(self, model: Model) -> None:
         # This also deals with all the special cases that need to be taken care of
         # after a value has been read in and checked.
         # If you choose to subclass this master class, you can also choose to override this method (or not),
-        # and if you do, do it before or after you call you own version of this method.  If you do, you can
+        # and if you do, do it before or after you call your own version of this method.  If you do, you can
         # also choose to call this method from you class, which can effectively modify all these
         # superclass parameters in your class.
 
@@ -729,7 +729,7 @@ def Calculate(self, model: Model) -> None:
 
         # temperatureindex = max(loc for loc, val in enumerate(self.depth.value > totaldepth) if val is True)
         self.Trock.value = intersecttemperature[temperatureindex] + self.gradient.value[temperatureindex] * \
-                           (self.depth.value - totaldepth[temperatureindex])
+            (self.depth.value - totaldepth[temperatureindex])
 
         # calculate average geothermal gradient
         if self.numseg.value == 1:

src/geophires_x/SBTReservoir.py

@@ -388,7 +388,7 @@ def Calculate_Coaxial(self, model):
         # SBT v2 for co-axial heat exchanger with high-temperature capability
         # last update: January 14th, 2024
 
-        # 1. Input
+        # 1. Inputs
         # Generally, the user should only make changes to this section
 
         fluid = 1  # Heat transfer fluid selection: 1 = H2O; 2 = CO2

src/geophires_x/SurfacePlantAGS.py

@@ -129,7 +129,7 @@ def __init__(self, model: Model):
             ErrMessage="assume default Dead-state pressure (1e5 Pa)"
         )
 
-        # Input data for electricity generation with CO2
+        # Inputs data for electricity generation with CO2
         self.Turbine_isentropic_efficiency = self.ParameterDict[
             self.Turbine_isentropic_efficiency.Name] = floatParameter(
             "Isentropic Efficiency for CO2 Turbine",

src/geophires_x/SurfacePlantAbsorptionChiller.py

@@ -36,7 +36,7 @@ def __init__(self, model: Model):
         self.MyClass = self.__class__.__name__
         self.MyPath = __file__
 
-        # Input parameters absorption chiller
+        # Inputs parameters absorption chiller
         self.absorption_chiller_cop = self.ParameterDict[self.absorption_chiller_cop.Name] = floatParameter(
             "Absorption Chiller COP",
             value=0.7,