Merge pull request #1315 from NREL/hvac-seasons-fix

Heating and Cooling Unavailable Days, follow-up
NREL · Oct 25, 2024 · 280a58c · 280a58c
2 parents 0081eb7 + a893e2a
commit 280a58c
Show file tree

Hide file tree

Showing 10 changed files with 60,154 additions and 60,156 deletions.
diff --git a/docs/read_the_docs/source/workflow_inputs/characteristics.rst b/docs/read_the_docs/source/workflow_inputs/characteristics.rst
@@ -42234,7 +42234,7 @@ From ``project_national`` the list of options, option stock sturation, and optio
 
    * - 1 day
      - 0.82%
-     - 0
+     - 1
    * - 1 month
      - 0.35%
      - 30

diff --git a/measures/ResStockArguments/measure.rb b/measures/ResStockArguments/measure.rb
@@ -569,8 +569,6 @@ def run(model, runner, user_arguments)
     end
 
     # HVAC Unavailability
-    args[:schedules_space_heating_unavailable_days] = 0
-    args[:schedules_space_cooling_unavailable_days] = 0
     if (args[:schedules_space_heating_unavailable_days] > 0) || (args[:schedules_space_cooling_unavailable_days] > 0)
       epw_path = File.absolute_path(File.join(File.dirname(__FILE__), '../../weather', File.basename(args[:weather_station_epw_filepath])))
       if not File.exist? epw_path

diff --git a/resources/options_lookup.tsv b/resources/options_lookup.tsv
@@ -9942,7 +9942,7 @@ Heating Setpoint Offset Period	Night -3h	ResStockArguments	"hvac_control_heating
 Heating Setpoint Offset Period	Night -4h	ResStockArguments	"hvac_control_heating_weekday_setpoint_schedule=-1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1"	"hvac_control_heating_weekend_setpoint_schedule=-1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1"
 Heating Setpoint Offset Period	Night -5h	ResStockArguments	"hvac_control_heating_weekday_setpoint_schedule=-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1, -1"	"hvac_control_heating_weekend_setpoint_schedule=-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1, -1"
 Heating Setpoint Offset Period	None	ResStockArguments	"hvac_control_heating_weekday_setpoint_schedule=0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0"	"hvac_control_heating_weekend_setpoint_schedule=0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0"
-Heating Unavailable Days	1 day	ResStockArguments	schedules_space_heating_unavailable_days=0
+Heating Unavailable Days	1 day	ResStockArguments	schedules_space_heating_unavailable_days=1
 Heating Unavailable Days	1 month	ResStockArguments	schedules_space_heating_unavailable_days=30
 Heating Unavailable Days	1 week	ResStockArguments	schedules_space_heating_unavailable_days=7
 Heating Unavailable Days	2 weeks	ResStockArguments	schedules_space_heating_unavailable_days=14

diff --git a/test/base_results/baseline/annual/results_characteristics.csv b/test/base_results/baseline/annual/results_characteristics.csv
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