Skip to content

Commit 3fdc98d

Browse files
Fix 'Peaking Boiler Cost per kW' unit capitalization ('kW' instead of 'KW')
1 parent cb38f7f commit 3fdc98d

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/geophires_x/Economics.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,17 +1125,17 @@ def __init__(self, model: Model):
11251125
ErrMessage="assume default peaking boiler efficiency (85%)",
11261126
ToolTipText="Peaking boiler efficiency"
11271127
)
1128-
self._default_peaking_boiler_cost_USD_per_kw = 65
1129-
self.peaking_boiler_cost_per_kw = self.ParameterDict[self.peaking_boiler_cost_per_kw.Name] = floatParameter(
1130-
"Peaking Boiler Cost per KW",
1131-
DefaultValue=self._default_peaking_boiler_cost_USD_per_kw,
1128+
self._default_peaking_boiler_cost_USD_per_kW = 65
1129+
self.peaking_boiler_cost_per_kW = self.ParameterDict[self.peaking_boiler_cost_per_kW.Name] = floatParameter(
1130+
"Peaking Boiler Cost per kW",
1131+
DefaultValue=self._default_peaking_boiler_cost_USD_per_kW,
11321132
Min=0,
11331133
Max=1000,
11341134
UnitType=Units.ENERGYCOST,
11351135
PreferredUnits=EnergyCostUnit.DOLLARSPERKW,
11361136
CurrentUnits=EnergyCostUnit.DOLLARSPERKW,
11371137
Required=False,
1138-
ToolTipText="Peaking boiler cost per KW of maximum peaking boiler demand"
1138+
ToolTipText="Peaking boiler cost per kW of maximum peaking boiler demand"
11391139
)
11401140
self.dhpipingcostrate = self.ParameterDict[self.dhpipingcostrate.Name] = floatParameter(
11411141
"District Heating Piping Cost Rate",
@@ -1733,9 +1733,9 @@ def __init__(self, model: Model):
17331733
UnitType=Units.CURRENCY,
17341734
PreferredUnits=CurrencyUnit.MDOLLARS,
17351735
CurrentUnits=CurrencyUnit.MDOLLARS,
1736-
ToolTipText=f'Default cost: ${self._default_peaking_boiler_cost_USD_per_kw}/KW '
1736+
ToolTipText=f'Default cost: ${self._default_peaking_boiler_cost_USD_per_kW}/KW '
17371737
f'of maximum peaking boiler demand. '
1738-
f'Provide {self.peaking_boiler_cost_per_kw.Name} override the default.'
1738+
f'Provide {self.peaking_boiler_cost_per_kW.Name} override the default.'
17391739
)
17401740

17411741
self.dhdistrictcost = self.OutputParameterDict[self.dhdistrictcost.Name] = OutputParameter(
@@ -2698,7 +2698,7 @@ def calculate_plant_costs(self, model:Model) -> None:
26982698
model.surfaceplant.HeatExtracted.value) * 1000.
26992699

27002700
# add 65$/KW for peaking boiler
2701-
self.peakingboilercost.value = (self.peaking_boiler_cost_per_kw.quantity()
2701+
self.peakingboilercost.value = (self.peaking_boiler_cost_per_kW.quantity()
27022702
.to('USD / kilowatt').magnitude
27032703
* model.surfaceplant.max_peaking_boiler_demand.value / 1000)
27042704

src/geophires_x_schema_generator/geophires-request.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1869,8 +1869,8 @@
18691869
"minimum": 0,
18701870
"maximum": 1
18711871
},
1872-
"Peaking Boiler Cost per KW": {
1873-
"description": "Peaking boiler cost per KW of maximum peaking boiler demand",
1872+
"Peaking Boiler Cost per kW": {
1873+
"description": "Peaking boiler cost per kW of maximum peaking boiler demand",
18741874
"type": "number",
18751875
"units": "USD/kW",
18761876
"category": "Economics",

tests/geophires_x_tests/test_economics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def _get_result(peaking_boiler_cost_: int) -> GeophiresXResult:
125125
GeophiresInputParameters(
126126
from_file_path=self._get_test_file_path('../examples/example12_DH.txt'),
127127
params={
128-
'Peaking Boiler Cost per KW': peaking_boiler_cost_,
128+
'Peaking Boiler Cost per kW': peaking_boiler_cost_,
129129
},
130130
)
131131
)

0 commit comments

Comments
 (0)