Merge remote-tracking branch 'origin/main'

Author: softwareengineerprogrammer

src/geophires_x/AGSWellBores.py

@@ -716,28 +716,24 @@ def verify(self, model: Model) -> int:
         errors = []
 
         def on_invalid_parameter_value(err_msg):
-            errors.append(err_msg)
-            print(err_msg)
-            model.logger.fatal(err_msg)
+            s = f'Error: CLGS model database imposes additional range restrictions: {err_msg}. Simulation terminated.'
+            errors.append(s)
+            print(s)
+            model.logger.fatal(s)
             self.error = 1
 
         if self.Nonvertical_length.value < 1000 or self.Nonvertical_length.value > 20000:
-            on_invalid_parameter_value(
-                'Error: CLGS model database imposes additional range restrictions: Nonvertical length must be '
-                'between 1,000 and 20,000 m. Simulation terminated.'
-            )
+            on_invalid_parameter_value('Nonvertical length must be between 1,000 and 20,000 m')
 
         if self.Tinj.value < 30.0 or self.Tinj.value > 60.0:
-            on_invalid_parameter_value(
-                'Error: CLGS model database imposes additional range restrictions: Injection temperature '
-                'must be between 30 and 60 C. Simulation terminated.'
-            )
+            on_invalid_parameter_value('Injection temperature must be between 30 and 60 C')
 
         if self.krock < 1.5 or self.krock > 4.5:
-            on_invalid_parameter_value(
-                'Error: CLGS model database imposes additional range restrictions: '
-                'Rock thermal conductivity must be between 1.5 and 4.5 W/m/K. Simulation terminated.'
-            )
+            on_invalid_parameter_value('Rock thermal conductivity must be between 1.5 and 4.5 W/m/K')
+
+        if model.reserv.gradient.value[0] < 0.03 or model.reserv.gradient.value[0] > 0.07:
+            on_invalid_parameter_value(f'{model.reserv.gradient1.Name} must be between '
+                                       f'30 and 70 {TemperatureGradientUnit.DEGREESCPERKM.value}')
 
         model.logger.info(f'complete {str(__class__)}: {sys._getframe().f_code.co_name}')
 
@@ -816,6 +812,12 @@ def Calculate(self, model: Model) -> None:
         """
         model.logger.info(f'Init {__class__!s}: {sys._getframe().f_code.co_name}')
 
+        if model.reserv.Trock.value > model.reserv.Tmax.value:
+            s = f'{model.reserv.Trock.Name} ({model.reserv.Trock.value}) exceeds ' \
+                f'{model.reserv.Tmax.Name} ({model.reserv.Tmax.value})'
+            model.logger.critical(s)
+            raise ValueError(s)
+
         self.Tini = model.reserv.Trock.value  # initialize the temperature to be the initial temperature of the reservoir
         if self.Tini > 375.0 or self.numnonverticalsections.value > 1:
             # must be a multilateral setup or too hot for CLGS, so must try to use wanju code.

src/geophires_x/SurfacePlant.py

@@ -152,6 +152,9 @@ def electricity_heat_production(self, enduse_option: EndUseOptions, availability
 
         # next do the electricity produced - the same for all, except enduse=5, where it is recalculated
         ElectricityProduced = availability * etau * nprod * prodwellflowrate
+        if ElectricityProduced.max() < 0:
+            # TODO: make message more informative (possibly by hinting that maximum temperature may be too high)
+            raise RuntimeError('Electricity production calculated as negative.')
 
         if enduse_option == EndUseOptions.ELECTRICITY:
             # pure electricity

tests/test_geophires_x.py

@@ -867,3 +867,49 @@ def test_heat_pump_lcoh_bicycle(self):
 
         lcoh = result.result['SUMMARY OF RESULTS']['Direct-Use heat breakeven price (LCOH)']['value']
         self.assertTrue(10 < lcoh < 20)  # Sanity-check that value is non-zero and broadly within the expected range.
+
+    def test_ags_temperature_limitations(self):
+        client = GeophiresXClient()
+
+        with self.assertRaises(RuntimeError) as e:
+            params = GeophiresInputParameters(
+                {
+                    'Is AGS': True,
+                    'Well Geometry Configuration': 1,
+                    'Injection Temperature': 60,
+                    'Gradient 1': 60,
+                    'Reservoir Depth': 8,
+                    'Cylindrical Reservoir Input Depth': 8,
+                    'Economic Model': 3,
+                }
+            )
+            client.get_geophires_result(params)
+        self.assertIn(' exceeds ', str(e.exception))
+
+        with self.assertRaises(RuntimeError) as e:
+            params = GeophiresInputParameters(
+                {
+                    'Is AGS': True,
+                    'Closed-loop Configuration': 2,
+                    'Gradient 1': 25,
+                    'Reservoir Depth': 3,
+                    'Injection Temperature': 60,
+                    'Economic Model': 4,
+                }
+            )
+            client.get_geophires_result(params)
+        self.assertIn('failed to validate CLGS input value', str(e.exception))
+
+    def test_negative_electricity_production_raises_error(self):
+        client = GeophiresXClient()
+        with self.assertRaises(RuntimeError) as e:
+            params = GeophiresInputParameters(
+                {
+                    'Reservoir Depth': 5,
+                    'Gradient 1': 112,
+                    'Power Plant Type': 2,
+                    'Maximum Temperature': 600,
+                }
+            )
+            client.get_geophires_result(params)
+        self.assertIn('Electricity production calculated as negative', str(e.exception))