add counties in efinsight

slacgismo · Jun 7, 2024 · 40dfbe8 · 40dfbe8
1 parent 556d8c7
commit 40dfbe8
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 25 deletions.
diff --git a/sg2t/io/loadshapes/nrel/naming.py b/sg2t/io/loadshapes/nrel/naming.py
@@ -15,28 +15,37 @@
 
 NREL_COL_MAPPING= {
     "timestamp": "Datetime",
-    "out.electricity.cooling.energy_consumption.kwh": "Electricity Cooling",
-    "out.electricity.heating.energy_consumption.kwh": "Electricity Heating",
-    "out.fuel_oil.heating.energy_consumption.kwh": "Fuel Oil Heating",
-    "out.natural_gas.heating.energy_consumption.kwh": "Natural Gas Heating",
-    "out.propane.heating.energy_consumption.kwh": "Propane Heating",
-    "out.natural_gas.hot_water.energy_consumption.kwh": "Natural Gas Hot Water",
-    "out.propane.hot_water.energy_consumption.kwh": "Propane Hot Water",
-    "out.fuel_oil.hot_water.energy_consumption.kwh": "Fuel Oil Hot Water", 
-    "out.natural_gas.clothes_dryer.energy_consumption.kwh": "Natural Gas Clothes Dryer",
-    "out.propane.clothes_dryer.energy_consumption.kwh": "Propane Clothes Dryer",  
-    "out.natural_gas.range_oven.energy_consumption.kwh": "Natural Gas Oven", 
-    "out.propane.range_oven.energy_consumption.kwh": "Propane Oven",
-    "out.site_energy.total.energy_consumption.kwh": "Site Energy Total",
-    "out.electricity.total.energy_consumption.kwh": "Electricity Total",
-    "out.fuel_oil.total.energy_consumption.kwh": "Fuel Oil Total",
-    "out.natural_gas.total.energy_consumption.kwh": "Natural Gas Total",
-    "out.propane.total.energy_consumption.kwh": "Propane Total",
+    "out.electricity.cooling.energy_consumption.kwh": "Electricity Cooling [kWh]",
+    "out.electricity.heating.energy_consumption.kwh": "Electricity Heating [kWh]",
+    "out.fuel_oil.heating.energy_consumption.kwh": "Fuel Oil Heating [kWh]",
+    "out.natural_gas.heating.energy_consumption.kwh": "Natural Gas Heating [kWh]",
+    "out.propane.heating.energy_consumption.kwh": "Propane Heating [kWh]",
+    "out.natural_gas.hot_water.energy_consumption.kwh": "Natural Gas Water Heating [kWh]",
+    "out.natural_gas.water_systems.energy_consumption": "Natural Gas Water Heating",
+    "out.propane.hot_water.energy_consumption.kwh": "Propane Water Heating [kWh]",
+    "out.propane.water_systems.energy_consumption": "Propane Water Heating",
+    "out.fuel_oil.hot_water.energy_consumption.kwh": "Fuel Oil Water Heating [kWh]",
+    "out.fuel_oil.water_systems.energy_consumption": "Fuel Oil Water Heating",
+    "out.natural_gas.clothes_dryer.energy_consumption.kwh": "Natural Gas Clothes Dryer [kWh]",
+    "out.natural_gas.clothes_dryer.energy_consumption": "Natural Gas Clothes Dryer",
+    "out.propane.clothes_dryer.energy_consumption.kwh": "Propane Clothes Dryer [kWh]",
+    "out.propane.clothes_dryer.energy_consumption": "Propane Clothes Dryer",
+    "out.natural_gas.range_oven.energy_consumption.kwh": "Natural Gas Oven [kWh]",
+    "out.natural_gas.cooking_range.energy_consumption": "Natural Gas Oven",
+    "out.propane.range_oven.energy_consumption.kwh": "Propane Oven [kWh]",
+    "out.propane.cooking_range.energy_consumption": "Propane Oven",
+    "out.site_energy.total.energy_consumption.kwh": "Site Energy Total [kWh]",
+    "out.electricity.total.energy_consumption.kwh": "Electricity Total [kWh]",
+    "out.fuel_oil.total.energy_consumption.kwh": "Fuel Oil Total [kWh]",
+    "out.fuel_oil.total.energy_consumption": "Fuel Oil Total",
+    "out.natural_gas.total.energy_consumption.kwh": "Natural Gas Total [kWh]",
+    "out.propane.total.energy_consumption.kwh": "Propane Total [kWh]",
     "out.electricity.cooling.energy_consumption": "Electricity Cooling",
     "out.electricity.heating.energy_consumption": "Electricity Heating",
     "out.fuel_oil.heating.energy_consumption": "Fuel Oil Heating",
     "out.natural_gas.heating.energy_consumption": "Natural Gas Heating",
     "out.other_fuel.heating.energy_consumption": "Other Fuel Heating",
+    "out.propane.heating.energy_consumption": "Propane Heating",
     "out.natural_gas.water_systems.energy_consumption": "Natural Gas Water Heating",
     "out.other_fuel.water_systems.energy_consumption": "Other Fuel Water Heating",
     "out.site_energy.total.energy_consumption": "Site Energy Total",
@@ -45,11 +54,15 @@
     "out.electricity.total.energy_consumption": "Electricity Total",
     "out.natural_gas.total.energy_consumption": "Natural Gas Total",
     "out.other_fuel.total.energy_consumption": "Other Fuel Total",
-    "out.natural_gas.interior_equipment.energy_consumption.kwh": "Natural Gas Interior Equipment",
-    "out.natural_gas.water_systems.energy_consumption.kwh": "Natural Gas Water Heating",
-    "out.other_fuel.cooling.energy_consumption.kwh": "Other Fuel Cooling",
-    "out.natural_gas.cooling.energy_consumption.kwh": "Natural Gas Cooling",
-    "out.other_fuel.interior_equipment.energy_consumption.kwh": "Other Fuel Interior Equipment",
-    "out.other_fuel.water_systems.energy_consumption.kwh": "Other Fuel Water Heating",
-    "out.other_fuel.heating.energy_consumption.kwh": "Other Fuel Heating"
+    "out.natural_gas.interior_equipment.energy_consumption.kwh": "Natural Gas Interior Equipment [kWh]",
+    "out.natural_gas.interior_equipment.energy_consumption": "Natural Gas Interior Equipment",
+    "out.natural_gas.water_systems.energy_consumption.kwh": "Natural Gas Water Heating [kWh]",
+    "out.other_fuel.cooling.energy_consumption.kwh": "Other Fuel Cooling [kWh]",
+    "out.natural_gas.cooling.energy_consumption.kwh": "Natural Gas Cooling [kWh]",
+    "out.other_fuel.cooling.energy_consumption": "Other Fuel Cooling",
+    "out.natural_gas.cooling.energy_consumption": "Natural Gas Cooling",
+    "out.other_fuel.interior_equipment.energy_consumption.kwh": "Other Fuel Interior Equipment [kWh]",
+    "out.other_fuel.interior_equipment.energy_consumption": "Other Fuel Interior Equipment",
+    "out.other_fuel.water_systems.energy_consumption.kwh": "Other Fuel Water Heating [kWh]",
+    "out.other_fuel.heating.energy_consumption.kwh": "Other Fuel Heating [kWh]"
 }
diff --git a/sg2t/io/loadshapes/nrel/nbs.py b/sg2t/io/loadshapes/nrel/nbs.py
@@ -1,4 +1,4 @@
-"""Module for ResStock and Comstock Building data.
+"""Module for ResStock and ComStock Building data.
 Data can be found at https://resstock.nrel.gov/datasets
 """