sync casing ID output params for AGS, SBT, and SUTRA

Author: softwareengineerprogrammer

src/geophires_x/AGSWellBores.py

@@ -1028,6 +1028,8 @@ def Calculate(self, model: Model) -> None:
             # (b/c we are not generating electricity) = thermosiphon is happening!
             self.PumpingPower.value = [max(x, 0.) for x in self.PumpingPower.value]
 
+        self._sync_output_params_from_input_params()
+
         model.logger.info(f'complete {str(__class__)}: {sys._getframe().f_code.co_name}')
 
     def __str__(self):

src/geophires_x/SBTWellbores.py

@@ -286,6 +286,8 @@ def Calculate(self, model: Model) -> None:
         # (b/c we are not generating electricity) = thermosiphon is happening!
         self.PumpingPower.value = [max(x, 0.) for x in self.PumpingPower.value]
 
+        self._sync_output_params_from_input_params()
+
         model.logger.info(f'complete {str(__class__)}: {sys._getframe().f_code.co_name}')
 
     def CalculateNonverticalPressureDrop(self, model, value, time_max, al):

src/geophires_x/SUTRAWellBores.py

@@ -342,4 +342,6 @@ def Calculate(self, model: Model) -> None:
             / model.surfaceplant.pump_efficiency.value
         )
 
-        model.logger.info("complete " + str(__class__) + ": " + sys._getframe().f_code.co_name)
+        self._sync_output_params_from_input_params()
+
+        model.logger.info(f'complete {str(__class__)}: {sys._getframe().f_code.co_name}')

src/geophires_x/WellBores.py

@@ -1554,14 +1554,19 @@ def Calculate(self, model: Model) -> None:
             # negative pumping power values become zero (b/c we are not generating electricity)
             self.PumpingPower.value = [0. if x < 0. else x for x in self.PumpingPower.value]
 
-        # Injection/production well casing ID have same value as inputs but exist as separate output parameters due to
-        # having a different display name.
-        self._set_output_param_from_input_param(self.injwelldiam, self.injection_well_casing_inner_diameter)
-        self._set_output_param_from_input_param(self.prodwelldiam, self.production_well_casing_inner_diameter)
+        self._sync_output_params_from_input_params()
 
         model.logger.info(f'complete {self.__class__.__name__}: {__name__}')
 
-    # noinspection PyMethodMayBeStatic
-    def _set_output_param_from_input_param(self, input_param: Parameter, output_param: OutputParameter) -> None:
-        output_param.value = input_param.value
-        output_param.CurrentUnits = input_param.CurrentUnits
+    def _sync_output_params_from_input_params(self) -> None:
+        """
+        Handles setting output parameters whose values are based on 1:1 corresponding input parameters.
+        """
+
+        def _set_output_param_from_input_param(input_param: Parameter, output_param: OutputParameter) -> None:
+            output_param.value = input_param.quantity().to(output_param.CurrentUnits).magnitude
+
+        # Injection/production well casing ID have same value as inputs but exist as separate output parameters due to
+        # having a different display name.
+        _set_output_param_from_input_param(self.injwelldiam, self.injection_well_casing_inner_diameter)
+        _set_output_param_from_input_param(self.prodwelldiam, self.production_well_casing_inner_diameter)