simplify code to get dst info

NREL · Jan 31, 2025 · fedd071 · fedd071
1 parent 95c6722
commit fedd071
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 40 deletions.
diff --git a/measures/ResStockArgumentsPostHPXML/resources/hvac_flexibility/setpoint_modifier.rb b/measures/ResStockArgumentsPostHPXML/resources/hvac_flexibility/setpoint_modifier.rb
@@ -34,8 +34,12 @@ def initialize(state:, sim_year:, weather:, epw_path:, minutes_per_step:, runner
 
   def modify_setpoints(setpoints, flexibility_inputs)
     log_inputs(flexibility_inputs)
-    dst_info = _daylight_savings_month_day()
+    dst_info = {dst_begin_month: @hpxml_bldg.dst_begin_month,
+                dst_begin_day: @hpxml_bldg.dst_begin_day,
+                dst_end_month: @hpxml_bldg.dst_end_month,
+                dst_end_day: @hpxml_bldg.dst_end_day}
     puts dst_info
+
     heating_setpoint = setpoints[:heating_setpoint].dup
     cooling_setpoint = setpoints[:cooling_setpoint].dup
     raise "heating_setpoint.length != cooling_setpoint.length" unless heating_setpoint.length == cooling_setpoint.length
@@ -78,9 +82,11 @@ def _get_peak_times(index, flexibility_inputs, dst_info)
 
     pre_peak_duration = flexibility_inputs.pre_peak_duration_steps
     peak_hour_start, peak_hour_end = _get_peak_hour(pre_peak_duration, month:)
-    dst_adjust_hour = _dst_ajustment(month, day, dst_info)
-    peak_hour_start += dst_adjust_hour
-    peak_hour_end += dst_adjust_hour
+    if dst_info.values.all? { |v| !v.nil? }
+      dst_adjust_hour = _dst_ajustment(month, day, dst_info)
+      peak_hour_start += dst_adjust_hour
+      peak_hour_end += dst_adjust_hour
+    end
 
     peak_times = DailyPeakIndices.new
     random_shift_steps = flexibility_inputs.random_shift_steps
@@ -135,42 +141,6 @@ def _get_peak_hour(pre_peak_duration, month:)
     end
   end
 
-  def _daylight_savings_month_day()
-    if @hpxml_bldg.dst_enabled
-      if @hpxml_bldg.dst_begin_month.nil? || @hpxml_bldg.dst_begin_day.nil? || @hpxml_bldg.dst_end_month.nil? || @hpxml_bldg.dst_end_day.nil?
-        if (not @weather.header.DSTStartDate.nil?) && (not @weather.header.DSTEndDate.nil?)
-          # Use weather file DST dates if available
-          dst_start_date = @weather.header.DSTStartDate
-          dst_end_date = @weather.header.DSTEndDate
-          @hpxml_bldg.dst_begin_month = dst_start_date.monthOfYear.value
-          @hpxml_bldg.dst_begin_day = dst_start_date.dayOfMonth
-          @hpxml_bldg.dst_end_month = dst_end_date.monthOfYear.value
-          @hpxml_bldg.dst_end_day = dst_end_date.dayOfMonth
-        else
-          # Roughly average US dates according to https://en.wikipedia.org/wiki/Daylight_saving_time_in_the_United_States
-          @hpxml_bldg.dst_begin_month = 3
-          @hpxml_bldg.dst_begin_day = 12
-          @hpxml_bldg.dst_end_month = 11
-          @hpxml_bldg.dst_end_day = 5
-        end
-        @hpxml_bldg.dst_begin_month_isdefaulted = true
-        @hpxml_bldg.dst_begin_day_isdefaulted = true
-        @hpxml_bldg.dst_end_month_isdefaulted = true
-        @hpxml_bldg.dst_end_day_isdefaulted = true
-      end
-    else
-      @hpxml_bldg.dst_begin_month = 0
-      @hpxml_bldg.dst_begin_day = 0
-      @hpxml_bldg.dst_end_month = 0
-      @hpxml_bldg.dst_end_day = 0
-    end
-    dst_info = {dst_begin_month: @hpxml_bldg.dst_begin_month,
-                dst_begin_day: @hpxml_bldg.dst_begin_day,
-                dst_end_month: @hpxml_bldg.dst_end_month,
-                dst_end_day: @hpxml_bldg.dst_end_day}
-    return dst_info
-  end
-
   def _dst_ajustment(month, day, dst_info)
     if month > dst_info[:dst_begin_month] &&  month < dst_info[:dst_end_month]
       dst_adjust_hour = 1

diff --git a/measures/ResStockArgumentsPostHPXML/tests/baseline.osw b/measures/ResStockArgumentsPostHPXML/tests/baseline.osw
@@ -6,6 +6,7 @@
   "steps": [
     {
       "arguments": {
+        "apply_defaults": true,
         "site_state_code" : "CO",
         "simulation_control_daylight_saving_enabled": false,
         "air_leakage_house_pressure": 50,

diff --git a/measures/ResStockArgumentsPostHPXML/tests/baseline_dst_impacted.osw b/measures/ResStockArgumentsPostHPXML/tests/baseline_dst_impacted.osw
@@ -6,6 +6,7 @@
   "steps": [
     {
       "arguments": {
+        "apply_defaults": true,
         "site_state_code" : "CO",
         "simulation_control_daylight_saving_enabled": true,
         "air_leakage_house_pressure": 50,