Re-enable Beckers et all tests now that interpolation errors are ignored

softwareengineerprogrammer · Oct 4, 2023 · 9e29bd3 · 9e29bd3
1 parent bc72ec0
commit 9e29bd3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/src/geophires_x/AGSOutputs.py b/src/geophires_x/AGSOutputs.py
@@ -44,7 +44,9 @@ def PrintOutputs(self, model: Model):
             if model.wellbores.IsAGS:  # do a classical output display
                 import scipy
                 # Need to do some interpolating to get the arrays to be the right size for output
-                # FIXME WIP (errstate may or may not be appropriate)
+
+                # FIXME TODO - determine if ignore errstate is appropriate here. Without ignore, GitHub Actions unit
+                # tests fail in a way that appears to be specific to their runners (processor architecture, maybe)
                 with np.errstate(all='ignore'):
                     if len(model.wellbores.PumpingPower.value) != len(model.wellbores.ProducedTemperature.value):
                         f = scipy.interpolate.interp1d(np.arange(0, len(model.wellbores.PumpingPower.value)),

diff --git a/tests/test_geophires_x.py b/tests/test_geophires_x.py
@@ -211,19 +211,7 @@ def get_output_file_for_example(example_file: str):
             return self._get_test_file_path(Path('examples', f'{example_file.split(".txt")[0]}V3_output.txt'))
 
         for example_file_path in example_files:
-            if (
-                (example_file_path.startswith(('example', 'Beckers_et_al')))
-                # FIXME temporarily disabled unit tests (debugging GitHub Actions WIP)
-                and not example_file_path.startswith(
-                    (
-                        # 'Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_heat',
-                        'Beckers_et_al_2023_Tabulated_Database_Coaxial_water_heat',
-                        'Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat',
-                        'Beckers_et_al_2023_Tabulated_Database_Uloop_water_heat',
-                    )
-                )
-                and '_output' not in example_file_path
-            ):
+            if (example_file_path.startswith(('example', 'Beckers_et_al'))) and '_output' not in example_file_path:
                 with self.subTest(msg=example_file_path):
                     print(f'Running example test {example_file_path}')
                     input_params = GeophiresInputParameters(from_file_path=self._get_test_file_path(Path('examples', example_file_path)))