Skip to content

Commit

Permalink
Run clang-format on changed lines
Browse files Browse the repository at this point in the history
  • Loading branch information
lefticus committed Nov 13, 2020
1 parent 3fa2195 commit a29b55a
Show file tree
Hide file tree
Showing 179 changed files with 7,928 additions and 2,610 deletions.
6 changes: 4 additions & 2 deletions src/EnergyPlus/AirLoopHVACDOAS.cc
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,8 @@ namespace AirLoopHVACDOAS {
thisDOAS.NumOfAirLoops = fields.at("number_of_airloophvac"); //
if (thisDOAS.NumOfAirLoops < 1) {
cFieldName = "Number of AirLoopHVAC";
ShowSevereError(state, fmt::format("{}, \"{}\" {} = {}", cCurrentModuleObject, thisDOAS.Name, cFieldName, thisDOAS.NumOfAirLoops));
ShowSevereError(state,
fmt::format("{}, \"{}\" {} = {}", cCurrentModuleObject, thisDOAS.Name, cFieldName, thisDOAS.NumOfAirLoops));
ShowContinueError(state, " The minimum value should be 1.");
errorsFound = true;
}
Expand Down Expand Up @@ -1021,7 +1022,8 @@ namespace AirLoopHVACDOAS {
if (loop.ConveCount == 0) {
++loop.ConveCount;
ShowWarningError(state, "Convergence limit is above 1.0e-6 for unit=" + loop.Name);
ShowContinueErrorTimeStamp(state, format("The max difference of node temperatures between AirLoopDOAS outlet and OA mixer inlet ={:.6R}", maxDiff));
ShowContinueErrorTimeStamp(
state, format("The max difference of node temperatures between AirLoopDOAS outlet and OA mixer inlet ={:.6R}", maxDiff));
} else {
++loop.ConveCount;
ShowRecurringWarningErrorAtEnd(loop.Name +
Expand Down
7 changes: 5 additions & 2 deletions src/EnergyPlus/AirflowNetwork/src/Properties.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,17 @@ namespace AirflowNetwork {
if (lowerLimitErrIdx == 0) {
ShowWarningMessage(state, "Air temperature below lower limit of -20C for conductivity calculation");
}
ShowRecurringWarningErrorAtEnd(format("Air temperature below lower limit of -20C for conductivity calculation. Air temperature of {:.1R} used for conductivity calculation.", LowerLimit),
ShowRecurringWarningErrorAtEnd(format("Air temperature below lower limit of -20C for conductivity calculation. Air temperature of {:.1R} "
"used for conductivity calculation.",
LowerLimit),
lowerLimitErrIdx);
T = LowerLimit;
} else if (T > UpperLimit) {
if (upperLimitErrIdx == 0) {
ShowWarningMessage(state, "Air temperature above upper limit of 70C for conductivity calculation");
}
ShowRecurringWarningErrorAtEnd(format("Air temperature above upper limit of 70C for conductivity calculation. Air temperature of {:.1R} used for conductivity calculation.",
ShowRecurringWarningErrorAtEnd(format("Air temperature above upper limit of 70C for conductivity calculation. Air temperature of {:.1R} "
"used for conductivity calculation.",
UpperLimit),
upperLimitErrIdx);
T = UpperLimit;
Expand Down
118 changes: 88 additions & 30 deletions src/EnergyPlus/AirflowNetworkBalanceManager.cc

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions src/EnergyPlus/Autosizing/Base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,7 @@ void BaseSizer::selectSizerOutput(EnergyPlusData &state, bool &errorsFound)
std::string msg = this->callingRoutine + ": Potential issue with equipment sizing for " + this->compType + ' ' + this->compName;
this->addErrorMessage(msg);
ShowMessage(state, msg);
msg =
format("User-Specified {}{} = {:.5R}", this->sizingStringScalable, this->sizingString, this->originalValue);
msg = format("User-Specified {}{} = {:.5R}", this->sizingStringScalable, this->sizingString, this->originalValue);
this->addErrorMessage(msg);
ShowContinueError(state, msg);
msg = format("differs from Design Size {} = {:.5R}", this->sizingString, this->autoSizedValue);
Expand Down Expand Up @@ -527,8 +526,7 @@ void BaseSizer::select2StgDXHumCtrlSizerOutput(EnergyPlusData &state, bool &erro
std::string msg = this->callingRoutine + ": Potential issue with equipment sizing for " + this->compType + ' ' + this->compName;
this->addErrorMessage(msg);
ShowMessage(state, msg);
msg =
format("User-Specified {}{} = {:.5R}", this->sizingStringScalable, this->sizingString, this->originalValue);
msg = format("User-Specified {}{} = {:.5R}", this->sizingStringScalable, this->sizingString, this->originalValue);
this->addErrorMessage(msg);
ShowContinueError(state, msg);
msg = format("differs from Design Size {} = {:.5R}", this->sizingString, this->autoSizedValue);
Expand Down
Loading

5 comments on commit a29b55a

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

remove_round_trim_cleanup_formatting (lefticus) - x86_64-MacOS-10.15-clang-11.0.0: Build Failed

Failures:\n

API Test Summary

  • Failed: 6
  • notrun: 3

integration Test Summary

  • Passed: 2
  • Failed: 717

regression Test Summary

  • Passed: 715
  • Failed: 2

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.

remove_round_trim_cleanup_formatting (lefticus) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: Build Failed

Failures:\n

API Test Summary

  • Failed: 6
  • notrun: 3

integration Test Summary

  • Passed: 2
  • Failed: 720

regression Test Summary

  • Passed: 735
  • Failed: 2

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.

remove_round_trim_cleanup_formatting (lefticus) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: Build Failed

Failures:\n

API Test Summary

  • Failed: 6
  • notrun: 3

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.

remove_round_trim_cleanup_formatting (lefticus) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: Build Failed

Failures:\n

integration Test Summary

  • Passed: 2
  • Failed: 720

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

remove_round_trim_cleanup_formatting (lefticus) - Win64-Windows-10-VisualStudio-16: Build Failed

Failures:\n

API Test Summary

  • Failed: 1
  • notrun: 3

integration Test Summary

  • Passed: 2
  • Failed: 717

Build Badge Test Badge

Please sign in to comment.