Skip to content

HP performance model + HHW reset #54 #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
t-kramer merged 5 commits into from
Apr 8, 2026
Merged

HP performance model + HHW reset #54 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c12fd87
add HHW reset calculation
urwahah Mar 26, 2026
a86d78d
add performance model inputs
urwahah Mar 26, 2026
f018fb8
fix: update pydantic model
t-kramer Apr 1, 2026
5995db4
update supply temp/performance inputs
urwahah Apr 2, 2026
b1d85b2
fix measured loads with nan calculation
urwahah Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions data/input/equipment_data.JSON
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
"60": {
"cop": [1.48, 2.31],
"constraints": {
"min_temp_C": -15,
"min_temp_C": -8,
"max_temp_C": 35
}
}
Expand Down Expand Up @@ -273,7 +273,7 @@
"60": {
"cop": [1.48, 2.31],
"constraints": {
"min_temp_C": -15,
"min_temp_C": -8,
"max_temp_C": 35
}
}
Expand Down Expand Up @@ -689,8 +689,10 @@
"eq_scen_id": "eq_scenario_1",
"eq_scen_name": "Gas Boiler+AC Chiller",
"hr_wwhp": null,
"hr_wwhp_performance_model": "interpolate_HHWST",
"hr_wwhp_h_supply_t": 48.9,
"awhp": null,
"awhp_performance_model": "interpolate_HHWST_fixed",
"awhp_sizing_mode": "integer_sizing_peak_load",
"awhp_sizing_value": 1,
"awhp_redundancy": 1,
Expand All @@ -703,8 +705,10 @@
"eq_scen_id": "eq_scenario_2",
"eq_scen_name": "Elec Boiler+AC Chiller",
"hr_wwhp": null,
"hr_wwhp_performance_model": "interpolate_HHWST",
"hr_wwhp_h_supply_t": 48.9,
"awhp": null,
"awhp_performance_model": "interpolate_HHWST_fixed",
"awhp_sizing_mode": "integer_sizing_peak_load",
"awhp_sizing_value": 1,
"awhp_redundancy": 1,
Expand All @@ -717,8 +721,10 @@
"eq_scen_id": "eq_scenario_3",
"eq_scen_name": "20% AWHP (H+C)+Gas Backup",
"hr_wwhp": null,
"hr_wwhp_performance_model": "interpolate_HHWST",
"hr_wwhp_h_supply_t": 48.9,
"awhp": "hp01",
"awhp_performance_model": "interpolate_HHWST_fixed",
"awhp_sizing_mode": "integer_sizing_peak_load",
"awhp_sizing_value": 0.2,
"awhp_redundancy": 1,
Expand All @@ -731,8 +737,10 @@
"eq_scen_id": "eq_scenario_4",
"eq_scen_name": "100% AWHP (H+C)+Elec Backup",
"hr_wwhp": null,
"hr_wwhp_performance_model": "interpolate_HHWST",
"hr_wwhp_h_supply_t": 48.9,
"awhp": "hp01",
"awhp_performance_model": "interpolate_HHWST_fixed",
"awhp_sizing_mode": "integer_sizing_peak_load",
"awhp_sizing_value": 1,
"awhp_redundancy": 1,
Expand All @@ -745,8 +753,10 @@
"eq_scen_id": "eq_scenario_5",
"eq_scen_name": "HR WWHP+100% AWHP (H+C)+Elec Backup",
"hr_wwhp": "hr03",
"hr_wwhp_performance_model": "interpolate_HHWST",
"hr_wwhp_h_supply_t": 48.9,
"awhp": "hp01",
"awhp_performance_model": "interpolate_HHWST_fixed",
"awhp_sizing_mode": "integer_sizing_peak_load",
"awhp_sizing_value": 1,
"awhp_redundancy": 1,
Expand All @@ -759,8 +769,10 @@
"eq_scen_id": "eq_scenario_6",
"eq_scen_name": "20% (Frac) AWHP (H+C)+Gas Backup",
"hr_wwhp": null,
"hr_wwhp_performance_model": "interpolate_HHWST",
"hr_wwhp_h_supply_t": 48.9,
"awhp": "hp01",
"awhp_performance_model": "interpolate_HHWST_fixed",
"awhp_sizing_mode": "fractional_sizing_peak_load",
"awhp_sizing_value": 0.2,
"awhp_redundancy": 1,
Expand All @@ -773,8 +785,10 @@
"eq_scen_id": "eq_scenario_7",
"eq_scen_name": "40% (Frac) AWHP (H+C)+Gas Backup",
"hr_wwhp": null,
"hr_wwhp_performance_model": "interpolate_HHWST",
"hr_wwhp_h_supply_t": 48.9,
"awhp": "hp01",
"awhp_performance_model": "interpolate_HHWST_fixed",
"awhp_sizing_mode": "fractional_sizing_peak_load",
"awhp_sizing_value": 0.4,
"awhp_redundancy": 1,
Expand All @@ -787,8 +801,10 @@
"eq_scen_id": "eq_scenario_8",
"eq_scen_name": "60% (Frac) AWHP (H+C)+Gas Backup",
"hr_wwhp": null,
"hr_wwhp_performance_model": "interpolate_HHWST",
"hr_wwhp_h_supply_t": 48.9,
"awhp": "hp01",
"awhp_performance_model": "interpolate_HHWST_fixed",
"awhp_sizing_mode": "fractional_sizing_peak_load",
"awhp_sizing_value": 0.6,
"awhp_redundancy": 1,
Expand All @@ -801,8 +817,10 @@
"eq_scen_id": "eq_scenario_9",
"eq_scen_name": "100% (Frac) AWHP (H+C)+Gas Backup",
"hr_wwhp": null,
"hr_wwhp_performance_model": "interpolate_HHWST",
"hr_wwhp_h_supply_t": 48.9,
"awhp": "hp01",
"awhp_performance_model": "interpolate_HHWST_fixed",
"awhp_sizing_mode": "fractional_sizing_peak_load",
"awhp_sizing_value": 1,
"awhp_redundancy": 1,
Expand All @@ -815,8 +833,10 @@
"eq_scen_id": "eq_scenario_10",
"eq_scen_name": "HR WWHP+Gas Boiler+AC Chiller",
"hr_wwhp": "hr03",
"hr_wwhp_performance_model": "interpolate_HHWST",
"hr_wwhp_h_supply_t": 48.9,
"awhp": null,
"awhp_performance_model": "interpolate_HHWST_fixed",
"awhp_sizing_mode": "integer_sizing_peak_load",
"awhp_sizing_value": 1,
"awhp_redundancy": 1,
Expand All @@ -829,8 +849,10 @@
"eq_scen_id": "eq_scenario_11",
"eq_scen_name": "HR WWHP+Elec Boiler+AC Chiller",
"hr_wwhp": "hr03",
"hr_wwhp_performance_model": "interpolate_HHWST",
"hr_wwhp_h_supply_t": 48.9,
"awhp": null,
"awhp_performance_model": "interpolate_HHWST_fixed",
"awhp_sizing_mode": "integer_sizing_peak_load",
"awhp_sizing_value": 1,
"awhp_redundancy": 1,
Expand All @@ -843,8 +865,10 @@
"eq_scen_id": "eq_scenario_12",
"eq_scen_name": "HR WWHP+20% AWHP (H+C)+Elec Backup",
"hr_wwhp": "hr03",
"hr_wwhp_performance_model": "interpolate_HHWST",
"hr_wwhp_h_supply_t": 48.9,
"awhp": "hp01",
"awhp_performance_model": "interpolate_HHWST_fixed",
"awhp_sizing_mode": "integer_sizing_peak_load",
"awhp_sizing_value": 0.2,
"awhp_redundancy": 1,
Expand Down
32 changes: 32 additions & 0 deletions layout/input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,10 @@ def build_equipment_table(
# Note: eq_scen_id and eq_scen_name are excluded as they're shown in the header
row_config = [
("hr_wwhp", "HR WWHP Model"),
("hr_wwhp_performance_model", "HR WWHP Performance Calculation Model"),
("hr_wwhp_h_supply_t", f"HR WWHP Heating Supply Temp ({temp_unit})"),
("awhp", "AWHP Model"),
("awhp_performance_model", "AWHP Performance Calculation Model"),
("awhp_h_supply_t", f"AWHP Heating Supply Temp ({temp_unit})"),
("awhp_sizing_mode", "AWHP Sizing Mode"),
("awhp_sizing_value", "AWHP Sizing Value"),
Expand Down Expand Up @@ -819,6 +821,36 @@ def edit_equipment_modal():
clearable=True,
searchable=True,
),
dmc.Select(
id="edit-hr-wwhp-performance-model",
label="HR HP Performance Calculation Model",
placeholder="None",
data = [ # not including fixed_COP and performance_curves atm
{
"label": "Interpolated table (HHWST fixed)",
"value": "interpolate_HHWST",
}
],
clearable=True,
searchable=True,
),
dmc.Select(
id="edit-awhp-performance-model",
label="AWHP Performance Calculation Model",
placeholder="None",
data = [ # not including fixed_COP and performance_curves atm
{
"label": "Interpolated table (HHWST fixed)",
"value": "interpolate_HHWST_fixed",
},
{
"label": "Interpolated table (HHWST reset)",
"value": "interpolate_HHWST_reset",
}
],
clearable=True,
searchable=True,
),
dmc.Stack(
gap=4,
children=[
Expand Down
2 changes: 2 additions & 0 deletions layout/output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,10 @@ def get_value(self, path: str):
fields = [
("eq_scen_name", "Scenario"),
("hr_wwhp", "HR WWHP"),
("hr_wwhp_performance_model", "HR WWHP Performance Calculation Model"),
("hr_wwhp_h_supply_t", "HR WWHP Heating Supply Temperature"),
("awhp", "AWHP"),
("awhp_performance_model", "AWHP Performance Calculation Model"),
("awhp_h_supply_t", "AWHP Heating Supply Temperature"),
("awhp_sizing_mode", "AWHP Sizing Mode"),
("awhp_sizing_value", "AWHP Sizing Value"),
Expand Down
Loading