diff --git a/src/EnergyPlus/DataSystemVariables.cc b/src/EnergyPlus/DataSystemVariables.cc index 15fb0fbf221..9ccc2d40ece 100644 --- a/src/EnergyPlus/DataSystemVariables.cc +++ b/src/EnergyPlus/DataSystemVariables.cc @@ -96,42 +96,6 @@ namespace DataSystemVariables { // MODULE PARAMETER DEFINITIONS: - std::string const DDOnlyEnvVar("DDONLY"); // Only run design days - std::string const ReverseDDEnvVar("REVERSEDD"); // Reverse DD during run - std::string const DisableGLHECachingEnvVar("DISABLEGLHECACHING"); - std::string const FullAnnualSimulation("FULLANNUALRUN"); // Generate annual run - std::string const cDeveloperFlag("DeveloperFlag"); - std::string const cDisplayAllWarnings("DisplayAllWarnings"); - std::string const cDisplayExtraWarnings("DisplayExtraWarnings"); - std::string const cDisplayAdvancedReportVariables("DisplayAdvancedReportVariables"); - std::string const cDisplayUnusedObjects("DisplayUnusedObjects"); - std::string const cDisplayUnusedSchedules("DisplayUnusedSchedules"); - std::string const cDisplayZoneAirHeatBalanceOffBalance("DisplayZoneAirHeatBalanceOffBalance"); - std::string const cSortIDD("SortIDD"); - std::string const cReportDuringWarmup("ReportDuringWarmup"); - std::string const cReportDuringHVACSizingSimulation("REPORTDURINGHVACSIZINGSIMULATION"); - std::string const cIgnoreSolarRadiation("IgnoreSolarRadiation"); - std::string const cIgnoreBeamRadiation("IgnoreBeamRadiation"); - std::string const cIgnoreDiffuseRadiation("IgnoreDiffuseRadiation"); - std::string const cSutherlandHodgman("SutherlandHodgman"); - std::string const cSlaterBarsky("SlaterBarsky"); - std::string const cMinimalSurfaceVariables("CreateMinimalSurfaceVariables"); - std::string const cMinimalShadowing("MinimalShadowing"); - std::string const cNumActiveSims("cntActv"); - std::string const cInputPath1("epin"); // EP-Launch setting. Full path + project name - std::string const cInputPath2("input_path"); // RunEplus.bat setting. Full path - std::string const cProgramPath("program_path"); - std::string const cTimingFlag("TimingFlag"); - std::string const TrackAirLoopEnvVar("TRACK_AIRLOOP"); // To generate a file with runtime statistics - // for each controller on each air loop - std::string const TraceAirLoopEnvVar("TRACE_AIRLOOP"); // To generate a trace file with the converged - // solutions of all controllers on each air loop at each call to SimAirLoop() - std::string const TraceHVACControllerEnvVar("TRACE_HVACCONTROLLER"); // To generate a trace file for - // each individual HVAC controller with all controller iterations - - std::string const MinReportFrequencyEnvVar("MINREPORTFREQUENCY"); // environment var for reporting frequency. - std::string const - cDisplayInputInAuditEnvVar("DISPLAYINPUTINAUDIT"); // environmental variable that enables the echoing of the input file into the audit file // DERIVED TYPE DEFINITIONS // na diff --git a/src/EnergyPlus/DataSystemVariables.hh b/src/EnergyPlus/DataSystemVariables.hh index be21e4b1fed..d7d20ebe322 100644 --- a/src/EnergyPlus/DataSystemVariables.hh +++ b/src/EnergyPlus/DataSystemVariables.hh @@ -69,41 +69,42 @@ namespace DataSystemVariables { // MODULE PARAMETER DEFINITIONS: - extern std::string const DDOnlyEnvVar; // Only run design days - extern std::string const ReverseDDEnvVar; // Reverse DD during run - extern std::string const DisableGLHECachingEnvVar; // GLHE Caching - extern std::string const FullAnnualSimulation; // Generate annual run - extern std::string const cDeveloperFlag; - extern std::string const cDisplayAllWarnings; - extern std::string const cDisplayExtraWarnings; - extern std::string const cDisplayAdvancedReportVariables; - extern std::string const cDisplayUnusedObjects; - extern std::string const cDisplayUnusedSchedules; - extern std::string const cDisplayZoneAirHeatBalanceOffBalance; - extern std::string const cSortIDD; - extern std::string const cReportDuringWarmup; - extern std::string const cReportDuringHVACSizingSimulation; - extern std::string const cIgnoreSolarRadiation; - extern std::string const cIgnoreBeamRadiation; - extern std::string const cIgnoreDiffuseRadiation; - extern std::string const cSutherlandHodgman; - extern std::string const cSlaterBarsky; - extern std::string const cMinimalSurfaceVariables; - extern std::string const cMinimalShadowing; - extern std::string const cNumActiveSims; - extern std::string const cInputPath1; // EP-Launch setting. Full path + project name - extern std::string const cInputPath2; // RunEplus.bat setting. Full path - extern std::string const cProgramPath; - extern std::string const cTimingFlag; - extern std::string const TrackAirLoopEnvVar; // To generate a file with runtime statistics + auto constexpr DDOnlyEnvVar("DDONLY"); // Only run design days + auto constexpr ReverseDDEnvVar("REVERSEDD"); // Reverse DD during run + auto constexpr DisableGLHECachingEnvVar("DISABLEGLHECACHING"); + auto constexpr FullAnnualSimulation("FULLANNUALRUN"); // Generate annual run + auto constexpr cDeveloperFlag("DeveloperFlag"); + auto constexpr cDisplayAllWarnings("DisplayAllWarnings"); + auto constexpr cDisplayExtraWarnings("DisplayExtraWarnings"); + auto constexpr cDisplayAdvancedReportVariables("DisplayAdvancedReportVariables"); + auto constexpr cDisplayUnusedObjects("DisplayUnusedObjects"); + auto constexpr cDisplayUnusedSchedules("DisplayUnusedSchedules"); + auto constexpr cDisplayZoneAirHeatBalanceOffBalance("DisplayZoneAirHeatBalanceOffBalance"); + auto constexpr cSortIDD("SortIDD"); + auto constexpr cReportDuringWarmup("ReportDuringWarmup"); + auto constexpr cReportDuringHVACSizingSimulation("REPORTDURINGHVACSIZINGSIMULATION"); + auto constexpr cIgnoreSolarRadiation("IgnoreSolarRadiation"); + auto constexpr cIgnoreBeamRadiation("IgnoreBeamRadiation"); + auto constexpr cIgnoreDiffuseRadiation("IgnoreDiffuseRadiation"); + auto constexpr cSutherlandHodgman("SutherlandHodgman"); + auto constexpr cSlaterBarsky("SlaterBarsky"); + auto constexpr cMinimalSurfaceVariables("CreateMinimalSurfaceVariables"); + auto constexpr cMinimalShadowing("MinimalShadowing"); + auto constexpr cNumActiveSims("cntActv"); + auto constexpr cInputPath1("epin"); // EP-Launch setting. Full path + project name + auto constexpr cInputPath2("input_path"); // RunEplus.bat setting. Full path + auto constexpr cProgramPath("program_path"); + auto constexpr cTimingFlag("TimingFlag"); + auto constexpr TrackAirLoopEnvVar("TRACK_AIRLOOP"); // To generate a file with runtime statistics // for each controller on each air loop - extern std::string const TraceAirLoopEnvVar; // To generate a trace file with the converged + auto constexpr TraceAirLoopEnvVar("TRACE_AIRLOOP"); // To generate a trace file with the converged // solutions of all controllers on each air loop at each call to SimAirLoop() - extern std::string const TraceHVACControllerEnvVar; // To generate a trace file for + auto constexpr TraceHVACControllerEnvVar("TRACE_HVACCONTROLLER"); // To generate a trace file for // each individual HVAC controller with all controller iterations - extern std::string const MinReportFrequencyEnvVar; // environment var for reporting frequency. - extern std::string const cDisplayInputInAuditEnvVar; // environmental variable that enables the echoing of the input file into the audit file + auto constexpr MinReportFrequencyEnvVar("MINREPORTFREQUENCY"); // environment var for reporting frequency. + auto constexpr cDisplayInputInAuditEnvVar( + "DISPLAYINPUTINAUDIT"); // environmental variable that enables the echoing of the input file into the audit file // DERIVED TYPE DEFINITIONS // na diff --git a/src/EnergyPlus/FaultsManager.hh b/src/EnergyPlus/FaultsManager.hh index 096a7c1c859..4b1f036558c 100644 --- a/src/EnergyPlus/FaultsManager.hh +++ b/src/EnergyPlus/FaultsManager.hh @@ -133,8 +133,6 @@ namespace FaultsManager { // 'FaultModel:DamperLeakage:ReturnAir ', & // 'FaultModel:DamperLeakage:OutdoorAir ' /) - //extern Array1D_string const cFaults; - //extern Array1D_int const iFaultTypeEnums; diff --git a/src/EnergyPlus/SolarShading.cc b/src/EnergyPlus/SolarShading.cc index 08d6fb1399e..e8b76bcbdaf 100644 --- a/src/EnergyPlus/SolarShading.cc +++ b/src/EnergyPlus/SolarShading.cc @@ -443,7 +443,7 @@ namespace EnergyPlus::SolarShading { ShowContinueError(state, "Value entered=\"" + cAlphaArgs(aNum) + "\""); ShowContinueError(state, "This version of EnergyPlus was not compiled to use OpenGL (required for PixelCounting)"); ShowContinueError(state, "PolygonClipping will be used instead"); - shadingMethod = ShadingMethod::PolygonClipping; + state.dataSysVars->shadingMethod = ShadingMethod::PolygonClipping; cAlphaArgs(aNum) = "PolygonClipping"; #else auto error_callback = [](const int messageType, const std::string & message, void *contextPtr){