Skip to content

Commit 2d6b1fb

Browse files
Add-ons parameters tooltip text including pattern for specifying multiple add-ons.
1 parent 822739e commit 2d6b1fb

File tree

2 files changed

+23
-14
lines changed

2 files changed

+23
-14
lines changed

src/geophires_x/EconomicsAddOns.py

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,51 +46,60 @@ def __init__(self, model: Model):
4646
self.MyClass = sclass.replace("\'>", "")
4747
self.MyPath = os.path.abspath(__file__)
4848

49+
def multi_addon_tooltip_text(param_name: str) -> str:
50+
return f'If using multiple add-ons, suffix with a number e.g. \'{param_name} 1\', \'{param_name} 2\', etc.'
51+
4952
self.AddOnNickname = self.ParameterDict[self.AddOnNickname.Name] = listParameter(
5053
"AddOn Nickname",
5154
UnitType=Units.NONE,
5255
Min=0.0,
53-
Max=1000.0
56+
Max=1000.0,
57+
ToolTipText=multi_addon_tooltip_text("AddOn Nickname")
5458
)
5559
self.AddOnCAPEX = self.ParameterDict[self.AddOnCAPEX.Name] = listParameter(
5660
"AddOn CAPEX",
5761
Min=0.0,
5862
Max=1000.0,
5963
UnitType=Units.CURRENCY,
6064
PreferredUnits=CurrencyUnit.MDOLLARS,
61-
CurrentUnits=CurrencyUnit.MDOLLARS
65+
CurrentUnits=CurrencyUnit.MDOLLARS,
66+
ToolTipText=multi_addon_tooltip_text("AddOn CAPEX")
6267
)
6368
self.AddOnOPEXPerYear = self.ParameterDict[self.AddOnOPEXPerYear.Name] = listParameter(
6469
"AddOn OPEX",
6570
Min=0.0,
6671
Max=1000.0,
6772
UnitType=Units.CURRENCYFREQUENCY,
6873
PreferredUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR,
69-
CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR
74+
CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR,
75+
ToolTipText=f'Annual operating cost. {multi_addon_tooltip_text("AddOn OPEX")}'
7076
)
7177
self.AddOnElecGainedPerYear = self.ParameterDict[self.AddOnElecGainedPerYear.Name] = listParameter(
7278
"AddOn Electricity Gained",
7379
Min=0.0,
7480
Max=1000.0,
7581
UnitType=Units.ENERGYFREQUENCY,
7682
PreferredUnits=EnergyFrequencyUnit.KWPERYEAR,
77-
CurrentUnits=EnergyFrequencyUnit.KWPERYEAR
83+
CurrentUnits=EnergyFrequencyUnit.KWPERYEAR,
84+
ToolTipText=f'Annual electricity gained. {multi_addon_tooltip_text("AddOn Electricity Gained")}'
7885
)
7986
self.AddOnHeatGainedPerYear = self.ParameterDict[self.AddOnHeatGainedPerYear.Name] = listParameter(
8087
"AddOn Heat Gained",
8188
Min=0.0,
8289
Max=1000.0,
8390
UnitType=Units.ENERGYFREQUENCY,
8491
PreferredUnits=EnergyFrequencyUnit.KWPERYEAR,
85-
CurrentUnits=EnergyFrequencyUnit.KWPERYEAR
92+
CurrentUnits=EnergyFrequencyUnit.KWPERYEAR,
93+
ToolTipText=f'Annual heat gained. {multi_addon_tooltip_text("AddOn Heat Gained")}'
8694
)
8795
self.AddOnProfitGainedPerYear = self.ParameterDict[self.AddOnProfitGainedPerYear.Name] = listParameter(
8896
"AddOn Profit Gained",
8997
Min=0.0,
9098
Max=1000.0,
9199
UnitType=Units.CURRENCYFREQUENCY,
92100
PreferredUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR,
93-
CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR
101+
CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR,
102+
ToolTipText=f'Annual profit gained. {multi_addon_tooltip_text("AddOn Profit Gained")}'
94103
)
95104

