Merge pull request #8118 from NREL/8111_DST_Southern_Crash

Fix #8111 - E+ Crash w/ RunPeriodControl:DaylightSavingTime that wraps around year
NREL · Jul 6, 2020 · 4ad2038 · 4ad2038 · nrel-bot-2 · Jul 6, 2020
2 parents 969c86b + 0bd3544
commit 4ad2038
Show file tree

Hide file tree

Showing 2 changed files with 446 additions and 1 deletion.
diff --git a/src/EnergyPlus/ScheduleManager.cc b/src/EnergyPlus/ScheduleManager.cc
@@ -68,6 +68,7 @@
 #include <EnergyPlus/OutputProcessor.hh>
 #include <EnergyPlus/ScheduleManager.hh>
 #include <EnergyPlus/UtilityRoutines.hh>
+#include <EnergyPlus/WeatherManager.hh>
 
 namespace EnergyPlus {
 
@@ -2777,7 +2778,7 @@ namespace ScheduleManager {
         // na
 
         // Using/Aliasing
-        
+
         // Locals
         // SUBROUTINE ARGUMENT DEFINITIONS:
         // na
@@ -2877,6 +2878,12 @@ namespace ScheduleManager {
             thisHolidayIndex = DataEnvironment::HolidayIndexTomorrow;
         }
 
+        // In the case where DST is applied on 12/31 at 24:00, which is the case for a Southern Hemisphere location for eg
+        // (DayOfYear_Schedule is a bit weird, ScheduleManager always assumes LeapYear)
+        if (thisDayOfYear == 367) {
+            thisDayOfYear = 1;
+        }
+
         int WeekSchedulePointer = Schedule(ScheduleIndex).WeekSchedulePointer(thisDayOfYear);
         int DaySchedulePointer;