Skip to content

Commit 7d1419b

Browse files
softwareengineerprogrammersoftwareengineerprogrammer
committed
more 1:1 output display names including o&m-related
1 parent fd7f189 commit 7d1419b

File tree

3 files changed

+35
-17
lines changed

3 files changed

+35
-17
lines changed

‎src/geophires_x/Economics.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1622,6 +1622,7 @@ def __init__(self, model: Model):
16221622
)
16231623
self.Coamwell = self.OutputParameterDict[self.Coamwell.Name] = OutputParameter(
16241624
Name="O&M Wellfield cost",
1625+
display_name='Wellfield maintenance costs',
16251626
UnitType=Units.CURRENCYFREQUENCY,
16261627
PreferredUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR,
16271628
CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR
@@ -1634,12 +1635,14 @@ def __init__(self, model: Model):
16341635
)
16351636
self.Coamplant = self.OutputParameterDict[self.Coamplant.Name] = OutputParameter(
16361637
Name="O&M Surface Plant costs",
1638+
display_name='Power plant maintenance costs',
16371639
UnitType=Units.CURRENCYFREQUENCY,
16381640
PreferredUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR,
16391641
CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR
16401642
)
16411643
self.Cgath = self.OutputParameterDict[self.Cgath.Name] = OutputParameter(
16421644
Name="Field gathering system cost",
1645+
display_name='Field gathering system costs',
16431646
UnitType=Units.CURRENCY,
16441647
PreferredUnits=CurrencyUnit.MDOLLARS,
16451648
CurrentUnits=CurrencyUnit.MDOLLARS
@@ -1653,6 +1656,7 @@ def __init__(self, model: Model):
16531656
)
16541657
self.Coamwater = self.OutputParameterDict[self.Coamwater.Name] = OutputParameter(
16551658
Name="O&M Make-up Water costs",
1659+
display_name='Water costs',
16561660
UnitType=Units.CURRENCYFREQUENCY,
16571661
PreferredUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR,
16581662
CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR
@@ -1670,8 +1674,6 @@ def __init__(self, model: Model):
16701674
PreferredUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR,
16711675
CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR
16721676
)
1673-
# self.averageannualpumpingcosts = self.OutputParameterDict[
1674-
# self.averageannualpumpingcosts.Name] = OutputParameter( #typo here!??!
16751677
self.averageannualpumpingcosts = OutputParameter(
16761678
Name="Average Annual Pumping Costs",
16771679
UnitType=Units.CURRENCYFREQUENCY,

‎src/geophires_x/Outputs.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ def PrintOutputs(self, model: Model):
437437
f.write(f' of which Heat Pump Cost: {model.economics.heatpumpcapex.value:10.2f} ' + model.economics.Cplant.CurrentUnits.value + NL)
438438
if model.surfaceplant.plant_type.value == PlantType.DISTRICT_HEATING:
439439
f.write(f' of which Peaking Boiler Cost: {model.economics.peakingboilercost.value:10.2f} ' + model.economics.peakingboilercost.CurrentUnits.value + NL)
440-
f.write(f' Field gathering system costs: {model.economics.Cgath.value:10.2f} ' + model.economics.Cgath.CurrentUnits.value + NL)
440+
f.write(f' {model.economics.Cgath.display_name}: {model.economics.Cgath.value:10.2f} {model.economics.Cgath.CurrentUnits.value}\n')
441441
if model.surfaceplant.piping_length.value > 0:
442442
f.write(f' {model.economics.Cpiping.display_name}: {model.economics.Cpiping.value:10.2f} {model.economics.Cpiping.CurrentUnits.value}\n')
443443
if model.surfaceplant.plant_type.value == PlantType.DISTRICT_HEATING:
@@ -459,18 +459,18 @@ def PrintOutputs(self, model: Model):
459459
f.write(' ***OPERATING AND MAINTENANCE COSTS (M$/yr)***\n')
460460
f.write(NL)
461461
if not model.economics.oamtotalfixed.Valid:
462-
f.write(f' Wellfield maintenance costs: {model.economics.Coamwell.value:10.2f} ' + model.economics.Coamwell.CurrentUnits.value + NL)
463-
f.write(f' Power plant maintenance costs: {model.economics.Coamplant.value:10.2f} ' + model.economics.Coamplant.CurrentUnits.value + NL)
464-
f.write(f' Water costs: {model.economics.Coamwater.value:10.2f} ' + model.economics.Coamwater.CurrentUnits.value + NL)
462+
f.write(f' {model.economics.Coamwell.display_name}: {model.economics.Coamwell.value:10.2f} {model.economics.Coamwell.CurrentUnits.value}\n')
463+
f.write(f' {model.economics.Coamplant.display_name}: {model.economics.Coamplant.value:10.2f} {model.economics.Coamplant.CurrentUnits.value}\n')
464+
f.write(f' {model.economics.Coamwater.display_name}: {model.economics.Coamwater.value:10.2f} {model.economics.Coamwater.CurrentUnits.value}\n')
465465
if model.surfaceplant.plant_type.value in [PlantType.INDUSTRIAL, PlantType.ABSORPTION_CHILLER, PlantType.HEAT_PUMP, PlantType.DISTRICT_HEATING]:
466-
f.write(f' Average Reservoir Pumping Cost: {model.economics.averageannualpumpingcosts.value:10.2f} ' + model.economics.averageannualpumpingcosts.CurrentUnits.value + NL)
467-
if model.surfaceplant.plant_type.value == PlantType.ABSORPTION_CHILLER:
468-
f.write(f' Absorption Chiller O&M Cost: {model.economics.chilleropex.value:10.2f} ' + model.economics.chilleropex.CurrentUnits.value + NL)
469-
if model.surfaceplant.plant_type.value == PlantType.HEAT_PUMP:
470-
f.write(f' Average Heat Pump Electricity Cost: {model.economics.averageannualheatpumpelectricitycost.value:10.2f} ' + model.economics.averageannualheatpumpelectricitycost.CurrentUnits.value + NL)
466+
f.write(f' Average Reservoir Pumping Cost: {model.economics.averageannualpumpingcosts.value:10.2f} {model.economics.averageannualpumpingcosts.CurrentUnits.value}\n7')
467+
if model.surfaceplant.plant_type.value == PlantType.ABSORPTION_CHILLER:
468+
f.write(f' Absorption Chiller O&M Cost: {model.economics.chilleropex.value:10.2f} {model.economics.chilleropex.CurrentUnits.value}\n')
469+
if model.surfaceplant.plant_type.value == PlantType.HEAT_PUMP:
470+
f.write(f' Average Heat Pump Electricity Cost: {model.economics.averageannualheatpumpelectricitycost.value:10.2f} {model.economics.averageannualheatpumpelectricitycost.CurrentUnits.value}\n')
471471
if model.surfaceplant.plant_type.value == PlantType.DISTRICT_HEATING:
472-
f.write(f' Annual District Heating O&M Cost: {model.economics.dhdistrictoandmcost.value:10.2f} ' + model.economics.dhdistrictoandmcost.CurrentUnits.value + NL)
473-
f.write(f' Average Annual Peaking Fuel Cost: {model.economics.averageannualngcost.value:10.2f} ' + model.economics.averageannualngcost.CurrentUnits.value + NL)
472+
f.write(f' Annual District Heating O&M Cost: {model.economics.dhdistrictoandmcost.value:10.2f} {model.economics.dhdistrictoandmcost.CurrentUnits.value}\n')
473+
f.write(f' Average Annual Peaking Fuel Cost: {model.economics.averageannualngcost.value:10.2f} {model.economics.averageannualngcost.CurrentUnits.value}\n')
474474

475475
f.write(f' Total operating and maintenance costs: {(model.economics.Coam.value + model.economics.averageannualpumpingcosts.value+model.economics.averageannualheatpumpelectricitycost.value):10.2f} ' + model.economics.Coam.CurrentUnits.value + NL)
476476
else:

‎src/geophires_x_schema_generator/geophires-result.json

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,11 @@
339339
"description": "",
340340
"units": "MUSD"
341341
},
342-
"Field gathering system costs": {},
342+
"Field gathering system costs": {
343+
"type": "number",
344+
"description": "Field gathering system cost",
345+
"units": "MUSD"
346+
},
343347
"Total surface equipment costs": {},
344348
"Exploration costs": {
345349
"type": "number",
@@ -369,9 +373,21 @@
369373
"OPERATING AND MAINTENANCE COSTS (M$/yr)": {
370374
"type": "object",
371375
"properties": {
372-
"Wellfield maintenance costs": {},
373-
"Power plant maintenance costs": {},
374-
"Water costs": {},
376+
"Wellfield maintenance costs": {
377+
"type": "number",
378+
"description": "O&M Wellfield cost",
379+
"units": "MUSD/yr"
380+
},
381+
"Power plant maintenance costs": {
382+
"type": "number",
383+
"description": "O&M Surface Plant costs",
384+
"units": "MUSD/yr"
385+
},
386+
"Water costs": {
387+
"type": "number",
388+
"description": "O&M Make-up Water costs",
389+
"units": "MUSD/yr"
390+
},
375391
"Average Reservoir Pumping Cost": {},
376392
"Absorption Chiller O&M Cost": {},
377393
"Average Heat Pump Electricity Cost": {},

0 commit comments

Comments
 (0)