Skip to content

Remove fmt: convert S-Z files to std::format (part 6) #11633

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

Merged
mitchute merged 9 commits into from
Jun 12, 2026
Merged

Remove fmt: convert S-Z files to std::format (part 6) #11633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
de7c54e
Remove fmt: convert S-Z files to std::format (part 6)
brianlball Jun 9, 2026
2476378
Show Zone/Space Sizing humidity ratio in scientific to preserve preci…
brianlball Jun 9, 2026
ebe20eb
Stragglers in WindowManager and InternalHeatGains (straightforward)
jmarrec Jun 12, 2026
77dca42
Makes more sense to output the sizing temps with {:.2f} here
jmarrec Jun 12, 2026
dd37953
velosity -> velocity
jmarrec Jun 12, 2026
cb4038b
Update R format in Solver: Do the .f ones
jmarrec Jun 12, 2026
55dd171
Eliminate R fortran formats in tests (except OutputFiles.unit.cc)
jmarrec Jun 12, 2026
36a4900
Update R format in Solver: Do the <N>R to <N+1>G ones for flow rates
jmarrec Jun 12, 2026
281b8dc
Actually AFN Solver.cpp <N>R to <N>f produces less diffs
jmarrec Jun 12, 2026
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
187 changes: 85 additions & 102 deletions src/EnergyPlus/AirflowNetwork/src/Solver.cpp
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/EnergyPlus/InternalHeatGains.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7070,8 +7070,8 @@ namespace InternalHeatGains {
if (std::abs(LowTemperatureDes - thisBBHeat.LowTemperature) > state.dataSize->AutoVsHardSizingDeltaTempThreshold) {
ShowMessage(state,
EnergyPlus::format("{}: Potential issue with equipment sizing for {} {}", RoutineName, CompType, CompName));
ShowContinueError(state, EnergyPlus::format("User-Specified {} = {:.1R}", SizingString, thisBBHeat.LowTemperature));
ShowContinueError(state, EnergyPlus::format("differs from Design Size {} = {:.1R}", SizingString, LowTemperatureDes));
ShowContinueError(state, EnergyPlus::format("User-Specified {} = {:.2f}", SizingString, thisBBHeat.LowTemperature));
ShowContinueError(state, EnergyPlus::format("differs from Design Size {} = {:.2f}", SizingString, LowTemperatureDes));
ShowContinueError(state, "This may, or may not, indicate mismatched component sizes.");
ShowContinueError(state, "Verify that the value entered is intended and is consistent with other components.");
}
Expand Down Expand Up @@ -7104,8 +7104,8 @@ namespace InternalHeatGains {
if (std::abs(HighTemperatureDes - thisBBHeat.HighTemperature) > state.dataSize->AutoVsHardSizingDeltaTempThreshold) {
ShowMessage(state,
EnergyPlus::format("{}: Potential issue with equipment sizing for {} {}", RoutineName, CompType, CompName));
ShowContinueError(state, EnergyPlus::format("User-Specified {} = {:.1R}", SizingString, thisBBHeat.HighTemperature));
ShowContinueError(state, EnergyPlus::format("differs from Design Size {} = {:.1R}", SizingString, HighTemperatureDes));
ShowContinueError(state, EnergyPlus::format("User-Specified {} = {:.2f}", SizingString, thisBBHeat.HighTemperature));
ShowContinueError(state, EnergyPlus::format("differs from Design Size {} = {:.2f}", SizingString, HighTemperatureDes));
ShowContinueError(state, "This may, or may not, indicate mismatched component sizes.");
ShowContinueError(state, "Verify that the value entered is intended and is consistent with other components.");
}
Expand Down
74 changes: 35 additions & 39 deletions src/EnergyPlus/ScheduleManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,8 +551,7 @@ namespace Sched {
NumAlphas = 0;
NumNumbers = 0;
if (NumCommaFileShading > 1) {
ShowWarningError(state,
EnergyPlus::format("{}: More than 1 occurrence of this object found, only first will be used.", CurrentModuleObject));
ShowWarningError(state, std::format("{}: More than 1 occurrence of this object found, only first will be used.", CurrentModuleObject));
}

std::map<fs::path, nlohmann::json>::iterator schedule_file_shading_result;
Expand Down Expand Up @@ -675,27 +674,24 @@ namespace Sched {
int NumCSVAllColumnsSchedules =
schedule_file_shading_result->second["header"].get<std::set<std::string>>().size() - 1; // -1 to account for timestamp column
ShowWarningError(state,
EnergyPlus::format("{}: {}=\"{}\" Removing last column of the CSV since it has '()' for the surface name.",
routineName,
CurrentModuleObject,
Alphas(1)));
std::format("{}: {}=\"{}\" Removing last column of the CSV since it has '()' for the surface name.",
routineName,
CurrentModuleObject,
Alphas(1)));
ShowContinueError(state, "This was a problem in E+ 22.2.0 and below, consider removing it from the file to suppress this warning.");
schedule_file_shading_result->second["header"].erase(NumCSVAllColumnsSchedules);
assert(schedule_file_shading_result->second["header"].size() == schedule_file_shading_result->second["values"].size());
}

if (rowCnt != rowLimitCount) {
if (rowCnt < rowLimitCount) {
ShowSevereError(state,
EnergyPlus::format("{}: {}=\"{}\" {} data values read.", routineName, CurrentModuleObject, Alphas(1), rowCnt));
ShowSevereError(state, std::format("{}: {}=\"{}\" {} data values read.", routineName, CurrentModuleObject, Alphas(1), rowCnt));
} else if (rowCnt > rowLimitCount) {
ShowSevereError(state,
EnergyPlus::format("{}: {}=\"{}\" too many data values read.", routineName, CurrentModuleObject, Alphas(1)));
ShowSevereError(state, std::format("{}: {}=\"{}\" too many data values read.", routineName, CurrentModuleObject, Alphas(1)));
}
ShowContinueError(
state,
EnergyPlus::format("Number of rows in the shading file must be a full year multiplied by the simulation TimeStep: {}.",
rowLimitCount));
std::format("Number of rows in the shading file must be a full year multiplied by the simulation TimeStep: {}.", rowLimitCount));
ShowFatalError(state, "Program terminates due to previous condition.");
}

Expand All @@ -705,7 +701,7 @@ namespace Sched {
if (numerrors > 0) {
ShowWarningError(
state,
EnergyPlus::format(
std::format(
"{}:{}=\"{}\" {} records had errors - these values are set to 0.", routineName, CurrentModuleObject, Alphas(1), numerrors));
}
}
Expand Down Expand Up @@ -782,12 +778,12 @@ namespace Sched {
ShowSevereCustom(
state,
eoh,
EnergyPlus::format("{} [{:.2R}] > {} [{:.2R}].", cNumericFields(1), schedType->minVal, cNumericFields(2), schedType->maxVal));
std::format("{} [{:.2f}] > {} [{:.2f}].", cNumericFields(1), schedType->minVal, cNumericFields(2), schedType->maxVal));
} else {
ShowSevereCustom(
state,
eoh,
EnergyPlus::format("{} [{:.0R}] > {} [{:.0R}].", cNumericFields(1), schedType->minVal, cNumericFields(2), schedType->maxVal));
std::format("{} [{:.0f}] > {} [{:.0f}].", cNumericFields(1), schedType->minVal, cNumericFields(2), schedType->maxVal));
}
ShowContinueError(state, " Other warning/severes about schedule values may appear.");
}
Expand Down Expand Up @@ -842,11 +838,11 @@ namespace Sched {
}

