Merge branch 'hip-ra-monte-carlo' NREL#151

Author: softwareengineerprogrammer

src/geophires_monte_carlo/MC_GeoPHIRES3.py

@@ -35,6 +35,8 @@
 from hip_ra import HipRaResult
 from hip_ra_x import HipRaXClient
 
+logger = _get_logger()
+
 
 def Write_HTML_Output(
     html_path: str,
@@ -311,12 +313,6 @@ def work_package(pass_list: list):
             HipRaInputParameters(from_file_path=Path(tmp_input_file))
         )
         shutil.copyfile(result.output_file_path, tmp_output_file)
-    elif args.Code_File.endswith('HIP_RA_x.py'):
-        hip_ra_x_client: HipRaXClient = HipRaXClient()
-        result: HipRaResult = hip_ra_x_client.get_hip_ra_result(
-            HipRaInputParameters(from_file_path=Path(tmp_input_file))
-        )
-        shutil.copyfile(result.output_file_path, tmp_output_file)
     else:
         log.warning(
             f'Code file from args ({args.Code_File}) is not a known program, '
@@ -449,7 +445,6 @@ def main(command_line_args=None):
         if 'MC_OUTPUT_FILE' in args and args.MC_OUTPUT_FILE is not None
         else str(Path(Path(args.Input_file).parent, 'MC_Result.txt').absolute())
     )
-    args.MC_OUTPUT_FILE = output_file
     python_path = 'python'
     html_path = ''
 
@@ -528,7 +523,6 @@ def main(command_line_args=None):
         if '-9999.0' not in line and len(s) > 1:
             line = line.strip()
             if len(line) > 3:
-                # FIXME TODO doesn't work for HIP RA results
                 line, sep, tail = line.partition(', (')  # strip off the Input Variable Values
                 line = line.replace('(', '').replace(')', '')  # strip off the ()
                 results.append([float(y) for y in line.split(',')])
@@ -614,7 +608,6 @@ def main(command_line_args=None):
 
 
 if __name__ == '__main__':
-    logger = _get_logger()
     logger.info(f'Init {__name__!s}')
 
     main(command_line_args=sys.argv[1:])

src/geophires_monte_carlo/MC_HIP_Result.json

@@ -0,0 +1 @@
+{"Producible Heat": {"minimum": 4240000000000.0, "maximum": 15600000000000.0, "median": 9120000000000.0, "average": 9806000000000.0, "mean": 9806000000000.0, "standard deviation": 4394740492907.4023}, "Producible Electricity": {"minimum": 134.42, "maximum": 494.5, "median": 289.19, "average": 310.688, "mean": 310.688, "standard deviation": 139.11459756617924}}

src/geophires_monte_carlo/__init__.py

@@ -51,7 +51,9 @@ def __init__(
             self.output_file: Path = output_file
         else:
             self._temp_output_dir: TemporaryDirectory = TemporaryDirectory(prefix='geophires_monte_carlo-')
-            self.output_file: Path = Path(self._temp_output_dir.name, 'MC_GEOPHIRES_Result.txt').absolute()
+            self.output_file: Path = Path(
+                self._temp_output_dir.name, f'MC_{self._simulation_program.name}_Result.txt'
+            ).absolute()
 
         if not self.output_file.is_absolute():
             raise ValueError(f'Output file path ({output_file}) must be absolute')
@@ -71,15 +73,21 @@ def __init__(self, request: MonteCarloRequest):
 
         with open(self._request.input_file) as request_input_file, open(
             self._request.monte_carlo_settings_file
-        ) as mc_settings_file, open(self.json_output_file_path) as json_file:
+        ) as mc_settings_file:
             self._result: dict = {
                 'input': {
                     'input_file_content': request_input_file.read(),
                     'monte_carlo_settings_file_content': mc_settings_file.read(),
                 },
-                'output': json.loads(json_file.read()),
+                # 'output': json.loads(json_file.read()),
             }
 
+        try:
+            with open(self.json_output_file_path) as json_file:
+                self._result['output'] = json.loads(json_file.read())
+        except FileNotFoundError:
+            pass  # FIXME WIP
+
     @property
     def output_file_path(self) -> Path:
         return self._request.output_file

tests/.gitignore

@@ -1,5 +1,5 @@
 HIP.out
 *.log
-MC_Result.json
-MC_Result.txt
+MC_*Result.json
+MC_*Result.txt
 *.png

tests/geophires_monte_carlo_tests/MC_HIP_Settings_file.txt

@@ -3,11 +3,6 @@ INPUT, Reservoir Area, uniform, 50.0, 120.0
 INPUT, Reservoir Thickness, uniform, 0.122, 0.299
 INPUT, Reservoir Temperature, uniform, 130, 170
 INPUT, Rejection Temperature, uniform, 20, 33
-OUTPUT, Producible Heat (reservoir)
-OUTPUT, Producible Heat/Unit Area (reservoir)
-OUTPUT, Producible Heat/Unit Volume (reservoir)
-OUTPUT, Producible Electricity (reservoir)
-OUTPUT, Producible Electricity/Unit Area (reservoir)
-OUTPUT, Producible Electricity/Unit Volume (reservoir)
-ITERATIONS, 25
-MC_OUTPUT_FILE, MC_HIP_Result.txt
+OUTPUT, Producible Heat
+OUTPUT, Producible Electricity
+ITERATIONS, 5

tests/geophires_monte_carlo_tests/test_geophires_monte_carlo.py

@@ -107,7 +107,6 @@ def test_monte_carlo_result_ordering(self):
 
             self.assertDictEqual(result_json_obj, result.result['output'])
 
-    @unittest.skip(reason='FIXME: MC HIP result parsing is broken')
     def test_hip_ra_monte_carlo(self):
         client = GeophiresMonteCarloClient()
 
@@ -116,6 +115,7 @@ def test_hip_ra_monte_carlo(self):
                 SimulationProgram.HIP_RA,
                 self._get_arg_file_path('HIP-example1.txt'),
                 self._get_arg_file_path('MC_HIP_Settings_file.txt'),
+                self._get_arg_file_path('MC_HIP_Result.txt'),
             )
         )
         self.assertIsNotNone(result)
@@ -125,6 +125,12 @@ def test_hip_ra_monte_carlo(self):
             result_content = '\n'.join(f.readlines())
             self.assertIn('Electricity', result_content)
 
+        with open(result.json_output_file_path) as f:
+            json_result = json.loads(f.read())
+            self.assertIn('Producible Electricity', json_result)
+            self.assertLess(json_result['Producible Electricity']['median'], 1000)
+            self.assertGreater(json_result['Producible Electricity']['median'], 50)
+
     def _get_arg_file_path(self, arg_file):
         test_dir: Path = Path(os.path.abspath(__file__)).parent
         return Path(test_dir, arg_file).absolute()