Skip to content

Commit

Permalink
reduce again, same expression
Browse files Browse the repository at this point in the history
  • Loading branch information
rraustad committed Aug 30, 2024
1 parent 79dde14 commit 1c4c95b
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions src/EnergyPlus/DaylightingManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8925,11 +8925,11 @@ void DayltgInteriorMapIllum(EnergyPlusData &state)
if (state.dataSurface->SurfWinWindowModelType(IWin) == WindowModel::BSDF) break;
if (NOT_SHADED(state.dataSurface->SurfWinShadingFlag(IWin)) && !state.dataSurface->SurfWinSolarDiffusing(IWin)) break;
}
auto const &dfhr2 = DFHR[iWinCover];
auto const &dfhr3 = DFHR[iWinCover];

thisMap.refPts(ILB).winLums(loop)[iWinCover] = tmpDFHR[iWinCover].sun * state.dataEnvrn->HISUNF +
HorIllSkyFac * (dfhr2.sky[iSky1] * SkyWeight * tmpHorIll.sky[iSky1] +
dfhr2.sky[iSky2] * (1.0 - SkyWeight) * tmpHorIll.sky[iSky2]);
HorIllSkyFac * (dfhr3.sky[iSky1] * SkyWeight * tmpHorIll.sky[iSky1] +
dfhr3.sky[iSky2] * (1.0 - SkyWeight) * tmpHorIll.sky[iSky2]);
}

} // End of reference point loop
Expand Down Expand Up @@ -9773,8 +9773,7 @@ void CalcMinIntWinSolidAngs(EnergyPlusData &state)
Vector3<Real64> W23 = W3 - W2;
Real64 HW = W21.magnitude();
Real64 WW = W23.magnitude();
Vector3<Real64> WC =
(is_Rectangle) ? (W2 + (W23 + W21) / 2.0) : (is_Triangle ? (W2 + (W23 + W21) / 3.0) : (W2 + (W23 + W21) / 3.0));
Vector3<Real64> WC = (is_Rectangle) ? (W2 + (W23 + W21) / 2.0) : (W2 + (W23 + W21) / 3.0);

// Vector from ref point to center of window
Vector3<Real64> REFWC = WC - RREF;
Expand Down

4 comments on commit 1c4c95b

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CppCheck-DaylightingManager (rraustad) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3706 of 3706 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CppCheck-DaylightingManager (rraustad) - Win64-Windows-10-VisualStudio-16: OK (2871 of 2871 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CppCheck-DaylightingManager (rraustad) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (2077 of 2077 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CppCheck-DaylightingManager (rraustad) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (797 of 797 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.