Convert const int/double to constexpr Where Possible
#9130
Conversation
mitchute
added
the
Refactoring
| Real64 constexpr OutdoorUnitInletAirDryBulbTemp(27.78); // 27.78C (82F) Test B (for SEER) | ||
| Real64 constexpr OutdoorUnitInletAirDryBulbTempRated(35.0); // 35.00C (95F) Test A (rated capacity) | ||
| Real64 constexpr AirMassFlowRatioRated(1.0); // AHRI test is at the design flow rate so AirMassFlowRatio is 1.0 | ||
| Real64 constexpr PLRforSEER(0.5); // Part-load ratio for SEER calculation (single speed DX cooling coils) | ||
| Array1D<Real64> const ReducedPLR(4, {1.0, 0.75, 0.50, 0.25}); // Reduced Capacity part-load conditions |
There was a problem hiding this comment.
These cats can be turned into constexpr std::array<Real64>.
There was a problem hiding this comment.
OK, I'll work on replacing these, too.
There was a problem hiding this comment.
OK, I'll work on replacing these, too.
Ha. Haha. OK, that was naive of me. These aren't going to happen in this PR. I'll work on these separately.
| @@ -1263,7 +1263,7 @@ namespace CurveManager { | |||
| state.dataCurveManager->PerfCurve(CurveNum).CurveMaxPresent = true; | |||
| } | |||
|
|
|||
| const int NumVar = 5; | |||
| constexpr int NumVar = 5; | |||
| std::string VarNames[NumVar] = {"v", "w", "x", "y", "z"}; | |||
There was a problem hiding this comment.
I don't mind C-arrays, but I think constexpr std::array is preferred. Also, std::string could be std::string_view.
There was a problem hiding this comment.
I'll probably pass on the std::string to std::string_view for this round. I haven't spent much time working with string_view, but IIRC they probably are going to require some other changes at the use point.
| @@ -104,6 +104,7 @@ struct SystemVarsData : BaseGlobalStruct | |||
| { | |||
| bool firstTime = true; | |||
|
|
|||
| // TODO: remove 'const' from state | |||
| int const iASCII_CR = 13; // endline value when just CR instead of CR/LF | |||
There was a problem hiding this comment.
It's inside of a state subclass. These (and others) need to be pulled out at some point.
| @@ -1737,7 +1737,7 @@ void GshpSpecs::CalcWatertoWaterHPCooling(EnergyPlusData &state, Real64 const My | |||
|
|
|||
| // SUBROUTINE PARAMETER DEFINITIONS: | |||
| Real64 const CelsiustoKelvin(DataGlobalConstants::KelvinConv); // Conversion from Celsius to Kelvin | |||
There was a problem hiding this comment.
Because my script wasn't smart enough to find it. I'll fix this one up.
| @@ -240,7 +240,7 @@ void GetPumpInput(EnergyPlusData &state) | |||
| using ScheduleManager::GetScheduleIndex; | |||
|
|
|||
| // SUBROUTINE PARAMETER DEFINITIONS: | |||
| Real64 const StartTemp(100.0); // Standard Temperature across code to calculated Steam density | |||
| Real64 constexpr StartTemp(100.0); // Standard Temperature across code to calculated Steam density | |||
| static constexpr std::string_view RoutineName("GetPumpInput: "); | |||
There was a problem hiding this comment.
This Name/NameNoColon pattern is cray-cray.
src/EnergyPlus/TARCOGArgs.cc
Outdated
| @@ -425,19 +425,21 @@ int ArgCheck(EnergyPlusData &state, | |||
| return ArgCheck; | |||
| } | |||
|
|
|||
| if BITF_TEST_NONE (BITF(LayerType(i)), | |||
| if | |||
| BITF_TEST_NONE(BITF(LayerType(i)), | |||
There was a problem hiding this comment.
You need to put () around these even though the macro itself has ()s inside of it. We should probably turn the BITF stuff from macros to constexpr functions just to enforce this.
There was a problem hiding this comment.
I ❤️ ❤️ the idea of turning the BITF stuff into proper functions.
There was a problem hiding this comment.
Yes, especially since functions can be made constexpr. I've already put something about this on the wiki
|
This is a great big set of changes, that further emphasize the parts of the code that are known at compile time. This is great. I will pull develop in here, and I realize there are a couple things mentioned above that should be pursued next (string view, some extern thing), but this should be wrapped up. Any further comments before this merges, assuming it comes back clean? |
|
All clean, merging, thanks! |
Convert `const` `int`/`double` to `constexpr` Where Possible
Pull request overview
constintanddoubletoconstexprwhere possible.constvars exist instate. These should eventually be removed.