W/m/K and J/kg/K unit rendering NREL#155

softwareengineerprogrammer · softwareengineerprogrammer · commit 67eb181d1d58 · 2024-03-11T12:27:38.000-07:00
diff --git a/src/geophires_x/Outputs.py b/src/geophires_x/Outputs.py
@@ -292,7 +292,7 @@ def PrintOutputs(self, model: Model):
 
                     f.write(f"      Reservoir density:                                {model.reserv.rhorock.value:10.2f} " + model.reserv.rhorock.CurrentUnits.value + NL)
                     if model.wellbores.rameyoptionprod.value or model.reserv.resoption.value in [ReservoirModel.MULTIPLE_PARALLEL_FRACTURES, ReservoirModel.LINEAR_HEAT_SWEEP, ReservoirModel.SINGLE_FRACTURE, ReservoirModel.TOUGH2_SIMULATOR]:
-                        f.write(f"      Reservoir thermal conductivity:                   {model.reserv.krock.value:10.2f} " + model.reserv.krock.CurrentUnits.value + NL)
+                        f.write(f"      Reservoir thermal conductivity:                   {model.reserv.krock.value:10.2f} {model.reserv.krock.CurrentUnits.value}{NL}")
                     f.write(f"      Reservoir heat capacity:                          {model.reserv.cprock.value:10.2f} " + model.reserv.cprock.CurrentUnits.value + NL)
                     if model.reserv.resoption.value == ReservoirModel.LINEAR_HEAT_SWEEP or (model.reserv.resoption.value == ReservoirModel.TOUGH2_SIMULATOR and model.reserv.usebuiltintough2model):
                         f.write(f"      Reservoir porosity:                               {model.reserv.porrock.value*100:10.2f} " + model.reserv.porrock.CurrentUnits.value + NL)
diff --git a/src/geophires_x/Units.py b/src/geophires_x/Units.py
@@ -231,7 +231,7 @@ class HeatUnit(str, Enum):
 
 class HeatCapacityUnit(str, Enum):
     """Heat Capacity Units"""
-    JPERKGPERK = "J/kg/kelvin"
+    JPERKGPERK = "J/kg/K"
     KJPERKM3C = "kJ/km**3C"
     kJPERKGC = "kJ/kgC"
 
@@ -248,7 +248,7 @@ class EnthalpyUnit(str, Enum):
 
 class ThermalConductivityUnit(str, Enum):
     """Thermal Conductivity Units"""
-    WPERMPERK = "watt/m/kelvin"
+    WPERMPERK = "W/m/K"
 
 
 class TimeUnit(str, Enum):
