Change Gradients and Gradient1 units from degC/m to degC/km

aimiktena · Jun 8, 2024 · 7a90808 · 7a90808
1 parent becec79
commit 7a90808
Show file tree

Hide file tree

Showing 20 changed files with 2,555 additions and 2,557 deletions.
diff --git a/src/geophires_x/Reservoir.py b/src/geophires_x/Reservoir.py
@@ -100,7 +100,7 @@ def __init__(self, model: Model):
             Min=0.0,
             Max=500.0,
             UnitType=Units.TEMP_GRADIENT,
-            PreferredUnits=TemperatureGradientUnit.DEGREESCPERM,
+            PreferredUnits=TemperatureGradientUnit.DEGREESCPERKM,
             CurrentUnits=TemperatureGradientUnit.DEGREESCPERM,
             Required=True,
             ErrMessage="assume default geothermal gradients 1 (50, 0, 0, 0 deg.C/km)",
@@ -113,7 +113,7 @@ def __init__(self, model: Model):
             Min=0.0,
             Max=500.0,
             UnitType=Units.TEMP_GRADIENT,
-            PreferredUnits=TemperatureGradientUnit.DEGREESCPERM,
+            PreferredUnits=TemperatureGradientUnit.DEGREESCPERKM,
             CurrentUnits=TemperatureGradientUnit.DEGREESCPERM,
             Required=True,
             ErrMessage="assume default geothermal gradient 1 (50 deg.C/km)",
@@ -624,15 +624,15 @@ def read_parameters(self, model: Model) -> None:
                         parts = ParameterReadIn.Name.split(' ')
                         position = int(parts[1]) - 1
                         model.reserv.gradient.value[position] = ParameterToModify.value
-                        if model.reserv.gradient.value[position] > 1.0:
+                        model.reserv.gradient.CurrentUnits = ParameterToModify.CurrentUnits
+                        if model.reserv.gradient.value[position] > 1.0 and ParameterToModify.CurrentUnits == TemperatureGradientUnit.DEGREESCPERM:
                             # TODO refactor to avoid heuristic-based unit conversions
                             model.reserv.gradient.value[position] = model.reserv.gradient.value[
                                                                         position] / 1000.0  # convert C/m
-                            model.reserv.gradient.CurrentUnits = TemperatureGradientUnit.DEGREESCPERM
-
-                        if model.reserv.gradient.value[position] < 1e-6:
-                            # convert 0 C/m gradients to very small number, avoids divide by zero errors later
-                            model.reserv.gradient.value[position] = 1e-6
+                            # model.reserv.gradient.CurrentUnits = TemperatureGradientUnit.DEGREESCPERM
+                        elif model.reserv.gradient.value[position] <= 1.0 and ParameterToModify.CurrentUnits == TemperatureGradientUnit.DEGREESCPERKM:
+                            model.reserv.gradient.value[position] = model.reserv.gradient.value[
+                                                                        position] * 1000.0  # convert C/km
 
                     elif ParameterToModify.Name.startswith('Thickness'):
                         parts = ParameterReadIn.Name.split(' ')

diff --git a/src/geophires_x_schema_generator/geophires-request.json b/src/geophires_x_schema_generator/geophires-request.json
@@ -67,13 +67,13 @@
     "Gradients": {
       "description": "Geothermal gradients",
       "type": "number",
-      "units": "degC/m",
+      "units": "degC/km",
       "category": "Reservoir"
     },
     "Gradient 1": {
       "description": "Geothermal gradient 1 in rock segment 1",
       "type": "number",
-      "units": "degC/m",
+      "units": "degC/km",
       "category": "Reservoir"
     },
     "Gradient 2": {

diff --git a/tests/examples/Fervo_Norbeck_Latimer_2023.out b/tests/examples/Fervo_Norbeck_Latimer_2023.out
diff --git a/tests/examples/example1.out b/tests/examples/example1.out
diff --git a/tests/examples/example10_HP.out b/tests/examples/example10_HP.out
diff --git a/tests/examples/example11_AC.out b/tests/examples/example11_AC.out
diff --git a/tests/examples/example12_DH.out b/tests/examples/example12_DH.out
diff --git a/tests/examples/example13.out b/tests/examples/example13.out
diff --git a/tests/examples/example1_addons.out b/tests/examples/example1_addons.out
diff --git a/tests/examples/example2.out b/tests/examples/example2.out
diff --git a/tests/examples/example3.out b/tests/examples/example3.out
diff --git a/tests/examples/example4.out b/tests/examples/example4.out
diff --git a/tests/examples/example5.out b/tests/examples/example5.out
diff --git a/tests/examples/example8.out b/tests/examples/example8.out
diff --git a/tests/examples/example9.out b/tests/examples/example9.out
diff --git a/tests/examples/example_SHR-1.out b/tests/examples/example_SHR-1.out
diff --git a/tests/examples/example_SHR-2.out b/tests/examples/example_SHR-2.out
diff --git a/tests/examples/example_multiple_gradients.out b/tests/examples/example_multiple_gradients.out
diff --git a/tests/examples/example_overpressure.out b/tests/examples/example_overpressure.out
diff --git a/tests/examples/example_overpressure2.out b/tests/examples/example_overpressure2.out