Minor code cleanup

Author: softwareengineerprogrammer

src/geophires_x/Outputs.py

@@ -636,17 +636,18 @@ class Outputs:
     """
     This class handles all the outputs for the GEOPHIRESv3 model.
     """
+
     def __init__(self, model:Model, output_file:str ='HDR.out'):
         model.logger.info(f'Init {__class__!s}: {__name__}')
         self.ParameterDict = {}
         self.OutputParameterDict = {}
         self.filepath_parameter_names = []
 
-        def file_path_parameter(p: Parameter) -> Parameter:
+        def filepath_parameter(p: Parameter) -> Parameter:
             self.filepath_parameter_names.append(p.Name)
             return p
 
-        self.text_output_file = self.ParameterDict[self.text_output_file.Name] = file_path_parameter(strParameter(
+        self.text_output_file = self.ParameterDict[self.text_output_file.Name] = filepath_parameter(strParameter(
                 'Improved Text Output File',
                 DefaultValue='GEOPHIRES_Text.html',
                 Required=False,
@@ -655,7 +656,7 @@ def file_path_parameter(p: Parameter) -> Parameter:
                 ToolTipText='Provide a improved text output name if you want to have improved text output (no output if not provided)',
         ))
 
-        self.html_output_file = self.ParameterDict[self.html_output_file.Name] = file_path_parameter(strParameter(
+        self.html_output_file = self.ParameterDict[self.html_output_file.Name] = filepath_parameter(strParameter(
                 'HTML Output File',
                 DefaultValue='GEOPHIRES.html',
                 Required=False,
@@ -699,6 +700,7 @@ def read_parameters(self, model: Model, default_output_path: Path = None) -> Non
         :param model: The container class of the application, giving access to everything else, including the logger
         :type model: :class:`~geophires_x.Model.Model`
         :param default_output_path: Relative path for non-absolute output path parameters
+        :type default_output_path: pathlib.Path
         :return: None
         """
         model.logger.info(f'Init {__class__!s}: {__name__}')

src/geophires_x/SUTRAOutputs.py

@@ -47,30 +47,8 @@ def PrintOutputs(self, model: Model):
         """
         model.logger.info(f'Init {str(__class__)}: {sys._getframe().f_code.co_name}')
 
-        # Deal with converting Units back to PreferredUnits, if required.
-        # before we write the outputs, we go thru all the parameters for all of the objects and set the values back
-        # to the units that the user entered the data in
-        # We do this because the value may be displayed in the output, and we want the user to recognize their value,
-        # not some converted value
-        # for obj in [model.reserv, model.wellbores, model.surfaceplant, model.economics]:
-        #    for key in obj.ParameterDict:
-        #        param = obj.ParameterDict[key]
-        #        if not param.UnitsMatch: ConvertUnitsBack(param, model)
-
-        # now we need to loop through all thw output parameters to update their units to
-        # whatever units the user has specified.
-        # i.e., they may have specified that all LENGTH results must be in feet, so we need to convert those
-        # from whatever LENGTH unit they are to feet.
-        # same for all the other classes of units (TEMPERATURE, DENSITY, etc).
-
-        #for obj in [model.reserv, model.wellbores, model.surfaceplant, model.economics]:
-        #    for key in obj.OutputParameterDict:
-        #        if key in self.ParameterDict:
-        #            if self.ParameterDict[key] != obj.OutputParameterDict[key].CurrentUnits:
-        #                ConvertOutputUnits(obj.OutputParameterDict[key], self.ParameterDict[key], model)
 
         # write results to output file and screen
-
         try:
             with open(self.output_file,'w', encoding='UTF-8') as f:
                 f.write('                               *****************\n')
@@ -181,10 +159,10 @@ def PrintOutputs(self, model: Model):
         except BaseException as ex:
             tb = sys.exc_info()[2]
             print(str(ex))
-            print("Error: GEOPHIRES Failed to write the output file.  Exiting....Line %i" % tb.tb_lineno)
+            msg = "Error: GEOPHIRES Failed to write the output file.  Exiting....Line %i" % tb.tb_lineno
+            print(msg)
             model.logger.critical(str(ex))
-            model.logger.critical("Error: GEOPHIRES Failed to write the output file.  Exiting....Line %i" % tb.tb_lineno)
-            # FIXME raise exception instead of sys.exit()
-            sys.exit()
+            model.logger.critical(msg)
+            raise RuntimeError(msg)
 
         model.logger.info(f'Complete {str(__class__)}: {sys._getframe().f_code.co_name}')