Merge pull request #1113 from NREL/yml-resilience-args

Add resilience arguments to yml files
NREL · Oct 24, 2023 · 11c0794 · 11c0794
2 parents e2b9bee + 5d03b32
commit 11c0794
Show file tree

Hide file tree

Showing 14 changed files with 70,591 additions and 70,582 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -150,7 +150,7 @@ jobs:
 
       - name: Run buildstockbatch
         run: |
-          pip install git+https://github.com/NREL/buildstockbatch.git@v2023.06.0
+          pip install git+https://github.com/NREL/buildstockbatch.git@v2023.10.0
           
           buildstock_local project_national/national_baseline.yml
           buildstock_local project_testing/testing_baseline.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ Features
 - options_saturations.csv is added to project_*/resources/ folder ([#1132](https://github.com/NREL/resstock/pull/1132))
 - Update `run_analysis.rb` to map datapoints to run folder names when the `-k` argument is supplied ([#1138](https://github.com/NREL/resstock/pull/1138))
 - Add Water Heater Location and Geometry Space Combination, update Geometry Garage and Geometry Floor Area Bin to RECS2020, update RECS2020 microdata from v2 to v4, auto-generate buildstocks for yml_precomputed tests ([#1125](https://github.com/NREL/resstock/pull/1125))
+- Add ability to request timeseries resilience output from the yml file ([#1113](https://github.com/NREL/resstock/pull/1113))
 
 Fixes
 - Set standard format for options_lookup ([#962](https://github.com/NREL/resstock/pull/962))

diff --git a/project_national/national_baseline.yml b/project_national/national_baseline.yml
@@ -46,6 +46,7 @@ workflow_generator:
       include_timeseries_zone_temperatures: true
       include_timeseries_airflows: true
       include_timeseries_weather: true
+      include_timeseries_resilience: true
 
     reporting_measures:
       - measure_dir_name: QOIReport

diff --git a/project_national/national_upgrades.yml b/project_national/national_upgrades.yml
@@ -46,6 +46,7 @@ workflow_generator:
       include_timeseries_zone_temperatures: true
       include_timeseries_airflows: true
       include_timeseries_weather: true
+      include_timeseries_resilience: true
 
     reporting_measures:
       - measure_dir_name: QOIReport

diff --git a/project_testing/testing_baseline.yml b/project_testing/testing_baseline.yml
@@ -77,6 +77,7 @@ workflow_generator:
       include_timeseries_zone_temperatures: true
       include_timeseries_airflows: true
       include_timeseries_weather: true
+      include_timeseries_resilience: true
       timeseries_timestamp_convention: end
       timeseries_num_decimal_places: 4
       output_variables:

diff --git a/project_testing/testing_upgrades.yml b/project_testing/testing_upgrades.yml
@@ -77,6 +77,7 @@ workflow_generator:
       include_timeseries_zone_temperatures: true
       include_timeseries_airflows: true
       include_timeseries_weather: true
+      include_timeseries_resilience: true
       timeseries_timestamp_convention: end
       timeseries_num_decimal_places: 4
       output_variables:

diff --git a/resources/buildstock.rb b/resources/buildstock.rb
@@ -550,7 +550,7 @@ def self._rm_path(path)
 
 class Version
   ResStock_Version = '3.1.0' # Version of ResStock
-  BuildStockBatch_Version = '2023.5.0' # Minimum required version of BuildStockBatch
+  BuildStockBatch_Version = '2023.10.0' # Minimum required version of BuildStockBatch
 
   def self.check_buildstockbatch_version
     if ENV.keys.include?('BUILDSTOCKBATCH_VERSION') # buildstockbatch is installed

diff --git a/test/base_results/baseline/annual/results_output.csv b/test/base_results/baseline/annual/results_output.csv
diff --git a/test/base_results/baseline/timeseries/buildstockbatch.csv b/test/base_results/baseline/timeseries/buildstockbatch.csv
diff --git a/test/base_results/baseline/timeseries/results_output.csv b/test/base_results/baseline/timeseries/results_output.csv
diff --git a/test/base_results/upgrades/annual/results_output.csv b/test/base_results/upgrades/annual/results_output.csv
diff --git a/test/base_results/upgrades/timeseries/buildstockbatch.csv b/test/base_results/upgrades/timeseries/buildstockbatch.csv
diff --git a/test/base_results/upgrades/timeseries/results_output.csv b/test/base_results/upgrades/timeseries/results_output.csv
diff --git a/workflow/run_analysis.rb b/workflow/run_analysis.rb
@@ -182,6 +182,7 @@ def run_workflow(yml, in_threads, measures_only, debug_arg, overwrite, building_
       'include_annual_component_loads' => true,
       'include_annual_hot_water_uses' => true,
       'include_annual_hvac_summary' => true,
+      'include_annual_resilience' => true,
       'timeseries_frequency' => 'none',
       'include_timeseries_total_consumptions' => false,
       'include_timeseries_fuel_consumptions' => false,
@@ -197,6 +198,7 @@ def run_workflow(yml, in_threads, measures_only, debug_arg, overwrite, building_
       'include_timeseries_zone_temperatures' => false,
       'include_timeseries_airflows' => false,
       'include_timeseries_weather' => false,
+      'include_timeseries_resilience' => false,
       'timeseries_timestamp_convention' => 'end',
       'timeseries_num_decimal_places' => 3,
       'add_timeseries_dst_column' => true,
@@ -281,7 +283,9 @@ def run_workflow(yml, in_threads, measures_only, debug_arg, overwrite, building_
       },
       {
         'measure_dir_name' => 'ReportUtilityBills',
-        'arguments' => { 'output_format' => 'csv' }
+        'arguments' => { 'output_format' => 'csv',
+                         'include_annual_bills' => true,
+                         'include_monthly_bills' => false }
       },
       {
         'measure_dir_name' => 'UpgradeCosts',