m_osman/city_retrofit
1
0
Fork 0
forked from s_ranjbar/city_retrofit
Code Pull Requests Activity

Correct bug in comnet catalog

Browse Source 
Now excludes properly C13 - Data center and C6 - Parking garage
This commit is contained in:
Guille Gutierrez 2022-06-02 12:18:11 -04:00
parent 3b74d9e298
commit 4514138db7
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
catalog_factories/usage/comnet_catalog.py
View File

@ -172,7 +172,7 @@ class ComnetCatalog(Catalog):
""" """
number_usage_types = 33 number_usage_types = 33
xl_file = pd.ExcelFile(self._comnet_archetypes_path) xl_file = pd.ExcelFile(self._comnet_archetypes_path)
file_data = pd.read_excel(xl_file, sheet_name="Modeling Data", skiprows=[0, 1, 2], file_data = pd.read_excel(xl_file, sheet_name="Modeling Data", skiprows=[0, 1, 2, 24],
nrows=number_usage_types, usecols="A:AB") nrows=number_usage_types, usecols="A:AB")
lighting_data = {} lighting_data = {}
@ -182,8 +182,7 @@ class ComnetCatalog(Catalog):
water_heating = {} water_heating = {}
process_data = {} process_data = {}
schedules_key = {} schedules_key = {}
for j in range(0, number_usage_types-1):
for j in range(0, number_usage_types):
usage_parameters = file_data.iloc[j] usage_parameters = file_data.iloc[j]
usage_type = usage_parameters[0] usage_type = usage_parameters[0]
lighting_data[usage_type] = usage_parameters[1:6].values.tolist() lighting_data[usage_type] = usage_parameters[1:6].values.tolist()
@ -194,6 +193,7 @@ class ComnetCatalog(Catalog):
process_data[usage_type] = usage_parameters[24:26].values.tolist() process_data[usage_type] = usage_parameters[24:26].values.tolist()
schedules_key[usage_type] = usage_parameters[27:28].item() schedules_key[usage_type] = usage_parameters[27:28].item()
return {'lighting': lighting_data, return {'lighting': lighting_data,
'plug loads': plug_loads_data, 'plug loads': plug_loads_data,
'occupancy': occupancy_data, 'occupancy': occupancy_data,

2
catalog_factories/usage/usage_helper.py
View File

@ -84,14 +84,12 @@ class UsageHelper:
'C-3 Hotel Motel': 'C-3 Hotel', 'C-3 Hotel Motel': 'C-3 Hotel',
'C-4 Manufacturing': 'C-4 Manufacturing', 'C-4 Manufacturing': 'C-4 Manufacturing',
'C-5 Office': 'C-5 Office', 'C-5 Office': 'C-5 Office',
'C-6 Parking Garage': 'C-6 Parking',
'C-7 Restaurant': 'C-7 Restaurant', 'C-7 Restaurant': 'C-7 Restaurant',
'C-8 Retail': 'C-8 Retail', 'C-8 Retail': 'C-8 Retail',
'C-9 Schools': 'C-9 School', 'C-9 Schools': 'C-9 School',
'C-10 Warehouse': 'C-10 Warehouse', 'C-10 Warehouse': 'C-10 Warehouse',
'C-11 Laboratory': 'C-11 Lab', 'C-11 Laboratory': 'C-11 Lab',
'C-12 Residential': 'C-12 Residential', 'C-12 Residential': 'C-12 Residential',
'C-13 Data Center': 'C-13 Data',
'C-14 Gymnasium': 'C-14 Gymnasium' 'C-14 Gymnasium': 'C-14 Gymnasium'
} }