From 9b888f11dcfc33095fd220f54cab6f8fa44c7434 Mon Sep 17 00:00:00 2001 From: mjwitte Date: Wed, 15 Sep 2021 12:32:50 -0500 Subject: [PATCH 1/4] Move some local arrays to minimize allocates --- src/EnergyPlus/DaylightingManager.cc | 88 +++++++++++++++------------- src/EnergyPlus/DaylightingManager.hh | 22 +++++++ 2 files changed, 69 insertions(+), 41 deletions(-) diff --git a/src/EnergyPlus/DaylightingManager.cc b/src/EnergyPlus/DaylightingManager.cc index 6bea4d68ac0..088b74f9ce1 100644 --- a/src/EnergyPlus/DaylightingManager.cc +++ b/src/EnergyPlus/DaylightingManager.cc @@ -6142,9 +6142,7 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da int ISWFLG; // Switchable glazing flag: =1 if one or more windows in a zone // has switchable glazing that adjusts visible transmittance to just meet // daylighting setpoint; =0 otherwise. - int ICtrl; // Window shading control pointer - Array1D TVIS1(thisDaylightControl.ShadeDeployOrderExtWins.size()); // Visible transmittance at normal incidence of unswitched glazing - Array1D TVIS2(thisDaylightControl.ShadeDeployOrderExtWins.size()); // Visible transmittance at normal incidence of fully-switched glazing + int ICtrl; // Window shading control pointer Real64 VTRAT; // Ratio between switched and unswitched visible transmittance at normal incidence Real64 BACL; // Window background (surround) luminance for glare calc (cd/m2) Real64 SkyWeight; // Weighting factor used to average two different sky types @@ -6552,12 +6550,9 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da // unswitched state. Assumes some windows in a space may have this control and // others not. - Array1D DILLSW; // Illuminance a ref point from a group of windows that can be switched together, - Array1D DILLUN; // and from those that aren't (lux) - Array1D_bool previously_shaded; // array of flags to indicate that previously groups would have already shaded this window - DILLSW.allocate(thisDaylightControl.ShadeDeployOrderExtWins.size()); - DILLUN.allocate(thisDaylightControl.ShadeDeployOrderExtWins.size()); - previously_shaded.allocate(thisEnclDaylight.NumOfDayltgExtWins); + auto &DILLSW = state.dataDaylightingManager->DILLSW; + auto &DILLUN = state.dataDaylightingManager->DILLUN; + auto &previously_shaded = state.dataDaylightingManager->previously_shaded; // If daylight illuminance is above setpoint, allow switching if (ISWFLG != 0 && state.dataDaylightingManager->DaylIllum(1) > SetPnt(1)) { @@ -6615,6 +6610,8 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da for (std::size_t igroup = 1; igroup <= thisDaylightControl.ShadeDeployOrderExtWins.size(); igroup++) { std::vector listOfExtWin = thisDaylightControl.ShadeDeployOrderExtWins[igroup - 1]; + auto &thisTVIS1 = state.dataDaylightingManager->TVIS1(igroup); + auto &thisTVIS2 = state.dataDaylightingManager->TVIS2(igroup); for (const auto IWin : listOfExtWin) { ++count; @@ -6635,13 +6632,13 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da int const IConst = state.dataSurface->SurfActiveConstruction(IWin); // Vis trans at normal incidence of unswitched glass - TVIS1(igroup) = + thisTVIS1 = General::POLYF(1.0, state.dataConstruction->Construct(IConst).TransVisBeamCoef) * state.dataSurface->SurfWinGlazedFrac(IWin); // Vis trans at normal incidence of fully switched glass int const IConstShaded = state.dataSurface->Surface(IWin).activeShadedConstruction; - TVIS2(igroup) = General::POLYF(1.0, state.dataConstruction->Construct(IConstShaded).TransVisBeamCoef) * - state.dataSurface->SurfWinGlazedFrac(IWin); + thisTVIS2 = General::POLYF(1.0, state.dataConstruction->Construct(IConstShaded).TransVisBeamCoef) * + state.dataSurface->SurfWinGlazedFrac(IWin); // Reset shading flag to indicate that window is shaded by being partially or fully switched state.dataSurface->SurfWinShadingFlag(IWin) = WinShadingType::SwitchableGlazing; @@ -6650,14 +6647,14 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da // so completely switch all daylight-switchable windows to minimize solar gain if (ASETIL(igroup) <= 0.0) { state.dataSurface->SurfWinSwitchingFactor(IWin) = 1.0; - state.dataSurface->SurfWinVisTransSelected(IWin) = TVIS2(igroup); + state.dataSurface->SurfWinVisTransSelected(IWin) = thisTVIS2; } else { // Case where 0 < ASETIL < 1: darken glass in all // daylight-switchable windows to just meet illuminance setpoint // From this equation: SETPNT(1) = DILLUN + DILLSW/TVIS1 * VisTransSelected - state.dataSurface->SurfWinVisTransSelected(IWin) = max(TVIS2(igroup), ASETIL(igroup) * TVIS1(igroup)) + 0.000001; + state.dataSurface->SurfWinVisTransSelected(IWin) = max(thisTVIS2, ASETIL(igroup) * thisTVIS1) + 0.000001; state.dataSurface->SurfWinSwitchingFactor(IWin) = - (TVIS1(igroup) - state.dataSurface->SurfWinVisTransSelected(IWin)) / (TVIS1(igroup) - TVIS2(igroup) + 0.000001); + (thisTVIS1 - state.dataSurface->SurfWinVisTransSelected(IWin)) / (thisTVIS1 - thisTVIS2 + 0.000001); // bound switching factor between 0 and 1 state.dataSurface->SurfWinSwitchingFactor(IWin) = min(1.0, state.dataSurface->SurfWinSwitchingFactor(IWin)); state.dataSurface->SurfWinSwitchingFactor(IWin) = max(0.0, state.dataSurface->SurfWinSwitchingFactor(IWin)); @@ -6668,14 +6665,14 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da // DaylIllum(IL) and BacLum(IL) were calculated at the clear state: IS = 1, // and need to adjusted for intermediate switched state at VisTransSelected: IS = 2 int IS = 1; - VTRAT = state.dataSurface->SurfWinVisTransSelected(IWin) / (TVIS1(igroup) + 0.000001); + VTRAT = state.dataSurface->SurfWinVisTransSelected(IWin) / (thisTVIS1 + 0.000001); state.dataDaylightingManager->DaylIllum(IL) += (VTRAT - 1.0) * thisDaylightControl.IllumFromWinAtRefPt(loop, IS, IL); thisDaylightControl.BacLum(IL) += (VTRAT - 1.0) * thisDaylightControl.BackLumFromWinAtRefPt(loop, IS, IL); // Adjust illum, background illum and source luminance for this window in intermediate switched state // for later use in the DayltgGlare calc because SurfaceWindow(IWin)%ShadingFlag = WinShadingType::SwitchableGlazing = 2 IS = 2; - VTRAT = state.dataSurface->SurfWinVisTransSelected(IWin) / (TVIS2(igroup) + 0.000001); + VTRAT = state.dataSurface->SurfWinVisTransSelected(IWin) / (thisTVIS2 + 0.000001); thisDaylightControl.IllumFromWinAtRefPt(loop, IS, IL) = VTRAT * tmpIllumFromWinAtRefPt(loop, IS, IL); thisDaylightControl.BackLumFromWinAtRefPt(loop, IS, IL) = VTRAT * tmpBackLumFromWinAtRefPt(loop, IS, IL); thisDaylightControl.SourceLumFromWinAtRefPt(loop, IS, IL) = VTRAT * tmpSourceLumFromWinAtRefPt(loop, IS, IL); @@ -6714,20 +6711,10 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da } } - Array3D WDAYIL(2, - NREFPT, - thisDaylightControl.ShadeDeployOrderExtWins.size()); // Illuminance from window at reference point (second index) - // for shade open/closed (first index), the number of shade deployment groups (third index) - Array3D WBACLU( - 2, - NREFPT, - thisDaylightControl.ShadeDeployOrderExtWins.size()); // Background illuminance from window at reference point (second index) - // for shade open/closed (first index), the number of shade deployment groups (third index) - Array2D RDAYIL(NREFPT, - thisDaylightControl.ShadeDeployOrderExtWins.size()); // Illuminance from window at reference point after closing shade - Array2D RBACLU( - NREFPT, - thisDaylightControl.ShadeDeployOrderExtWins.size()); // Background illuminance from window at reference point after closing shade + auto &WDAYIL = state.dataDaylightingManager->WDAYIL; + auto &WBACLU = state.dataDaylightingManager->WBACLU; + auto &RDAYIL = state.dataDaylightingManager->RDAYIL; + auto &RBACLU = state.dataDaylightingManager->RBACLU; if (GlareFlag) { // Glare is too high at a ref pt. Loop through windows. int count = 0; @@ -6736,6 +6723,8 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da for (std::size_t igroup = 1; igroup <= thisDaylightControl.ShadeDeployOrderExtWins.size(); igroup++) { std::vector listOfExtWin = thisDaylightControl.ShadeDeployOrderExtWins[igroup - 1]; + auto &thisTVIS1 = state.dataDaylightingManager->TVIS1(igroup); + auto &thisTVIS2 = state.dataDaylightingManager->TVIS1(igroup); int countBeforeListOfExtWinLoop = count; bool atLeastOneGlareControlIsActive = false; @@ -6814,13 +6803,13 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da int const IConst = state.dataSurface->SurfActiveConstruction(IWin); // Vis trans at normal incidence of unswitched glass - TVIS1(igroup) = General::POLYF(1.0, state.dataConstruction->Construct(IConst).TransVisBeamCoef) * - state.dataSurface->SurfWinGlazedFrac(IWin); + thisTVIS1 = General::POLYF(1.0, state.dataConstruction->Construct(IConst).TransVisBeamCoef) * + state.dataSurface->SurfWinGlazedFrac(IWin); // Vis trans at normal incidence of fully switched glass int const IConstShaded = state.dataSurface->Surface(IWin).activeShadedConstruction; - TVIS2(igroup) = General::POLYF(1.0, state.dataConstruction->Construct(IConstShaded).TransVisBeamCoef) * - state.dataSurface->SurfWinGlazedFrac(IWin); + thisTVIS2 = General::POLYF(1.0, state.dataConstruction->Construct(IConstShaded).TransVisBeamCoef) * + state.dataSurface->SurfWinGlazedFrac(IWin); } } } @@ -6893,7 +6882,7 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da // for switchable glazings, reset properties to clear state or partial switched state? if (state.dataSurface->SurfWinShadingFlag(IWin) == WinShadingType::SwitchableGlazing) { state.dataSurface->SurfWinSwitchingFactor(IWin) = 0.0; - state.dataSurface->SurfWinVisTransSelected(IWin) = TVIS1(igroup); + state.dataSurface->SurfWinVisTransSelected(IWin) = thisTVIS1; // RESET properties for fully dark state for (int IL = 1; IL <= NREFPT; ++IL) { @@ -6929,7 +6918,7 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da // switching factor ////Unused Set but never used state.dataSurface->SurfWinSwitchingFactor(IWin) = 1.0; - state.dataSurface->SurfWinVisTransSelected(IWin) = TVIS2(igroup); + state.dataSurface->SurfWinVisTransSelected(IWin) = thisTVIS2; // restore fully dark values for (int IL = 1; IL <= NREFPT; ++IL) { @@ -6975,7 +6964,7 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da max(SetPnt(IL) * state.dataDaylightingData->enclDaylight(enclNum).aveVisDiffReflect / DataGlobalConstants::Pi, RBACLU(IL, igroup)); // needs to update SourceLumFromWinAtRefPt(IL,2,loop) before re-calc DayltgGlare - tmpMult = (TVIS1(igroup) - (TVIS1(igroup) - TVIS2(igroup)) * tmpSWFactor) / TVIS2(igroup); + tmpMult = (thisTVIS1 - (thisTVIS1 - thisTVIS2) * tmpSWFactor) / thisTVIS2; if (IL == 1) { thisDaylightControl.SourceLumFromWinAtRefPt(loop, 2, IL) = tmpSWSL1 * tmpMult; } else { @@ -7025,7 +7014,7 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da RBACLU(IL, igroup)); // needs to update SourceLumFromWinAtRefPt(IL,2,IWin) before re-calc DayltgGlare - tmpMult = (TVIS1(igroup) - (TVIS1(igroup) - TVIS2(igroup)) * tmpSWFactor) / TVIS2(igroup); + tmpMult = (thisTVIS1 - (thisTVIS1 - thisTVIS2) * tmpSWFactor) / thisTVIS2; if (IL == 1) { thisDaylightControl.SourceLumFromWinAtRefPt(loop, 2, 1) = tmpSWSL1 * tmpMult; } else { @@ -7041,13 +7030,13 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da GLRNDX(IL) = GLRNEW(IL); state.dataDaylightingManager->DaylIllum(IL) = RDAYIL(IL, igroup); - tmpMult = (TVIS1(igroup) - (TVIS1(igroup) - TVIS2(igroup)) * tmpSWFactor) / TVIS2(igroup); + tmpMult = (thisTVIS1 - (thisTVIS1 - thisTVIS2) * tmpSWFactor) / thisTVIS2; // update report variables thisDaylightControl.IllumFromWinAtRefPt(loop, 2, IL) = tmpIllumFromWinAtRefPt(loop, 2, IL) * tmpMult; thisDaylightControl.BackLumFromWinAtRefPt(loop, 2, IL) = tmpBackLumFromWinAtRefPt(loop, 2, IL) * tmpMult; } state.dataSurface->SurfWinSwitchingFactor(IWin) = tmpSWFactor; - state.dataSurface->SurfWinVisTransSelected(IWin) = TVIS1(igroup) - (TVIS1(igroup) - TVIS2(igroup)) * tmpSWFactor; + state.dataSurface->SurfWinVisTransSelected(IWin) = thisTVIS1 - (thisTVIS1 - thisTVIS2) * tmpSWFactor; } else { // For un-switchable glazing or switchable glazing but not MeetDaylightIlluminaceSetpoint control, @@ -10445,6 +10434,7 @@ void CreateShadeDeploymentOrder(EnergyPlusData &state, int const enclNum) // now make the deployment list of lists. // each sublist is a group of surfaces that should be deployed together // often the sublist is just a single item. + int maxShadeDeployOrderExtWinsSize = 0; for (int controlNum : state.dataDaylightingData->enclDaylight(enclNum).daylightControlIndexes) { auto &thisDaylightCtrl = state.dataDaylightingData->daylightControl(controlNum); for (auto sequence : shadeControlSequence) { @@ -10465,7 +10455,23 @@ void CreateShadeDeploymentOrder(EnergyPlusData &state, int const enclNum) } } } + maxShadeDeployOrderExtWinsSize = max(maxShadeDeployOrderExtWinsSize, thisDaylightCtrl.ShadeDeployOrderExtWins.size()); + } + state.dataDaylightingManager->DILLSW.allocate(maxShadeDeployOrderExtWinsSize); + state.dataDaylightingManager->DILLUN.allocate(maxShadeDeployOrderExtWinsSize); + state.dataDaylightingManager->WDAYIL.allocate(2, state.dataDaylightingData->maxRefPointsPerControl, maxShadeDeployOrderExtWinsSize); + state.dataDaylightingManager->WBACLU.allocate(2, state.dataDaylightingData->maxRefPointsPerControl, maxShadeDeployOrderExtWinsSize); + state.dataDaylightingManager->RDAYIL.allocate(state.dataDaylightingData->maxRefPointsPerControl, maxShadeDeployOrderExtWinsSize); + state.dataDaylightingManager->RBACLU.allocate(state.dataDaylightingData->maxRefPointsPerControl, maxShadeDeployOrderExtWinsSize); + + state.dataDaylightingManager->TVIS1.allocate(maxShadeDeployOrderExtWinsSize); + state.dataDaylightingManager->TVIS2.allocate(maxShadeDeployOrderExtWinsSize); + + int maxNumOfDayltgExtWins = 0; + for (int enclNum = 1; enclNum <= state.dataViewFactor->NumOfSolarEnclosures; ++enclNum) { + maxNumOfDayltgExtWins = max(maxNumOfDayltgExtWins, state.dataDaylightingData->enclDaylight(enclNum).NumOfDayltgExtWins); } + state.dataDaylightingManager->previously_shaded.allocate(maxNumOfDayltgExtWins); } void MapShadeDeploymentOrderToLoopNumber(EnergyPlusData &state, int const enclNum) diff --git a/src/EnergyPlus/DaylightingManager.hh b/src/EnergyPlus/DaylightingManager.hh index de1568aba47..b3db2f7fa5e 100644 --- a/src/EnergyPlus/DaylightingManager.hh +++ b/src/EnergyPlus/DaylightingManager.hh @@ -708,6 +708,18 @@ struct DaylightingManagerData : BaseGlobalStruct bool GlareOK = false; bool blnCycle = false; + Array1D DILLSW; // Illuminance a ref point from a group of windows that can be switched together, + Array1D DILLUN; // and from those that aren't (lux) + Array1D_bool previously_shaded; // array of flags to indicate that previously groups would have already shaded this window + Array3D WDAYIL; // Illuminance from window at reference point (second index) + // for shade open/closed (first index), the number of shade deployment groups (third index) + Array3D WBACLU; // Background illuminance from window at reference point (second index) + // for shade open/closed (first index), the number of shade deployment groups (third index) + Array2D RDAYIL; // Illuminance from window at reference point after closing shade + Array2D RBACLU; // Background illuminance from window at reference point after closing shade + Array1D TVIS1; // Visible transmittance at normal incidence of unswitched glazing + Array1D TVIS2; // Visible transmittance at normal incidence of fully-switched glazing + DaylightingManagerData() { this->cos_Phi = Array1D(DataSurfaces::AltAngStepsForSolReflCalc / 2); // cos( Phi ) table @@ -869,6 +881,16 @@ struct DaylightingManagerData : BaseGlobalStruct this->tmpMult = 0.0; this->GlareOK = false; this->blnCycle = false; + + this->DILLSW.clear(); + this->DILLUN.clear(); + this->previously_shaded.clear(); + this->WDAYIL.clear(); + this->WBACLU.clear(); + this->RDAYIL.clear(); + this->RBACLU.clear(); + this->TVIS1.clear(); + this->TVIS2.clear(); } }; From 388204ee0d045bfac09488485a5b00f178c15c37 Mon Sep 17 00:00:00 2001 From: mjwitte Date: Wed, 15 Sep 2021 13:11:16 -0500 Subject: [PATCH 2/4] Fix fussy linux maybe --- src/EnergyPlus/DaylightingManager.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EnergyPlus/DaylightingManager.cc b/src/EnergyPlus/DaylightingManager.cc index 088b74f9ce1..1fc0e3cc847 100644 --- a/src/EnergyPlus/DaylightingManager.cc +++ b/src/EnergyPlus/DaylightingManager.cc @@ -10455,7 +10455,7 @@ void CreateShadeDeploymentOrder(EnergyPlusData &state, int const enclNum) } } } - maxShadeDeployOrderExtWinsSize = max(maxShadeDeployOrderExtWinsSize, thisDaylightCtrl.ShadeDeployOrderExtWins.size()); + maxShadeDeployOrderExtWinsSize = max(maxShadeDeployOrderExtWinsSize, int(thisDaylightCtrl.ShadeDeployOrderExtWins.size())); } state.dataDaylightingManager->DILLSW.allocate(maxShadeDeployOrderExtWinsSize); state.dataDaylightingManager->DILLUN.allocate(maxShadeDeployOrderExtWinsSize); From c344ee80b0c6ac853b55f3654f169b9e9b4ed011 Mon Sep 17 00:00:00 2001 From: mjwitte Date: Wed, 15 Sep 2021 15:57:35 -0500 Subject: [PATCH 3/4] More daylighting arrays moved and reduce slat angles if no blinds --- src/EnergyPlus/DataSurfaces.hh | 3 + src/EnergyPlus/DaylightingManager.cc | 148 +++++++++++++++++---------- src/EnergyPlus/DaylightingManager.hh | 2 + src/EnergyPlus/HeatBalanceManager.cc | 3 + 4 files changed, 101 insertions(+), 55 deletions(-) diff --git a/src/EnergyPlus/DataSurfaces.hh b/src/EnergyPlus/DataSurfaces.hh index ea2955ce734..b4251c14e0f 100644 --- a/src/EnergyPlus/DataSurfaces.hh +++ b/src/EnergyPlus/DataSurfaces.hh @@ -1646,6 +1646,8 @@ struct SurfacesData : BaseGlobalStruct EPVector SurroundingSurfsProperty; EPVector IntMassObjects; + int actualMaxSlatAngs = DataSurfaces::MaxSlatAngs; // If there are no blinds in the model, then this is changed to 1 (used for shades) + void clear_state() override { this->TotSurfaces = 0; @@ -1986,6 +1988,7 @@ struct SurfacesData : BaseGlobalStruct this->SurfLocalEnvironment.deallocate(); this->SurroundingSurfsProperty.deallocate(); this->IntMassObjects.deallocate(); + this->actualMaxSlatAngs = DataSurfaces::MaxSlatAngs; } }; diff --git a/src/EnergyPlus/DaylightingManager.cc b/src/EnergyPlus/DaylightingManager.cc index 1fc0e3cc847..559b09b4a69 100644 --- a/src/EnergyPlus/DaylightingManager.cc +++ b/src/EnergyPlus/DaylightingManager.cc @@ -921,24 +921,39 @@ void CalcDayltgCoeffsRefPoints(EnergyPlusData &state, int const daylightCtrlNum) thisDaylightControl.DaylBackFacSunDisk = 0.0; } else { int numRefPts = thisDaylightControl.TotalDaylRefPoints; - thisDaylightControl.DaylIllFacSky( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, 4}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; - thisDaylightControl.DaylSourceFacSky( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, 4}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; - thisDaylightControl.DaylBackFacSky( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, 4}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + thisDaylightControl.DaylIllFacSky(state.dataGlobal->HourOfDay, + {1, state.dataSurface->actualMaxSlatAngs + 1}, + {1, 4}, + {1, numRefPts}, + {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + thisDaylightControl.DaylSourceFacSky(state.dataGlobal->HourOfDay, + {1, state.dataSurface->actualMaxSlatAngs + 1}, + {1, 4}, + {1, numRefPts}, + {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + thisDaylightControl.DaylBackFacSky(state.dataGlobal->HourOfDay, + {1, state.dataSurface->actualMaxSlatAngs + 1}, + {1, 4}, + {1, numRefPts}, + {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; thisDaylightControl.DaylIllFacSun( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = + 0.0; thisDaylightControl.DaylIllFacSunDisk( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = + 0.0; thisDaylightControl.DaylSourceFacSun( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = + 0.0; thisDaylightControl.DaylSourceFacSunDisk( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = + 0.0; thisDaylightControl.DaylBackFacSun( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = + 0.0; thisDaylightControl.DaylBackFacSunDisk( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = + 0.0; } NRF = thisDaylightControl.TotalDaylRefPoints; @@ -1303,24 +1318,39 @@ void CalcDayltgCoeffsMapPoints(EnergyPlusData &state, int const mapNum) state.dataDaylightingData->IllumMapCalc(mapNum).DaylBackFacSun = 0.0; state.dataDaylightingData->IllumMapCalc(mapNum).DaylBackFacSunDisk = 0.0; } else { - state.dataDaylightingData->IllumMapCalc(mapNum).DaylIllFacSky( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, 4}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; - state.dataDaylightingData->IllumMapCalc(mapNum).DaylSourceFacSky( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, 4}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; - state.dataDaylightingData->IllumMapCalc(mapNum).DaylBackFacSky( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, 4}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + state.dataDaylightingData->IllumMapCalc(mapNum).DaylIllFacSky(state.dataGlobal->HourOfDay, + {1, state.dataSurface->actualMaxSlatAngs + 1}, + {1, 4}, + {1, numRefPts}, + {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + state.dataDaylightingData->IllumMapCalc(mapNum).DaylSourceFacSky(state.dataGlobal->HourOfDay, + {1, state.dataSurface->actualMaxSlatAngs + 1}, + {1, 4}, + {1, numRefPts}, + {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + state.dataDaylightingData->IllumMapCalc(mapNum).DaylBackFacSky(state.dataGlobal->HourOfDay, + {1, state.dataSurface->actualMaxSlatAngs + 1}, + {1, 4}, + {1, numRefPts}, + {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; state.dataDaylightingData->IllumMapCalc(mapNum).DaylIllFacSun( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = + 0.0; state.dataDaylightingData->IllumMapCalc(mapNum).DaylIllFacSunDisk( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = + 0.0; state.dataDaylightingData->IllumMapCalc(mapNum).DaylSourceFacSun( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = + 0.0; state.dataDaylightingData->IllumMapCalc(mapNum).DaylSourceFacSunDisk( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = + 0.0; state.dataDaylightingData->IllumMapCalc(mapNum).DaylBackFacSun( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = + 0.0; state.dataDaylightingData->IllumMapCalc(mapNum).DaylBackFacSunDisk( - state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = 0.0; + state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}, {1, numRefPts}, {1, thisEnclDaylight.NumOfDayltgExtWins}) = + 0.0; } for (IL = 1; IL <= numRefPts; ++IL) { @@ -1947,12 +1977,12 @@ void FigureDayltgCoeffsAtPointsSetupForWindow( state.dataDaylightingManager->AVWLSU = 0.0; state.dataDaylightingManager->AVWLSUdisk = 0.0; } else { - state.dataDaylightingManager->EDIRSK(state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, 4}) = 0.0; - state.dataDaylightingManager->EDIRSU(state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}) = 0.0; - state.dataDaylightingManager->EDIRSUdisk(state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}) = 0.0; - state.dataDaylightingManager->AVWLSK(state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}, {1, 4}) = 0.0; - state.dataDaylightingManager->AVWLSU(state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}) = 0.0; - state.dataDaylightingManager->AVWLSUdisk(state.dataGlobal->HourOfDay, {1, MaxSlatAngs + 1}) = 0.0; + state.dataDaylightingManager->EDIRSK(state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}, {1, 4}) = 0.0; + state.dataDaylightingManager->EDIRSU(state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}) = 0.0; + state.dataDaylightingManager->EDIRSUdisk(state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}) = 0.0; + state.dataDaylightingManager->AVWLSK(state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}, {1, 4}) = 0.0; + state.dataDaylightingManager->AVWLSU(state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}) = 0.0; + state.dataDaylightingManager->AVWLSUdisk(state.dataGlobal->HourOfDay, {1, state.dataSurface->actualMaxSlatAngs + 1}) = 0.0; } if (CalledFrom == DataDaylighting::iCalledFor::RefPoint) { // Initialize solid angle subtended by window wrt ref pt @@ -6592,12 +6622,9 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da } } // End of third window loop, IWin - Array1D ASETIL; // Illuminance ratio (lux) - ASETIL.allocate(thisDaylightControl.ShadeDeployOrderExtWins.size()); - // Transmittance multiplier for (std::size_t igroup = 1; igroup <= thisDaylightControl.ShadeDeployOrderExtWins.size(); igroup++) { - ASETIL(igroup) = (SetPnt(1) - DILLUN(igroup)) / (DILLSW(igroup) + 0.00001); + state.dataDaylightingManager->ASETIL(igroup) = (SetPnt(1) - DILLUN(igroup)) / (DILLSW(igroup) + 0.00001); } // ASETIL < 1 means there's enough light, so check for switching @@ -6612,12 +6639,13 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da std::vector listOfExtWin = thisDaylightControl.ShadeDeployOrderExtWins[igroup - 1]; auto &thisTVIS1 = state.dataDaylightingManager->TVIS1(igroup); auto &thisTVIS2 = state.dataDaylightingManager->TVIS2(igroup); + auto &thisASETIL = state.dataDaylightingManager->ASETIL(igroup); for (const auto IWin : listOfExtWin) { ++count; // need to map back to the original order of the "loop" to not change all the other data structures loop = thisDaylightControl.MapShdOrdToLoopNum(count); - if (ASETIL(igroup) < 1.0) { + if (thisASETIL < 1.0) { ICtrl = state.dataSurface->Surface(IWin).activeWindowShadingControl; if (!state.dataSurface->Surface(IWin).HasShadeControl) { @@ -6645,14 +6673,14 @@ void DayltgInteriorIllum(EnergyPlusData &state, int const daylightCtrlNum) // Da // ASETIL < 0 means illuminance from non-daylight-switchable windows exceeds setpoint, // so completely switch all daylight-switchable windows to minimize solar gain - if (ASETIL(igroup) <= 0.0) { + if (thisASETIL <= 0.0) { state.dataSurface->SurfWinSwitchingFactor(IWin) = 1.0; state.dataSurface->SurfWinVisTransSelected(IWin) = thisTVIS2; } else { // Case where 0 < ASETIL < 1: darken glass in all // daylight-switchable windows to just meet illuminance setpoint // From this equation: SETPNT(1) = DILLUN + DILLSW/TVIS1 * VisTransSelected - state.dataSurface->SurfWinVisTransSelected(IWin) = max(thisTVIS2, ASETIL(igroup) * thisTVIS1) + 0.000001; + state.dataSurface->SurfWinVisTransSelected(IWin) = max(thisTVIS2, thisASETIL * thisTVIS1) + 0.000001; state.dataSurface->SurfWinSwitchingFactor(IWin) = (thisTVIS1 - state.dataSurface->SurfWinVisTransSelected(IWin)) / (thisTVIS1 - thisTVIS2 + 0.000001); // bound switching factor between 0 and 1 @@ -10325,15 +10353,15 @@ void DayltgSetupAdjZoneListsAndPointers(EnergyPlusData &state) for (int controlNum : thisEnclDaylight.daylightControlIndexes) { auto &thisDaylightControl = state.dataDaylightingData->daylightControl(controlNum); int refSize = thisDaylightControl.TotalDaylRefPoints; - thisDaylightControl.DaylIllFacSky.allocate(24, MaxSlatAngs + 1, 4, refSize, winSize); - thisDaylightControl.DaylSourceFacSky.allocate(24, MaxSlatAngs + 1, 4, refSize, winSize); - thisDaylightControl.DaylBackFacSky.allocate(24, MaxSlatAngs + 1, 4, refSize, winSize); - thisDaylightControl.DaylIllFacSun.allocate(24, MaxSlatAngs + 1, refSize, winSize); - thisDaylightControl.DaylIllFacSunDisk.allocate(24, MaxSlatAngs + 1, refSize, winSize); - thisDaylightControl.DaylSourceFacSun.allocate(24, MaxSlatAngs + 1, refSize, winSize); - thisDaylightControl.DaylSourceFacSunDisk.allocate(24, MaxSlatAngs + 1, refSize, winSize); - thisDaylightControl.DaylBackFacSun.allocate(24, MaxSlatAngs + 1, refSize, winSize); - thisDaylightControl.DaylBackFacSunDisk.allocate(24, MaxSlatAngs + 1, refSize, winSize); + thisDaylightControl.DaylIllFacSky.allocate(24, state.dataSurface->actualMaxSlatAngs + 1, 4, refSize, winSize); + thisDaylightControl.DaylSourceFacSky.allocate(24, state.dataSurface->actualMaxSlatAngs + 1, 4, refSize, winSize); + thisDaylightControl.DaylBackFacSky.allocate(24, state.dataSurface->actualMaxSlatAngs + 1, 4, refSize, winSize); + thisDaylightControl.DaylIllFacSun.allocate(24, state.dataSurface->actualMaxSlatAngs + 1, refSize, winSize); + thisDaylightControl.DaylIllFacSunDisk.allocate(24, state.dataSurface->actualMaxSlatAngs + 1, refSize, winSize); + thisDaylightControl.DaylSourceFacSun.allocate(24, state.dataSurface->actualMaxSlatAngs + 1, refSize, winSize); + thisDaylightControl.DaylSourceFacSunDisk.allocate(24, state.dataSurface->actualMaxSlatAngs + 1, refSize, winSize); + thisDaylightControl.DaylBackFacSun.allocate(24, state.dataSurface->actualMaxSlatAngs + 1, refSize, winSize); + thisDaylightControl.DaylBackFacSunDisk.allocate(24, state.dataSurface->actualMaxSlatAngs + 1, refSize, winSize); } } // End of check if thisEnclNumRefPoints > 0 @@ -10360,15 +10388,24 @@ void DayltgSetupAdjZoneListsAndPointers(EnergyPlusData &state) state.dataDaylightingData->IllumMapCalc(mapNum).SourceLumFromWinAtMapPt.allocate(numExtWin, 2, numMapRefPts); state.dataDaylightingData->IllumMapCalc(mapNum).SourceLumFromWinAtMapPt = 0.0; - state.dataDaylightingData->IllumMapCalc(mapNum).DaylIllFacSky.allocate(24, MaxSlatAngs + 1, 4, numMapRefPts, numExtWin); - state.dataDaylightingData->IllumMapCalc(mapNum).DaylSourceFacSky.allocate(24, MaxSlatAngs + 1, 4, numMapRefPts, numExtWin); - state.dataDaylightingData->IllumMapCalc(mapNum).DaylBackFacSky.allocate(24, MaxSlatAngs + 1, 4, numMapRefPts, numExtWin); - state.dataDaylightingData->IllumMapCalc(mapNum).DaylIllFacSun.allocate(24, MaxSlatAngs + 1, numMapRefPts, numExtWin); - state.dataDaylightingData->IllumMapCalc(mapNum).DaylIllFacSunDisk.allocate(24, MaxSlatAngs + 1, numMapRefPts, numExtWin); - state.dataDaylightingData->IllumMapCalc(mapNum).DaylSourceFacSun.allocate(24, MaxSlatAngs + 1, numMapRefPts, numExtWin); - state.dataDaylightingData->IllumMapCalc(mapNum).DaylSourceFacSunDisk.allocate(24, MaxSlatAngs + 1, numMapRefPts, numExtWin); - state.dataDaylightingData->IllumMapCalc(mapNum).DaylBackFacSun.allocate(24, MaxSlatAngs + 1, numMapRefPts, numExtWin); - state.dataDaylightingData->IllumMapCalc(mapNum).DaylBackFacSunDisk.allocate(24, MaxSlatAngs + 1, numMapRefPts, numExtWin); + state.dataDaylightingData->IllumMapCalc(mapNum).DaylIllFacSky.allocate( + 24, state.dataSurface->actualMaxSlatAngs + 1, 4, numMapRefPts, numExtWin); + state.dataDaylightingData->IllumMapCalc(mapNum).DaylSourceFacSky.allocate( + 24, state.dataSurface->actualMaxSlatAngs + 1, 4, numMapRefPts, numExtWin); + state.dataDaylightingData->IllumMapCalc(mapNum).DaylBackFacSky.allocate( + 24, state.dataSurface->actualMaxSlatAngs + 1, 4, numMapRefPts, numExtWin); + state.dataDaylightingData->IllumMapCalc(mapNum).DaylIllFacSun.allocate( + 24, state.dataSurface->actualMaxSlatAngs + 1, numMapRefPts, numExtWin); + state.dataDaylightingData->IllumMapCalc(mapNum).DaylIllFacSunDisk.allocate( + 24, state.dataSurface->actualMaxSlatAngs + 1, numMapRefPts, numExtWin); + state.dataDaylightingData->IllumMapCalc(mapNum).DaylSourceFacSun.allocate( + 24, state.dataSurface->actualMaxSlatAngs + 1, numMapRefPts, numExtWin); + state.dataDaylightingData->IllumMapCalc(mapNum).DaylSourceFacSunDisk.allocate( + 24, state.dataSurface->actualMaxSlatAngs + 1, numMapRefPts, numExtWin); + state.dataDaylightingData->IllumMapCalc(mapNum).DaylBackFacSun.allocate( + 24, state.dataSurface->actualMaxSlatAngs + 1, numMapRefPts, numExtWin); + state.dataDaylightingData->IllumMapCalc(mapNum).DaylBackFacSunDisk.allocate( + 24, state.dataSurface->actualMaxSlatAngs + 1, numMapRefPts, numExtWin); } } // End of map loop @@ -10466,6 +10503,7 @@ void CreateShadeDeploymentOrder(EnergyPlusData &state, int const enclNum) state.dataDaylightingManager->TVIS1.allocate(maxShadeDeployOrderExtWinsSize); state.dataDaylightingManager->TVIS2.allocate(maxShadeDeployOrderExtWinsSize); + state.dataDaylightingManager->ASETIL.allocate(maxShadeDeployOrderExtWinsSize); int maxNumOfDayltgExtWins = 0; for (int enclNum = 1; enclNum <= state.dataViewFactor->NumOfSolarEnclosures; ++enclNum) { diff --git a/src/EnergyPlus/DaylightingManager.hh b/src/EnergyPlus/DaylightingManager.hh index b3db2f7fa5e..7588dd57da8 100644 --- a/src/EnergyPlus/DaylightingManager.hh +++ b/src/EnergyPlus/DaylightingManager.hh @@ -719,6 +719,7 @@ struct DaylightingManagerData : BaseGlobalStruct Array2D RBACLU; // Background illuminance from window at reference point after closing shade Array1D TVIS1; // Visible transmittance at normal incidence of unswitched glazing Array1D TVIS2; // Visible transmittance at normal incidence of fully-switched glazing + Array1D ASETIL; // Illuminance ratio (lux) DaylightingManagerData() { @@ -891,6 +892,7 @@ struct DaylightingManagerData : BaseGlobalStruct this->RBACLU.clear(); this->TVIS1.clear(); this->TVIS2.clear(); + this->ASETIL.clear(); } }; diff --git a/src/EnergyPlus/HeatBalanceManager.cc b/src/EnergyPlus/HeatBalanceManager.cc index 6924c9a67ab..75530a37f59 100644 --- a/src/EnergyPlus/HeatBalanceManager.cc +++ b/src/EnergyPlus/HeatBalanceManager.cc @@ -3407,6 +3407,9 @@ namespace HeatBalanceManager { } // TotScreensEQL loop // Window Blind Materials + if ((state.dataHeatBal->TotBlindsEQL == 0) && (state.dataHeatBal->TotBlinds == 0)) { + state.dataSurface->actualMaxSlatAngs = 1; // first slot is used for shades + } if (state.dataHeatBal->TotBlinds > 0) { state.dataHeatBal->Blind.allocate(state.dataHeatBal->TotBlinds); // Allocate the array Size to the number of blinds From c2d07ab906bc60fe30f3b51305005660500ebbfc Mon Sep 17 00:00:00 2001 From: mjwitte Date: Wed, 15 Sep 2021 16:38:09 -0500 Subject: [PATCH 4/4] More daylighting arrays moved --- src/EnergyPlus/DaylightingManager.cc | 22 +++++ src/EnergyPlus/DaylightingManager.hh | 125 +++++++++++++-------------- 2 files changed, 81 insertions(+), 66 deletions(-) diff --git a/src/EnergyPlus/DaylightingManager.cc b/src/EnergyPlus/DaylightingManager.cc index 559b09b4a69..f25fbadf3fa 100644 --- a/src/EnergyPlus/DaylightingManager.cc +++ b/src/EnergyPlus/DaylightingManager.cc @@ -10409,6 +10409,28 @@ void DayltgSetupAdjZoneListsAndPointers(EnergyPlusData &state) } } // End of map loop + state.dataDaylightingManager->EINTSK.dimension(24, state.dataSurface->actualMaxSlatAngs + 1, 4, 0.0); + state.dataDaylightingManager->EINTSU.dimension(24, state.dataSurface->actualMaxSlatAngs + 1, 0.0); + state.dataDaylightingManager->EINTSUdisk.dimension(24, state.dataSurface->actualMaxSlatAngs + 1, 0.0); + state.dataDaylightingManager->WLUMSK.dimension(24, state.dataSurface->actualMaxSlatAngs + 1, 4, 0.0); + state.dataDaylightingManager->WLUMSU.dimension(24, state.dataSurface->actualMaxSlatAngs + 1, 0.0); + state.dataDaylightingManager->WLUMSUdisk.dimension(24, state.dataSurface->actualMaxSlatAngs + 1, 0.0); + state.dataDaylightingManager->EDIRSK.dimension(24, state.dataSurface->actualMaxSlatAngs + 1, 4); + state.dataDaylightingManager->EDIRSU.dimension(24, state.dataSurface->actualMaxSlatAngs + 1); + state.dataDaylightingManager->EDIRSUdisk.dimension(24, state.dataSurface->actualMaxSlatAngs + 1); + state.dataDaylightingManager->AVWLSK.dimension(24, state.dataSurface->actualMaxSlatAngs + 1, 4); + state.dataDaylightingManager->AVWLSU.dimension(24, state.dataSurface->actualMaxSlatAngs + 1); + state.dataDaylightingManager->AVWLSUdisk.dimension(24, state.dataSurface->actualMaxSlatAngs + 1); + state.dataDaylightingManager->FLFWSU.dimension(state.dataSurface->actualMaxSlatAngs + 1); + state.dataDaylightingManager->FLFWSUdisk.dimension(state.dataSurface->actualMaxSlatAngs + 1); + state.dataDaylightingManager->FLCWSU.dimension(state.dataSurface->actualMaxSlatAngs + 1); + state.dataDaylightingManager->TransMult.dimension(state.dataSurface->actualMaxSlatAngs); + state.dataDaylightingManager->DayltgInterReflectedIllumTransBmBmMult.dimension(state.dataSurface->actualMaxSlatAngs); + state.dataDaylightingManager->TransBmBmMult.dimension(state.dataSurface->actualMaxSlatAngs); + state.dataDaylightingManager->TransBmBmMultRefl.dimension(state.dataSurface->actualMaxSlatAngs); + state.dataDaylightingManager->FLCWSK.dimension(state.dataSurface->actualMaxSlatAngs + 1, 4); + state.dataDaylightingManager->FLFWSK.dimension(state.dataSurface->actualMaxSlatAngs + 1, 4); + // TODO MJW: These eio outputs need to change from zone to enclosure static constexpr std::string_view Format_700( "! , Zone Name, Number of Exterior Windows, Number of Exterior Windows in Adjacent Zones\n"); diff --git a/src/EnergyPlus/DaylightingManager.hh b/src/EnergyPlus/DaylightingManager.hh index 7588dd57da8..91fe3bd366e 100644 --- a/src/EnergyPlus/DaylightingManager.hh +++ b/src/EnergyPlus/DaylightingManager.hh @@ -516,26 +516,24 @@ struct DaylightingManagerData : BaseGlobalStruct // I = 1 for clear sky, 2 for clear turbid, 3 for intermediate, 4 for overcast; // J = 1 for bare window, 2 - 12 for shaded; // K = sun position index. - Array3D EINTSK = Array3D(24, DataSurfaces::MaxSlatAngs + 1, 4, 0.0); // Sky-related portion of internally reflected illuminance - Array2D EINTSU = Array2D(24, DataSurfaces::MaxSlatAngs + 1, 0.0); // Sun-related portion of internally reflected illuminance, + Array3D EINTSK; // Sky-related portion of internally reflected illuminance + Array2D EINTSU; // Sun-related portion of internally reflected illuminance, // excluding entering beam - Array2D EINTSUdisk = Array2D(24, DataSurfaces::MaxSlatAngs + 1, 0.0); // Sun-related portion of internally reflected illuminance + Array2D EINTSUdisk; // Sun-related portion of internally reflected illuminance // due to entering beam - Array3D WLUMSK = Array3D(24, DataSurfaces::MaxSlatAngs + 1, 4, 0.0); // Sky-related window luminance - Array2D WLUMSU = Array2D(24, DataSurfaces::MaxSlatAngs + 1, 0.0); // Sun-related window luminance, excluding view of solar disk - Array2D WLUMSUdisk = Array2D(24, DataSurfaces::MaxSlatAngs + 1, 0.0); // Sun-related window luminance, due to view of solar disk + Array3D WLUMSK; // Sky-related window luminance + Array2D WLUMSU; // Sun-related window luminance, excluding view of solar disk + Array2D WLUMSUdisk; // Sun-related window luminance, due to view of solar disk Array2D GILSK = Array2D(24, 4, 0.0); // Horizontal illuminance from sky, by sky type, for each hour of the day Array1D GILSU = Array1D(24, 0.0); // Horizontal illuminance from sun for each hour of the day - Array3D EDIRSK = Array3D(24, DataSurfaces::MaxSlatAngs + 1, 4); // Sky-related component of direct illuminance - Array2D EDIRSU = - Array2D(24, DataSurfaces::MaxSlatAngs + 1); // Sun-related component of direct illuminance (excluding beam solar at ref pt) - Array2D EDIRSUdisk = - Array2D(24, DataSurfaces::MaxSlatAngs + 1); // Sun-related component of direct illuminance due to beam solar at ref pt - Array3D AVWLSK = Array3D(24, DataSurfaces::MaxSlatAngs + 1, 4); // Sky-related average window luminance - Array2D AVWLSU = Array2D(24, DataSurfaces::MaxSlatAngs + 1); // Sun-related average window luminance, excluding view of solar disk - Array2D AVWLSUdisk = Array2D(24, DataSurfaces::MaxSlatAngs + 1); // Sun-related average window luminance due to view of solar disk + Array3D EDIRSK; // Sky-related component of direct illuminance + Array2D EDIRSU; // Sun-related component of direct illuminance (excluding beam solar at ref pt) + Array2D EDIRSUdisk; // Sun-related component of direct illuminance due to beam solar at ref pt + Array3D AVWLSK; // Sky-related average window luminance + Array2D AVWLSU; // Sun-related average window luminance, excluding view of solar disk + Array2D AVWLSUdisk; // Sun-related average window luminance due to view of solar disk // Allocatable daylight factor arrays -- are in the ZoneDaylight Structure @@ -668,24 +666,24 @@ struct DaylightingManagerData : BaseGlobalStruct Array1D BACLUM; Array1D DayltgInteriorMapIllumGLRNDX; Array1D daylight_illum; - Array1D FLFWSU = Array1D(DataSurfaces::MaxSlatAngs + 1); // Sun-related downgoing luminous flux, excluding entering beam - Array1D FLFWSUdisk = Array1D(DataSurfaces::MaxSlatAngs + 1); // Sun-related downgoing luminous flux, due to entering beam - Array1D FLCWSU = Array1D(DataSurfaces::MaxSlatAngs + 1); // Sun-related upgoing luminous flux - Array1D TransMult = Array1D(DataSurfaces::MaxSlatAngs); // Transmittance multiplier - Array1D DayltgInterReflectedIllumTransBmBmMult = Array1D(DataSurfaces::MaxSlatAngs); // Isolated blind beam-beam transmittance - Array1D TransBmBmMult = Array1D(DataSurfaces::MaxSlatAngs); // Beam-beam transmittance of isolated blind - Array1D TransBmBmMultRefl = Array1D(DataSurfaces::MaxSlatAngs); // As above but for beam reflected from exterior obstruction - Array1D PH = Array1D(DaylightingManager::NPH); // Altitude of sky element (radians) - Array1D TH = Array1D(DaylightingManager::NTH); // Azimuth of sky element (radians) - Array1D SPHCPH = Array1D(DaylightingManager::NPH); // Sine times cosine of altitude of sky element - Array1D SetPnt; // Illuminance setpoint at reference points (lux) - Array1D GLRNDX; // Glare index at reference point - Array1D GLRNEW; // New glare index at reference point - Array2D FLCWSK = Array2D(DataSurfaces::MaxSlatAngs + 1, 4); // Sky-related upgoing luminous flux + Array1D FLFWSU; // Sun-related downgoing luminous flux, excluding entering beam + Array1D FLFWSUdisk; // Sun-related downgoing luminous flux, due to entering beam + Array1D FLCWSU; // Sun-related upgoing luminous flux + Array1D TransMult; // Transmittance multiplier + Array1D DayltgInterReflectedIllumTransBmBmMult; // Isolated blind beam-beam transmittance + Array1D TransBmBmMult; // Beam-beam transmittance of isolated blind + Array1D TransBmBmMultRefl; // As above but for beam reflected from exterior obstruction + Array1D PH = Array1D(DaylightingManager::NPH); // Altitude of sky element (radians) + Array1D TH = Array1D(DaylightingManager::NTH); // Azimuth of sky element (radians) + Array1D SPHCPH = Array1D(DaylightingManager::NPH); // Sine times cosine of altitude of sky element + Array1D SetPnt; // Illuminance setpoint at reference points (lux) + Array1D GLRNDX; // Glare index at reference point + Array1D GLRNEW; // New glare index at reference point + Array2D FLCWSK; // Sky-related upgoing luminous flux Array2D SkyObstructionMult = Array2D(DaylightingManager::NPHMAX, DaylightingManager::NTHMAX); // Ratio of obstructed to unobstructed sky diffuse at a ground point for each (TH,PH) direction - Array2D FLFWSK = Array2D(DataSurfaces::MaxSlatAngs + 1, 4); // Sky-related downgoing luminous flux + Array2D FLFWSK; // Sky-related downgoing luminous flux Array2D ObTransM = Array2D(DaylightingManager::NPHMAX, DaylightingManager::NTHMAX); // ObTrans value for each (TH,PH) direction Array2D SFSKHR = Array2D(2, 4); // Sky source luminance factor for sky type (second index), bare/shaded window (first index) Array2D DFSKHR = Array2D(2, 4); // Sky daylight factor for sky type (second index), bare/shaded window (first index) @@ -757,20 +755,20 @@ struct DaylightingManagerData : BaseGlobalStruct this->SPHSUNHR = Array1D(24, 0.0); this->CPHSUNHR = Array1D(24, 0.0); this->THSUNHR = Array1D(24, 0.0); - this->EINTSK = Array3D(24, DataSurfaces::MaxSlatAngs + 1, 4, 0.0); - this->EINTSU = Array2D(24, DataSurfaces::MaxSlatAngs + 1, 0.0); - this->EINTSUdisk = Array2D(24, DataSurfaces::MaxSlatAngs + 1, 0.0); - this->WLUMSK = Array3D(24, DataSurfaces::MaxSlatAngs + 1, 4, 0.0); - this->WLUMSU = Array2D(24, DataSurfaces::MaxSlatAngs + 1, 0.0); - this->WLUMSUdisk = Array2D(24, DataSurfaces::MaxSlatAngs + 1, 0.0); + this->EINTSK.deallocate(); + this->EINTSU.deallocate(); + this->EINTSUdisk.deallocate(); + this->WLUMSK.deallocate(); + this->WLUMSU.deallocate(); + this->WLUMSUdisk.deallocate(); this->GILSK = Array2D(24, 4, 0.0); this->GILSU = Array1D(24, 0.0); - this->EDIRSK = Array3D(24, DataSurfaces::MaxSlatAngs + 1, 4); - this->EDIRSU = Array2D(24, DataSurfaces::MaxSlatAngs + 1); - this->EDIRSUdisk = Array2D(24, DataSurfaces::MaxSlatAngs + 1); - this->AVWLSK = Array3D(24, DataSurfaces::MaxSlatAngs + 1, 4); - this->AVWLSU = Array2D(24, DataSurfaces::MaxSlatAngs + 1); - this->AVWLSUdisk = Array2D(24, DataSurfaces::MaxSlatAngs + 1); + this->EDIRSK.deallocate(); + this->EDIRSU.deallocate(); + this->EDIRSUdisk.deallocate(); + this->AVWLSK.deallocate(); + this->AVWLSU.deallocate(); + this->AVWLSUdisk.deallocate(); this->TDDTransVisBeam.deallocate(); this->TDDFluxInc.deallocate(); this->TDDFluxTrans.deallocate(); @@ -835,37 +833,32 @@ struct DaylightingManagerData : BaseGlobalStruct this->VTDark = 0.0; this->VTMULT = 1.0; - this->DayltgInteriorMapIllumDFSKHR = - Array2D(2, 4); // Sky daylight factor for sky type (first index), bare/shaded window (second index) - this->DayltgInteriorMapIllumBFSKHR = - Array2D(2, 4); // Sky background luminance factor for sky type (first index), bare/shaded window (second index) - this->DayltgInteriorMapIllumSFSKHR = - Array2D(2, 4); // Sky source luminance factor for sky type (first index), bare/shaded window (second index) + this->DayltgInteriorMapIllumDFSKHR = Array2D(2, 4); + this->DayltgInteriorMapIllumBFSKHR = Array2D(2, 4); + this->DayltgInteriorMapIllumSFSKHR = Array2D(2, 4); this->BACLUM.clear(); this->DayltgInteriorMapIllumGLRNDX.clear(); this->daylight_illum.clear(); - this->FLFWSU = Array1D(DataSurfaces::MaxSlatAngs + 1); // Sun-related downgoing luminous flux, excluding entering beam - this->FLFWSUdisk = Array1D(DataSurfaces::MaxSlatAngs + 1); // Sun-related downgoing luminous flux, due to entering beam - this->FLCWSU = Array1D(DataSurfaces::MaxSlatAngs + 1); // Sun-related upgoing luminous flux - this->TransMult = Array1D(DataSurfaces::MaxSlatAngs); // Transmittance multiplier - this->DayltgInterReflectedIllumTransBmBmMult = Array1D(DataSurfaces::MaxSlatAngs); // Isolated blind beam-beam transmittance - this->TransBmBmMult = Array1D(DataSurfaces::MaxSlatAngs); // Beam-beam transmittance of isolated blind - this->TransBmBmMultRefl = Array1D(DataSurfaces::MaxSlatAngs); // As above but for beam reflected from exterior obstruction - this->PH = Array1D(DaylightingManager::NPH); // Altitude of sky element (radians) - this->TH = Array1D(DaylightingManager::NTH); // Azimuth of sky element (radians) - this->SPHCPH = Array1D(DaylightingManager::NPH); // Sine times cosine of altitude of sky element + this->FLFWSU.clear(); + this->FLFWSUdisk.clear(); + this->FLCWSU.clear(); + this->TransMult.clear(); + this->DayltgInterReflectedIllumTransBmBmMult.clear(); + this->TransBmBmMult.clear(); + this->TransBmBmMultRefl.clear(); + this->PH = Array1D(DaylightingManager::NPH); + this->TH = Array1D(DaylightingManager::NTH); + this->SPHCPH = Array1D(DaylightingManager::NPH); this->SetPnt.clear(); this->GLRNDX.clear(); this->GLRNEW.clear(); - this->FLCWSK = Array2D(DataSurfaces::MaxSlatAngs + 1, 4); // Sky-related upgoing luminous flux - this->SkyObstructionMult = Array2D( - DaylightingManager::NPHMAX, - DaylightingManager::NTHMAX); // Ratio of obstructed to unobstructed sky diffuse at a ground point for each (TH,PH) direction - this->FLFWSK = Array2D(DataSurfaces::MaxSlatAngs + 1, 4); // Sky-related downgoing luminous flux - this->ObTransM = Array2D(DaylightingManager::NPHMAX, DaylightingManager::NTHMAX); // ObTrans value for each (TH,PH) direction - this->SFSKHR = Array2D(2, 4); // Sky source luminance factor for sky type (second index), bare/shaded window (first index) - this->DFSKHR = Array2D(2, 4); // Sky daylight factor for sky type (second index), bare/shaded window (first index) - this->BFSKHR = Array2D(2, 4); // Sky background luminance factor for sky type (second index), bare/shaded window (first index) + this->FLCWSK.clear(); + this->SkyObstructionMult = Array2D(DaylightingManager::NPHMAX, DaylightingManager::NTHMAX); + this->FLFWSK.clear(); + this->ObTransM = Array2D(DaylightingManager::NPHMAX, DaylightingManager::NTHMAX); + this->SFSKHR = Array2D(2, 4); + this->DFSKHR = Array2D(2, 4); + this->BFSKHR = Array2D(2, 4); this->tmpIllumFromWinAtRefPt.clear(); this->tmpBackLumFromWinAtRefPt.clear(); this->tmpSourceLumFromWinAtRefPt.clear();