Skip to content

Commit ef0d26b

Browse files
nllongCopilot
nllong
and
Copilot
authored
Add in natural gas grid metrics (#59)
* add mypy types * add copyrights * Update urbanopt_des/exceptions.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update urbanopt_des/modelica_results.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update urbanopt_des/modelica_results.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update urbanopt_des/results_base.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update urbanopt_des/modelica_results.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * fix copilot suggestions * update dependencies * ETS was double counted in the DES energy * add in grid metrics for natural gas --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 0cb9601 commit ef0d26b

File tree

3 files changed

+36
-16
lines changed

3 files changed

+36
-16
lines changed

‎urbanopt_des/modelica_results.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,7 @@ def calculate_grid_metrics(
803803
"Total Building Electricity",
804804
"Total Building Natural Gas",
805805
"Total Electricity",
806+
"Total Natural Gas",
806807
"Total Thermal Cooling Energy",
807808
"Total Thermal Heating Energy",
808809
"District Loop Energy",

‎urbanopt_des/urbanopt_analysis.py‎

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,14 +1084,22 @@ def create_summary_results(self) -> None:
10841084
"Natural Gas Peak Demand Date Time": ["Datetime"],
10851085
"Thermal Cooling": ["MWh/year"],
10861086
"Thermal Heating": ["MWh/year"],
1087-
"Peak to Valley Ratio (Max)": ["Ratio"],
1088-
"Peak to Valley Ratio (Min)": ["Ratio"],
1089-
"Peak to Valley Ratio (Mean)": ["Ratio"],
1090-
"Load Factor (Max)": ["Ratio"],
1091-
"Load Factor (Min)": ["Ratio"],
1092-
"Load Factor (Mean)": ["Ratio"],
1093-
"System Ramping (Max)": ["MW/day"],
1094-
"System Ramping (Sum)": ["MW/year"],
1087+
"Electricity Peak to Valley Ratio (Max)": ["Ratio"],
1088+
"Electricity Peak to Valley Ratio (Min)": ["Ratio"],
1089+
"Electricity Peak to Valley Ratio (Mean)": ["Ratio"],
1090+
"Electricity Load Factor (Max)": ["Ratio"],
1091+
"Electricity Load Factor (Min)": ["Ratio"],
1092+
"Electricity Load Factor (Mean)": ["Ratio"],
1093+
"Electricity System Ramping (Max)": ["MW/day"],
1094+
"Electricity System Ramping (Sum)": ["MW/year"],
1095+
"Natural Gas Peak to Valley Ratio (Max)": ["Ratio"],
1096+
"Natural Gas Peak to Valley Ratio (Min)": ["Ratio"],
1097+
"Natural Gas Peak to Valley Ratio (Mean)": ["Ratio"],
1098+
"Natural Gas Load Factor (Max)": ["Ratio"],
1099+
"Natural Gas Load Factor (Min)": ["Ratio"],
1100+
"Natural Gas Load Factor (Mean)": ["Ratio"],
1101+
"Natural Gas System Ramping (Max)": ["MW/day"],
1102+
"Natural Gas System Ramping (Sum)": ["MW/year"],
10951103
"System Ramping Cooling (Max)": ["MW/day"],
10961104
"System Ramping Cooling (Sum)": ["MW/year"],
10971105
"System Ramping Heating (Max)": ["MW/day"],
@@ -1122,14 +1130,24 @@ def create_summary_results(self) -> None:
11221130
summary_data["Thermal Cooling"].append(df_annual[year_end]["Total Thermal Cooling Energy"])
11231131
summary_data["Thermal Heating"].append(df_annual[year_end]["Total Thermal Heating Energy"])
11241132

1125-
summary_data["Peak to Valley Ratio (Max)"].append(df_annual[year_end]["Total Electricity PVR max"])
1126-
summary_data["Peak to Valley Ratio (Min)"].append(df_annual[year_end]["Total Electricity PVR min"])
1127-
summary_data["Peak to Valley Ratio (Mean)"].append(df_annual[year_end]["Total Electricity PVR mean"])
1128-
summary_data["Load Factor (Max)"].append(df_annual[year_end]["Total Electricity Load Factor max"])
1129-
summary_data["Load Factor (Min)"].append(df_annual[year_end]["Total Electricity Load Factor min"])
1130-
summary_data["Load Factor (Mean)"].append(df_annual[year_end]["Total Electricity Load Factor mean"])
1131-
summary_data["System Ramping (Max)"].append(df_annual[year_end]["Total Electricity System Ramping max"])
1132-
summary_data["System Ramping (Sum)"].append(df_annual[year_end]["Total Electricity System Ramping sum"])
1133+
summary_data["Electricity Peak to Valley Ratio (Max)"].append(df_annual[year_end]["Total Electricity PVR max"])
1134+
summary_data["Electricity Peak to Valley Ratio (Min)"].append(df_annual[year_end]["Total Electricity PVR min"])
1135+
summary_data["Electricity Peak to Valley Ratio (Mean)"].append(df_annual[year_end]["Total Electricity PVR mean"])
1136+
summary_data["Electricity Load Factor (Max)"].append(df_annual[year_end]["Total Electricity Load Factor max"])
1137+
summary_data["Electricity Load Factor (Min)"].append(df_annual[year_end]["Total Electricity Load Factor min"])
1138+
summary_data["Electricity Load Factor (Mean)"].append(df_annual[year_end]["Total Electricity Load Factor mean"])
1139+
summary_data["Electricity System Ramping (Max)"].append(df_annual[year_end]["Total Electricity System Ramping max"])
1140+
summary_data["Electricity System Ramping (Sum)"].append(df_annual[year_end]["Total Electricity System Ramping sum"])
1141+
1142+
summary_data["Natural Gas Peak to Valley Ratio (Max)"].append(df_annual[year_end]["Total Natural Gas PVR max"])
1143+
summary_data["Natural Gas Peak to Valley Ratio (Min)"].append(df_annual[year_end]["Total Natural Gas PVR min"])
1144+
summary_data["Natural Gas Peak to Valley Ratio (Mean)"].append(df_annual[year_end]["Total Natural Gas PVR mean"])
1145+
summary_data["Natural Gas Load Factor (Max)"].append(df_annual[year_end]["Total Natural Gas Load Factor max"])
1146+
summary_data["Natural Gas Load Factor (Min)"].append(df_annual[year_end]["Total Natural Gas Load Factor min"])
1147+
summary_data["Natural Gas Load Factor (Mean)"].append(df_annual[year_end]["Total Natural Gas Load Factor mean"])
1148+
summary_data["Natural Gas System Ramping (Max)"].append(df_annual[year_end]["Total Natural Gas System Ramping max"])
1149+
summary_data["Natural Gas System Ramping (Sum)"].append(df_annual[year_end]["Total Natural Gas System Ramping sum"])
1150+
11331151
summary_data["System Ramping Cooling (Max)"].append(df_annual[year_end]["Total Thermal Cooling Energy System Ramping max"])
11341152
summary_data["System Ramping Cooling (Sum)"].append(df_annual[year_end]["Total Thermal Cooling Energy System Ramping sum"])
11351153
summary_data["System Ramping Heating (Max)"].append(df_annual[year_end]["Total Thermal Heating Energy System Ramping max"])

‎urbanopt_des/urbanopt_results.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ def calculate_grid_metrics(
8888
"Total Building Electricity",
8989
"Total Building Natural Gas",
9090
"Total Electricity",
91+
"Total Natural Gas",
9192
"Total Thermal Cooling Energy",
9293
"Total Thermal Heating Energy",
9394
"District Loop Energy",

0 commit comments

Comments
 (0)