Skip to content

Commit 7681bcd

Browse files
softwareengineerprogrammersoftwareengineerprogrammer
committed
fix missing percent unit for accrued financing during construction NatLabRockies#382 
1 parent 581e93b commit 7681bcd

33 files changed

Lines changed: 209 additions & 210 deletions

‎src/geophires_x/Economics.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -969,8 +969,8 @@ def __init__(self, model: Model):
969969
Min=0.0,
970970
Max=1.0,
971971
UnitType=Units.PERCENT,
972-
PreferredUnits=PercentUnit.TENTH,
973-
CurrentUnits=PercentUnit.TENTH,
972+
PreferredUnits=PercentUnit.PERCENT,
973+
CurrentUnits=PercentUnit.PERCENT,
974974
ErrMessage="assume default inflation rate during construction (0)"
975975
)
976976
self.wellcorrelation = self.ParameterDict[self.wellcorrelation.Name] = intParameter(

‎src/geophires_x/Outputs.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,7 @@ def PrintOutputs(self, model: Model):
264264
label = Outputs._field_label(field.Name, 49)
265265
f.write(f' {label}{field.value:10.2f} {field.CurrentUnits.value}\n')
266266

267-
# FIXME TODO unit is missing https://github.com/NREL/GEOPHIRES-X/issues/382
268-
f.write(f' Accrued financing during construction: {model.economics.inflrateconstruction.value*100:10.2f} {model.economics.inflrateconstruction.CurrentUnits.value}\n')
267+
f.write(f' Accrued financing during construction: {econ.inflrateconstruction.value*100:10.2f} {econ.inflrateconstruction.CurrentUnits.value}\n')
269268

270269
f.write(f' Project lifetime: {model.surfaceplant.plant_lifetime.value:10.0f} {model.surfaceplant.plant_lifetime.CurrentUnits.value}\n')
271270
f.write(f' Capacity factor: {model.surfaceplant.utilization_factor.value * 100:10.1f} %\n')

‎tests/example1_addons.csv‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SUMMARY OF RESULTS,Well depth,,3.0,kilometer
99
SUMMARY OF RESULTS,Geothermal gradient,,50,degC/km
1010
SUMMARY OF RESULTS,Total Avoided Carbon Emissions,,474.67,kilotonne
1111
ECONOMIC PARAMETERS,Economic Model,,Fixed Charge Rate (FCR),
12-
ECONOMIC PARAMETERS,Accrued financing during construction,,0.0,
12+
ECONOMIC PARAMETERS,Accrued financing during construction,,0.0,%
1313
ECONOMIC PARAMETERS,Project lifetime,,30,yr
1414
ECONOMIC PARAMETERS,Capacity factor,,90.0,%
1515
ECONOMIC PARAMETERS,Project NPV,,72.08,MUSD
@@ -99,7 +99,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,
9999
SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW
100100
SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,%
101101
SURFACE EQUIPMENT SIMULATION RESULTS,Heat to Power Conversion Efficiency,,10.07,%
102-
Simulation Metadata,GEOPHIRES Version,,3.8.4,
102+
Simulation Metadata,GEOPHIRES Version,,3.9.7,
103103
POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0,
104104
POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056,
105105
POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073,

‎tests/examples/Fervo_Norbeck_Latimer_2023.out‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.23
8-
Simulation Date: 2025-03-10
9-
Simulation Time: 10:42
10-
Calculation Time: 0.434 sec
7+
GEOPHIRES Version: 3.9.7
8+
Simulation Date: 2025-05-15
9+
Simulation Time: 09:22
10+
Calculation Time: 0.439 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -23,15 +23,15 @@ Simulation Metadata
2323

2424
***ECONOMIC PARAMETERS***
2525

26-
Economic Model = BICYCLE
27-
Accrued financing during construction: 5.00
26+
Economic Model = BICYCLE
27+
Accrued financing during construction: 5.00 %
2828
Project lifetime: 10 yr
2929
Capacity factor: 90.0 %
3030
Project NPV: -13.03 MUSD
3131
Project IRR: -4.40 %
3232
Project VIR=PI=PIR: 0.54
3333
Project MOIC: -0.18
34-
Project Payback Period: N/A
34+
Project Payback Period: N/A
3535
Estimated Jobs Created: 6
3636

3737
***ENGINEERING PARAMETERS***

‎tests/examples/Fervo_Project_Cape-2.out‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.8.9
8-
Simulation Date: 2025-03-26
9-
Simulation Time: 09:57
10-
Calculation Time: 0.650 sec
7+
GEOPHIRES Version: 3.9.7
8+
Simulation Date: 2025-05-15
9+
Simulation Time: 09:22
10+
Calculation Time: 0.653 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -23,15 +23,15 @@ Simulation Metadata
2323

2424
***ECONOMIC PARAMETERS***
2525

26-
Economic Model = BICYCLE
27-
Accrued financing during construction: 5.00
26+
Economic Model = BICYCLE
27+
Accrued financing during construction: 5.00 %
2828
Project lifetime: 15 yr
2929
Capacity factor: 90.0 %
3030
Project NPV: 42.34 MUSD
3131
Project IRR: 17.60 %
3232
Project VIR=PI=PIR: 1.83
3333
Project MOIC: 1.42
34-
Project Payback Period: 6.50 yr
34+
Project Payback Period: 6.50 yr
3535
Estimated Jobs Created: 19
3636

3737
***ENGINEERING PARAMETERS***

‎tests/examples/Fervo_Project_Cape-3.out‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.23
8-
Simulation Date: 2025-03-10
9-
Simulation Time: 10:42
10-
Calculation Time: 0.871 sec
7+
GEOPHIRES Version: 3.9.7
8+
Simulation Date: 2025-05-15
9+
Simulation Time: 09:22
10+
Calculation Time: 0.868 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -23,15 +23,15 @@ Simulation Metadata
2323

2424
***ECONOMIC PARAMETERS***
2525

26-
Economic Model = BICYCLE
27-
Accrued financing during construction: 5.00
26+
Economic Model = BICYCLE
27+
Accrued financing during construction: 5.00 %
2828
Project lifetime: 20 yr
2929
Capacity factor: 90.0 %
3030
Project NPV: 4580.36 MUSD
3131
Project IRR: 43.75 %
3232
Project VIR=PI=PIR: 5.27
3333
Project MOIC: 6.30
34-
Project Payback Period: 3.38 yr
34+
Project Payback Period: 3.38 yr
3535
Estimated Jobs Created: 976
3636

3737
***ENGINEERING PARAMETERS***

‎tests/examples/Fervo_Project_Cape.out‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.23
8-
Simulation Date: 2025-03-10
9-
Simulation Time: 10:42
10-
Calculation Time: 0.678 sec
7+
GEOPHIRES Version: 3.9.7
8+
Simulation Date: 2025-05-15
9+
Simulation Time: 09:23
10+
Calculation Time: 0.650 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -23,15 +23,15 @@ Simulation Metadata
2323

2424
***ECONOMIC PARAMETERS***
2525

26-
Economic Model = BICYCLE
27-
Accrued financing during construction: 5.00
26+
Economic Model = BICYCLE
27+
Accrued financing during construction: 5.00 %
2828
Project lifetime: 15 yr
2929
Capacity factor: 90.0 %
3030
Project NPV: 520.01 MUSD
3131
Project IRR: 21.00 %
3232
Project VIR=PI=PIR: 2.08
3333
Project MOIC: 1.88
34-
Project Payback Period: 5.67 yr
34+
Project Payback Period: 5.67 yr
3535
Estimated Jobs Created: 226
3636

3737
***ENGINEERING PARAMETERS***

‎tests/examples/S-DAC-GT.out‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.23
8-
Simulation Date: 2025-03-10
9-
Simulation Time: 10:42
10-
Calculation Time: 0.107 sec
7+
GEOPHIRES Version: 3.9.7
8+
Simulation Date: 2025-05-15
9+
Simulation Time: 09:23
10+
Calculation Time: 0.099 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -25,15 +25,15 @@ Simulation Metadata
2525

2626
***ECONOMIC PARAMETERS***
2727

28-
Economic Model = BICYCLE
29-
Accrued financing during construction: 0.00
28+
Economic Model = BICYCLE
29+
Accrued financing during construction: 0.00 %
3030
Project lifetime: 30 yr
3131
Capacity factor: 90.0 %
3232
Project NPV: -82.17 MUSD
3333
Project IRR: -5.86 %
3434
Project VIR=PI=PIR: 0.20
3535
Project MOIC: -0.30
36-
Project Payback Period: N/A
36+
Project Payback Period: N/A
3737
CHP: Percent cost allocation for electrical plant: 92.25 %
3838

3939
***ENGINEERING PARAMETERS***

‎tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.8.4
8-
Simulation Date: 2025-03-19
9-
Simulation Time: 10:30
10-
Calculation Time: 1.614 sec
7+
GEOPHIRES Version: 3.9.7
8+
Simulation Date: 2025-05-15
9+
Simulation Time: 09:22
10+
Calculation Time: 1.580 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -23,15 +23,15 @@ Simulation Metadata
2323

2424
***ECONOMIC PARAMETERS***
2525

26-
Economic Model = BICYCLE
27-
Accrued financing during construction: 0.00
26+
Economic Model = BICYCLE
27+
Accrued financing during construction: 0.00 %
2828
Project lifetime: 40 yr
2929
Capacity factor: 90.0 %
3030
Project NPV: -74.72 MUSD
3131
Project IRR: 0.00 %
3232
Project VIR=PI=PIR: -0.08
3333
Project MOIC: -0.82
34-
Project Payback Period: N/A
34+
Project Payback Period: N/A
3535
Estimated Jobs Created: 2
3636

3737
***ENGINEERING PARAMETERS***

‎tests/examples/example1.out‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.8.4
8-
Simulation Date: 2025-03-19
9-
Simulation Time: 10:30
10-
Calculation Time: 0.810 sec
7+
GEOPHIRES Version: 3.9.7
8+
Simulation Date: 2025-05-15
9+
Simulation Time: 09:22
10+
Calculation Time: 0.776 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -25,14 +25,14 @@ Simulation Metadata
2525

2626
Economic Model = Fixed Charge Rate (FCR)
2727
Fixed Charge Rate (FCR): 5.00
28-
Accrued financing during construction: 0.00
28+
Accrued financing during construction: 0.00 %
2929
Project lifetime: 30 yr
3030
Capacity factor: 90.0 %
3131
Project NPV: -35.81 MUSD
3232
Project IRR: -2.85 %
3333
Project VIR=PI=PIR: 0.25
3434
Project MOIC: -0.21
35-
Project Payback Period: N/A
35+
Project Payback Period: N/A
3636
Estimated Jobs Created: 12
3737

3838
***ENGINEERING PARAMETERS***

0 commit comments

Comments
 (0)