Skip to content
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

90.1 PRM heat pump data #40

Merged
merged 4 commits into from
Feb 28, 2024
Merged

90.1 PRM heat pump data #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09b70bf
Bump up maximum capacity of unitary air conditioners tables
AmmarDeh Feb 16, 2024
e60fd92
Expand 90.1 heat pump data
AmmarDeh Feb 16, 2024
cd1bc5d
Add 90.1 PRM heat pump data
AmmarDeh Feb 21, 2024
dbc9942
Modify heat pump prescriptive and PRM data
AmmarDeh Feb 23, 2024
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
10,798 changes: 8,431 additions & 2,367 deletions ...energy_standards_data/database_files/hvac_minimum_requirement_heat_pump_cooling_90_1.json
View file
Open in desktop

Large diffs are not rendered by default.

4,942 changes: 4,942 additions & 0 deletions ...gy_standards_data/database_files/hvac_minimum_requirement_heat_pump_cooling_90_1_prm.json
View file
Open in desktop

Large diffs are not rendered by default.

5,637 changes: 5,044 additions & 593 deletions ...energy_standards_data/database_files/hvac_minimum_requirement_heat_pump_heating_90_1.json
View file
Open in desktop

Large diffs are not rendered by default.

2,463 changes: 2,463 additions & 0 deletions ...gy_standards_data/database_files/hvac_minimum_requirement_heat_pump_heating_90_1_prm.json
View file
Open in desktop

Large diffs are not rendered by default.

392 changes: 183 additions & 209 deletions ...standards_data/database_files/hvac_minimum_requirement_unitary_air_conditioners_90_1.json
View file
Open in desktop

Large diffs are not rendered by default.

240 changes: 120 additions & 120 deletions ...dards_data/database_files/hvac_minimum_requirement_unitary_air_conditioners_90_1_prm.json
View file
Open in desktop

Large diffs are not rendered by default.

244 changes: 122 additions & 122 deletions ...standards_data/database_files/hvac_minimum_requirement_unitary_air_conditioners_IECC.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions building_energy_standards_data/database_tables/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
"hvac_minimum_requirement_unitary_air_conditioners_90_1_prm",
"hvac_minimum_requirement_unitary_air_conditioners_IECC",
"hvac_minimum_requirement_heat_pump_cooling_90_1",
"hvac_minimum_requirement_heat_pump_cooling_90_1_prm",
"hvac_minimum_requirement_heat_pump_heating_90_1",
"hvac_minimum_requirement_heat_pump_heating_90_1_prm",
"hvac_minimum_requirement_chillers_90_1",
"hvac_minimum_requirement_chillers_90_1_prm",
"hvac_minimum_requirement_chillers_IECC",
Expand Down
126 changes: 75 additions & 51 deletions building_energy_standards_data/database_tables/hvac_minimum_requirement_heat_pump_cooling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,98 +7,114 @@
RECORD_HELP = """
Must provide a tuple that contains:
template: TEXT
equipment_type: TEXT
cooling_type: TEXT
configuration: TEXT
heating_type: TEXT
subcategory: TEXT
application: TEXT
electric_power_phase: NUMERIC
region: TEXT
minimum_capacity: NUMERIC
maximum_capacity: NUMERIC
start_date: TEXT
end_date: TEXT
minimum_seasonal_efficiency: NUMERIC
minimum_full_load_efficiency: NUMERIC
minimum_iplv: NUMERIC
minimum_seasonal_energy_efficiency_ratio: NUMERIC
minimum_seasonal_energy_efficiency_ratio_2: NUMERIC
minimum_energy_efficiency_ratio: NUMERIC
minimum_integrated_part_load_value: NUMERIC
minimum_integrated_energy_efficiency_ratio: NUMERIC
minimum_combined_energy_efficiency_ratio: NUMERIC
pthp_eer_coefficient_1: NUMERIC
pthp_eer_coefficient_2: NUMERIC
cool_cap_ft: TEXT
cool_cap_fflow: TEXT
cool_eir_ft: TEXT
cool_eir_fflow: TEXT
cool_plf_fplr: TEXT
off_mode_power: NUMERIC
minimum_coefficient_of_performance_no_fan_cooling: NUMERIC
annotation: TEXT (optional)
"""

