Move additional state to local

src/EnergyPlus/DataDaylighting.hh

@@ -81,6 +81,8 @@ namespace Dayltg {
     struct Illums
     {
         std::array<Real64, (int)SkyType::Num> sky = {0.0, 0.0, 0.0, 0.0};
+        Real64 sun = 0.0;
+        Real64 sunDisk = 0.0;    
     };
 
     enum class ExtWinType
@@ -206,21 +208,10 @@ namespace Dayltg {
         //  3: Reference point number (1 to Total Daylighting Reference Points)
         //  4: Sky type (1 to 4; 1 = clear, 2 = clear turbid, 3 = intermediate, 4 = overcast
         //  5: Daylit window number (1 to NumOfDayltgExtWins)
-        Array4D<Dayltg::Illums> DaylIllFacSky;
-        Array4D<Dayltg::Illums> DaylSourceFacSky;
-        Array4D<Dayltg::Illums> DaylBackFacSky;
-        // Arguments (dimensions) for Dayl---Sun are:
-        //  1: Sun position index / HourOfDay (1 to 24)
-        //  2: Shading index (1 to MaxSlatAngs+1; 1 = bare window; 2 = with shade, or, if blinds
-        //      2 = first slat position, 3 = second position, ..., MaxSlatAngs+1 = last position)
-        //  3: Reference point number (1 to Total Daylighting Reference Points)
-        //  4: Daylit window number (1 to NumOfDayltgExtWins)
-        Array4D<Real64> DaylIllFacSun;
-        Array4D<Real64> DaylIllFacSunDisk;
-        Array4D<Real64> DaylSourceFacSun;
-        Array4D<Real64> DaylSourceFacSunDisk;
-        Array4D<Real64> DaylBackFacSun;
-        Array4D<Real64> DaylBackFacSunDisk;
+        Array4D<Dayltg::Illums> DaylIllumFac;
+        Array4D<Dayltg::Illums> DaylSourceFac;
+        Array4D<Dayltg::Illums> DaylBackFac;
+
         // Time exceeding daylight illuminance setpoint at reference points (hours)
         Array1D<Real64> TimeExceedingDaylightIlluminanceSPAtRefPt;
         std::vector<std::vector<int>> ShadeDeployOrderExtWins; // describes how the fenestration surfaces should deploy the shades.
@@ -278,15 +269,7 @@ namespace Dayltg {
         //  4: Shading index (1 to MaxSlatAngs+1; 1 = bare window; 2 = with shade, or, if blinds
         //      2 = first slat position, 3 = second position, ..., MaxSlatAngs+1 = last position)
         //  5: Sky type (1 to 4; 1 = clear, 2 = clear turbid, 3 = intermediate, 4 = overcast
-        Array4D<Dayltg::Illums> DaylIllFacSky;
-        // Arguments (dimensions) for Dayl---Sun are:
-        //  1: Sun position index / HourOfDay (1 to 24)
-        //  2: Daylit window number (1 to NumOfDayltgExtWins)
-        //  3: Reference point number (1 to Total Map Reference Points)
-        //  4: Shading index (1 to MaxSlatAngs+1; 1 = bare window; 2 = with shade, or, if blinds
-        //      2 = first slat position, 3 = second position, ..., MaxSlatAngs+1 = last position)
-        Array4D<Real64> DaylIllFacSun;
-        Array4D<Real64> DaylIllFacSunDisk;
+        Array4D<Dayltg::Illums> DaylIllumFac;
     };
 
     struct RefPointData