Skip to content

Commit 2b8af66

Browse files
Merge pull request NREL#187 from softwareengineerprogrammer/main
Fix docs rendering issue
2 parents 8eedc25 + de0e3ef commit 2b8af66

File tree

2 files changed

+50
-19
lines changed

2 files changed

+50
-19
lines changed

src/geophires_x/Economics.py

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -800,25 +800,26 @@ def __init__(self, model: Model):
800800
AllowableRange=[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17],
801801
UnitType=Units.NONE,
802802
ErrMessage="assume default well drilling cost correlation (10)",
803-
ToolTipText="""Select the built-in well drilling and completion cost correlation:
804-
1. vertical small diameter, baseline;
805-
2. deviated small diameter, baseline;
806-
3. vertical large diameter, baseline;
807-
4. deviated large diameter, baseline;
808-
5. Simple;
809-
6. vertical small diameter, intermediate1;
810-
7. vertical small diameter, intermediate2;
811-
8. deviated small diameter, intermediate1;
812-
9. deviated small diameter, intermediate2;
813-
10. vertical large diameter, intermediate1;
814-
11. vertical large diameter, intermediate2;
815-
12. deviated large diameter, intermediate1;
816-
13. deviated large diameter, intermediate2;
817-
14. vertical open-hole, small diameter, ideal;
818-
15. deviated liner, small diameter, ideal;
819-
16. vertical open-hole, large diameter, ideal;
820-
17. deviated liner, large diameter, ideal;"""
803+
ToolTipText="Select the built-in well drilling and completion cost correlation: " +
804+
"1. vertical small diameter, baseline; " +
805+
"2. deviated small diameter, baseline; " +
806+
"3. vertical large diameter, baseline; " +
807+
"4. deviated large diameter, baseline; " +
808+
"5. Simple; " +
809+
"6. vertical small diameter, intermediate1; " +
810+
"7. vertical small diameter, intermediate2; " +
811+
"8. deviated small diameter, intermediate1; " +
812+
"9. deviated small diameter, intermediate2; " +
813+
"10. vertical large diameter, intermediate1; " +
814+
"11. vertical large diameter, intermediate2; " +
815+
"12. deviated large diameter, intermediate1; " +
816+
"13. deviated large diameter, intermediate2; " +
817+
"14. vertical open-hole, small diameter, ideal; " +
818+
"15. deviated liner, small diameter, ideal; " +
819+
"16. vertical open-hole, large diameter, ideal; " +
820+
"17. deviated liner, large diameter, ideal"
821821
)
822+
822823
self.DoAddOnCalculations = self.ParameterDict[self.DoAddOnCalculations.Name] = boolParameter(
823824
"Do AddOn Calculations",
824825
DefaultValue=False,

src/geophires_x_schema_generator/geophires-request.json

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@
731731
"category": "Economics"
732732
},
733733
"Well Drilling Cost Correlation": {
734-
"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",
734+
"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",
735735
"type": "integer",
736736
"units": null,
737737
"category": "Economics"
@@ -988,6 +988,36 @@
988988
"units": "",
989989
"category": "Economics"
990990
},
991+
"Production Tax Credit Electricity": {
992+
"description": "Production tax credit for electricity in $/kWh",
993+
"type": "number",
994+
"units": "USD/kWh",
995+
"category": "Economics"
996+
},
997+
"Production Tax Credit Heat": {
998+
"description": "Production tax credit for heat in $/MMBTU",
999+
"type": "number",
1000+
"units": "USD/MMBTU",
1001+
"category": "Economics"
1002+
},
1003+
"Production Tax Credit Cooling": {
1004+
"description": "Production tax credit for cooling in $/MMBTU",
1005+
"type": "number",
1006+
"units": "USD/MMBTU",
1007+
"category": "Economics"
1008+
},
1009+
"Production Tax Credit Duration": {
1010+
"description": "Production tax credit for duration in years",
1011+
"type": "integer",
1012+
"units": "yr",
1013+
"category": "Economics"
1014+
},
1015+
"Production Tax Credit Inflation Adjusted": {
1016+
"description": "Production tax credit inflation adjusted",
1017+
"type": "boolean",
1018+
"units": null,
1019+
"category": "Economics"
1020+
},
9911021
"Operation & Maintenance Cost of Surface Plant": {
9921022
"description": "",
9931023
"type": "number",

0 commit comments

Comments
 (0)