From de97252f1b4ecd9dd594da4599f901e2d902ec2d Mon Sep 17 00:00:00 2001 From: Xiong Date: Tue, 27 Feb 2024 11:57:11 -0700 Subject: [PATCH 1/2] update load shift options_lookup --- national/housing_characteristics/options_lookup.tsv | 10 +++++----- resources/options_lookup.tsv | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/national/housing_characteristics/options_lookup.tsv b/national/housing_characteristics/options_lookup.tsv index 6b17b273f..38e83b423 100644 --- a/national/housing_characteristics/options_lookup.tsv +++ b/national/housing_characteristics/options_lookup.tsv @@ -5030,11 +5030,11 @@ thermostat_control_load_shed shed_part_year_15min_3cspa upgrade_df_thermostat_co thermostat_control_load_shed shed_full_baseline_15min_3hpeak upgrade_df_thermostat_control_load_shed peak_len=3 rebound_len=2 sp_adjustment=2.0 num_timesteps_in_hr=4 load_prediction_method=full baseline thermostat_control_load_shed shed_full_baseline_15min_norebound upgrade_df_thermostat_control_load_shed peak_len=4 rebound_len=0 sp_adjustment=2.0 num_timesteps_in_hr=4 load_prediction_method=full baseline thermostat_control_load_shed shed_full_baseline_15min_3cspa upgrade_df_thermostat_control_load_shed peak_len=4 rebound_len=2 sp_adjustment=3.0 num_timesteps_in_hr=4 load_prediction_method=full baseline -thermostat_control_load_shift shift_full_baseline_15min upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=1 sp_adjustment=1.0 num_timesteps_in_hr=4 load_prediction_method=full baseline -thermostat_control_load_shift shift_full_baseline_60min upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=1 sp_adjustment=1.0 num_timesteps_in_hr=1 load_prediction_method=full baseline -thermostat_control_load_shift shift_full_baseline_15min_3hpeak upgrade_df_thermostat_control_load_shift peak_len=3 prepeak_len=1 sp_adjustment=1.0 num_timesteps_in_hr=4 load_prediction_method=full baseline -thermostat_control_load_shift shift_full_baseline_15min_2hprepeak upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=2 sp_adjustment=1.0 num_timesteps_in_hr=4 load_prediction_method=full baseline -thermostat_control_load_shift shift_full_baseline_15min_2cspa upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=1 sp_adjustment=2.0 num_timesteps_in_hr=4 load_prediction_method=full baseline +thermostat_control_load_shift shift_full_baseline_15min upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=2 sp_adjustment=1.0 num_timesteps_in_hr=4 load_prediction_method=full baseline +thermostat_control_load_shift shift_full_baseline_60min upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=2 sp_adjustment=1.0 num_timesteps_in_hr=1 load_prediction_method=full baseline +thermostat_control_load_shift shift_full_baseline_15min_3hpeak upgrade_df_thermostat_control_load_shift peak_len=3 prepeak_len=2 sp_adjustment=1.0 num_timesteps_in_hr=4 load_prediction_method=full baseline +thermostat_control_load_shift shift_full_baseline_15min_1hprepeak upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=1 sp_adjustment=1.0 num_timesteps_in_hr=4 load_prediction_method=full baseline +thermostat_control_load_shift shift_full_baseline_15min_2cspa upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=2 sp_adjustment=2.0 num_timesteps_in_hr=4 load_prediction_method=full baseline state_id * energy_code_compliance_during_original_building_construction * energy_code_compliance_interior_lighting * diff --git a/resources/options_lookup.tsv b/resources/options_lookup.tsv index 6b17b273f..38e83b423 100644 --- a/resources/options_lookup.tsv +++ b/resources/options_lookup.tsv @@ -5030,11 +5030,11 @@ thermostat_control_load_shed shed_part_year_15min_3cspa upgrade_df_thermostat_co thermostat_control_load_shed shed_full_baseline_15min_3hpeak upgrade_df_thermostat_control_load_shed peak_len=3 rebound_len=2 sp_adjustment=2.0 num_timesteps_in_hr=4 load_prediction_method=full baseline thermostat_control_load_shed shed_full_baseline_15min_norebound upgrade_df_thermostat_control_load_shed peak_len=4 rebound_len=0 sp_adjustment=2.0 num_timesteps_in_hr=4 load_prediction_method=full baseline thermostat_control_load_shed shed_full_baseline_15min_3cspa upgrade_df_thermostat_control_load_shed peak_len=4 rebound_len=2 sp_adjustment=3.0 num_timesteps_in_hr=4 load_prediction_method=full baseline -thermostat_control_load_shift shift_full_baseline_15min upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=1 sp_adjustment=1.0 num_timesteps_in_hr=4 load_prediction_method=full baseline -thermostat_control_load_shift shift_full_baseline_60min upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=1 sp_adjustment=1.0 num_timesteps_in_hr=1 load_prediction_method=full baseline -thermostat_control_load_shift shift_full_baseline_15min_3hpeak upgrade_df_thermostat_control_load_shift peak_len=3 prepeak_len=1 sp_adjustment=1.0 num_timesteps_in_hr=4 load_prediction_method=full baseline -thermostat_control_load_shift shift_full_baseline_15min_2hprepeak upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=2 sp_adjustment=1.0 num_timesteps_in_hr=4 load_prediction_method=full baseline -thermostat_control_load_shift shift_full_baseline_15min_2cspa upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=1 sp_adjustment=2.0 num_timesteps_in_hr=4 load_prediction_method=full baseline +thermostat_control_load_shift shift_full_baseline_15min upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=2 sp_adjustment=1.0 num_timesteps_in_hr=4 load_prediction_method=full baseline +thermostat_control_load_shift shift_full_baseline_60min upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=2 sp_adjustment=1.0 num_timesteps_in_hr=1 load_prediction_method=full baseline +thermostat_control_load_shift shift_full_baseline_15min_3hpeak upgrade_df_thermostat_control_load_shift peak_len=3 prepeak_len=2 sp_adjustment=1.0 num_timesteps_in_hr=4 load_prediction_method=full baseline +thermostat_control_load_shift shift_full_baseline_15min_1hprepeak upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=1 sp_adjustment=1.0 num_timesteps_in_hr=4 load_prediction_method=full baseline +thermostat_control_load_shift shift_full_baseline_15min_2cspa upgrade_df_thermostat_control_load_shift peak_len=4 prepeak_len=2 sp_adjustment=2.0 num_timesteps_in_hr=4 load_prediction_method=full baseline state_id * energy_code_compliance_during_original_building_construction * energy_code_compliance_interior_lighting * From 248da99c0538a233f249242cf332844f74042b35 Mon Sep 17 00:00:00 2001 From: Xiong Date: Tue, 27 Feb 2024 12:06:03 -0700 Subject: [PATCH 2/2] Update measure default --- .../upgrade_df_thermostat_control_load_shift/measure.rb | 2 +- .../upgrade_df_thermostat_control_load_shift/measure.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/measures/upgrade_df_thermostat_control_load_shift/measure.rb b/resources/measures/upgrade_df_thermostat_control_load_shift/measure.rb index 5be0a88c9..501f16078 100644 --- a/resources/measures/upgrade_df_thermostat_control_load_shift/measure.rb +++ b/resources/measures/upgrade_df_thermostat_control_load_shift/measure.rb @@ -71,7 +71,7 @@ def arguments(model) prepeak_len = OpenStudio::Measure::OSArgument.makeIntegerArgument('prepeak_len', true) prepeak_len.setDisplayName("Length of pre-peak period before dispatch window (hour)") - prepeak_len.setDefaultValue(1) + prepeak_len.setDefaultValue(2) args << prepeak_len sp_adjustment = OpenStudio::Measure::OSArgument.makeDoubleArgument('sp_adjustment', true) diff --git a/resources/measures/upgrade_df_thermostat_control_load_shift/measure.xml b/resources/measures/upgrade_df_thermostat_control_load_shift/measure.xml index 09b24427b..c5a6c1561 100644 --- a/resources/measures/upgrade_df_thermostat_control_load_shift/measure.xml +++ b/resources/measures/upgrade_df_thermostat_control_load_shift/measure.xml @@ -25,7 +25,7 @@ Integer true false - 1 + 2 sp_adjustment