if (daySched->checkValsForLimitViolations(state)) {
ShowWarningCustom(state, eoh, EnergyPlus::format("Values are outside of range for {}={}", cAlphaFields(2), Alphas(2)));
ShowWarningCustom(state, eoh, std::format("Values are outside of range for {}={}", cAlphaFields(2), Alphas(2)));
}

if (daySched->checkValsForBadIntegers(state)) {
ShowWarningCustom(state, eoh, EnergyPlus::format("One or more values are not integer in {}={}", cAlphaFields(2), Alphas(2)));
ShowWarningCustom(state, eoh, std::format("One or more values are not integer in {}={}", cAlphaFields(2), Alphas(2)));
}

} // for (Loop)
Expand Down Expand Up @@ -892,9 +888,9 @@ namespace Sched {
if (NumFields == 0) {
ShowSevereCustom(state,
eoh,
EnergyPlus::format("Insufficient data entered for a full schedule day."
"Number of interval fields == [{}].",
NumFields));
std::format("Insufficient data entered for a full schedule day."
"Number of interval fields == [{}].",
NumFields));
ErrorsFound = true;
}

Expand All @@ -921,11 +917,11 @@ namespace Sched {
daySched->populateFromMinuteVals(state, minuteVals);

if (daySched->checkValsForLimitViolations(state)) {
ShowWarningCustom(state, eoh, EnergyPlus::format("Values are outside of range for {}={}", cAlphaFields(2), Alphas(2)));
ShowWarningCustom(state, eoh, std::format("Values are outside of range for {}={}", cAlphaFields(2), Alphas(2)));
}

if (daySched->checkValsForBadIntegers(state)) {
ShowWarningCustom(state, eoh, EnergyPlus::format("One or more values are not integer in {}={}", cAlphaFields(2), Alphas(2)));
ShowWarningCustom(state, eoh, std::format("One or more values are not integer in {}={}", cAlphaFields(2), Alphas(2)));
}
}

