Skip to content

Commit

Permalink
Revise and update another function
Browse files Browse the repository at this point in the history
  • Loading branch information
rraustad committed Aug 16, 2024
1 parent 167a8bb commit 339fe3b
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions src/EnergyPlus/UtilityRoutines.cc
Original file line number Diff line number Diff line change
Expand Up @@ -548,12 +548,12 @@ int AbortEnergyPlus(EnergyPlusData &state)
CloseMiscOpenFiles(state);
NumWarnings = fmt::to_string(state.dataErrTracking->TotalWarningErrors);
NumSevere = fmt::to_string(state.dataErrTracking->TotalSevereErrors);
NumWarningsDuringWarmup =
fmt::to_string(state.dataErrTracking->TotalWarningErrorsDuringWarmup + state.dataErrTracking->TotalWarningErrorsDuringInputs);
NumSevereDuringWarmup =
fmt::to_string(state.dataErrTracking->TotalSevereErrorsDuringWarmup + state.dataErrTracking->TotalSevereErrorsDuringInputs);
NumWarningsDuringSizing = fmt::to_string(state.dataErrTracking->TotalWarningErrorsDuringSizing);
NumSevereDuringSizing = fmt::to_string(state.dataErrTracking->TotalSevereErrorsDuringSizing);
NumWarningsDuringWarmup = fmt::to_string(state.dataErrTracking->TotalWarningErrorsDuringWarmup);
NumSevereDuringWarmup = fmt::to_string(state.dataErrTracking->TotalSevereErrorsDuringWarmup);
NumWarningsDuringSizing =
fmt::to_string(state.dataErrTracking->TotalWarningErrorsDuringSizing + state.dataErrTracking->TotalWarningErrorsDuringInputs);
NumSevereDuringSizing =
fmt::to_string(state.dataErrTracking->TotalSevereErrorsDuringSizing + state.dataErrTracking->TotalSevereErrorsDuringInputs);

// catch up with timings if in middle
state.dataSysVars->runtimeTimer.tock();
Expand Down Expand Up @@ -682,9 +682,11 @@ int EndEnergyPlus(EnergyPlusData &state)
strip(NumWarningsDuringWarmup);
NumSevereDuringWarmup = fmt::to_string(state.dataErrTracking->TotalSevereErrorsDuringWarmup);
strip(NumSevereDuringWarmup);
NumWarningsDuringSizing = fmt::to_string(state.dataErrTracking->TotalWarningErrorsDuringSizing);
NumWarningsDuringSizing =
fmt::to_string(state.dataErrTracking->TotalWarningErrorsDuringSizing + state.dataErrTracking->TotalWarningErrorsDuringInputs);
strip(NumWarningsDuringSizing);
NumSevereDuringSizing = fmt::to_string(state.dataErrTracking->TotalSevereErrorsDuringSizing);
NumSevereDuringSizing =
fmt::to_string(state.dataErrTracking->TotalSevereErrorsDuringSizing + state.dataErrTracking->TotalSevereErrorsDuringInputs);
strip(NumSevereDuringSizing);

state.dataSysVars->runtimeTimer.tock();
Expand Down

5 comments on commit 339fe3b

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

Round2_init_state_use (rraustad) - Win64-Windows-10-VisualStudio-16: OK (2866 of 2866 tests passed, 0 test warnings)

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.

Round2_init_state_use (rraustad) - x86_64-MacOS-10.18-clang-15.0.0: OK (3659 of 3659 tests passed, 82 test warnings)

Messages:\n

  • 34 tests had: EDD diffs.
  • 30 tests had: ERR diffs.
  • 19 tests had: EIO diffs.
  • 1 test had: AUD diffs.
  • 1 test had: RDD diffs.

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.

Round2_init_state_use (rraustad) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3700 of 3700 tests passed, 84 test warnings)

Messages:\n

  • 36 tests had: EDD diffs.
  • 30 tests had: ERR diffs.
  • 19 tests had: EIO diffs.
  • 1 test had: AUD diffs.
  • 1 test had: RDD diffs.

Build Badge Test 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.

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

Build Badge Test Badge Coverage 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.

Round2_init_state_use (rraustad) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (2069 of 2073 tests passed, 0 test warnings)

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1577
  • NUMERICAL: 3

ZoneUnitarySysTest Test Summary

  • Passed: 26
  • NUMERICAL: 1

Build Badge Test Badge Coverage Badge

Please sign in to comment.