CREATE_HVAC_REQUIREMENT_HEAT_PUMP_COOLING_TABLE = """
CREATE TABLE IF NOT EXISTS %s
(id INTEGER PRIMARY KEY,
template TEXT NOT NULL,
equipment_type TEXT NOT NULL,
cooling_type TEXT NOT NULL,
heating_type TEXT NOT NULL,
subcategory TEXT NOT NULL,
heating_type TEXT,
configuration TEXT,
subcategory TEXT,
application TEXT,
electric_power_phase NUMERIC,
region TEXT,
minimum_capacity NUMERIC,
maximum_capacity NUMERIC,
start_date TEXT,
end_date TEXT,
minimum_seasonal_efficiency NUMERIC,
minimum_full_load_efficiency NUMERIC,
minimum_iplv NUMERIC,
minimum_seasonal_energy_efficiency_ratio NUMERIC,
minimum_seasonal_energy_efficiency_ratio_2 NUMERIC,
minimum_energy_efficiency_ratio NUMERIC,
minimum_integrated_part_load_value NUMERIC,
minimum_integrated_energy_efficiency_ratio NUMERIC,
minimum_combined_energy_efficiency_ratio NUMERIC,
pthp_eer_coefficient_1 NUMERIC,
pthp_eer_coefficient_2 NUMERIC,
cool_cap_ft TEXT,
cool_cap_fflow TEXT,
cool_eir_ft TEXT,
cool_eir_fflow TEXT,
cool_plf_fplr TEXT,
off_mode_power NUMERIC,
minimum_coefficient_of_performance_no_fan_cooling NUMERIC,
annotation TEXT);
"""

INSERT_A_HEAT_PUMP_COOLING_RECORD = """
INSERT INTO %s (
template,
equipment_type,
cooling_type,
heating_type,
configuration,
subcategory,
application,
electric_power_phase,
region,
minimum_capacity,
maximum_capacity,
start_date,
end_date,
minimum_seasonal_efficiency,
minimum_full_load_efficiency,
minimum_iplv,
minimum_seasonal_energy_efficiency_ratio,
minimum_seasonal_energy_efficiency_ratio_2,
minimum_energy_efficiency_ratio,
minimum_integrated_part_load_value,
minimum_integrated_energy_efficiency_ratio,
minimum_combined_energy_efficiency_ratio,
pthp_eer_coefficient_1,
pthp_eer_coefficient_2,
cool_cap_ft,
cool_cap_fflow,
cool_eir_ft,
cool_eir_fflow,
cool_plf_fplr,
off_mode_power,
minimum_coefficient_of_performance_no_fan_cooling,
annotation
)
VALUES (?, ?, ?, ? ,? , ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
"""

RECORD_TEMPLATE = {
"template": "",
"equipment_type": "",
"cooling_type": "",
"heating_type": "",
"configuration": "",
"subcategory": "",
"application": "",
"electric_power_phase": 0.0,
"region": "",
"minimum_capacity": 0.0,
"maximum_capacity": 0.0,
"start_date": "",
"end_date": "",
"minimum_seasonal_efficiency": 0.0,
"minimum_full_load_efficiency": 0.0,
"minimum_iplv": 0.0,
"minimum_seasonal_energy_efficiency_ratio": 0.0,
"minimum_seasonal_energy_efficiency_ratio_2": 0.0,
"minimum_energy_efficiency_ratio": 0.0,
"minimum_integrated_part_load_value": 0.0,
"minimum_integrated_energy_efficiency_ratio": 0.0,
"minimum_combined_energy_efficiency_ratio": 0.0,
"pthp_eer_coefficient_1": 0.0,
"pthp_eer_coefficient_2": 0.0,
"cool_cap_ft": "",
"cool_cap_fflow": "",
"cool_eir_ft": "",
"cool_eir_fflow": "",
"cool_plf_fplr": "",
"off_mode_power": 0.0,
"minimum_coefficient_of_performance_no_fan_cooling": 0.0,
"annotation": "",
}

