diff --git a/catalog_factories/usage/comnet_catalog.py b/catalog_factories/usage/comnet_catalog.py index 41be303e..29b6b2c1 100644 --- a/catalog_factories/usage/comnet_catalog.py +++ b/catalog_factories/usage/comnet_catalog.py @@ -172,7 +172,7 @@ class ComnetCatalog(Catalog): """ number_usage_types = 33 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") lighting_data = {} @@ -182,8 +182,7 @@ class ComnetCatalog(Catalog): water_heating = {} process_data = {} schedules_key = {} - - for j in range(0, number_usage_types): + for j in range(0, number_usage_types-1): usage_parameters = file_data.iloc[j] usage_type = usage_parameters[0] 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() schedules_key[usage_type] = usage_parameters[27:28].item() + return {'lighting': lighting_data, 'plug loads': plug_loads_data, 'occupancy': occupancy_data, diff --git a/catalog_factories/usage/usage_helper.py b/catalog_factories/usage/usage_helper.py index 3e2c8e6e..4a397566 100644 --- a/catalog_factories/usage/usage_helper.py +++ b/catalog_factories/usage/usage_helper.py @@ -84,14 +84,12 @@ class UsageHelper: 'C-3 Hotel Motel': 'C-3 Hotel', 'C-4 Manufacturing': 'C-4 Manufacturing', 'C-5 Office': 'C-5 Office', - 'C-6 Parking Garage': 'C-6 Parking', 'C-7 Restaurant': 'C-7 Restaurant', 'C-8 Retail': 'C-8 Retail', 'C-9 Schools': 'C-9 School', 'C-10 Warehouse': 'C-10 Warehouse', 'C-11 Laboratory': 'C-11 Lab', 'C-12 Residential': 'C-12 Residential', - 'C-13 Data Center': 'C-13 Data', 'C-14 Gymnasium': 'C-14 Gymnasium' }