Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into vrfFluidCtrlFixCoo…
Browse files Browse the repository at this point in the history
…lingCycling
  • Loading branch information
Myoldmopar committed Sep 10, 2024
2 parents eb4bc0e + 08056a2 commit 5907d73
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/EnergyPlus/ConvectionCoefficients.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6301,7 +6301,7 @@ Real64 CalcClearRoof(EnergyPlusData &state,

Real64 Rf = RoughnessMultiplier[(int)RoughnessIndex];
if (Rex > 0.1) { // avoid zero and crazy small denominators
Real64 tmp = std::log(1.0 + GrLn / pow_2(Rex));
Real64 tmp = std::log1p(GrLn / pow_2(Rex));
eta = tmp / (1.0 + tmp);
} else {
eta = 1.0; // forced convection gone because no wind
Expand Down

4 comments on commit 5907d73

@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.

vrfFluidCtrlFixCoolingCycling (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (2904 of 2904 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.

vrfFluidCtrlFixCoolingCycling (Myoldmopar) - Win64-Windows-10-VisualStudio-16: OK (2882 of 2882 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.

vrfFluidCtrlFixCoolingCycling (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-RelWithDebInfo: OK (2088 of 2088 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.

vrfFluidCtrlFixCoolingCycling (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-RelWithDebInfo: OK (799 of 799 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.