Skip to content

Commit

Permalink
Rain flag follow dev branch with >=
Browse files Browse the repository at this point in the history
  • Loading branch information
yujiex committed Mar 14, 2022
1 parent b042c39 commit 63a2f62
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/EnergyPlus/WeatherManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2330,9 +2330,7 @@ namespace WeatherManager {
state.dataEnvrn->OpaqueCloudCover = state.dataWeatherManager->TodayOpaqueSkyCover(state.dataGlobal->TimeStep, state.dataGlobal->HourOfDay);

if (state.dataWeatherManager->UseRainValues) {
state.dataEnvrn->IsRain = state.dataWaterData->RainFall.CurrentAmount > 0.8 / 1000.0 / double(state.dataGlobal->NumOfTimeStepInHour);
// state.dataEnvrn->IsRain = state.dataWaterData->RainFall.CurrentAmount > 0.0;
// state.dataEnvrn->IsRain = state.dataWeatherManager->TodayIsRain(state.dataGlobal->TimeStep, state.dataGlobal->HourOfDay);
state.dataEnvrn->IsRain = state.dataWaterData->RainFall.CurrentAmount >= 0.8 / 1000.0 / double(state.dataGlobal->NumOfTimeStepInHour);
} else {
state.dataEnvrn->IsRain = false;
}
Expand Down

5 comments on commit 63a2f62

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

fixRainFlag (yujiex) - Win64-Windows-10-VisualStudio-16: OK (2474 of 2474 tests passed, 0 test warnings)

Build Badge Test Badge

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

fixRainFlag (yujiex) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: OK (1753 of 1753 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.

fixRainFlag (yujiex) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: OK (3276 of 3279 tests passed, 0 test warnings)

Messages:\n

  • 3 tests had: EIO diffs.
  • 3 tests had: MTR big diffs.
  • 3 tests had: SSZ big diffs.
  • 3 tests had: ZSZ big diffs.
  • 3 tests had: Table big diffs.
  • 1 test had: ESO big diffs.

Failures:\n

regression Test Summary

  • Passed: 759
  • Failed: 3

Build Badge Test Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

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

fixRainFlag (yujiex) - x86_64-MacOS-10.15-clang-11.0.0: OK (3235 of 3238 tests passed, 0 test warnings)

Messages:\n

  • 3 tests had: EIO diffs.
  • 3 tests had: MTR big diffs.
  • 3 tests had: SSZ big diffs.
  • 3 tests had: ZSZ big diffs.
  • 3 tests had: Table big diffs.
  • 1 test had: ESO big diffs.

Failures:\n

regression Test Summary

  • Passed: 739
  • Failed: 3

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.

fixRainFlag (yujiex) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: OK (746 of 746 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.