Skip to content

Commit 269aa89

Browse files
Implementing PTC and ITC more fully
Adding test modules for PTC and IC Fixing unit tests
1 parent e09b3a9 commit 269aa89

21 files changed

+4144
-3333
lines changed

src/geophires_x/Economics.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,10 +1314,6 @@ def __init__(self, model: Model):
13141314
self.InputFile = ""
13151315
self.Cplantcorrelation = 0.0
13161316
self.C1well = 0.0
1317-
self.PTCElecPrice = [0.0] * model.surfaceplant.plant_lifetime.value
1318-
self.PTCHeatPrice = [0.0] * model.surfaceplant.plant_lifetime.value
1319-
self.PTCCoolingPrice = [0.0] * model.surfaceplant.plant_lifetime.value
1320-
self.PTCCarbonPrice = [0.0] * model.surfaceplant.plant_lifetime.value
13211317
sclass = str(__class__).replace("<class \'", "")
13221318
self.MyClass = sclass.replace("\'>", "")
13231319
self.MyPath = os.path.abspath(__file__)
@@ -2503,6 +2499,10 @@ def Calculate(self, model: Model) -> None:
25032499
model.reserv.depth.CurrentUnits = LengthUnit.KILOMETERS
25042500

25052501
# build the PTC price models
2502+
self.PTCElecPrice = [0.0] * model.surfaceplant.plant_lifetime.value
2503+
self.PTCHeatPrice = [0.0] * model.surfaceplant.plant_lifetime.value
2504+
self.PTCCoolingPrice = [0.0] * model.surfaceplant.plant_lifetime.value
2505+
self.PTCCarbonPrice = [0.0] * model.surfaceplant.plant_lifetime.value
25062506
if self.PTCElec.Provided:
25072507
self.PTCElecPrice = BuildPTCModel(model.surfaceplant.plant_lifetime.value,
25082508
self.PTCDuration.value, self.PTCElec.value, self.PTCInflationAdjusted.value,

src/geophires_x_client/geophires_x_result.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class GeophiresXResult:
140140
# TODO moved to power generation profile, parse from there
141141
# 'Annual Thermal Drawdown (%/year)',
142142
'Bottom-hole temperature',
143-
'Well seperation: fracture height', # TODO correct typo upstream
143+
'Well separation: fracture height',
144144
'Fracture area',
145145
'Fracture width',
146146
'Reservoir volume',

tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out

Lines changed: 228 additions & 213 deletions
Large diffs are not rendered by default.

tests/examples/example1.out

Lines changed: 223 additions & 208 deletions
Large diffs are not rendered by default.

tests/examples/example10_HP.out

Lines changed: 217 additions & 202 deletions
Large diffs are not rendered by default.

tests/examples/example11_AC.out

Lines changed: 223 additions & 208 deletions
Large diffs are not rendered by default.

tests/examples/example12_DH.out

Lines changed: 232 additions & 217 deletions
Large diffs are not rendered by default.

tests/examples/example13.out

Lines changed: 230 additions & 215 deletions
Large diffs are not rendered by default.

tests/examples/example1_addons.out

Lines changed: 224 additions & 209 deletions
Large diffs are not rendered by default.

tests/examples/example2.out

Lines changed: 202 additions & 187 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)