Skip to content

Commit

Permalink
change to constexpr
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmythms
jmythms committed Mar 9, 2021
1 parent d47ec95 commit a18f364
Showing 1 changed file with 31 additions and 31 deletions.
62 changes: 31 additions & 31 deletions src/EnergyPlus/DataSystemVariables.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,41 +96,41 @@ namespace DataSystemVariables {

// MODULE PARAMETER DEFINITIONS:

const char *DDOnlyEnvVar("DDONLY"); // Only run design days
const char *ReverseDDEnvVar("REVERSEDD"); // Reverse DD during run
const char *DisableGLHECachingEnvVar("DISABLEGLHECACHING");
const char *FullAnnualSimulation("FULLANNUALRUN"); // Generate annual run
const char *cDeveloperFlag("DeveloperFlag");
const char *cDisplayAllWarnings("DisplayAllWarnings");
const char *cDisplayExtraWarnings("DisplayExtraWarnings");
const char *cDisplayAdvancedReportVariables("DisplayAdvancedReportVariables");
const char *cDisplayUnusedObjects("DisplayUnusedObjects");
const char *cDisplayUnusedSchedules("DisplayUnusedSchedules");
const char *cDisplayZoneAirHeatBalanceOffBalance("DisplayZoneAirHeatBalanceOffBalance");
const char *cSortIDD("SortIDD");
const char *cReportDuringWarmup("ReportDuringWarmup");
const char *cReportDuringHVACSizingSimulation("REPORTDURINGHVACSIZINGSIMULATION");
const char *cIgnoreSolarRadiation("IgnoreSolarRadiation");
const char *cIgnoreBeamRadiation("IgnoreBeamRadiation");
const char *cIgnoreDiffuseRadiation("IgnoreDiffuseRadiation");
const char *cSutherlandHodgman("SutherlandHodgman");
const char *cSlaterBarsky("SlaterBarsky");
const char *cMinimalSurfaceVariables("CreateMinimalSurfaceVariables");
const char *cMinimalShadowing("MinimalShadowing");
const char *cNumActiveSims("cntActv");
const char *cInputPath1("epin"); // EP-Launch setting. Full path + project name
const char *cInputPath2("input_path"); // RunEplus.bat setting. Full path
const char *cProgramPath("program_path");
const char *cTimingFlag("TimingFlag");
const char *TrackAirLoopEnvVar("TRACK_AIRLOOP"); // To generate a file with runtime statistics
constexpr const char *DDOnlyEnvVar("DDONLY"); // Only run design days
constexpr const char *ReverseDDEnvVar("REVERSEDD"); // Reverse DD during run
constexpr const char *DisableGLHECachingEnvVar("DISABLEGLHECACHING");
constexpr const char *FullAnnualSimulation("FULLANNUALRUN"); // Generate annual run
constexpr const char *cDeveloperFlag("DeveloperFlag");
constexpr const char *cDisplayAllWarnings("DisplayAllWarnings");
constexpr const char *cDisplayExtraWarnings("DisplayExtraWarnings");
constexpr const char *cDisplayAdvancedReportVariables("DisplayAdvancedReportVariables");
constexpr const char *cDisplayUnusedObjects("DisplayUnusedObjects");
constexpr const char *cDisplayUnusedSchedules("DisplayUnusedSchedules");
constexpr const char *cDisplayZoneAirHeatBalanceOffBalance("DisplayZoneAirHeatBalanceOffBalance");
constexpr const char *cSortIDD("SortIDD");
constexpr const char *cReportDuringWarmup("ReportDuringWarmup");
constexpr const char *cReportDuringHVACSizingSimulation("REPORTDURINGHVACSIZINGSIMULATION");
constexpr const char *cIgnoreSolarRadiation("IgnoreSolarRadiation");
constexpr const char *cIgnoreBeamRadiation("IgnoreBeamRadiation");
constexpr const char *cIgnoreDiffuseRadiation("IgnoreDiffuseRadiation");
constexpr const char *cSutherlandHodgman("SutherlandHodgman");
constexpr const char *cSlaterBarsky("SlaterBarsky");
constexpr const char *cMinimalSurfaceVariables("CreateMinimalSurfaceVariables");
constexpr const char *cMinimalShadowing("MinimalShadowing");
constexpr const char *cNumActiveSims("cntActv");
constexpr const char *cInputPath1("epin"); // EP-Launch setting. Full path + project name
constexpr const char *cInputPath2("input_path"); // RunEplus.bat setting. Full path
constexpr const char *cProgramPath("program_path");
constexpr const char *cTimingFlag("TimingFlag");
constexpr const char *TrackAirLoopEnvVar("TRACK_AIRLOOP"); // To generate a file with runtime statistics
// for each controller on each air loop
const char *TraceAirLoopEnvVar("TRACE_AIRLOOP"); // To generate a trace file with the converged
constexpr const char *TraceAirLoopEnvVar("TRACE_AIRLOOP"); // To generate a trace file with the converged
// solutions of all controllers on each air loop at each call to SimAirLoop()
const char *TraceHVACControllerEnvVar("TRACE_HVACCONTROLLER"); // To generate a trace file for
constexpr const char *TraceHVACControllerEnvVar("TRACE_HVACCONTROLLER"); // To generate a trace file for
// each individual HVAC controller with all controller iterations

const char *MinReportFrequencyEnvVar("MINREPORTFREQUENCY"); // environment var for reporting frequency.
const char *
constexpr const char *MinReportFrequencyEnvVar("MINREPORTFREQUENCY"); // environment var for reporting frequency.
constexpr const char *
cDisplayInputInAuditEnvVar("DISPLAYINPUTINAUDIT"); // environmental variable that enables the echoing of the input file into the audit file

// DERIVED TYPE DEFINITIONS
Expand Down

8 comments on commit a18f364

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

Global-DataSysVars (jmythms) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: OK (3101 of 3101 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

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

Global-DataSysVars (jmythms) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: OK (1615 of 1615 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

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

Global-DataSysVars (jmythms) - x86_64-MacOS-10.15-clang-11.0.0: OK (3061 of 3061 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

Global-DataSysVars (jmythms) - Win64-Windows-10-VisualStudio-16: OK (2310 of 2310 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

Global-DataSysVars (jmythms) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: OK (726 of 727 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 726
  • Timeout: 1

Build Badge Test Badge Coverage Badge

@jmythms
Copy link
Contributor Author

@jmythms jmythms commented on a18f364 Mar 9, 2021

Choose a reason for hiding this comment

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

Global-DataSysVars (jmythms) - x86_64-MacOS-10.15-clang-11.0.0: OK (3061 of 3061 tests passed, 0 test warnings)

Build Badge Test Badge

image

Is it ok to take these variables out?

@Myoldmopar
Copy link
Member

Choose a reason for hiding this comment

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

If it's not used, then yep! Just take it out locally and make sure it still builds fine then push. Based on that variable name I think it's not used.

@jmythms
Copy link
Contributor Author

@jmythms jmythms commented on a18f364 Mar 9, 2021

Choose a reason for hiding this comment

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

Thanks! I did a "search entire project" for the variable name and didn't find anything as well... Will take it out locally and try building.

Please sign in to comment.