Skip to content

Commit 7e7517c

Browse files
configure 1:1 output display names thru total capex
1 parent 72e35ba commit 7e7517c

File tree

5 files changed

+44
-18
lines changed

5 files changed

+44
-18
lines changed

src/geophires_x/Economics.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,6 +1601,7 @@ def __init__(self, model: Model):
16011601
)
16021602
self.Cexpl = self.OutputParameterDict[self.Cexpl.Name] = OutputParameter(
16031603
Name="Exploration cost",
1604+
display_name='Exploration costs',
16041605
UnitType=Units.CURRENCY,
16051606
PreferredUnits=CurrencyUnit.MDOLLARS,
16061607
CurrentUnits=CurrencyUnit.MDOLLARS
@@ -1643,6 +1644,7 @@ def __init__(self, model: Model):
16431644
)
16441645
self.Cpiping = self.OutputParameterDict[self.Cpiping.Name] = OutputParameter(
16451646
Name="Transmission pipeline costs",
1647+
display_name='Transmission pipeline cost',
16461648
UnitType=Units.CURRENCY,
16471649
PreferredUnits=CurrencyUnit.MDOLLARS,
16481650
CurrentUnits=CurrencyUnit.MDOLLARS
@@ -1655,6 +1657,7 @@ def __init__(self, model: Model):
16551657
)
16561658
self.CCap = self.OutputParameterDict[self.CCap.Name] = OutputParameter(
16571659
Name="Total Capital Cost",
1660+
display_name='Total capital costs',
16581661
UnitType=Units.CURRENCY,
16591662
PreferredUnits=CurrencyUnit.MDOLLARS,
16601663
CurrentUnits=CurrencyUnit.MDOLLARS
@@ -1847,6 +1850,7 @@ def __init__(self, model: Model):
18471850
)
18481851
self.RITCValue = self.OutputParameterDict[self.RITCValue.Name] = OutputParameter(
18491852
Name="Investment Tax Credit Value",
1853+
display_name='Investment Tax Credit',
18501854
UnitType=Units.CURRENCY,
18511855
PreferredUnits=CurrencyUnit.MDOLLARS,
18521856
CurrentUnits=CurrencyUnit.MDOLLARS

src/geophires_x/Outputs.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -349,10 +349,10 @@ def PrintOutputs(self, model: Model):
349349
f.write(' Fracture separation calculated with reservoir volume and number of fractures as input\n')
350350
elif model.reserv.resvoloption.value == ReservoirVolume.RES_VOL_ONLY:
351351
f.write(' Reservoir volume provided as input\n')
352-
if model.reserv.resvoloption.value in [ReservoirVolume.FRAC_NUM_SEP, ReservoirVolume.RES_VOL_FRAC_SEP,ReservoirVolume.FRAC_NUM_SEP]:
352+
if model.reserv.resvoloption.value in [ReservoirVolume.FRAC_NUM_SEP, ReservoirVolume.RES_VOL_FRAC_SEP, ReservoirVolume.FRAC_NUM_SEP]:
353353
f.write(f' Number of fractures: {model.reserv.fracnumbcalc.value:10.2f}' + NL)
354354
f.write(f' Fracture separation: {model.reserv.fracsepcalc.value:10.2f} ' + model.reserv.fracsep.CurrentUnits.value + NL)
355-
f.write(f' Reservoir volume: {model.reserv.resvolcalc.value:10.0f} ' + model.reserv.resvol.CurrentUnits.value + NL)
355+
f.write(f' Reservoir volume: {model.reserv.resvolcalc.value:10.0f} {model.reserv.resvol.CurrentUnits.value}\n')
356356

357357
if model.wellbores.impedancemodelused.value:
358358
# See note re: unit conversion:
@@ -361,7 +361,7 @@ def PrintOutputs(self, model: Model):
361361
else:
362362
if model.wellbores.overpressure_percentage.Provided:
363363
# write the reservoir pressure as an average in the overpressure case
364-
f.write(f' Average reservoir pressure: {model.wellbores.average_production_reservoir_pressure.value:10.2f} ' + model.wellbores.average_production_reservoir_pressure.CurrentUnits.value + NL)
364+
f.write(f' {model.wellbores.average_production_reservoir_pressure.display_name}: {model.wellbores.average_production_reservoir_pressure.value:10.2f} {model.wellbores.average_production_reservoir_pressure.CurrentUnits.value}\n')
365365
else:
366366
# write the reservoir pressure as a single value
367367
f.write(f' Reservoir hydrostatic pressure: {model.wellbores.production_reservoir_pressure.value[0]:10.2f} ' + model.wellbores.production_reservoir_pressure.CurrentUnits.value + NL)
@@ -392,11 +392,11 @@ def PrintOutputs(self, model: Model):
392392
f.write(f' Minimum Production Temperature: {np.min(model.wellbores.ProducedTemperature.value):10.1f} ' + model.wellbores.ProducedTemperature.PreferredUnits.value + NL)
393393
f.write(f' Initial Production Temperature: {model.wellbores.ProducedTemperature.value[0]:10.1f} ' + model.wellbores.ProducedTemperature.PreferredUnits.value + NL)
394394
if model.wellbores.IsAGS.value:
395-
f.write('The AGS models contain an intrinsic reservoir model that doesn\'t expose values that can be used in extensive reporting.' + NL)
395+
f.write('The AGS models contain an intrinsic reservoir model that doesn\'t expose values that can be used in extensive reporting.\n')
396396
else:
397397
f.write(f' Average Reservoir Heat Extraction: {np.average(model.surfaceplant.HeatExtracted.value):10.2f} ' + model.surfaceplant.HeatExtracted.PreferredUnits.value + NL)
398398
if model.wellbores.rameyoptionprod.value:
399-
f.write(' Production Wellbore Heat Transmission Model = Ramey Model' + NL)
399+
f.write(' Production Wellbore Heat Transmission Model = Ramey Model\n')
400400
f.write(f' Average Production Well Temperature Drop: {np.average(model.wellbores.ProdTempDrop.value):10.1f} ' + model.wellbores.ProdTempDrop.PreferredUnits.value + NL)
401401
else:
402402
f.write(f' Wellbore Heat Transmission Model = Constant Temperature Drop:{model.wellbores.tempdropprod.value:10.1f} ' + model.wellbores.tempdropprod.PreferredUnits.value + NL)
@@ -416,13 +416,13 @@ def PrintOutputs(self, model: Model):
416416
f.write(' ***CAPITAL COSTS (M$)***\n')
417417
f.write(NL)
418418
if not model.economics.totalcapcost.Valid:
419-
f.write(f' Drilling and completion costs: {model.economics.Cwell.value:10.2f} ' + model.economics.Cwell.CurrentUnits.value + NL)
419+
f.write(f' {model.economics.Cwell.display_name}: {model.economics.Cwell.value:10.2f} {model.economics.Cwell.CurrentUnits.value}\n')
420420
if econ.cost_lateral_section.value > 0.0:
421421
f.write(f' Drilling and completion costs per vertical production well: {econ.cost_one_production_well.value:10.2f} ' + econ.cost_one_production_well.CurrentUnits.value + NL)
422422
f.write(f' Drilling and completion costs per vertical injection well: {econ.cost_one_injection_well.value:10.2f} ' + econ.cost_one_injection_well.CurrentUnits.value + NL)
423423
f.write(f' {econ.cost_per_lateral_section.Name}: {econ.cost_per_lateral_section.value:10.2f} {econ.cost_lateral_section.CurrentUnits.value}\n')
424-
elif round(econ.cost_one_production_well.value, 4) != round(econ.cost_one_injection_well.value, 4) and \
425-
model.economics.cost_one_injection_well.value != -1:
424+
elif round(econ.cost_one_production_well.value, 4) != round(econ.cost_one_injection_well.value, 4) \
425+
and model.economics.cost_one_injection_well.value != -1:
426426
f.write(f' Drilling and completion costs per production well: {econ.cost_one_production_well.value:10.2f} ' + econ.cost_one_production_well.CurrentUnits.value + NL)
427427
f.write(f' Drilling and completion costs per injection well: {econ.cost_one_injection_well.value:10.2f} ' + econ.cost_one_injection_well.CurrentUnits.value + NL)
428428
else:
@@ -437,18 +437,18 @@ def PrintOutputs(self, model: Model):
437437
f.write(f' of which Peaking Boiler Cost: {model.economics.peakingboilercost.value:10.2f} ' + model.economics.peakingboilercost.CurrentUnits.value + NL)
438438
f.write(f' Field gathering system costs: {model.economics.Cgath.value:10.2f} ' + model.economics.Cgath.CurrentUnits.value + NL)
439439
if model.surfaceplant.piping_length.value > 0:
440-
f.write(f' Transmission pipeline cost: {model.economics.Cpiping.value:10.2f} ' + model.economics.Cpiping.CurrentUnits.value + NL)
440+
f.write(f' {model.economics.Cpiping.display_name}: {model.economics.Cpiping.value:10.2f} {model.economics.Cpiping.CurrentUnits.value}\n')
441441
if model.surfaceplant.plant_type.value == PlantType.DISTRICT_HEATING:
442-
f.write(f' District Heating System Cost: {model.economics.dhdistrictcost.value:10.2f} ' + model.economics.dhdistrictcost.CurrentUnits.value + NL)
442+
f.write(f' District Heating System Cost: {model.economics.dhdistrictcost.value:10.2f} {model.economics.dhdistrictcost.CurrentUnits.value}\n')
443443
f.write(f' Total surface equipment costs: {(model.economics.Cplant.value+model.economics.Cgath.value):10.2f} ' + model.economics.Cplant.CurrentUnits.value + NL)
444-
f.write(f' Exploration costs: {model.economics.Cexpl.value:10.2f} ' + model.economics.Cexpl.CurrentUnits.value + NL)
444+
f.write(f' {model.economics.Cexpl.display_name}: {model.economics.Cexpl.value:10.2f} {model.economics.Cexpl.CurrentUnits.value}\n')
445445
if model.economics.totalcapcost.Valid and model.wellbores.redrill.value > 0:
446446
f.write(f' Drilling and completion costs (for redrilling):{model.economics.Cwell.value:10.2f} ' + model.economics.Cwell.CurrentUnits.value + NL)
447447
f.write(f' Drilling and completion costs per redrilled well: {(model.economics.Cwell.value/(model.wellbores.nprod.value+model.wellbores.ninj.value)):10.2f} ' + model.economics.Cwell.CurrentUnits.value + NL)
448448
f.write(f' Stimulation costs (for redrilling): {model.economics.Cstim.value:10.2f} ' + model.economics.Cstim.CurrentUnits.value + NL)
449449
if model.economics.RITCValue.value:
450-
f.write(f' Investment Tax Credit: {-1*model.economics.RITCValue.value:10.2f} ' + model.economics.RITCValue.CurrentUnits.value + NL)
451-
f.write(f' Total capital costs: {model.economics.CCap.value:10.2f} ' + model.economics.CCap.CurrentUnits.value + NL)
450+
f.write(f' {model.economics.RITCValue.display_name}: {-1*model.economics.RITCValue.value:10.2f} {model.economics.RITCValue.CurrentUnits.value}\n')
451+
f.write(f' {model.economics.CCap.display_name}: {model.economics.CCap.value:10.2f} {model.economics.CCap.CurrentUnits.value}\n')
452452
if model.economics.econmodel.value == EconomicModel.FCR:
453453
f.write(f' Annualized capital costs: {(model.economics.CCap.value*(1+model.economics.inflrateconstruction.value)*model.economics.FCR.value):10.2f} ' + model.economics.CCap.CurrentUnits.value + NL)
454454

src/geophires_x/Reservoir.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@ def __init__(self, model: Model):
458458

459459
self.resvolcalc = self.OutputParameterDict[self.resvolcalc.Name] = floatParameter(
460460
"Calculated Reservoir Volume",
461+
# display_name='Reservoir volume',
461462
value=self.resvol.value,
462463
UnitType=Units.VOLUME,
463464
PreferredUnits=VolumeUnit.METERS3,

src/geophires_x/WellBores.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,6 +1072,7 @@ def __init__(self, model: Model):
10721072
)
10731073
self.average_production_reservoir_pressure = self.OutputParameterDict[self.average_production_reservoir_pressure.Name] = OutputParameter(
10741074
Name="Average Reservoir Pressure",
1075+
display_name='Average reservoir pressure',
10751076
UnitType=Units.PRESSURE,
10761077
PreferredUnits=PressureUnit.KPASCAL,
10771078
CurrentUnits=PressureUnit.KPASCAL

src/geophires_x_schema_generator/geophires-result.json

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,11 @@
209209
"Reservoir volume": {},
210210
"Reservoir impedance": {},
211211
"Reservoir hydrostatic pressure": {},
212-
"Average reservoir pressure": {},
212+
"Average reservoir pressure": {
213+
"type": "number",
214+
"description": "Average Reservoir Pressure",
215+
"units": "kPa"
216+
},
213217
"Plant outlet pressure": {},
214218
"Production wellhead pressure": {
215219
"type": "number",
@@ -297,17 +301,33 @@
297301
"of which Absorption Chiller Cost": {},
298302
"of which Heat Pump Cost": {},
299303
"of which Peaking Boiler Cost": {},
300-
"Transmission pipeline cost": {},
304+
"Transmission pipeline cost": {
305+
"type": "number",
306+
"description": "Transmission pipeline costs",
307+
"units": "MUSD"
308+
},
301309
"District Heating System Cost": {
302310
"type": "number",
303311
"description": "",
304312
"units": "MUSD"
305313
},
306314
"Field gathering system costs": {},
307315
"Total surface equipment costs": {},
308-
"Exploration costs": {},
309-
"Investment Tax Credit": {},
310-
"Total capital costs": {},
316+
"Exploration costs": {
317+
"type": "number",
318+
"description": "Exploration cost",
319+
"units": "MUSD"
320+
},
321+
"Investment Tax Credit": {
322+
"type": "number",
323+
"description": "Investment Tax Credit Value",
324+
"units": "MUSD"
325+
},
326+
"Total capital costs": {
327+
"type": "number",
328+
"description": "Total Capital Cost",
329+
"units": "MUSD"
330+
},
311331
"Annualized capital costs": {},
312332
"Total CAPEX": {},
313333
"Drilling Cost": {},

0 commit comments

Comments
 (0)