Expand Down Expand Up @@ -972,19 +968,19 @@ namespace Sched {
if (Numbers(1) <= 0.0) {
ShowSevereCustom(state,
eoh,
EnergyPlus::format("Insufficient data entered for a full schedule day."
"...Minutes per Item field = [{}].",
Numbers(1)));
std::format("Insufficient data entered for a full schedule day."
"...Minutes per Item field = [{}].",
Numbers(1)));
ErrorsFound = true;
continue;
}
if (NumNumbers < 25) {
ShowSevereCustom(state,
eoh,
EnergyPlus::format("Insufficient data entered for a full schedule day."
"...Minutes per Item field = [{}] and only [{}] to apply to list fields.",
Numbers(1),
NumNumbers - 1));
std::format("Insufficient data entered for a full schedule day."
"...Minutes per Item field = [{}] and only [{}] to apply to list fields.",
Numbers(1),
NumNumbers - 1));
ErrorsFound = true;
continue;
}
Expand All @@ -994,12 +990,12 @@ namespace Sched {
if ((NumNumbers - 1) != NumExpectedItems) {
ShowSevereCustom(state,
eoh,
EnergyPlus::format("Number of Entered Items={} not equal number of expected items={}"
"based on {}={}",
NumNumbers - 1,
NumExpectedItems,
cNumericFields(1),
MinutesPerItem));
std::format("Number of Entered Items={} not equal number of expected items={}"
"based on {}={}",
NumNumbers - 1,
NumExpectedItems,
cNumericFields(1),
MinutesPerItem));
ErrorsFound = true;
continue;
}
Expand Down Expand Up @@ -2264,9 +2260,9 @@ namespace Sched {
for (auto const *schedType : state.dataSched->scheduleTypes) {
if (schedType->isLimited) {
YesNoLimited = "Yes";
minValStr = EnergyPlus::format("{:.2R}", schedType->minVal);
minValStr = std::format("{:.2f}", schedType->minVal);
strip(minValStr);
maxValStr = EnergyPlus::format("{:.2R}", schedType->maxVal);
maxValStr = std::format("{:.2f}", schedType->maxVal);
strip(maxValStr);
if (schedType->isReal) {
YesNoContinous = "Yes";
Expand Down Expand Up @@ -2381,12 +2377,12 @@ namespace Sched {

if (LevelOfDetail == ReportLevel::Hourly) {
for (int hr = 0; hr < Constant::iHoursInDay; ++hr) {
print(state.files.eio, ",{:.2R}", daySched->tsVals[(hr + 1) * s_glob->TimeStepsInHour - 1]);
print(state.files.eio, ",{:.2f}", daySched->tsVals[(hr + 1) * s_glob->TimeStepsInHour - 1]);
}
} else if (LevelOfDetail == ReportLevel::TimeStep) {
for (int hr = 0; hr < Constant::iHoursInDay; ++hr) {
for (int ts = 0; ts < s_glob->TimeStepsInHour; ++ts) {
print(state.files.eio, ",{:.2R}", daySched->tsVals[hr * s_glob->TimeStepsInHour + ts]);
print(state.files.eio, ",{:.2f}", daySched->tsVals[hr * s_glob->TimeStepsInHour + ts]);
}
}
} else {
Expand Down
Loading
Loading