Expand All @@ -124,16 +140,15 @@ def get_record_info(self):
def validate_record_datatype(self, record):
str_expected = [
"template",
"equipment_type",
"cooling_type",
"heating_type",
"configuration",
"subcategory",
"application",
"region",
"start_date",
"end_date",
"cool_cap_ft",
"cool_cap_fflow",
"cool_eir_ft",
"cool_eir_fflow",
"cool_plf_fplr",
]

for f in str_expected:
Expand All @@ -143,14 +158,19 @@ def validate_record_datatype(self, record):
), f"{f} requires to be a string, instead got {record[f]}"

float_expected = [
"electric_power_phase",
"minimum_capacity",
"maximum_capacity",
"minimum_seasonal_efficiency",
"minimum_full_load_efficiency",
"minimum_iplv",
"minimum_seasonal_energy_efficiency_ratio",
"minimum_seasonal_energy_efficiency_ratio_2",
"minimum_energy_efficiency_ratio",
"minimum_integrated_part_load_value",
"minimum_integrated_energy_efficiency_ratio",
"minimum_combined_energy_efficiency_ratio",
"pthp_eer_coefficient_1",
"pthp_eer_coefficient_2",
"off_mode_power",
"minimum_coefficient_of_performance_no_fan_cooling",
]

for f in float_expected:
Expand All @@ -169,23 +189,27 @@ def _preprocess_record(self, record):

return (
getattr_either("template", record),
getattr_either("equipment_type", record),
getattr_either("cooling_type", record),
getattr_either("heating_type", record),
getattr_either("configuration", record),
getattr_either("subcategory", record),
getattr_either("application", record),
getattr_either("electric_power_phase", record),
getattr_either("region", record),
getattr_either("minimum_capacity", record),
getattr_either("maximum_capacity", record),
getattr_either("start_date", record),
getattr_either("end_date", record),
getattr_either("minimum_seasonal_efficiency", record),
getattr_either("minimum_full_load_efficiency", record),
getattr_either("minimum_iplv", record),
getattr_either("minimum_seasonal_energy_efficiency_ratio", record),
getattr_either("minimum_seasonal_energy_efficiency_ratio_2", record),
getattr_either("minimum_energy_efficiency_ratio", record),
getattr_either("minimum_integrated_part_load_value", record),
getattr_either("minimum_integrated_energy_efficiency_ratio", record),
getattr_either("minimum_combined_energy_efficiency_ratio", record),
getattr_either("pthp_eer_coefficient_1", record),
getattr_either("pthp_eer_coefficient_2", record),
getattr_either("cool_cap_ft", record),
getattr_either("cool_cap_fflow", record),
getattr_either("cool_eir_ft", record),
getattr_either("cool_eir_fflow", record),
getattr_either("cool_plf_fplr", record),
getattr_either("off_mode_power", record),
getattr_either("minimum_coefficient_of_performance_no_fan_cooling", record),
getattr_either("annotation", record),
)
17 changes: 17 additions & 0 deletions ...rgy_standards_data/database_tables/hvac_minimum_requirement_heat_pump_cooling_90_1_prm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import sqlite3

from building_energy_standards_data.database_tables.hvac_minimum_requirement_heat_pump_cooling import (
HVACMinimumRequirementHeatPumpCooling,
)

TABLE_NAME = "hvac_minimum_requirement_heat_pump_cooling_90_1_prm"


class HVACMinimumRequirementHeatPumpCooling901PRMTable(
HVACMinimumRequirementHeatPumpCooling
):
def __init__(self):
super(HVACMinimumRequirementHeatPumpCooling901PRMTable, self).__init__(
table_name=TABLE_NAME,
initial_data_directory=f"building_energy_standards_data/database_files/{TABLE_NAME}",
)
Loading
Loading