Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove round trim cleanup formatting #8379

Merged
merged 8 commits into from
Nov 21, 2020
Merged

Remove round trim cleanup formatting #8379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
16efb27
Remove RoundSigDigits and TrimSigDigits, use libfmt
lefticus Nov 13, 2020
3fa2195
Remove misplaced "state, "'s
lefticus Nov 13, 2020
a29b55a
Run clang-format on changed lines
lefticus Nov 13, 2020
595e0f8
Fix missing header include
lefticus Nov 13, 2020
a7adbb2
Escape name scope for ::fmt to avoid conflicts with Objexx
lefticus Nov 15, 2020
1236d0c
Merge branch 'develop' into remove_round_trim_cleanup_formatting
mitchute Nov 19, 2020
d417c92
Merge branch 'develop' into remove_round_trim_cleanup_formatting
mitchute Nov 20, 2020
0b0512f
fix botched merge conflict
mitchute Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/EnergyPlus/AirLoopHVACDOAS.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ namespace AirLoopHVACDOAS {
if (!(CompNum == 1 || CompNum == state.dataAirLoop->OutsideAirSys(thisDOAS.m_OASystemNum).NumComponents)) {
ShowSevereError(state, "The fan placement is either first as blow through or last as draw through in" + CurrentModuleObject +
" = " + state.dataAirLoop->OutsideAirSys(thisDOAS.m_OASystemNum).ComponentName(CompNum));
ShowContinueError(state, "The current position is number " + General::RoundSigDigits(CompNum));
ShowContinueError(state, format("The current position is number {}", CompNum));
errorsFound = true;
}
} else if (SELECT_CASE_var == "FAN:COMPONENTMODEL") {
Expand All @@ -460,7 +460,7 @@ namespace AirLoopHVACDOAS {
if (!(CompNum == 1 || CompNum == state.dataAirLoop->OutsideAirSys(thisDOAS.m_OASystemNum).NumComponents)) {
ShowSevereError(state, "The fan placement is either first as blow through or last as draw through in" + CurrentModuleObject +
" = " + state.dataAirLoop->OutsideAirSys(thisDOAS.m_OASystemNum).ComponentName(CompNum));
ShowContinueError(state, "The current position is number " + General::RoundSigDigits(CompNum));
ShowContinueError(state, format("The current position is number {}", CompNum));
errorsFound = true;
}
} else if (SELECT_CASE_var == "COIL:COOLING:WATER") {
Expand Down Expand Up @@ -742,8 +742,8 @@ namespace AirLoopHVACDOAS {
thisDOAS.NumOfAirLoops = fields.at("number_of_airloophvac"); //
if (thisDOAS.NumOfAirLoops < 1) {
cFieldName = "Number of AirLoopHVAC";
ShowSevereError(state, cCurrentModuleObject + ", \"" + thisDOAS.Name + "\" " + cFieldName + " = " +
General::TrimSigDigits(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,8 +1021,8 @@ namespace AirLoopHVACDOAS {
if (loop.ConveCount == 0) {
++loop.ConveCount;
ShowWarningError(state, "Convergence limit is above 1.0e-6 for unit=" + loop.Name);
ShowContinueErrorTimeStamp(state, "The max difference of node temperatures between AirLoopDOAS outlet and OA mixer inlet =" +
General::RoundSigDigits(maxDiff, 6));
ShowContinueErrorTimeStamp(
state, format("The max difference of node temperatures between AirLoopDOAS outlet and OA mixer inlet ={:.6R}", maxDiff));
} else {
++loop.ConveCount;
ShowRecurringWarningErrorAtEnd(state, loop.Name +
Expand Down
12 changes: 6 additions & 6 deletions src/EnergyPlus/AirflowNetwork/src/Properties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,18 @@ namespace AirflowNetwork {
if (lowerLimitErrIdx == 0) {
ShowWarningMessage(state, "Air temperature below lower limit of -20C for conductivity calculation");
}
ShowRecurringWarningErrorAtEnd(state, "Air temperature below lower limit of -20C for conductivity calculation. "
"Air temperature of " + General::RoundSigDigits(LowerLimit, 1) +
" used for conductivity calculation.",
ShowRecurringWarningErrorAtEnd(state, 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(state, "Air temperature below lower limit of 70C for conductivity calculation. "
"Air temperature of " + General::RoundSigDigits(UpperLimit, 1) +
" used for conductivity calculation.",
ShowRecurringWarningErrorAtEnd(state, 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
Loading