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

Jump to bottom

Change consts to enums #8409

Merged
merged 30 commits into from
Dec 5, 2020
Merged

Change consts to enums #8409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ab61eeb
move to SystemType enum class in LowTempRadiantSystems, begin moving …
mitchute Dec 1, 2020
aa01863
Fix unit tests
jmythms Dec 2, 2020
906a9be
Furnace mode of operations
jmythms Dec 2, 2020
ed1bbe4
[Bad] RuntimeLangProcessor - Where to put the enum class
jmythms Dec 2, 2020
55a8993
Enum RuntimeLangProcessor ErlKeywordParam
jmythms Dec 2, 2020
b0d6555
auto constexpr RuntimeLangProc
jmythms Dec 2, 2020
ffe38b8
enum PumpControlType
jmythms Dec 2, 2020
05eb73b
enum class VFDControlType
jmythms Dec 2, 2020
c14a68f
enum class PumpBankControlSeq
jmythms Dec 2, 2020
c950b31
auto constexpr + warnings Pumps.cc
jmythms Dec 2, 2020
d91b5d3
Fix pumps?
jmythms Dec 2, 2020
bd31082
Fix warnings
jmythms Dec 3, 2020
7515fa2
enum EconomicTariff kind
jmythms Dec 3, 2020
5b229a3
Code cleanup
jmythms Dec 3, 2020
06cc85b
enum class varSpecific
jmythms Dec 3, 2020
d57cec9
Merge branch 'develop' into jermy-const-cleanups
jmythms Dec 3, 2020
fbe7da5
Merge branch 'jermy-const-cleanups' of https://github.com/NREL/Energy…
jmythms Dec 3, 2020
b207855
Revert "enum class varSpecific"
jmythms Dec 3, 2020
ddc146f
Revert "Code cleanup"
jmythms Dec 3, 2020
9480627
Revert "enum EconomicTariff kind"
jmythms Dec 3, 2020
eabe692
Revert "auto constexpr + warnings Pumps.cc"
jmythms Dec 3, 2020
8c2216b
Merge branch 'jermy-const-cleanups' of https://github.com/NREL/Energy…
jmythms Dec 3, 2020
0f63645
MixedAir enum class EconomizerControl
jmythms Dec 4, 2020
3baca91
Merge remote-tracking branch 'origin/jermy-const-cleanups' into jermy…
jmythms Dec 4, 2020
f92af3d
Revert "MixedAir enum class EconomizerControl"
jmythms Dec 4, 2020
843658f
Revert "Merge remote-tracking branch 'origin/jermy-const-cleanups' in…
jmythms Dec 4, 2020
bd9636b
Remove test file from cmakelists
Myoldmopar Dec 5, 2020
ff37ba1
Merge branch 'jermy-const-cleanups' of github.com:NREL/EnergyPlus int…
Myoldmopar Dec 5, 2020
b1818be
Re-remove PIU test file
Myoldmopar Dec 5, 2020
42d555a
Put back in plugin manager and apt fix
Myoldmopar Dec 5, 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
2 changes: 1 addition & 1 deletion src/EnergyPlus/CTElectricGenerator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ namespace CTElectricGenerator {
// PURPOSE OF THIS SUBROUTINE:
// This subroutine is for initializations of the CT generators.

static std::string const RoutineName("InitICEngineGenerators");
auto constexpr RoutineName("InitICEngineGenerators");

bool errFlag;

Expand Down
19 changes: 17 additions & 2 deletions src/EnergyPlus/DataRuntimeLanguage.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,21 @@ namespace DataRuntimeLanguage {
// Data module should be available to other modules and routines.
// Thus, all variables in this module must be PUBLIC.

enum class ErlKeywordParam // keyword parameters for types of Erl statements
{
KeywordNone, // statement type not set
KeywordReturn, // Return statement, as in leave program
KeywordGoto, // Goto statement, used in parsing to manage IF-ElseIf-Else-EndIf and nesting
KeywordSet, // Set statement, as in assign RHS to LHS
KeywordRun, // Run statement, used to call a subroutine from a main program
KeywordIf, // If statement, begins an IF-ElseIf-Else-EndIf logic block
KeywordElseIf, // ElseIf statement, begins an ElseIf block
KeywordElse, // Else statement, begins an Else block
KeywordEndIf, // EndIf statement, terminates an IF-ElseIf-Else-EndIf logic block
KeywordWhile, // While statement, begins a While block
KeywordEndWhile, // EndWhile statement, terminates a While block
};

// MODULE PARAMETER DEFINITIONS:
extern int const ValueNull; // Erl entity type, "Null" value
extern int const ValueNumber; // Erl entity type, hard numeric value
Expand Down Expand Up @@ -421,12 +436,12 @@ namespace DataRuntimeLanguage {
// Members
// nested structure inside ErlStack that holds program instructions
int LineNum; // Erl program line number reference
int Keyword; // type of instruction for this line, e.g. KeywordSet, KeywordIf, etc
DataRuntimeLanguage::ErlKeywordParam Keyword; // type of instruction for this line, e.g. KeywordSet, KeywordIf, etc
int Argument1; // Index to a variable, function, expression, or stack
int Argument2; // Index to a variable, function, expression, or stack

// Default Constructor
InstructionType() : LineNum(0), Keyword(0), Argument1(0), Argument2(0)
InstructionType() : LineNum(0), Keyword(DataRuntimeLanguage::ErlKeywordParam::KeywordNone), Argument1(0), Argument2(0)
{
}
};
Expand Down
4 changes: 2 additions & 2 deletions src/EnergyPlus/ExteriorEnergyUse.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ namespace ExteriorEnergyUse {
using ScheduleManager::GetScheduleName;
using namespace OutputReportPredefined;
// SUBROUTINE PARAMETER DEFINITIONS:
static std::string const RoutineName("GetExteriorEnergyUseInput: ");
auto constexpr RoutineName("GetExteriorEnergyUseInput: ");

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
int Item; // Item to be "gotten"
Expand Down Expand Up @@ -438,7 +438,7 @@ namespace ExteriorEnergyUse {
}

if (ErrorsFound) {
ShowFatalError(state, RoutineName + "Errors found in input. Program terminates.");
ShowFatalError(state, format("{}Errors found in input. Program terminates.", RoutineName));
}
}

Expand Down
66 changes: 31 additions & 35 deletions src/EnergyPlus/Furnaces.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,6 @@ namespace Furnaces {
// MODULE PARAMETER DEFINITIONS
static std::string const BlankString;

// Last mode of operation
int const CoolingMode(1); // last compressor operating mode was in cooling
int const HeatingMode(2); // last compressor operating mode was in heating
int const NoCoolHeat(3); // last operating mode was coil off
// Airflow control for contant fan mode
int const UseCompressorOnFlow(1); // set compressor OFF air flow rate equal to compressor ON air flow rate
int const UseCompressorOffFlow(2); // set compressor OFF air flow rate equal to user defined value
Expand Down Expand Up @@ -4895,9 +4891,9 @@ namespace Furnaces {
int OutNode; // Outlet node number in MSHP loop
Real64 RhoAir; // Air density at InNode
int IHPIndex(0); // coil id of IHP coil
int OperatingMode; // track cooling, heating, and no cooling or heating modes
int OperatingModeMinusOne;
int OperatingModeMinusTwo;
Furnaces::ModeOfOperation OperatingMode; // track cooling, heating, and no cooling or heating modes
Furnaces::ModeOfOperation OperatingModeMinusOne;
Furnaces::ModeOfOperation OperatingModeMinusTwo;
bool Oscillate; // detection of oscillating operating modes

InNode = Furnace(FurnaceNum).FurnaceInletNodeNum;
Expand Down Expand Up @@ -5838,19 +5834,19 @@ namespace Furnaces {

if (FirstHVACIteration) {
Furnace(FurnaceNum).iterationCounter = 0;
Furnace(FurnaceNum).iterationMode = 0;
Furnace(FurnaceNum).iterationMode = Furnaces::ModeOfOperation::NoCoolHeat;
}
Furnace(FurnaceNum).iterationCounter += 1;

// push iteration mode stack and set current mode
Furnace(FurnaceNum).iterationMode(3) = Furnace(FurnaceNum).iterationMode(2);
Furnace(FurnaceNum).iterationMode(2) = Furnace(FurnaceNum).iterationMode(1);
if (CoolingLoad) {
Furnace(FurnaceNum).iterationMode(1) = CoolingMode;
Furnace(FurnaceNum).iterationMode(1) = Furnaces::ModeOfOperation::CoolingMode;
} else if (HeatingLoad) {
Furnace(FurnaceNum).iterationMode(1) = HeatingMode;
Furnace(FurnaceNum).iterationMode(1) = Furnaces::ModeOfOperation::HeatingMode;
} else {
Furnace(FurnaceNum).iterationMode(1) = NoCoolHeat;
Furnace(FurnaceNum).iterationMode(1) = Furnaces::ModeOfOperation::NoCoolHeat;
}

// IF small loads to meet or not converging, just shut down unit
Expand Down Expand Up @@ -5972,12 +5968,12 @@ namespace Furnaces {
CompOnMassFlow = Furnace(FurnaceNum).MaxHeatAirMassFlow;
CompOnFlowRatio = Furnace(FurnaceNum).HeatingSpeedRatio;
}
Furnace(FurnaceNum).LastMode = HeatingMode;
Furnace(FurnaceNum).LastMode = Furnaces::ModeOfOperation::HeatingMode;
// IF a cooling load exists, operate at the cooling mass flow rate
} else if (CoolingLoad) {
CompOnMassFlow = Furnace(FurnaceNum).MaxCoolAirMassFlow;
CompOnFlowRatio = Furnace(FurnaceNum).CoolingSpeedRatio;
Furnace(FurnaceNum).LastMode = CoolingMode;
Furnace(FurnaceNum).LastMode = Furnaces::ModeOfOperation::CoolingMode;
// If no load exists, set the compressor on mass flow rate.
// Set equal the mass flow rate when no heating or cooling is needed if no moisture load exists.
// If the user has set the off mass flow rate to 0, set according to the last operating mode.
Expand All @@ -5991,7 +5987,7 @@ namespace Furnaces {
CompOnFlowRatio = Furnace(FurnaceNum).HeatingSpeedRatio;
// User may have entered a 0 for MaxNoCoolHeatAirMassFlow
if (CompOnMassFlow == 0.0) {
if (Furnace(FurnaceNum).LastMode == HeatingMode) {
if (Furnace(FurnaceNum).LastMode == Furnaces::ModeOfOperation::HeatingMode) {
CompOnMassFlow = Furnace(FurnaceNum).MaxHeatAirMassFlow;
CompOnFlowRatio = Furnace(FurnaceNum).HeatingSpeedRatio;
} else {
Expand All @@ -6005,7 +6001,7 @@ namespace Furnaces {
// Set the compressor or coil OFF mass flow rate based on LOGICAL flag
// UseCompressorOnFlow is used when the user does not enter a value for no cooling or heating flow rate
if (Furnace(FurnaceNum).AirFlowControl == UseCompressorOnFlow) {
if (Furnace(FurnaceNum).LastMode == HeatingMode) {
if (Furnace(FurnaceNum).LastMode == Furnaces::ModeOfOperation::HeatingMode) {
if (MoistureLoad < 0.0 && Furnace(FurnaceNum).Humidistat &&
Furnace(FurnaceNum).DehumidControlType_Num == DehumidControl_CoolReheat) {
CompOffMassFlow = Furnace(FurnaceNum).MaxCoolAirMassFlow;
Expand All @@ -6032,11 +6028,11 @@ namespace Furnaces {
Furnace(FurnaceNum).DehumidControlType_Num == DehumidControl_CoolReheat) {
CompOnMassFlow = Furnace(FurnaceNum).MaxCoolAirMassFlow;
CompOnFlowRatio = Furnace(FurnaceNum).CoolingSpeedRatio;
Furnace(FurnaceNum).LastMode = CoolingMode;
Furnace(FurnaceNum).LastMode = Furnaces::ModeOfOperation::CoolingMode;
} else {
CompOnMassFlow = Furnace(FurnaceNum).MaxHeatAirMassFlow;
CompOnFlowRatio = Furnace(FurnaceNum).HeatingSpeedRatio;
Furnace(FurnaceNum).LastMode = HeatingMode;
Furnace(FurnaceNum).LastMode = Furnaces::ModeOfOperation::HeatingMode;
}
} else if (CoolingLoad) {
CompOnMassFlow = Furnace(FurnaceNum).MaxCoolAirMassFlow;
Expand Down Expand Up @@ -10032,12 +10028,12 @@ namespace Furnaces {

// Set latent load for heating
if (HeatingLoad) {
Furnace(FurnaceNum).HeatCoolMode = HeatingMode;
Furnace(FurnaceNum).HeatCoolMode = Furnaces::ModeOfOperation::HeatingMode;
// Set latent load for cooling and no sensible load condition
} else if (CoolingLoad) {
Furnace(FurnaceNum).HeatCoolMode = CoolingMode;
Furnace(FurnaceNum).HeatCoolMode = Furnaces::ModeOfOperation::CoolingMode;
} else {
Furnace(FurnaceNum).HeatCoolMode = 0;
Furnace(FurnaceNum).HeatCoolMode = Furnaces::ModeOfOperation::NoCoolHeat;
}

// set the on/off flags
Expand Down Expand Up @@ -10395,9 +10391,9 @@ namespace Furnaces {
// Get full load result
PartLoadFrac = 1.0;
SpeedRatio = 1.0;
if (Furnace(FurnaceNum).HeatCoolMode == HeatingMode) {
if (Furnace(FurnaceNum).HeatCoolMode == Furnaces::ModeOfOperation::HeatingMode) {
SpeedNum = Furnace(FurnaceNum).NumOfSpeedHeating;
} else if (Furnace(FurnaceNum).HeatCoolMode == CoolingMode) {
} else if (Furnace(FurnaceNum).HeatCoolMode == Furnaces::ModeOfOperation::CoolingMode) {
SpeedNum = Furnace(FurnaceNum).NumOfSpeedCooling;
} else if (QLatReq < -SmallLoad) {
SpeedNum = Furnace(FurnaceNum).NumOfSpeedCooling;
Expand Down Expand Up @@ -11705,7 +11701,7 @@ namespace Furnaces {
};
} else {
if (!CurDeadBandOrSetback(Furnace(FurnaceNum).ControlZoneNum) && present(SpeedNum)) {
if (Furnace(FurnaceNum).HeatCoolMode == HeatingMode) {
if (Furnace(FurnaceNum).HeatCoolMode == Furnaces::ModeOfOperation::HeatingMode) {
if (SpeedNum == 1) {
CompOnMassFlow = Furnace(FurnaceNum).HeatMassFlowRate(SpeedNum);
CompOnFlowRatio = Furnace(FurnaceNum).MSHeatingSpeedRatio(SpeedNum);
Expand All @@ -11719,7 +11715,7 @@ namespace Furnaces {
MSHPMassFlowRateLow = Furnace(FurnaceNum).HeatMassFlowRate(SpeedNum - 1);
MSHPMassFlowRateHigh = Furnace(FurnaceNum).HeatMassFlowRate(SpeedNum);
}
} else if (Furnace(FurnaceNum).HeatCoolMode == CoolingMode) {
} else if (Furnace(FurnaceNum).HeatCoolMode == Furnaces::ModeOfOperation::CoolingMode) {
if (SpeedNum == 1) {
CompOnMassFlow = Furnace(FurnaceNum).CoolMassFlowRate(SpeedNum);
CompOnFlowRatio = Furnace(FurnaceNum).MSCoolingSpeedRatio(SpeedNum);
Expand All @@ -11742,7 +11738,7 @@ namespace Furnaces {
if (SpeedNum == 1) { // LOWEST SPEED USE IDLE FLOW
CompOffMassFlow = Furnace(FurnaceNum).IdleMassFlowRate;
CompOffFlowRatio = Furnace(FurnaceNum).IdleSpeedRatio;
} else if (Furnace(FurnaceNum).LastMode == HeatingMode) {
} else if (Furnace(FurnaceNum).LastMode == Furnaces::ModeOfOperation::HeatingMode) {
CompOffMassFlow = Furnace(FurnaceNum).HeatMassFlowRate(SpeedNum);
CompOffFlowRatio = Furnace(FurnaceNum).MSHeatingSpeedRatio(SpeedNum);
} else {
Expand Down Expand Up @@ -11850,24 +11846,24 @@ namespace Furnaces {
// FLOW:

if (CoolingLoad) {
Furnace(FurnaceNum).HeatCoolMode = CoolingMode;
Furnace(FurnaceNum).HeatCoolMode = Furnaces::ModeOfOperation::CoolingMode;
} else if (HeatingLoad) {
Furnace(FurnaceNum).HeatCoolMode = HeatingMode;
Furnace(FurnaceNum).HeatCoolMode = Furnaces::ModeOfOperation::HeatingMode;
} else {
Furnace(FurnaceNum).HeatCoolMode = 0;
Furnace(FurnaceNum).HeatCoolMode = Furnaces::ModeOfOperation::NoCoolHeat;
}

// Set the inlet node mass flow rate
if (Furnace(FurnaceNum).OpMode == ContFanCycCoil) {
// constant fan mode
if ((Furnace(FurnaceNum).HeatCoolMode == HeatingMode) && !CurDeadBandOrSetback(ZoneNum)) {
if ((Furnace(FurnaceNum).HeatCoolMode == Furnaces::ModeOfOperation::HeatingMode) && !CurDeadBandOrSetback(ZoneNum)) {
CompOnMassFlow = Furnace(FurnaceNum).HeatMassFlowRate(1);
CompOnFlowRatio = Furnace(FurnaceNum).MSHeatingSpeedRatio(1);
Furnace(FurnaceNum).LastMode = HeatingMode;
} else if ((Furnace(FurnaceNum).HeatCoolMode == CoolingMode) && !CurDeadBandOrSetback(ZoneNum)) {
Furnace(FurnaceNum).LastMode = Furnaces::ModeOfOperation::HeatingMode;
} else if ((Furnace(FurnaceNum).HeatCoolMode == Furnaces::ModeOfOperation::CoolingMode) && !CurDeadBandOrSetback(ZoneNum)) {
CompOnMassFlow = Furnace(FurnaceNum).CoolMassFlowRate(1);
CompOnFlowRatio = Furnace(FurnaceNum).MSCoolingSpeedRatio(1);
Furnace(FurnaceNum).LastMode = CoolingMode;
Furnace(FurnaceNum).LastMode = Furnaces::ModeOfOperation::CoolingMode;
} else {
CompOnMassFlow = Furnace(FurnaceNum).IdleMassFlowRate;
CompOnFlowRatio = Furnace(FurnaceNum).IdleSpeedRatio;
Expand All @@ -11876,10 +11872,10 @@ namespace Furnaces {
CompOffFlowRatio = Furnace(FurnaceNum).IdleSpeedRatio;
} else {
// cycling fan mode
if ((Furnace(FurnaceNum).HeatCoolMode == HeatingMode) && !CurDeadBandOrSetback(ZoneNum)) {
if ((Furnace(FurnaceNum).HeatCoolMode == Furnaces::ModeOfOperation::HeatingMode) && !CurDeadBandOrSetback(ZoneNum)) {
CompOnMassFlow = Furnace(FurnaceNum).HeatMassFlowRate(1);
CompOnFlowRatio = Furnace(FurnaceNum).MSHeatingSpeedRatio(1);
} else if ((Furnace(FurnaceNum).HeatCoolMode == CoolingMode) && !CurDeadBandOrSetback(ZoneNum)) {
} else if ((Furnace(FurnaceNum).HeatCoolMode == Furnaces::ModeOfOperation::CoolingMode) && !CurDeadBandOrSetback(ZoneNum)) {
CompOnMassFlow = Furnace(FurnaceNum).CoolMassFlowRate(1);
CompOnFlowRatio = Furnace(FurnaceNum).MSCoolingSpeedRatio(1);
} else {
Expand All @@ -11897,7 +11893,7 @@ namespace Furnaces {
Node(InNode).MassFlowRate = CompOnMassFlow;
PartLoadRatio = 0.0;
} else {
if (Furnace(FurnaceNum).HeatCoolMode != 0) {
if (Furnace(FurnaceNum).HeatCoolMode != Furnaces::ModeOfOperation::NoCoolHeat) {
PartLoadRatio = 1.0;
} else {
PartLoadRatio = 0.0;
Expand Down
Loading