Skip to content

Remove fmt - Part 2: Remove {R}, Files A-D #11588

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

Open
mitchute wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Remove fmt - Part 2: Remove {R}, Files A-D #11588

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d3b779
first pass at removing {R} string formatting for files A-D
mitchute May 11, 2026
90012ae
adjust component sizing information output
mitchute May 13, 2026
529077a
normalize all 'm3/s/W' values to use '{:G}' formatting
mitchute May 14, 2026
e4cfbaa
uppercase exponents
mitchute May 15, 2026
1f0bd7e
touch up DFS file diffs
mitchute May 15, 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
3 changes: 1 addition & 2 deletions src/EnergyPlus/AirLoopHVACDOAS.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1158,8 +1158,7 @@ namespace AirLoopHVACDOAS {
++loop.ConveCount;
ShowWarningError(state, std::format("Convergence limit is above 1.0e-6 for unit={}", loop.Name));
ShowContinueErrorTimeStamp(
state,
EnergyPlus::format("The max difference of node temperatures between AirLoopDOAS outlet and OA mixer inlet ={:.6R}", maxDiff));
state, std::format("The max difference of node temperatures between AirLoopDOAS outlet and OA mixer inlet ={:.6f}", maxDiff));
} else {
++loop.ConveCount;
ShowRecurringWarningErrorAtEnd(
Expand Down
10 changes: 7 additions & 3 deletions src/EnergyPlus/Autosizing/Base.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,11 @@ void BaseSizer::reportSizerOutput(EnergyPlusData &state,

static constexpr std::string_view Format_990(
"! <Component Sizing Information>, Component Type, Component Name, Input Field Description, Value\n");
static constexpr std::string_view Format_991(" Component Sizing Information, {}, {}, {}, {:.5R}\n");
static constexpr std::string_view Format_991(" Component Sizing Information, {}, {}, {}, {:.5f}\n");
Copy link
Copy Markdown
Collaborator

@rraustad rraustad May 12, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

I am assuming this change is the reason for this type of diff. Maybe use E here?
File: UnitarySystem_ZoneVSWSHP_wDOAS

Image

static constexpr std::string_view Format_991_HumRat(" Component Sizing Information, {}, {}, {}, {:.3E}\n");
auto const sizingFormat = [](std::string_view description) {
return description.find("Humidity Ratio") != std::string_view::npos ? Format_991_HumRat : Format_991;
};
Comment on lines +316 to +320
Copy link
Copy Markdown
Collaborator Author

@mitchute mitchute May 15, 2026

Choose a reason for hiding this comment

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

1ZoneDataCenterCRAC_wApproachTemp_ClassH1/eplusout.eio.diff

- Component Sizing Information, Fan:VariableVolume, EC PLUG FAN 1, Design Electric Power Consumption [W], 5901.42857
+ Component Sizing Information, Fan:VariableVolume, EC PLUG FAN 1, Design Electric Power Consumption [W], 5901.43

CoolingTowerWithDBDeltaTempOp/eplusout.eio.diff

- Component Sizing Information, Coil:Cooling:Water, MAIN COOLING COIL 1, Design Size Design Inlet Air Temperature [C], 26.94481
- Component Sizing Information, Coil:Cooling:Water, MAIN COOLING COIL 1, Design Size Design Inlet Air Humidity Ratio [kgWater/kgDryAir], 1.15091E-002
- Component Sizing Information, Coil:Cooling:Water, MAIN COOLING COIL 1, Design Size Design Coil Load [W], 38693.32884
+ Component Sizing Information, Coil:Cooling:Water, MAIN COOLING COIL 1, Design Size Design Inlet Air Temperature [C], 26.9448
+ Component Sizing Information, Coil:Cooling:Water, MAIN COOLING COIL 1, Design Size Design Inlet Air Humidity Ratio [kgWater/kgDryAir], 1.151E-02
+ Component Sizing Information, Coil:Cooling:Water, MAIN COOLING COIL 1, Design Size Design Coil Load [W], 38693.3


// to do, make this a parameter. Unfortunately this function is used in MANY
// places so it involves touching most of E+
Expand All @@ -322,12 +326,12 @@ void BaseSizer::reportSizerOutput(EnergyPlusData &state,
state.dataEnvrn->oneTimeCompRptHeaderFlag = false;
}

print(state.files.eio, Format_991, CompType, CompName, VarDesc, VarValue);
print(state.files.eio, sizingFormat(VarDesc), CompType, CompName, VarDesc, VarValue);
// add to tabular output reports
OutputReportPredefined::AddCompSizeTableEntry(state, CompType, CompName, VarDesc, VarValue);

if (present(UsrDesc) && present(UsrValue)) {
print(state.files.eio, Format_991, CompType, CompName, UsrDesc(), UsrValue());
print(state.files.eio, sizingFormat(UsrDesc()), CompType, CompName, UsrDesc(), UsrValue());
OutputReportPredefined::AddCompSizeTableEntry(state, CompType, CompName, UsrDesc(), UsrValue);
} else if (present(UsrDesc) || present(UsrValue)) {
ShowFatalError(state, "ReportSizingOutput: (Developer Error) - called with user-specified description or value but not both.");
Expand Down
18 changes: 9 additions & 9 deletions src/EnergyPlus/Autosizing/CoolingWaterDesAirOutletHumRatSizing.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ Real64 CoolingWaterDesAirOutletHumRatSizer::size(EnergyPlusData &state, Real64 _
this->callingRoutine + ":" + " Coil=\"" + this->compName + "\", Cooling Coil has leaving humidity ratio > entering humidity ratio.";
this->addErrorMessage(msg);
ShowWarningError(state, msg);
msg = EnergyPlus::format(" Wair,in = {:.6R} [kgWater/kgDryAir]", this->dataDesInletAirHumRat);
msg = std::format(" Wair,in = {:.3E} [kgWater/kgDryAir]", this->dataDesInletAirHumRat);
this->addErrorMessage(msg);
ShowContinueError(state, msg);
msg = EnergyPlus::format(" Wair,out = {:.6R} [kgWater/kgDryAir]", this->autoSizedValue);
msg = std::format(" Wair,out = {:.3E} [kgWater/kgDryAir]", this->autoSizedValue);
this->addErrorMessage(msg);
ShowContinueError(state, msg);
if (this->dataDesInletAirHumRat > 0.016) {
Expand All @@ -116,7 +116,7 @@ Real64 CoolingWaterDesAirOutletHumRatSizer::size(EnergyPlusData &state, Real64 _
msg = "....coil leaving humidity ratio will be reset to:";
this->addErrorMessage(msg);
ShowContinueError(state, msg);
msg = EnergyPlus::format(" Wair,out = {:.6R} [kgWater/kgDryAir]", this->autoSizedValue);
msg = std::format(" Wair,out = {:.3E} [kgWater/kgDryAir]", this->autoSizedValue);
this->addErrorMessage(msg);
ShowContinueError(state, msg);
}
Expand All @@ -132,24 +132,24 @@ Real64 CoolingWaterDesAirOutletHumRatSizer::size(EnergyPlusData &state, Real64 _
"temperature > design air entering humidity ratio.";
this->addErrorMessage(msg);
ShowWarningError(state, msg);
msg = EnergyPlus::format(" Wair,in = {:.6R} [kgWater/kgDryAir]", this->dataDesInletAirHumRat);
msg = std::format(" Wair,in = {:.3E} [kgWater/kgDryAir]", this->dataDesInletAirHumRat);
this->addErrorMessage(msg);
ShowContinueError(state, msg);
msg = EnergyPlus::format(" Wair,out = {:.6R} [kgWater/kgDryAir]", this->autoSizedValue);
msg = std::format(" Wair,out = {:.3E} [kgWater/kgDryAir]", this->autoSizedValue);
this->addErrorMessage(msg);
ShowContinueError(state, msg);
msg = EnergyPlus::format(" Inlet chilled water temperature = {:.3R} [C]", this->dataDesInletWaterTemp);
msg = std::format(" Inlet chilled water temperature = {:.3f} [C]", this->dataDesInletWaterTemp);
this->addErrorMessage(msg);
ShowContinueError(state, msg);
msg = EnergyPlus::format(" Minimum humidity ratio at saturation for inlet chilled water temperature = {:.6R} [kgWater/kgDryAir]",
desHumRatAtWaterInTemp);
msg = std::format(" Minimum humidity ratio at saturation for inlet chilled water temperature = {:.3E} [kgWater/kgDryAir]",
desHumRatAtWaterInTemp);
this->addErrorMessage(msg);
ShowContinueError(state, msg);
this->autoSizedValue = this->dataDesInletAirHumRat;
msg = "....coil leaving humidity ratio will be reset to:";
this->addErrorMessage(msg);
ShowContinueError(state, msg);
msg = EnergyPlus::format(" Wair,out = {:.6R} [kgWater/kgDryAir]", this->autoSizedValue);
msg = std::format(" Wair,out = {:.3E} [kgWater/kgDryAir]", this->autoSizedValue);
this->addErrorMessage(msg);
ShowContinueError(state, msg);
}
Expand Down
12 changes: 6 additions & 6 deletions src/EnergyPlus/Autosizing/CoolingWaterDesAirOutletTempSizing.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,17 @@ Real64 CoolingWaterDesAirOutletTempSizer::size(EnergyPlusData &state, Real64 _or
"\", Cooling Coil has leaving air temperature < entering water temperature.";
this->addErrorMessage(msg);
ShowWarningError(state, msg);
msg = EnergyPlus::format(" Tair,out = {:.3R}", this->autoSizedValue);
msg = std::format(" Tair,out = {:.3f}", this->autoSizedValue);
this->addErrorMessage(msg);
ShowContinueError(state, msg);
msg = EnergyPlus::format(" Twater,in = {:.3R}", this->dataDesInletWaterTemp);
msg = std::format(" Twater,in = {:.3f}", this->dataDesInletWaterTemp);
this->addErrorMessage(msg);
ShowContinueError(state, msg);
this->autoSizedValue = this->dataDesInletWaterTemp + 0.5;
msg = "....coil leaving air temperature will be reset to:";
this->addErrorMessage(msg);
ShowContinueError(state, msg);
msg = EnergyPlus::format(" Tair,out = {:.3R}", this->autoSizedValue);
msg = std::format(" Tair,out = {:.3f}", this->autoSizedValue);
this->addErrorMessage(msg);
ShowContinueError(state, msg);
}
Expand Down Expand Up @@ -156,14 +156,14 @@ Real64 CoolingWaterDesAirOutletTempSizer::size(EnergyPlusData &state, Real64 _or
"\", Cooling Coil has leaving air temperature < entering water temperature.";
this->addErrorMessage(msg);
ShowWarningError(state, msg);
msg = EnergyPlus::format(" Tair,out = {:.3R}", this->autoSizedValue);
msg = std::format(" Tair,out = {:.3f}", this->autoSizedValue);
ShowContinueError(state, msg);
msg = EnergyPlus::format(" Twater,in = {:.3R}", this->dataDesInletWaterTemp);
msg = std::format(" Twater,in = {:.3f}", this->dataDesInletWaterTemp);
ShowContinueError(state, msg);
this->autoSizedValue = this->dataDesInletWaterTemp + 0.5;
msg = "....coil leaving air temperature will be reset to:";
ShowContinueError(state, msg);
msg = EnergyPlus::format(" Tair,out = {:.3R}", this->autoSizedValue);
msg = std::format(" Tair,out = {:.3f}", this->autoSizedValue);
ShowContinueError(state, msg);
}
}
Expand Down
24 changes: 11 additions & 13 deletions src/EnergyPlus/BaseboardRadiator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,12 +685,11 @@ namespace BaseboardRadiator {
std::format(
"SizeBaseboard: Potential issue with equipment sizing for ZoneHVAC:Baseboard:Convective:Water=\"{}\".",
this->EquipID));
ShowContinueError(
state, std::format("User-Specified Maximum Water Flow Rate of {:.5f} [m3/s]", WaterVolFlowRateMaxUser));
ShowContinueError(
state,
EnergyPlus::format("User-Specified Maximum Water Flow Rate of {:.5R} [m3/s]", WaterVolFlowRateMaxUser));
ShowContinueError(state,
EnergyPlus::format("differs from Design Size Maximum Water Flow Rate of {:.5R} [m3/s]",
WaterVolFlowRateMaxDes));
std::format("differs from Design Size Maximum Water Flow Rate of {:.5f} [m3/s]", WaterVolFlowRateMaxDes));
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 @@ -831,9 +830,9 @@ namespace BaseboardRadiator {
ShowContinueError(
state,
std::format("Design UA set equal to design coil load for {}=\"{}\"", cCMO_BBRadiator_Water, this->EquipID));
ShowContinueError(state, EnergyPlus::format("Design coil load used during sizing = {:.5R} W.", DesCoilLoad));
ShowContinueError(
state, EnergyPlus::format("Inlet water temperature used during sizing = {:.5R} C.", this->WaterInletTemp));
ShowContinueError(state, std::format("Design coil load used during sizing = {:.5f} W.", DesCoilLoad));
ShowContinueError(state,
std::format("Inlet water temperature used during sizing = {:.5f} C.", this->WaterInletTemp));
}
}
} else { // baseboard design load is less than output at UA = 0.001 * design load so set UA to minimum value
Expand All @@ -847,9 +846,8 @@ namespace BaseboardRadiator {
std::format("Design UA set equal to 0.001 * design coil load for {}=\"{}\"",
cCMO_BBRadiator_Water,
this->EquipID));
ShowContinueError(state, EnergyPlus::format("Design coil load used during sizing = {:.5R} W.", DesCoilLoad));
ShowContinueError(state,
EnergyPlus::format("Inlet water temperature used during sizing = {:.5R} C.", this->WaterInletTemp));
ShowContinueError(state, std::format("Design coil load used during sizing = {:.5f} W.", DesCoilLoad));
ShowContinueError(state, std::format("Inlet water temperature used during sizing = {:.5f} C.", this->WaterInletTemp));
}
}

Expand Down Expand Up @@ -879,9 +877,9 @@ namespace BaseboardRadiator {
std::format(
"SizeBaseboard: Potential issue with equipment sizing for ZoneHVAC:Baseboard:Convective:Water=\"{}\".",
this->EquipID));
ShowContinueError(state, EnergyPlus::format("User-Specified U-Factor Times Area Value of {:.2R} [W/K]", UAUser));
ShowContinueError(
state, EnergyPlus::format("differs from Design Size U-Factor Times Area Value of {:.2R} [W/K]", UADes));
ShowContinueError(state, std::format("User-Specified U-Factor Times Area Value of {:.2f} [W/K]", UAUser));
ShowContinueError(state,
std::format("differs from Design Size U-Factor Times Area Value of {:.2f} [W/K]", UADes));
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
14 changes: 6 additions & 8 deletions src/EnergyPlus/BoilerSteam.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,14 +226,13 @@ namespace BoilerSteam {

if (thisBoiler.MinPartLoadRat < 0.0) {
ShowSevereError(state, EnergyPlus::format("{}{}=\"{}\",", RoutineName, state.dataIPShortCut->cCurrentModuleObject, boilerName));
ShowContinueError(state, EnergyPlus::format("Invalid {}={:.3R}", "Minimum Part Load Ratio", thisBoiler.MinPartLoadRat));
ShowContinueError(state, std::format("Invalid {}={:.3f}", "Minimum Part Load Ratio", thisBoiler.MinPartLoadRat));
ErrorsFound = true;
}

if (thisBoiler.TempUpLimitBoilerOut == 0.0) {
ShowSevereError(state, EnergyPlus::format("{}{}=\"{}\",", RoutineName, state.dataIPShortCut->cCurrentModuleObject, boilerName));
ShowContinueError(state,
EnergyPlus::format("Invalid {}={:.3R}", "Design Outlet Steam Temperature", thisBoiler.TempUpLimitBoilerOut));
ShowContinueError(state, std::format("Invalid {}={:.3f}", "Design Outlet Steam Temperature", thisBoiler.TempUpLimitBoilerOut));
ErrorsFound = true;
}
thisBoiler.BoilerInletNodeNum = Node::GetOnlySingleNode(state,
Expand Down Expand Up @@ -570,9 +569,8 @@ namespace BoilerSteam {
if (state.dataGlobal->DisplayExtraWarnings) {
if ((std::abs(tmpNomCap - NomCapUser) / NomCapUser) > state.dataSize->AutoVsHardSizingThreshold) {
ShowMessage(state, EnergyPlus::format("SizePump: Potential issue with equipment sizing for {}", this->Name));
ShowContinueError(state, EnergyPlus::format("User-Specified Nominal Capacity of {:.2R} [W]", NomCapUser));
ShowContinueError(state,
EnergyPlus::format("differs from Design Size Nominal Capacity of {:.2R} [W]", tmpNomCap));
ShowContinueError(state, std::format("User-Specified Nominal Capacity of {:.2f} [W]", NomCapUser));
ShowContinueError(state, std::format("differs from Design Size Nominal Capacity of {:.2f} [W]", tmpNomCap));
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 @@ -664,8 +662,8 @@ namespace BoilerSteam {
ShowSevereError(
state, EnergyPlus::format("Boiler:Steam=\"{}\", Saturation Pressure is greater than Maximum Operating Pressure,", this->Name));
ShowContinueError(state, "Lower Input Temperature");
ShowContinueError(state, EnergyPlus::format("Steam temperature=[{:.2R}] C", this->BoilerOutletTemp));
ShowContinueError(state, EnergyPlus::format("Refrigerant Saturation Pressure =[{:.0R}] Pa", this->BoilerPressCheck));
ShowContinueError(state, std::format("Steam temperature=[{:.2f}] C", this->BoilerOutletTemp));
ShowContinueError(state, std::format("Refrigerant Saturation Pressure =[{:.0f}] Pa", this->BoilerPressCheck));
}
ShowRecurringSevereErrorAtEnd(state,
"Boiler:Steam=\"" + this->Name +
Expand Down
Loading
Loading