diff --git a/src/geophires_x_schema_generator/geophires-request.json b/src/geophires_x_schema_generator/geophires-request.json
@@ -181,7 +181,7 @@
     "Reservoir Heat Capacity": {
       "description": "Constant and uniform reservoir rock heat capacity",
       "type": "number",
-      "units": "J/kg/kelvin",
+      "units": "J/kg/K",
       "category": "Reservoir"
     },
     "Reservoir Density": {
@@ -193,7 +193,7 @@
     "Reservoir Thermal Conductivity": {
       "description": "Constant and uniform reservoir rock thermal conductivity",
       "type": "number",
-      "units": "watt/m/kelvin",
+      "units": "W/m/K",
       "category": "Reservoir"
     },
     "Reservoir Permeability": {
@@ -397,7 +397,7 @@
     "Water Thermal Conductivity": {
       "description": "Water Thermal Conductivity",
       "type": "number",
-      "units": "watt/m/kelvin",
+      "units": "W/m/K",
       "category": "Well Bores"
     },
     "Nonvertical Wellbore Diameter": {
diff --git a/tests/example1_addons.csv b/tests/example1_addons.csv
@@ -59,8 +59,8 @@ RESERVOIR PARAMETERS,Production wellhead pressure,,29774.91,kPa
 RESERVOIR PARAMETERS,Productivity Index,,5.0,kg/sec/bar
 RESERVOIR PARAMETERS,Injectivity Index,,5.0,kg/sec/bar
 RESERVOIR PARAMETERS,Reservoir density,,2700.0,kg/m**3
-RESERVOIR PARAMETERS,Reservoir thermal conductivity,,2.7,watt/m/kelvin
-RESERVOIR PARAMETERS,Reservoir heat capacity,,1000.0,J/kg/kelvin
+RESERVOIR PARAMETERS,Reservoir thermal conductivity,,2.7,W/m/K
+RESERVOIR PARAMETERS,Reservoir heat capacity,,1000.0,J/kg/K
 RESERVOIR SIMULATION RESULTS,Maximum Production Temperature,,167.2,degC
 RESERVOIR SIMULATION RESULTS,Average Production Temperature,,167.0,degC
 RESERVOIR SIMULATION RESULTS,Minimum Production Temperature,,165.2,degC
diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.out b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.out
@@ -23,7 +23,7 @@ Simulation Metadata
       Geothermal Gradient:                                   0.0600 degC/km
       Wellbore Diameter:                                      8.5000 in
       Injection Temperature:                                 60.0 degC
-      Thermal Conductivity:                                   3.00 watt/m/kelvin
+      Thermal Conductivity:                                   3.00 W/m/K
  ### Reservoir Simulation Results ###
       Average Production Temperature:                       71.2 degC
       Average Production Pressure:                          209.9 bar
diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_water_heat.out b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_water_heat.out
@@ -23,7 +23,7 @@ Simulation Metadata
       Geothermal Gradient:                                   0.0600 degC/m
       Wellbore Diameter:                                      8.5000 in
       Injection Temperature:                                 60.0 degC
-      Thermal Conductivity:                                   3.00 watt/m/kelvin
+      Thermal Conductivity:                                   3.00 W/m/K
  ### Reservoir Simulation Results ###
       Average Production Temperature:                       105.9 degC
       Average Production Pressure:                          139.9 bar
diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_elec.out b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_elec.out
@@ -23,7 +23,7 @@ Simulation Metadata
       Geothermal Gradient:                                   0.0600 degC/m
       Wellbore Diameter:                                      8.5000 in
       Injection Temperature:                                 60.0 degC
-      Thermal Conductivity:                                   3.00 watt/m/kelvin
+      Thermal Conductivity:                                   3.00 W/m/K
  ### Reservoir Simulation Results ###
       Average Production Temperature:                       96.1 degC
       Average Production Pressure:                          234.2 bar
diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_heat.out b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_heat.out
@@ -23,7 +23,7 @@ Simulation Metadata
       Geothermal Gradient:                                   0.0600 degC/m
       Wellbore Diameter:                                      8.5000 in
       Injection Temperature:                                 60.0 degC
-      Thermal Conductivity:                                   3.00 watt/m/kelvin
+      Thermal Conductivity:                                   3.00 W/m/K
  ### Reservoir Simulation Results ###
       Average Production Temperature:                       96.1 degC
       Average Production Pressure:                          234.2 bar
diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_elec.out b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_elec.out
@@ -23,7 +23,7 @@ Simulation Metadata
       Geothermal Gradient:                                   0.0600 degC/m
       Wellbore Diameter:                                      8.5000 in
       Injection Temperature:                                 60.0 degC
-      Thermal Conductivity:                                   3.00 watt/m/kelvin
+      Thermal Conductivity:                                   3.00 W/m/K
  ### Reservoir Simulation Results ###
       Average Production Temperature:                       107.0 degC
       Average Production Pressure:                          207.0 bar
diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_heat.out b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_heat.out
@@ -23,7 +23,7 @@ Simulation Metadata
       Geothermal Gradient:                                   0.0600 degC/m
       Wellbore Diameter:                                      8.5000 in
       Injection Temperature:                                 60.0 degC
-      Thermal Conductivity:                                   3.00 watt/m/kelvin
+      Thermal Conductivity:                                   3.00 W/m/K
  ### Reservoir Simulation Results ###
       Average Production Temperature:                       107.0 degC
       Average Production Pressure:                          207.0 bar
diff --git a/tests/examples/FIXME_example1_outputunits.out b/tests/examples/FIXME_example1_outputunits.out
@@ -72,8 +72,8 @@ Simulation Metadata
       Productivity Index:                                     5.00 kg/sec/bar
       Injectivity Index:                                      5.00 kg/sec/bar
       Reservoir density:                                   2700.00 kg/m**3
-      Reservoir thermal conductivity:                         2.70 watt/m/kelvin
-      Reservoir heat capacity:                             1000.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         2.70 W/m/K
+      Reservoir heat capacity:                             1000.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/examples/S-DAC-GT.out b/tests/examples/S-DAC-GT.out
@@ -74,8 +74,8 @@ Simulation Metadata
       Plant outlet pressure:                                100.00 kPa
       Injectivity Index:                                      5.00 kg/sec/bar
       Reservoir density:                                   2700.00 kg/m**3
-      Reservoir thermal conductivity:                         3.00 watt/m/kelvin
-      Reservoir heat capacity:                             1000.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         3.00 W/m/K
+      Reservoir heat capacity:                             1000.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/examples/example1.out b/tests/examples/example1.out
@@ -73,8 +73,8 @@ Simulation Metadata
       Productivity Index:                                     5.00 kg/sec/bar
       Injectivity Index:                                      5.00 kg/sec/bar
       Reservoir density:                                   2700.00 kg/m**3
-      Reservoir thermal conductivity:                         2.70 watt/m/kelvin
-      Reservoir heat capacity:                             1000.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         2.70 W/m/K
+      Reservoir heat capacity:                             1000.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/examples/example10_HP.out b/tests/examples/example10_HP.out
@@ -73,8 +73,8 @@ Simulation Metadata
       Productivity Index:                                    10.00 kg/sec/bar
       Injectivity Index:                                      5.00 kg/sec/bar
       Reservoir density:                                   3000.00 kg/m**3
-      Reservoir thermal conductivity:                         3.00 watt/m/kelvin
-      Reservoir heat capacity:                             1000.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         3.00 W/m/K
+      Reservoir heat capacity:                             1000.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/examples/example11_AC.out b/tests/examples/example11_AC.out
@@ -74,8 +74,8 @@ Simulation Metadata
       Productivity Index:                                    10.00 kg/sec/bar
       Injectivity Index:                                      5.00 kg/sec/bar
       Reservoir density:                                   3000.00 kg/m**3
-      Reservoir thermal conductivity:                         3.00 watt/m/kelvin
-      Reservoir heat capacity:                             1000.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         3.00 W/m/K
+      Reservoir heat capacity:                             1000.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/examples/example12_DH.out b/tests/examples/example12_DH.out
@@ -77,7 +77,7 @@ Simulation Metadata
       Productivity Index:                                    10.00 kg/sec/bar
       Injectivity Index:                                     10.00 kg/sec/bar
       Reservoir density:                                   2700.00 kg/m**3
-      Reservoir heat capacity:                             1000.00 J/kg/kelvin
+      Reservoir heat capacity:                             1000.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/examples/example13.out b/tests/examples/example13.out
@@ -78,7 +78,7 @@ Simulation Metadata
       Productivity Index:                                    10.00 kg/sec/bar
       Injectivity Index:                                     10.00 kg/sec/bar
       Reservoir density:                                   2700.00 kg/m**3
-      Reservoir heat capacity:                             1000.00 J/kg/kelvin
+      Reservoir heat capacity:                             1000.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/examples/example1_addons.out b/tests/examples/example1_addons.out
@@ -74,8 +74,8 @@ Simulation Metadata
       Productivity Index:                                     5.00 kg/sec/bar
       Injectivity Index:                                      5.00 kg/sec/bar
       Reservoir density:                                   2700.00 kg/m**3
-      Reservoir thermal conductivity:                         2.70 watt/m/kelvin
-      Reservoir heat capacity:                             1000.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         2.70 W/m/K
+      Reservoir heat capacity:                             1000.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/examples/example2.out b/tests/examples/example2.out
@@ -71,8 +71,8 @@ Simulation Metadata
       Reservoir volume:                               125000000 m**3
       Reservoir impedance:                                    0.20 GPa.s/m**3
       Reservoir density:                                   3000.00 kg/m**3
-      Reservoir thermal conductivity:                         3.20 watt/m/kelvin
-      Reservoir heat capacity:                              975.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         3.20 W/m/K
+      Reservoir heat capacity:                              975.00 J/kg/K
       Reservoir porosity:                                    10.00
 
 
diff --git a/tests/examples/example3.out b/tests/examples/example3.out
@@ -74,8 +74,8 @@ Simulation Metadata
       Plant outlet pressure:                                100.00 kPa
       Injectivity Index:                                      5.00 kg/sec/bar
       Reservoir density:                                   3000.00 kg/m**3
-      Reservoir thermal conductivity:                         3.00 watt/m/kelvin
-      Reservoir heat capacity:                             1000.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         3.00 W/m/K
+      Reservoir heat capacity:                             1000.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/examples/example4.out b/tests/examples/example4.out
@@ -74,7 +74,7 @@ Simulation Metadata
       Productivity Index:                                    10.00 kg/sec/bar
       Injectivity Index:                                     10.00 kg/sec/bar
       Reservoir density:                                   2700.00 kg/m**3
-      Reservoir heat capacity:                             1050.00 J/kg/kelvin
+      Reservoir heat capacity:                             1050.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/examples/example5.out b/tests/examples/example5.out
@@ -68,8 +68,8 @@ Simulation Metadata
       Reservoir volume:                              1000000000 m**3
       Reservoir impedance:                                    0.05 GPa.s/m**3
       Reservoir density:                                   2700.00 kg/m**3
-      Reservoir thermal conductivity:                         3.00 watt/m/kelvin
-      Reservoir heat capacity:                             1050.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         3.00 W/m/K
+      Reservoir heat capacity:                             1050.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/examples/example8.out b/tests/examples/example8.out
@@ -71,8 +71,8 @@ Simulation Metadata
       Reservoir volume:                               196000000 m**3
       Reservoir impedance:                                    0.05 GPa.s/m**3
       Reservoir density:                                   2730.00 kg/m**3
-      Reservoir thermal conductivity:                         2.83 watt/m/kelvin
-      Reservoir heat capacity:                              825.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         2.83 W/m/K
+      Reservoir heat capacity:                              825.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/examples/example9.out b/tests/examples/example9.out
@@ -72,8 +72,8 @@ Simulation Metadata
       Reservoir volume:                               196000000 m**3
       Reservoir impedance:                                    0.05 GPa.s/m**3
       Reservoir density:                                   2730.00 kg/m**3
-      Reservoir thermal conductivity:                         2.83 watt/m/kelvin
-      Reservoir heat capacity:                              825.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         2.83 W/m/K
+      Reservoir heat capacity:                              825.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/examples/example_SHR-1.out b/tests/examples/example_SHR-1.out
@@ -71,8 +71,8 @@ Simulation Metadata
       Plant outlet pressure:                                100.00 kPa
       Injectivity Index:                                      5.00 kg/sec/bar
       Reservoir density:                                   2700.00 kg/m**3
-      Reservoir thermal conductivity:                         2.70 watt/m/kelvin
-      Reservoir heat capacity:                             1000.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         2.70 W/m/K
+      Reservoir heat capacity:                             1000.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/examples/example_SHR-2.out b/tests/examples/example_SHR-2.out
@@ -71,8 +71,8 @@ Simulation Metadata
       Plant outlet pressure:                                100.00 kPa
       Injectivity Index:                                      5.00 kg/sec/bar
       Reservoir density:                                   2700.00 kg/m**3
-      Reservoir thermal conductivity:                         2.70 watt/m/kelvin
-      Reservoir heat capacity:                             1000.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         2.70 W/m/K
+      Reservoir heat capacity:                             1000.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/examples/example_multiple_gradients.out b/tests/examples/example_multiple_gradients.out
@@ -85,8 +85,8 @@ Simulation Metadata
       Productivity Index:                                     5.00 kg/sec/bar
       Injectivity Index:                                      5.00 kg/sec/bar
       Reservoir density:                                   2700.00 kg/m**3
-      Reservoir thermal conductivity:                         2.70 watt/m/kelvin
-      Reservoir heat capacity:                             1000.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         2.70 W/m/K
+      Reservoir heat capacity:                             1000.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/geophires-result_example-1.out b/tests/geophires-result_example-1.out
@@ -70,8 +70,8 @@ Simulation Metadata
       Reservoir volume:                               125000000 m**3
       Reservoir impedance:                                    0.20 GPa.s/m**3
       Reservoir density:                                   3000.00 kg/m**3
-      Reservoir thermal conductivity:                         3.20 watt/m/kelvin
-      Reservoir heat capacity:                              975.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         3.20 W/m/K
+      Reservoir heat capacity:                              975.00 J/kg/K
       Reservoir porosity:                                    10.00
 
 
diff --git a/tests/geophires-result_example-2.out b/tests/geophires-result_example-2.out
@@ -72,8 +72,8 @@ Simulation Metadata
       Productivity Index:                                     5.00 kg/sec/bar
       Injectivity Index:                                      5.00 kg/sec/bar
       Reservoir density:                                   2700.00 kg/m**3
-      Reservoir thermal conductivity:                         2.70 watt/m/kelvin
-      Reservoir heat capacity:                             1000.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         2.70 W/m/K
+      Reservoir heat capacity:                             1000.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/geophires-result_example-3.csv b/tests/geophires-result_example-3.csv
@@ -37,8 +37,8 @@ RESERVOIR PARAMETERS,Reservoir hydrostatic pressure,,100.0,kPa
 RESERVOIR PARAMETERS,Plant outlet pressure,,100.0,kPa
 RESERVOIR PARAMETERS,Injectivity Index,,5.0,kg/sec/bar
 RESERVOIR PARAMETERS,Reservoir density,,3000.0,kg/m**3
-RESERVOIR PARAMETERS,Reservoir thermal conductivity,,3.0,watt/m/kelvin
-RESERVOIR PARAMETERS,Reservoir heat capacity,,1000.0,J/kg/kelvin
+RESERVOIR PARAMETERS,Reservoir thermal conductivity,,3.0,W/m/K
+RESERVOIR PARAMETERS,Reservoir heat capacity,,1000.0,J/kg/K
 RESERVOIR SIMULATION RESULTS,Maximum Production Temperature,,227.9,degC
 RESERVOIR SIMULATION RESULTS,Average Production Temperature,,220.9,degC
 RESERVOIR SIMULATION RESULTS,Minimum Production Temperature,,207.4,degC
diff --git a/tests/geophires-result_example-3.out b/tests/geophires-result_example-3.out
@@ -71,8 +71,8 @@ Simulation Metadata
       Plant outlet pressure:                                100.00 kPa
       Injectivity Index:                                      5.00 kg/sec/bar
       Reservoir density:                                   3000.00 kg/m**3
-      Reservoir thermal conductivity:                         3.00 watt/m/kelvin
-      Reservoir heat capacity:                             1000.00 J/kg/kelvin
+      Reservoir thermal conductivity:                         3.00 W/m/K
+      Reservoir heat capacity:                             1000.00 J/kg/K
 
 
                            ***RESERVOIR SIMULATION RESULTS***
diff --git a/tests/geophires-result_example-4.out b/tests/geophires-result_example-4.out
diff --git a/tests/geophires-result_example-5.out b/tests/geophires-result_example-5.out
diff --git a/tests/result_with_ccus_profile.out b/tests/result_with_ccus_profile.out
diff --git a/tests/result_with_revenue_and_cashflow_profile.out b/tests/result_with_revenue_and_cashflow_profile.out