96105
# local variables that need initialization
@@ -99,7 +108,7 @@ def __init__(self, model: Model):
99108
"AddOn CAPEX Total",
100109
UnitType=Units.CURRENCY,
101110
PreferredUnits=CurrencyUnit.MDOLLARS,
102-
CurrentUnits=CurrencyUnit.MDOLLARS
111+
CurrentUnits=CurrencyUnit.MDOLLARS,
103112
)
104113
self.AddOnOPEXTotalPerYear = self.OutputParameterDict[self.AddOnOPEXTotalPerYear.Name] = OutputParameter(
105114
"AddOn OPEX Total Per Year",
@@ -242,7 +251,7 @@ def read_parameters(self, model: Model) -> None:
242251
if key.startswith("AddOn Profit Gained"):
243252
val = float(model.InputParameters[key].sValue)
244253
self.AddOnProfitGainedPerYear.value.append(val) # this assumes they put the values in the file in consecutive fashion
245-
model.logger.info("complete " + str(__class__) + ": " + sys._getframe().f_code.co_name)
254+
model.logger.info(f"complete {__class__!s}: {sys._getframe().f_code.co_name}")
246255

247256
def Calculate(self, model: Model) -> None:
248257
"""

src/geophires_x_schema_generator/geophires-request.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2217,7 +2217,7 @@
22172217
"maximum": 10000.0
22182218
},
22192219
"AddOn Nickname": {
2220-
"description": "",
2220+
"description": "If using multiple add-ons, suffix with a number e.g. 'AddOn Nickname 1', 'AddOn Nickname 2', etc.",
22212221
"type": "array",
22222222
"units": null,
22232223
"category": "Economics",
@@ -2226,7 +2226,7 @@
22262226
"maximum": 1000.0
22272227
},
22282228
"AddOn CAPEX": {
2229-
"description": "",
2229+
"description": "If using multiple add-ons, suffix with a number e.g. 'AddOn CAPEX 1', 'AddOn CAPEX 2', etc.",
22302230
"type": "array",
22312231
"units": "MUSD",
22322232
"category": "Economics",
@@ -2235,7 +2235,7 @@
22352235
"maximum": 1000.0
22362236
},
22372237
"AddOn OPEX": {
2238-
"description": "",
2238+
"description": "Annual operating cost. If using multiple add-ons, suffix with a number e.g. 'AddOn OPEX 1', 'AddOn OPEX 2', etc.",
22392239
"type": "array",
22402240
"units": "MUSD/yr",
22412241
"category": "Economics",
@@ -2244,7 +2244,7 @@
22442244
"maximum": 1000.0
22452245
},
22462246
"AddOn Electricity Gained": {
2247-
"description": "",
2247+
"description": "Annual electricity gained. If using multiple add-ons, suffix with a number e.g. 'AddOn Electricity Gained 1', 'AddOn Electricity Gained 2', etc.",
22482248
"type": "array",
22492249
"units": "kW/yr",
22502250
"category": "Economics",
@@ -2253,7 +2253,7 @@
22532253
"maximum": 1000.0
22542254
},
22552255
"AddOn Heat Gained": {
2256-
"description": "",
2256+
"description": "Annual heat gained. If using multiple add-ons, suffix with a number e.g. 'AddOn Heat Gained 1', 'AddOn Heat Gained 2', etc.",
22572257
"type": "array",
22582258
"units": "kW/yr",
22592259
"category": "Economics",
@@ -2262,7 +2262,7 @@
22622262
"maximum": 1000.0
22632263
},
22642264
"AddOn Profit Gained": {
2265-
"description": "",
2265+
"description": "Annual profit gained. If using multiple add-ons, suffix with a number e.g. 'AddOn Profit Gained 1', 'AddOn Profit Gained 2', etc.",
22662266
"type": "array",
22672267
"units": "MUSD/yr",
22682268
"category": "Economics",

0 commit comments

Comments
 (0)