Merge pull request #1009 from NREL/stub-batteries

Stub battery tsv for testing project
NREL · Mar 8, 2023 · 883e031 · 883e031
2 parents 9504f4c + 1ac950a
commit 883e031
Show file tree

Hide file tree

Showing 16 changed files with 45,920 additions and 45,904 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 Features
 - Ability to check buildstock csv against an options lookup as a command line utility ([#1042](https://github.com/NREL/resstock/pull/1042))
+- Include battery modeling capabilities for project_testing ([#1009](https://github.com/NREL/resstock/pull/1009))
 
 Fixes
 - 

diff --git a/measures/ServerDirectoryCleanup/measure.xml b/measures/ServerDirectoryCleanup/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>server_directory_cleanup</name>
   <uid>ec7d04ad-0b7b-495b-825a-e1b6d28d1d3f</uid>
-  <version_id>0fb92be4-f6da-42f4-bca6-ca79a284a210</version_id>
-  <version_modified>20230307T014103Z</version_modified>
+  <version_id>0eac2fa0-9256-4518-a588-4b75ccf9349b</version_id>
+  <version_modified>20230307T202937Z</version_modified>
   <xml_checksum>5F1EDF75</xml_checksum>
   <class_name>ServerDirectoryCleanup</class_name>
   <display_name>Server Directory Cleanup</display_name>

diff --git a/project_national/housing_characteristics/Battery.tsv b/project_national/housing_characteristics/Battery.tsv
@@ -0,0 +1,3 @@
+Dependency=Has PV	Option=None	Option=10 kWh	Option=20 kWh, Outside	Option=20 kWh, Garage	Option=20 kWh, 80% Round Trip Efficiency	sampling_probability
+Yes	1	0	0	0	0	0.00943895
+No	1	0	0	0	0	0.990561
diff --git a/project_testing/housing_characteristics/Battery.tsv b/project_testing/housing_characteristics/Battery.tsv
@@ -0,0 +1,5 @@
+Dependency=Geometry Garage	Option=None	Option=10 kWh	Option=20 kWh, Outside	Option=20 kWh, Garage	Option=20 kWh, 80% Round Trip Efficiency	sampling_probability
+None	0.25	0.25	0.25	0	0.25	0.951852
+1 Car	0.2	0.2	0.2	0.2	0.2	0.027572
+2 Car	0.2	0.2	0.2	0.2	0.2	0.0144033
+3 Car	0.2	0.2	0.2	0.2	0.2	0.00617284
diff --git a/resources/options_lookup.tsv b/resources/options_lookup.tsv
@@ -1197,14 +1197,14 @@ Range Spot Vent Hour	Hour22	ResStockArguments	kitchen_fans_quantity=auto	kitchen
 Range Spot Vent Hour	Hour23	ResStockArguments	kitchen_fans_quantity=auto	kitchen_fans_start_hour=23																							
 Has PV	No																										
 Has PV	Yes																										
-PV System Size	None	ResStockArguments	pv_system_present=false	pv_system_module_type=auto	pv_system_max_power_output=0	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch	battery_present=false	battery_location=auto	battery_power=auto	battery_capacity=auto	battery_usable_capacity=auto								
-PV System Size	1.0 kWDC	ResStockArguments	pv_system_present=true	pv_system_module_type=auto	pv_system_max_power_output=1000	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch	battery_present=false	battery_location=auto	battery_power=auto	battery_capacity=auto	battery_usable_capacity=auto								
-PV System Size	3.0 kWDC	ResStockArguments	pv_system_present=true	pv_system_module_type=auto	pv_system_max_power_output=3000	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch	battery_present=false	battery_location=auto	battery_power=auto	battery_capacity=auto	battery_usable_capacity=auto								
-PV System Size	5.0 kWDC	ResStockArguments	pv_system_present=true	pv_system_module_type=auto	pv_system_max_power_output=5000	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch	battery_present=false	battery_location=auto	battery_power=auto	battery_capacity=auto	battery_usable_capacity=auto								
-PV System Size	7.0 kWDC	ResStockArguments	pv_system_present=true	pv_system_module_type=auto	pv_system_max_power_output=7000	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch	battery_present=false	battery_location=auto	battery_power=auto	battery_capacity=auto	battery_usable_capacity=auto								
-PV System Size	9.0 kWDC	ResStockArguments	pv_system_present=true	pv_system_module_type=auto	pv_system_max_power_output=9000	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch	battery_present=false	battery_location=auto	battery_power=auto	battery_capacity=auto	battery_usable_capacity=auto								
-PV System Size	11.0 kWDC	ResStockArguments	pv_system_present=true	pv_system_module_type=auto	pv_system_max_power_output=11000	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch	battery_present=false	battery_location=auto	battery_power=auto	battery_capacity=auto	battery_usable_capacity=auto								
-PV System Size	13.0 kWDC	ResStockArguments	pv_system_present=true	pv_system_module_type=auto	pv_system_max_power_output=13000	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch	battery_present=false	battery_location=auto	battery_power=auto	battery_capacity=auto	battery_usable_capacity=auto								
+PV System Size	None	ResStockArguments	pv_system_present=false	pv_system_module_type=auto	pv_system_max_power_output=0	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch													
+PV System Size	1.0 kWDC	ResStockArguments	pv_system_present=true	pv_system_module_type=auto	pv_system_max_power_output=1000	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch													
+PV System Size	3.0 kWDC	ResStockArguments	pv_system_present=true	pv_system_module_type=auto	pv_system_max_power_output=3000	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch													
+PV System Size	5.0 kWDC	ResStockArguments	pv_system_present=true	pv_system_module_type=auto	pv_system_max_power_output=5000	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch													
+PV System Size	7.0 kWDC	ResStockArguments	pv_system_present=true	pv_system_module_type=auto	pv_system_max_power_output=7000	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch													
+PV System Size	9.0 kWDC	ResStockArguments	pv_system_present=true	pv_system_module_type=auto	pv_system_max_power_output=9000	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch													
+PV System Size	11.0 kWDC	ResStockArguments	pv_system_present=true	pv_system_module_type=auto	pv_system_max_power_output=11000	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch													
+PV System Size	13.0 kWDC	ResStockArguments	pv_system_present=true	pv_system_module_type=auto	pv_system_max_power_output=13000	pv_system_location=roof	pv_system_tracking=auto	pv_system_array_tilt=roofpitch	pv_system_2_present=false	pv_system_2_module_type=auto	pv_system_2_max_power_output=0	pv_system_2_location=auto	pv_system_2_tracking=auto	pv_system_2_array_tilt=roofpitch													
 PV Orientation	None	ResStockArguments	pv_system_array_azimuth=180	pv_system_2_array_azimuth=0																							
 PV Orientation	South	ResStockArguments	pv_system_array_azimuth=180	pv_system_2_array_azimuth=0																							
 PV Orientation	Southwest	ResStockArguments	pv_system_array_azimuth=225	pv_system_2_array_azimuth=0																							
@@ -1214,6 +1214,11 @@ PV Orientation	North	ResStockArguments	pv_system_array_azimuth=0	pv_system_2_arr
 PV Orientation	Northeast	ResStockArguments	pv_system_array_azimuth=45	pv_system_2_array_azimuth=0																							
 PV Orientation	East	ResStockArguments	pv_system_array_azimuth=90	pv_system_2_array_azimuth=0																							
 PV Orientation	Southeast	ResStockArguments	pv_system_array_azimuth=135	pv_system_2_array_azimuth=0																							
+Battery	None	ResStockArguments	battery_present=false	battery_location=auto	battery_power=auto	battery_capacity=auto	battery_usable_capacity=auto	battery_round_trip_efficiency=auto																			
+Battery	10 kWh	ResStockArguments	battery_present=true	battery_location=auto	battery_power=auto	battery_capacity=auto	battery_usable_capacity=auto	battery_round_trip_efficiency=auto																			
+Battery	"20 kWh, Outside"	ResStockArguments	battery_present=true	battery_location=outside	battery_power=auto	battery_capacity=auto	battery_usable_capacity=auto	battery_round_trip_efficiency=auto																			
+Battery	"20 kWh, Garage"	ResStockArguments	battery_present=true	battery_location=garage	battery_power=auto	battery_capacity=auto	battery_usable_capacity=auto	battery_round_trip_efficiency=auto																			
+Battery	"20 kWh, 80% Round Trip Efficiency"	ResStockArguments	battery_present=true	battery_location=auto	battery_power=auto	battery_capacity=auto	battery_usable_capacity=auto	battery_round_trip_efficiency=0.8																			
 AHS Region	"CBSA Atlanta-Sandy Springs-Roswell, GA"																										
 AHS Region	"CBSA Boston-Cambridge-Newton, MA-NH"																										
 AHS Region	"CBSA Chicago-Naperville-Elgin, IL-IN-WI"