Remove fmt: convert J-R files to std::format (part 5)#11630
Merged
Conversation
Convert EnergyPlus::format/fmt::format -> std::format and {:.NR} -> {:.Nf}
in 35 J-R source files. fmt::join and raw-enum format args are kept on their
fmt entry point (no std::formatter exists). Surface-report view factors stay
{:.2f} (matches the coarse {:.2R} baseline; {:#G} measured worse).
No numeric result diffs; remaining EIO/table diffs are display-precision only.
brianlball
added
the
Refactoring
|
|
Contributor
|
CO2ControlDesignOARateTest fails EnergyPlus/tst/EnergyPlus/unit/MixedAir.unit.cc Line 6847 in 4a09beb - " ** ~~~ ** Minimum OA fraction = 2.9412E-003, Mech Vent OA fraction = 1.5603E-003",
+ " ** ~~~ ** Minimum OA fraction = 0.0029, Mech Vent OA fraction = 0.0016",@brianlball FYI git apply << 'EOF'
diff --git a/tst/EnergyPlus/unit/MixedAir.unit.cc b/tst/EnergyPlus/unit/MixedAir.unit.cc
index 13cef0f122..679a4d8a5c 100644
--- a/tst/EnergyPlus/unit/MixedAir.unit.cc
+++ b/tst/EnergyPlus/unit/MixedAir.unit.cc
@@ -6844,7 +6844,7 @@ TEST_F(EnergyPlusFixture, CO2ControlDesignOARateTest)
"1, Min OA fraction is used.",
" ** ~~~ ** This may be overriding desired ventilation controls. Check inputs for Minimum Outdoor Air Flow Rate, Minimum Outdoor Air "
"Schedule Name and Controller:MechanicalVentilation",
- " ** ~~~ ** Minimum OA fraction = 2.9412E-003, Mech Vent OA fraction = 1.5603E-003",
+ " ** ~~~ ** Minimum OA fraction = 0.0029, Mech Vent OA fraction = 0.0016",
" ** ~~~ ** Environment=, at Simulation time= 00:00 - 00:15",
});
EOF |
@brianlball, you can revert if you don't like it, just figured having CI running while it's nighttime would save you a bit of wait time when you wake up
|
|
View factors span 0-1 and dip below 0.1; {:.2f} truncated those cells
(2.34E-002 -> 0.02). {:#G} matches the parts 2/3 magnitude-spanning
precedent. Geometry columns (area/angles/vertices) stay {:.2f}.
|
|
View factors now render 0.500000 (6 sig figs) instead of 0.50.
|
|
std::format({:#G}, 0.5) renders 0.500000 on MSVC/libstdc++ but
0.50000 on macOS libc++, so there is no portable output and CI cannot
pass. {:.2f} is standardized across STLs and passed all platforms.
Restores the original part-5 state (byte-identical to a29e90c).
Contributor
Author
|
Thanks @jmarrec for catching Status: green on
Note on view factors: I briefly tried (CI re-running on |
|
|
Collaborator
|
@brianlball it looks like there's still some |
|
|
|
|
|
|
Collaborator
|
I think this one is ready to go. The big table and eio diffs are because we turned up the precision slightly in a few places, where it made sense. Develop This branch If you have issues with this or other proposed changes here, let me know. |
Contributor
|
Collaborator
|
|
Collaborator
|
Thanks @brianlball. This one is ready to go. Merging. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part 5 of the Remove-fmt campaign (continues #11553 / #11588 / #11592, and #11619 for the
I*files).Scope — 35 source files, basenames J–R
Convert
EnergyPlus::format/fmt::format→std::formatand remove the custom{R}flag ({:.NR}→{:.Nf}).LowTempRadiantSystem, Material, Micro{CHP,turbine}ElectricGenerator, MixedAir, OutdoorAirUnit, Output{Reports,ReportTabular}, OutsideEnergySources, PackagedThermalStorageCoil, PCMThermalStorage, Photovoltaic{s,ThermalCollectors}, PipeHeatTransfer, Plant{CentralGSHP,Chillers,ComponentTemperatureSources,CondLoopOperation,HeatExchangerFluidToFluid,LoopHeatPumpEIR,Utilities}, Plant/{Loop,LoopSide,PlantManager}, PondGroundHeatExchanger, PoweredInductionUnits, Psychrometrics, Pumps, PurchasedAirManager, PVWatts, RefrigeratedCase, RoomAirModel{AirflowNetwork,Manager,UserTempPattern}, RuntimeLanguageProcessor.
Conversions
EnergyPlus::format+ 5fmt::format→ 910std::format{:.NR}→{:.Nf}; 0 residual{R}