Merge remote-tracking branch 'origin/main'

malcolm-dsider · Apr 23, 2024 · d9ef4a6 · d9ef4a6
2 parents ff16820 + ea9fd9b
commit d9ef4a6
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 20 deletions.
diff --git a/README.rst b/README.rst
@@ -100,7 +100,7 @@ Steps:
 
    - Windows::
 
-       venv\Scripts\Activate.ps1
+       venv\Scripts\activate
 
    - macOS/Linux::
 

diff --git a/src/geophires_x/Economics.py b/src/geophires_x/Economics.py
@@ -927,25 +927,26 @@ def __init__(self, model: Model):
             AllowableRange=[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17],
             UnitType=Units.NONE,
             ErrMessage="assume default well drilling cost correlation (10)",
-            ToolTipText="""Select the built-in well drilling and completion cost correlation:
-1. vertical small diameter, baseline;
-2. deviated small diameter, baseline;
-3. vertical large diameter, baseline;
-4. deviated large diameter, baseline;
-5. Simple;
-6. vertical small diameter, intermediate1;
-7. vertical small diameter, intermediate2;
-8. deviated small diameter, intermediate1;
-9. deviated small diameter, intermediate2;
-10. vertical large diameter, intermediate1;
-11. vertical large diameter, intermediate2;
-12. deviated large diameter, intermediate1;
-13. deviated large diameter, intermediate2;
-14. vertical open-hole, small diameter, ideal;
-15. deviated liner, small diameter, ideal;
-16. vertical open-hole, large diameter, ideal;
-17. deviated liner, large diameter, ideal;"""
+            ToolTipText="Select the built-in well drilling and completion cost correlation: " +
+                        "1. vertical small diameter, baseline; " +
+                        "2. deviated small diameter, baseline; " +
+                        "3. vertical large diameter, baseline; " +
+                        "4. deviated large diameter, baseline; " +
+                        "5. Simple; " +
+                        "6. vertical small diameter, intermediate1; " +
+                        "7. vertical small diameter, intermediate2; " +
+                        "8. deviated small diameter, intermediate1; " +
+                        "9. deviated small diameter, intermediate2; " +
+                        "10. vertical large diameter, intermediate1; " +
+                        "11. vertical large diameter, intermediate2; " +
+                        "12. deviated large diameter, intermediate1; " +
+                        "13. deviated large diameter, intermediate2; " +
+                        "14. vertical open-hole, small diameter, ideal; " +
+                        "15. deviated liner, small diameter, ideal; " +
+                        "16. vertical open-hole, large diameter, ideal; " +
+                        "17. deviated liner, large diameter, ideal"
         )
+
         self.DoAddOnCalculations = self.ParameterDict[self.DoAddOnCalculations.Name] = boolParameter(
             "Do AddOn Calculations",
             DefaultValue=False,

diff --git a/src/geophires_x_schema_generator/geophires-request.json b/src/geophires_x_schema_generator/geophires-request.json
@@ -731,7 +731,7 @@
       "category": "Economics"
     },
     "Well Drilling Cost Correlation": {
-      "description": "Select the built-in horizontal well drilling and completion cost correlation. 1. vertical small diameter, baseline; 2. deviated small diameter, baseline; 3. vertical large diameter, baseline; 4. deviated large diameter, baseline; 5. Simple; 6. vertical small diameter, intermediate1; 7. vertical small diameter, intermediate2; 8. deviated small diameter, intermediate1; 9. deviated small diameter, intermediate2; 10. vertical large diameter, intermediate1; 11. vertical large diameter, intermediate2; 12. deviated large diameter, intermediate1; 13. deviated large diameter, intermediate2; 14. vertical open-hole, small diameter, ideal; 15. deviated liner, small diameter, ideal; 16. vertical open-hole, large diameter, ideal; 17. deviated liner, large diameter, ideal",
+      "description": "Select the built-in well drilling and completion cost correlation: 1. vertical small diameter, baseline; 2. deviated small diameter, baseline; 3. vertical large diameter, baseline; 4. deviated large diameter, baseline; 5. Simple; 6. vertical small diameter, intermediate1; 7. vertical small diameter, intermediate2; 8. deviated small diameter, intermediate1; 9. deviated small diameter, intermediate2; 10. vertical large diameter, intermediate1; 11. vertical large diameter, intermediate2; 12. deviated large diameter, intermediate1; 13. deviated large diameter, intermediate2; 14. vertical open-hole, small diameter, ideal; 15. deviated liner, small diameter, ideal; 16. vertical open-hole, large diameter, ideal; 17. deviated liner, large diameter, ideal",
       "type": "integer",
       "units": null,
       "category": "Economics"
@@ -988,6 +988,36 @@
       "units": "",
       "category": "Economics"
     },
+    "Production Tax Credit Electricity": {
+      "description": "Production tax credit for electricity in $/kWh",
+      "type": "number",
+      "units": "USD/kWh",
+      "category": "Economics"
+    },
+    "Production Tax Credit Heat": {
+      "description": "Production tax credit for heat in $/MMBTU",
+      "type": "number",
+      "units": "USD/MMBTU",
+      "category": "Economics"
+    },
+    "Production Tax Credit Cooling": {
+      "description": "Production tax credit for cooling in $/MMBTU",
+      "type": "number",
+      "units": "USD/MMBTU",
+      "category": "Economics"
+    },
+    "Production Tax Credit Duration": {
+      "description": "Production tax credit for duration in years",
+      "type": "integer",
+      "units": "yr",
+      "category": "Economics"
+    },
+    "Production Tax Credit Inflation Adjusted": {
+      "description": "Production tax credit inflation adjusted",
+      "type": "boolean",
+      "units": null,
+      "category": "Economics"
+    },
     "Operation & Maintenance Cost of Surface Plant": {
       "description": "",
       "type": "number",