From 2de59eff2e58990750236cfa0d6538ea826d1579 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Sun, 11 Oct 2020 17:14:52 -0600 Subject: [PATCH] fix EvapCooler naming conflict, remove UC resource strings, cleanup DataPrecisionGlobals usages --- src/EnergyPlus/BaseboardRadiator.cc | 5 +- src/EnergyPlus/ChillerGasAbsorption.cc | 1 - .../Coils/CoilCoolingDXCurveFitSpeed.cc | 1 - src/EnergyPlus/DXCoils.cc | 10 +- src/EnergyPlus/DXFEarClipping.cc | 2 - src/EnergyPlus/DataBSDFWindow.cc | 3 - src/EnergyPlus/DataBranchAirLoopPlant.cc | 3 - src/EnergyPlus/DataComplexFenestration.cc | 4 - src/EnergyPlus/DataContaminantBalance.cc | 2 - src/EnergyPlus/DataConvergParams.cc | 4 - src/EnergyPlus/DataConversions.cc | 4 - src/EnergyPlus/DataDElight.cc | 4 - src/EnergyPlus/DataDaylighting.cc | 4 - src/EnergyPlus/DataDaylightingDevices.cc | 4 - src/EnergyPlus/DataDefineEquip.cc | 4 - src/EnergyPlus/DataEnvironment.cc | 2 - src/EnergyPlus/DataErrorTracking.cc | 4 - src/EnergyPlus/DataGenerators.cc | 4 - src/EnergyPlus/DataGlobalConstants.cc | 47 ------- src/EnergyPlus/DataGlobalConstants.hh | 47 ------- src/EnergyPlus/DataHVACGlobals.cc | 4 - src/EnergyPlus/DataHeatBalFanSys.cc | 4 - src/EnergyPlus/DataHeatBalSurface.cc | 4 - src/EnergyPlus/DataIPShortCuts.cc | 2 - src/EnergyPlus/DataLoopNode.cc | 4 - src/EnergyPlus/DataMoistureBalance.cc | 3 - src/EnergyPlus/DataMoistureBalanceEMPD.cc | 2 - src/EnergyPlus/DataPhotovoltaics.cc | 4 - src/EnergyPlus/DataRoomAirModel.cc | 3 - src/EnergyPlus/DataRootFinder.cc | 3 - src/EnergyPlus/DataSizing.cc | 3 - src/EnergyPlus/DataSurfaceColors.cc | 3 - src/EnergyPlus/DataSurfaceLists.cc | 3 - src/EnergyPlus/DataSurfaces.cc | 2 - src/EnergyPlus/DataTimings.cc | 2 - src/EnergyPlus/DataUCSDSharedData.cc | 2 - src/EnergyPlus/DataViewFactorInformation.cc | 3 - src/EnergyPlus/DataWater.cc | 3 - src/EnergyPlus/DataWindowEquivalentLayer.cc | 3 - src/EnergyPlus/DataZoneControls.cc | 2 - src/EnergyPlus/DataZoneEnergyDemands.cc | 3 - src/EnergyPlus/DataZoneEquipment.cc | 2 - src/EnergyPlus/DaylightingDevices.cc | 2 - src/EnergyPlus/DaylightingManager.cc | 3 +- src/EnergyPlus/EarthTube.cc | 2 - src/EnergyPlus/EcoRoofManager.cc | 2 - src/EnergyPlus/EvaporativeCoolers.cc | 88 ++++++------- src/EnergyPlus/EvaporativeCoolers.hh | 124 +++++++++--------- src/EnergyPlus/FanCoilUnits.cc | 17 ++- src/EnergyPlus/Fans.cc | 3 +- src/EnergyPlus/FluidCoolers.cc | 1 - src/EnergyPlus/FluidProperties.cc | 2 - src/EnergyPlus/GlobalNames.cc | 2 - src/EnergyPlus/HVACControllers.cc | 11 +- src/EnergyPlus/HVACDXSystem.cc | 2 - src/EnergyPlus/HVACDuct.cc | 2 - src/EnergyPlus/HVACFan.cc | 1 - src/EnergyPlus/HVACHXAssistedCoolingCoil.cc | 2 - src/EnergyPlus/HVACManager.cc | 2 - src/EnergyPlus/HVACSingleDuctInduc.cc | 2 - .../HeatBalanceInternalHeatGains.cc | 2 - src/EnergyPlus/HeatBalanceManager.cc | 2 - .../HeatBalanceMovableInsulation.cc | 2 - src/EnergyPlus/HeatPumpWaterToWaterSimple.cc | 2 - src/EnergyPlus/HeatRecovery.cc | 2 - src/EnergyPlus/HighTempRadiantSystem.cc | 2 - src/EnergyPlus/Humidifiers.cc | 2 - src/EnergyPlus/HybridModel.cc | 2 - src/EnergyPlus/IntegratedHeatPump.cc | 2 - src/EnergyPlus/InternalHeatGains.cc | 5 +- src/EnergyPlus/MixedAir.cc | 2 - src/EnergyPlus/OutAirNodeManager.cc | 2 - src/EnergyPlus/OutputProcessor.cc | 25 ---- src/EnergyPlus/OutputReportPredefined.cc | 3 - src/EnergyPlus/OutsideEnergySources.cc | 1 - src/EnergyPlus/PackagedTerminalHeatPump.cc | 2 - src/EnergyPlus/Photovoltaics.cc | 5 +- src/EnergyPlus/PipeHeatTransfer.cc | 2 - src/EnergyPlus/Pipes.cc | 2 - src/EnergyPlus/Plant/DataPlant.cc | 2 - src/EnergyPlus/PlantCondLoopOperation.cc | 2 - src/EnergyPlus/PlantLoadProfile.cc | 2 - src/EnergyPlus/PlantPressureSystem.cc | 2 - src/EnergyPlus/PlantUtilities.cc | 3 - src/EnergyPlus/PlantValves.cc | 2 - src/EnergyPlus/PoweredInductionUnits.cc | 5 +- src/EnergyPlus/Psychrometrics.cc | 4 +- src/EnergyPlus/Pumps.cc | 1 - src/EnergyPlus/PurchasedAirManager.cc | 2 - src/EnergyPlus/ReturnAirPathManager.cc | 2 - src/EnergyPlus/RoomAirModelAirflowNetwork.cc | 2 - src/EnergyPlus/RoomAirModelManager.cc | 2 - src/EnergyPlus/RoomAirModelUserTempPattern.cc | 2 - src/EnergyPlus/RootFinder.cc | 3 +- src/EnergyPlus/SZVAVModel.cc | 12 +- src/EnergyPlus/SetPointManager.cc | 15 +-- src/EnergyPlus/SimAirServingZones.cc | 30 ++--- src/EnergyPlus/SimulationManager.cc | 3 - src/EnergyPlus/SingleDuct.cc | 2 - src/EnergyPlus/SteamBaseboardRadiator.cc | 2 - src/EnergyPlus/SteamCoils.cc | 2 - src/EnergyPlus/SurfaceGroundHeatExchanger.cc | 5 +- src/EnergyPlus/TARCOGCommon.cc | 3 - src/EnergyPlus/TARCOGGassesParams.cc | 3 - src/EnergyPlus/TARCOGOutput.cc | 2 - src/EnergyPlus/TARCOGParams.cc | 3 - src/EnergyPlus/ThermalComfort.cc | 3 +- src/EnergyPlus/ThermalISO15099Calc.cc | 2 - src/EnergyPlus/UFADManager.cc | 2 - src/EnergyPlus/UnitHeater.cc | 2 - src/EnergyPlus/UnitVentilator.cc | 2 - src/EnergyPlus/WaterCoils.cc | 2 - src/EnergyPlus/WaterToAirHeatPumpSimple.cc | 3 +- src/EnergyPlus/WindTurbine.cc | 2 - src/EnergyPlus/WindowAC.cc | 2 - src/EnergyPlus/ZoneDehumidifier.cc | 2 - src/EnergyPlus/ZoneTempPredictorCorrector.cc | 6 +- .../unit/EvaporativeCoolers.unit.cc | 8 +- 118 files changed, 168 insertions(+), 544 deletions(-) diff --git a/src/EnergyPlus/BaseboardRadiator.cc b/src/EnergyPlus/BaseboardRadiator.cc index 527e87adb18..6de57ae59b1 100644 --- a/src/EnergyPlus/BaseboardRadiator.cc +++ b/src/EnergyPlus/BaseboardRadiator.cc @@ -96,7 +96,6 @@ namespace BaseboardRadiator { // RE-ENGINEERED na // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataGlobals; using DataHVACGlobals::SmallLoad; using DataPlant::PlantLoop; @@ -1087,13 +1086,13 @@ namespace BaseboardRadiator { // To prevent possible underflows (numbers smaller than the computer can handle) we must break // the calculation up into steps and check the size of the exponential arguments. AA = -CapacityRatio * std::pow(NTU, 0.78); - if (AA < EXP_LowerLimit) { + if (AA < DataPrecisionGlobals::EXP_LowerLimit) { BB = 0.0; } else { BB = std::exp(AA); } CC = (1.0 / CapacityRatio) * std::pow(NTU, 0.22) * (BB - 1.0); - if (CC < EXP_LowerLimit) { + if (CC < DataPrecisionGlobals::EXP_LowerLimit) { Effectiveness = 1.0; } else { Effectiveness = 1.0 - std::exp(CC); diff --git a/src/EnergyPlus/ChillerGasAbsorption.cc b/src/EnergyPlus/ChillerGasAbsorption.cc index 1aef67686c7..bce9410376c 100644 --- a/src/EnergyPlus/ChillerGasAbsorption.cc +++ b/src/EnergyPlus/ChillerGasAbsorption.cc @@ -64,7 +64,6 @@ #include #include #include -#include #include #include #include diff --git a/src/EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.cc b/src/EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.cc index 9053d2a04e4..96b1fab42a1 100644 --- a/src/EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.cc +++ b/src/EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.cc @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include diff --git a/src/EnergyPlus/DXCoils.cc b/src/EnergyPlus/DXCoils.cc index 798fefbf24c..aa4a3684a70 100644 --- a/src/EnergyPlus/DXCoils.cc +++ b/src/EnergyPlus/DXCoils.cc @@ -63,7 +63,6 @@ #include #include #include -#include #include #include #include @@ -126,7 +125,6 @@ namespace DXCoils { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataGlobals; using namespace DataHVACGlobals; @@ -8728,7 +8726,7 @@ namespace DXCoils { A0 = 0.0; } ADiff = -A0 / AirMassFlow; - if (ADiff >= EXP_LowerLimit) { + if (ADiff >= DataPrecisionGlobals::EXP_LowerLimit) { CBF = std::exp(ADiff); } else { CBF = 0.0; @@ -9677,7 +9675,7 @@ namespace DXCoils { A0 = 0.0; } ADiff = -A0 / AirMassFlow; - if (ADiff >= EXP_LowerLimit) { + if (ADiff >= DataPrecisionGlobals::EXP_LowerLimit) { CBF = std::exp(ADiff); } else { CBF = 0.0; @@ -11058,7 +11056,7 @@ namespace DXCoils { A0 = 0.0; } ADiff = -A0 / AirMassFlowRate; - if (ADiff >= EXP_LowerLimit) { + if (ADiff >= DataPrecisionGlobals::EXP_LowerLimit) { CBFAdj = std::exp(ADiff); } else { CBFAdj = 1.0e-6; @@ -15923,7 +15921,7 @@ namespace DXCoils { A0 = 0.0; } ADiff = -A0 / AirMassFlow; - if (ADiff >= EXP_LowerLimit) { + if (ADiff >= DataPrecisionGlobals::EXP_LowerLimit) { CBF = std::exp(ADiff); } else { CBF = 0.0; diff --git a/src/EnergyPlus/DXFEarClipping.cc b/src/EnergyPlus/DXFEarClipping.cc index d1b95d9d7db..52c43a96252 100644 --- a/src/EnergyPlus/DXFEarClipping.cc +++ b/src/EnergyPlus/DXFEarClipping.cc @@ -56,7 +56,6 @@ #include #include #include -#include #include #include @@ -87,7 +86,6 @@ namespace DXFEarClipping { // Use statements: // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataVectorTypes; // Data diff --git a/src/EnergyPlus/DataBSDFWindow.cc b/src/EnergyPlus/DataBSDFWindow.cc index ce8b927d60a..cf1893f2862 100644 --- a/src/EnergyPlus/DataBSDFWindow.cc +++ b/src/EnergyPlus/DataBSDFWindow.cc @@ -48,8 +48,6 @@ // EnergyPlus Headers #include #include -#include - namespace EnergyPlus { namespace DataBSDFWindow { @@ -80,7 +78,6 @@ namespace DataBSDFWindow { // USE STATEMENTS: // // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataVectorTypes; // diff --git a/src/EnergyPlus/DataBranchAirLoopPlant.cc b/src/EnergyPlus/DataBranchAirLoopPlant.cc index f23e45a7aa7..53ac42e5635 100644 --- a/src/EnergyPlus/DataBranchAirLoopPlant.cc +++ b/src/EnergyPlus/DataBranchAirLoopPlant.cc @@ -47,8 +47,6 @@ // EnergyPlus Headers #include -#include - namespace EnergyPlus { namespace DataBranchAirLoopPlant { @@ -77,7 +75,6 @@ namespace DataBranchAirLoopPlant { // USE STATEMENTS: // // Using/Aliasing - using namespace DataPrecisionGlobals; // // Data diff --git a/src/EnergyPlus/DataComplexFenestration.cc b/src/EnergyPlus/DataComplexFenestration.cc index 9ad4d983e9f..21b91e15a98 100644 --- a/src/EnergyPlus/DataComplexFenestration.cc +++ b/src/EnergyPlus/DataComplexFenestration.cc @@ -47,8 +47,6 @@ // EnergyPlus Headers #include -#include - namespace EnergyPlus { namespace DataComplexFenestration { @@ -62,8 +60,6 @@ namespace DataComplexFenestration { // This module contains data necessary for complex fenestration calculations // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // Parameters for complex shade int const csVenetianHorizontal(1); diff --git a/src/EnergyPlus/DataContaminantBalance.cc b/src/EnergyPlus/DataContaminantBalance.cc index d84900f7b16..0f07adfeed2 100644 --- a/src/EnergyPlus/DataContaminantBalance.cc +++ b/src/EnergyPlus/DataContaminantBalance.cc @@ -47,7 +47,6 @@ // EnergyPlus Headers #include -#include #include namespace EnergyPlus { @@ -65,7 +64,6 @@ namespace DataContaminantBalance { // that is needed to pass from the Contaminant Balance Module. // Using/Aliasing - using namespace DataPrecisionGlobals; using DataSurfaces::MaxSlatAngs; // Data diff --git a/src/EnergyPlus/DataConvergParams.cc b/src/EnergyPlus/DataConvergParams.cc index d853c75d80d..8b6899df79e 100644 --- a/src/EnergyPlus/DataConvergParams.cc +++ b/src/EnergyPlus/DataConvergParams.cc @@ -51,8 +51,6 @@ // EnergyPlus Headers #include -#include - namespace EnergyPlus { namespace DataConvergParams { @@ -62,8 +60,6 @@ namespace DataConvergParams { // of the HVAC simulation. // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataConversions.cc b/src/EnergyPlus/DataConversions.cc index 0c8d5f5ecb4..4f1714073e4 100644 --- a/src/EnergyPlus/DataConversions.cc +++ b/src/EnergyPlus/DataConversions.cc @@ -47,8 +47,6 @@ // EnergyPlus Headers #include -#include - namespace EnergyPlus { namespace DataConversions { @@ -79,8 +77,6 @@ namespace DataConversions { // na // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataDElight.cc b/src/EnergyPlus/DataDElight.cc index 4a1e6036af3..b7297a30d34 100644 --- a/src/EnergyPlus/DataDElight.cc +++ b/src/EnergyPlus/DataDElight.cc @@ -47,8 +47,6 @@ // EnergyPlus Headers #include -#include - namespace EnergyPlus { namespace DataDElight { @@ -73,8 +71,6 @@ namespace DataDElight { // na // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataDaylighting.cc b/src/EnergyPlus/DataDaylighting.cc index 26284638c60..ca87a05f295 100644 --- a/src/EnergyPlus/DataDaylighting.cc +++ b/src/EnergyPlus/DataDaylighting.cc @@ -47,8 +47,6 @@ // EnergyPlus Headers #include -#include - namespace EnergyPlus { namespace DataDaylighting { @@ -73,8 +71,6 @@ namespace DataDaylighting { // na // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataDaylightingDevices.cc b/src/EnergyPlus/DataDaylightingDevices.cc index 61861fae174..4efb9ce3101 100644 --- a/src/EnergyPlus/DataDaylightingDevices.cc +++ b/src/EnergyPlus/DataDaylightingDevices.cc @@ -47,8 +47,6 @@ // EnergyPlus Headers #include -#include - namespace EnergyPlus { namespace DataDaylightingDevices { @@ -68,8 +66,6 @@ namespace DataDaylightingDevices { // OTHER NOTES: na // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataDefineEquip.cc b/src/EnergyPlus/DataDefineEquip.cc index 91f87c5e9ab..2cae86cb2ec 100644 --- a/src/EnergyPlus/DataDefineEquip.cc +++ b/src/EnergyPlus/DataDefineEquip.cc @@ -47,8 +47,6 @@ // EnergyPlus Headers #include -#include - namespace EnergyPlus { namespace DataDefineEquip { @@ -69,8 +67,6 @@ namespace DataDefineEquip { // OTHER NOTES: none // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataEnvironment.cc b/src/EnergyPlus/DataEnvironment.cc index 6d4eec92df0..a76b376bc5c 100644 --- a/src/EnergyPlus/DataEnvironment.cc +++ b/src/EnergyPlus/DataEnvironment.cc @@ -51,7 +51,6 @@ // EnergyPlus Headers #include #include -#include #include #include @@ -81,7 +80,6 @@ namespace DataEnvironment { // na // Using/Aliasing - using namespace DataPrecisionGlobals; // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataErrorTracking.cc b/src/EnergyPlus/DataErrorTracking.cc index bc1e6d7815b..aae8649bf9c 100644 --- a/src/EnergyPlus/DataErrorTracking.cc +++ b/src/EnergyPlus/DataErrorTracking.cc @@ -47,8 +47,6 @@ // EnergyPlus Headers #include -#include - namespace EnergyPlus { namespace DataErrorTracking { @@ -73,8 +71,6 @@ namespace DataErrorTracking { // na // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataGenerators.cc b/src/EnergyPlus/DataGenerators.cc index 762a5511b28..3ac5aaed825 100644 --- a/src/EnergyPlus/DataGenerators.cc +++ b/src/EnergyPlus/DataGenerators.cc @@ -47,8 +47,6 @@ // EnergyPlus Headers #include -#include - namespace EnergyPlus { namespace DataGenerators { @@ -73,8 +71,6 @@ namespace DataGenerators { // na // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataGlobalConstants.cc b/src/EnergyPlus/DataGlobalConstants.cc index 9822be5fd34..12f7382a945 100644 --- a/src/EnergyPlus/DataGlobalConstants.cc +++ b/src/EnergyPlus/DataGlobalConstants.cc @@ -103,145 +103,98 @@ namespace DataGlobalConstants { // Resource Types std::string const cRT_None("None"); - std::string const cRT_NoneUC("NONE"); int const iRT_None(1000); std::string const cRT_Electricity("Electricity"); - std::string const cRT_ElectricityUC("ELECTRICITY"); int const iRT_Electricity(1001); std::string const cRT_Natural_Gas("NaturalGas"); - std::string const cRT_Natural_GasUC("NATURALGAS"); int const iRT_Natural_Gas(1002); std::string const cRT_Gasoline("Gasoline"); - std::string const cRT_GasolineUC("GASOLINE"); int const iRT_Gasoline(1003); std::string const cRT_Diesel("Diesel"); - std::string const cRT_DieselUC("DIESEL"); int const iRT_Diesel(1004); std::string const cRT_Coal("Coal"); - std::string const cRT_CoalUC("COAL"); int const iRT_Coal(1005); std::string const cRT_FuelOil_1("FuelOilNo1"); - std::string const cRT_FuelOil_1UC("FUELOILNO1"); int const iRT_FuelOil_1(1006); std::string const cRT_FuelOil_2("FuelOilNo2"); - std::string const cRT_FuelOil_2UC("FUELOILNO2"); int const iRT_FuelOil_2(1007); std::string const cRT_Propane("Propane"); - std::string const cRT_PropaneUC("PROPANE"); int const iRT_Propane(1008); std::string const cRT_Water("Water"); - std::string const cRT_WaterUC("WATER"); int const iRT_Water(1009); std::string const cRT_EnergyTransfer("EnergyTransfer"); - std::string const cRT_EnergyTransferUC("ENERGYTRANSFER"); int const iRT_EnergyTransfer(1010); std::string const cRT_Steam("Steam"); - std::string const cRT_SteamUC("STEAM"); int const iRT_Steam(1011); std::string const cRT_DistrictCooling("DistrictCooling"); - std::string const cRT_DistrictCoolingUC("DISTRICTCOOLING"); int const iRT_DistrictCooling(1012); std::string const cRT_DistrictHeating("DistrictHeating"); - std::string const cRT_DistrictHeatingUC("DISTRICTHEATING"); int const iRT_DistrictHeating(1013); std::string const cRT_ElectricityProduced("ElectricityProduced"); - std::string const cRT_ElectricityProducedUC("ELECTRICITYPRODUCED"); int const iRT_ElectricityProduced(1014); std::string const cRT_ElectricityPurchased("ElectricityPurchased"); - std::string const cRT_ElectricityPurchasedUC("ELECTRICITYPURCHASED"); int const iRT_ElectricityPurchased(1015); std::string const cRT_ElectricitySurplusSold("ElectricitySurplusSold"); - std::string const cRT_ElectricitySurplusSoldUC("ELECTRICITYSURPLUSSOLD"); int const iRT_ElectricitySurplusSold(1016); std::string const cRT_ElectricityNet("ElectricityNet"); - std::string const cRT_ElectricityNetUC("ELECTRICITYNET"); int const iRT_ElectricityNet(1017); std::string const cRT_SolarWater("SolarWater"); - std::string const cRT_SolarWaterUC("SOLARWATER"); int const iRT_SolarWater(1018); std::string const cRT_SolarAir("SolarAir"); - std::string const cRT_SolarAirUC("SOLARAIR"); int const iRT_SolarAir(1019); std::string const cRT_SO2("SO2"); - std::string const cRT_SO2UC("SO2"); int const iRT_SO2(1020); std::string const cRT_NOx("NOx"); - std::string const cRT_NOxUC("NOX"); int const iRT_NOx(1021); std::string const cRT_N2O("N2O"); - std::string const cRT_N2OUC("N2O"); int const iRT_N2O(1022); std::string const cRT_PM("PM"); - std::string const cRT_PMUC("PM"); int const iRT_PM(1023); std::string const cRT_PM2_5("PM2.5"); - std::string const cRT_PM2_5UC("PM2.5"); int const iRT_PM2_5(1024); std::string const cRT_PM10("PM10"); - std::string const cRT_PM10UC("PM10"); int const iRT_PM10(1025); std::string const cRT_CO("CO"); - std::string const cRT_COUC("CO"); int const iRT_CO(1026); std::string const cRT_CO2("CO2"); - std::string const cRT_CO2UC("CO2"); int const iRT_CO2(1027); std::string const cRT_CH4("CH4"); - std::string const cRT_CH4UC("CH4"); int const iRT_CH4(1028); std::string const cRT_NH3("NH3"); - std::string const cRT_NH3UC("NH3"); int const iRT_NH3(1029); std::string const cRT_NMVOC("NMVOC"); - std::string const cRT_NMVOCUC("NMVOC"); int const iRT_NMVOC(1030); std::string const cRT_Hg("Hg"); - std::string const cRT_HgUC("HG"); int const iRT_Hg(1031); std::string const cRT_Pb("Pb"); - std::string const cRT_PbUC("PB"); int const iRT_Pb(1032); std::string const cRT_NuclearHigh("NuclearHigh"); - std::string const cRT_NuclearHighUC("NUCLEARHIGH"); int const iRT_NuclearHigh(1033); std::string const cRT_NuclearLow("NuclearLow"); - std::string const cRT_NuclearLowUC("NUCLEARLOW"); int const iRT_NuclearLow(1034); std::string const cRT_WaterEnvironmentalFactors("WaterEnvironmentalFactors"); - std::string const cRT_WaterEnvironmentalFactorsUC("WATERENVIRONMENTALFACTORS"); int const iRT_WaterEnvironmentalFactors(1035); std::string const cRT_CarbonEquivalent("Carbon Equivalent"); - std::string const cRT_CarbonEquivalentUC("CARBON EQUIVALENT"); int const iRT_CarbonEquivalent(1036); std::string const cRT_Source("Source"); - std::string const cRT_SourceUC("SOURCE"); int const iRT_Source(1037); std::string const cRT_PlantLoopHeatingDemand("PlantLoopHeatingDemand"); - std::string const cRT_PlantLoopHeatingDemandUC("PLANTLOOPHEATINGDEMAND"); int const iRT_PlantLoopHeatingDemand(1038); std::string const cRT_PlantLoopCoolingDemand("PlantLoopCoolingDemand"); - std::string const cRT_PlantLoopCoolingDemandUC("PLANTLOOPCOOLINGDEMAND"); int const iRT_PlantLoopCoolingDemand(1039); std::string const cRT_OnSiteWater("OnSiteWater"); - std::string const cRT_OnSiteWaterUC("ONSITEWATER"); int const iRT_OnSiteWater(1040); std::string const cRT_MainsWater("MainsWater"); - std::string const cRT_MainsWaterUC("MAINSWATER"); int const iRT_MainsWater(1041); std::string const cRT_RainWater("RainWater"); - std::string const cRT_RainWaterUC("RAINWATER"); int const iRT_RainWater(1042); std::string const cRT_WellWater("WellWater"); - std::string const cRT_WellWaterUC("WellWATER"); int const iRT_WellWater(1043); std::string const cRT_Condensate("Condensate"); - std::string const cRT_CondensateUC("CONDENSATE"); int const iRT_Condensate(1044); std::string const cRT_OtherFuel1("OtherFuel1"); - std::string const cRT_OtherFuel1UC("OTHERFUEL1"); int const iRT_OtherFuel1(1045); std::string const cRT_OtherFuel2("OtherFuel2"); - std::string const cRT_OtherFuel2UC("OTHERFUEL2"); int const iRT_OtherFuel2(1046); int const NumOfResourceTypes(46); int const ResourceTypeInitialOffset(1000); // to reach "ValidTypes" diff --git a/src/EnergyPlus/DataGlobalConstants.hh b/src/EnergyPlus/DataGlobalConstants.hh index ccca48ee8ea..6b4413b8c38 100644 --- a/src/EnergyPlus/DataGlobalConstants.hh +++ b/src/EnergyPlus/DataGlobalConstants.hh @@ -80,145 +80,98 @@ namespace DataGlobalConstants { // Resource Types extern std::string const cRT_None; - extern std::string const cRT_NoneUC; extern int const iRT_None; extern std::string const cRT_Electricity; - extern std::string const cRT_ElectricityUC; extern int const iRT_Electricity; extern std::string const cRT_Natural_Gas; - extern std::string const cRT_Natural_GasUC; extern int const iRT_Natural_Gas; extern std::string const cRT_Gasoline; - extern std::string const cRT_GasolineUC; extern int const iRT_Gasoline; extern std::string const cRT_Diesel; - extern std::string const cRT_DieselUC; extern int const iRT_Diesel; extern std::string const cRT_Coal; - extern std::string const cRT_CoalUC; extern int const iRT_Coal; extern std::string const cRT_FuelOil_1; - extern std::string const cRT_FuelOil_1UC; extern int const iRT_FuelOil_1; extern std::string const cRT_FuelOil_2; - extern std::string const cRT_FuelOil_2UC; extern int const iRT_FuelOil_2; extern std::string const cRT_Propane; - extern std::string const cRT_PropaneUC; extern int const iRT_Propane; extern std::string const cRT_Water; - extern std::string const cRT_WaterUC; extern int const iRT_Water; extern std::string const cRT_EnergyTransfer; - extern std::string const cRT_EnergyTransferUC; extern int const iRT_EnergyTransfer; extern std::string const cRT_Steam; - extern std::string const cRT_SteamUC; extern int const iRT_Steam; extern std::string const cRT_DistrictCooling; - extern std::string const cRT_DistrictCoolingUC; extern int const iRT_DistrictCooling; extern std::string const cRT_DistrictHeating; - extern std::string const cRT_DistrictHeatingUC; extern int const iRT_DistrictHeating; extern std::string const cRT_ElectricityProduced; - extern std::string const cRT_ElectricityProducedUC; extern int const iRT_ElectricityProduced; extern std::string const cRT_ElectricityPurchased; - extern std::string const cRT_ElectricityPurchasedUC; extern int const iRT_ElectricityPurchased; extern std::string const cRT_ElectricitySurplusSold; - extern std::string const cRT_ElectricitySurplusSoldUC; extern int const iRT_ElectricitySurplusSold; extern std::string const cRT_ElectricityNet; - extern std::string const cRT_ElectricityNetUC; extern int const iRT_ElectricityNet; extern std::string const cRT_SolarWater; - extern std::string const cRT_SolarWaterUC; extern int const iRT_SolarWater; extern std::string const cRT_SolarAir; - extern std::string const cRT_SolarAirUC; extern int const iRT_SolarAir; extern std::string const cRT_SO2; - extern std::string const cRT_SO2UC; extern int const iRT_SO2; extern std::string const cRT_NOx; - extern std::string const cRT_NOxUC; extern int const iRT_NOx; extern std::string const cRT_N2O; - extern std::string const cRT_N2OUC; extern int const iRT_N2O; extern std::string const cRT_PM; - extern std::string const cRT_PMUC; extern int const iRT_PM; extern std::string const cRT_PM2_5; - extern std::string const cRT_PM2_5UC; extern int const iRT_PM2_5; extern std::string const cRT_PM10; - extern std::string const cRT_PM10UC; extern int const iRT_PM10; extern std::string const cRT_CO; - extern std::string const cRT_COUC; extern int const iRT_CO; extern std::string const cRT_CO2; - extern std::string const cRT_CO2UC; extern int const iRT_CO2; extern std::string const cRT_CH4; - extern std::string const cRT_CH4UC; extern int const iRT_CH4; extern std::string const cRT_NH3; - extern std::string const cRT_NH3UC; extern int const iRT_NH3; extern std::string const cRT_NMVOC; - extern std::string const cRT_NMVOCUC; extern int const iRT_NMVOC; extern std::string const cRT_Hg; - extern std::string const cRT_HgUC; extern int const iRT_Hg; extern std::string const cRT_Pb; - extern std::string const cRT_PbUC; extern int const iRT_Pb; extern std::string const cRT_NuclearHigh; - extern std::string const cRT_NuclearHighUC; extern int const iRT_NuclearHigh; extern std::string const cRT_NuclearLow; - extern std::string const cRT_NuclearLowUC; extern int const iRT_NuclearLow; extern std::string const cRT_WaterEnvironmentalFactors; - extern std::string const cRT_WaterEnvironmentalFactorsUC; extern int const iRT_WaterEnvironmentalFactors; extern std::string const cRT_CarbonEquivalent; - extern std::string const cRT_CarbonEquivalentUC; extern int const iRT_CarbonEquivalent; extern std::string const cRT_Source; - extern std::string const cRT_SourceUC; extern int const iRT_Source; extern std::string const cRT_PlantLoopHeatingDemand; - extern std::string const cRT_PlantLoopHeatingDemandUC; extern int const iRT_PlantLoopHeatingDemand; extern std::string const cRT_PlantLoopCoolingDemand; - extern std::string const cRT_PlantLoopCoolingDemandUC; extern int const iRT_PlantLoopCoolingDemand; extern std::string const cRT_OnSiteWater; - extern std::string const cRT_OnSiteWaterUC; extern int const iRT_OnSiteWater; extern std::string const cRT_MainsWater; - extern std::string const cRT_MainsWaterUC; extern int const iRT_MainsWater; extern std::string const cRT_RainWater; - extern std::string const cRT_RainWaterUC; extern int const iRT_RainWater; extern std::string const cRT_WellWater; - extern std::string const cRT_WellWaterUC; extern int const iRT_WellWater; extern std::string const cRT_Condensate; - extern std::string const cRT_CondensateUC; extern int const iRT_Condensate; extern std::string const cRT_OtherFuel1; - extern std::string const cRT_OtherFuel1UC; extern int const iRT_OtherFuel1; extern std::string const cRT_OtherFuel2; - extern std::string const cRT_OtherFuel2UC; extern int const iRT_OtherFuel2; extern int const NumOfResourceTypes; extern int const ResourceTypeInitialOffset; // to reach "ValidTypes" diff --git a/src/EnergyPlus/DataHVACGlobals.cc b/src/EnergyPlus/DataHVACGlobals.cc index 70c12fad36f..9a115638a6b 100644 --- a/src/EnergyPlus/DataHVACGlobals.cc +++ b/src/EnergyPlus/DataHVACGlobals.cc @@ -47,8 +47,6 @@ // EnergyPlus Headers #include -#include - namespace EnergyPlus { namespace DataHVACGlobals { @@ -67,8 +65,6 @@ namespace DataHVACGlobals { // OTHER NOTES: // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataHeatBalFanSys.cc b/src/EnergyPlus/DataHeatBalFanSys.cc index 1556c9e5a23..cdb2506ebba 100644 --- a/src/EnergyPlus/DataHeatBalFanSys.cc +++ b/src/EnergyPlus/DataHeatBalFanSys.cc @@ -47,8 +47,6 @@ // EnergyPlus Headers #include -#include - namespace EnergyPlus { namespace DataHeatBalFanSys { @@ -64,8 +62,6 @@ namespace DataHeatBalFanSys { // Heat Balance Module to the Fan Systems // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataHeatBalSurface.cc b/src/EnergyPlus/DataHeatBalSurface.cc index 07f8ea599ce..0858625c839 100644 --- a/src/EnergyPlus/DataHeatBalSurface.cc +++ b/src/EnergyPlus/DataHeatBalSurface.cc @@ -47,8 +47,6 @@ // EnergyPlus Headers #include -#include - namespace EnergyPlus { namespace DataHeatBalSurface { @@ -62,8 +60,6 @@ namespace DataHeatBalSurface { // heat balances which are now "external" subroutines. // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // MODULE PARAMETER DEFINITIONS Real64 const MinSurfaceTempLimit(-100.0); // Lowest inside surface temperature allowed in Celsius diff --git a/src/EnergyPlus/DataIPShortCuts.cc b/src/EnergyPlus/DataIPShortCuts.cc index ad3238d293a..b1d5dcd110e 100644 --- a/src/EnergyPlus/DataIPShortCuts.cc +++ b/src/EnergyPlus/DataIPShortCuts.cc @@ -48,8 +48,6 @@ // EnergyPlus Headers #include #include -#include - namespace EnergyPlus { namespace DataIPShortCuts { diff --git a/src/EnergyPlus/DataLoopNode.cc b/src/EnergyPlus/DataLoopNode.cc index d9f62332634..04902ab575f 100644 --- a/src/EnergyPlus/DataLoopNode.cc +++ b/src/EnergyPlus/DataLoopNode.cc @@ -47,8 +47,6 @@ // EnergyPlus Headers #include -#include - namespace EnergyPlus { namespace DataLoopNode { @@ -73,8 +71,6 @@ namespace DataLoopNode { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // MODULE PARAMETER DEFINITIONS: // Valid Fluid Types for Nodes diff --git a/src/EnergyPlus/DataMoistureBalance.cc b/src/EnergyPlus/DataMoistureBalance.cc index 6c1944b1096..11ca8fc272f 100644 --- a/src/EnergyPlus/DataMoistureBalance.cc +++ b/src/EnergyPlus/DataMoistureBalance.cc @@ -47,7 +47,6 @@ // EnergyPlus Headers #include -#include namespace EnergyPlus { @@ -65,8 +64,6 @@ namespace DataMoistureBalance { // Data is still used in the CondFD solution. // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // module should be available to other modules and routines. Thus, // all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataMoistureBalanceEMPD.cc b/src/EnergyPlus/DataMoistureBalanceEMPD.cc index 43bcefaf2e0..2e0287eedd3 100644 --- a/src/EnergyPlus/DataMoistureBalanceEMPD.cc +++ b/src/EnergyPlus/DataMoistureBalanceEMPD.cc @@ -47,7 +47,6 @@ // EnergyPlus Headers #include -#include namespace EnergyPlus { @@ -64,7 +63,6 @@ namespace DataMoistureBalanceEMPD { // moisture level at interior surfaces // Using/Aliasing - using namespace DataPrecisionGlobals; // Data // module should be available to other modules and routines. Thus, diff --git a/src/EnergyPlus/DataPhotovoltaics.cc b/src/EnergyPlus/DataPhotovoltaics.cc index a8f4a78f17f..7fcaa3f1b8c 100644 --- a/src/EnergyPlus/DataPhotovoltaics.cc +++ b/src/EnergyPlus/DataPhotovoltaics.cc @@ -47,8 +47,6 @@ // EnergyPlus Headers #include -#include - namespace EnergyPlus { namespace DataPhotovoltaics { @@ -73,8 +71,6 @@ namespace DataPhotovoltaics { // na // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataRoomAirModel.cc b/src/EnergyPlus/DataRoomAirModel.cc index 2a96c5eb39b..8ff17bbba30 100644 --- a/src/EnergyPlus/DataRoomAirModel.cc +++ b/src/EnergyPlus/DataRoomAirModel.cc @@ -46,7 +46,6 @@ // POSSIBILITY OF SUCH DAMAGE. // EnergyPlus Headers -#include #include namespace EnergyPlus { @@ -68,8 +67,6 @@ namespace DataRoomAirModel { // USE STATEMENTS: ! UCSD // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // module should be available to other modules and routines. Thus, // all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataRootFinder.cc b/src/EnergyPlus/DataRootFinder.cc index 3d30450ce10..e11118c9f64 100644 --- a/src/EnergyPlus/DataRootFinder.cc +++ b/src/EnergyPlus/DataRootFinder.cc @@ -46,7 +46,6 @@ // POSSIBILITY OF SUCH DAMAGE. // EnergyPlus Headers -#include #include namespace EnergyPlus { @@ -73,8 +72,6 @@ namespace DataRootFinder { // na // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataSizing.cc b/src/EnergyPlus/DataSizing.cc index 6d431bfca61..c191bb03b2d 100644 --- a/src/EnergyPlus/DataSizing.cc +++ b/src/EnergyPlus/DataSizing.cc @@ -46,7 +46,6 @@ // POSSIBILITY OF SUCH DAMAGE. // EnergyPlus Headers -#include #include #include #include @@ -74,8 +73,6 @@ namespace DataSizing { // na // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataSurfaceColors.cc b/src/EnergyPlus/DataSurfaceColors.cc index cf3c1c5755d..b36d689c3c1 100644 --- a/src/EnergyPlus/DataSurfaceColors.cc +++ b/src/EnergyPlus/DataSurfaceColors.cc @@ -48,7 +48,6 @@ // EnergyPlus Headers #include #include -#include #include #include #include @@ -80,8 +79,6 @@ namespace DataSurfaceColors { // na // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // MODULE PARAMETER DEFINITIONS: int const NumColors(15); diff --git a/src/EnergyPlus/DataSurfaceLists.cc b/src/EnergyPlus/DataSurfaceLists.cc index 8033ece19c8..40658e9bb99 100644 --- a/src/EnergyPlus/DataSurfaceLists.cc +++ b/src/EnergyPlus/DataSurfaceLists.cc @@ -51,7 +51,6 @@ // EnergyPlus Headers #include #include -#include #include #include #include @@ -79,8 +78,6 @@ namespace DataSurfaceLists { // na // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataSurfaces.cc b/src/EnergyPlus/DataSurfaces.cc index c743a18dfdc..e22e91caaab 100644 --- a/src/EnergyPlus/DataSurfaces.cc +++ b/src/EnergyPlus/DataSurfaces.cc @@ -59,7 +59,6 @@ #include #include #include -#include #include #include #include @@ -92,7 +91,6 @@ namespace DataSurfaces { // na // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataVectorTypes; using namespace DataBSDFWindow; using namespace DataHeatBalance; diff --git a/src/EnergyPlus/DataTimings.cc b/src/EnergyPlus/DataTimings.cc index 882696f3b4d..f25680bf1f7 100644 --- a/src/EnergyPlus/DataTimings.cc +++ b/src/EnergyPlus/DataTimings.cc @@ -52,7 +52,6 @@ // EnergyPlus Headers #include #include -#include #include #include #include @@ -86,7 +85,6 @@ namespace DataTimings { // na // Using/Aliasing - using namespace DataPrecisionGlobals; using DataSystemVariables::DeveloperFlag; using DataSystemVariables::tabchar; diff --git a/src/EnergyPlus/DataUCSDSharedData.cc b/src/EnergyPlus/DataUCSDSharedData.cc index 89f3488faef..b7c62fe114b 100644 --- a/src/EnergyPlus/DataUCSDSharedData.cc +++ b/src/EnergyPlus/DataUCSDSharedData.cc @@ -46,7 +46,6 @@ // POSSIBILITY OF SUCH DAMAGE. // EnergyPlus Headers -#include #include namespace EnergyPlus { @@ -76,7 +75,6 @@ namespace DataUCSDSharedData { // USE STATEMENTS: // // Using/Aliasing - using namespace DataPrecisionGlobals; // // Data diff --git a/src/EnergyPlus/DataViewFactorInformation.cc b/src/EnergyPlus/DataViewFactorInformation.cc index 91f419935bf..fba554d66a7 100644 --- a/src/EnergyPlus/DataViewFactorInformation.cc +++ b/src/EnergyPlus/DataViewFactorInformation.cc @@ -46,7 +46,6 @@ // POSSIBILITY OF SUCH DAMAGE. // EnergyPlus Headers -#include #include namespace EnergyPlus { @@ -60,8 +59,6 @@ namespace DataViewFactorInformation { // AUTHOR Rob Hitchcock // DATE WRITTEN September 2007; Moved from HeatBalanceIntRadExchange - using namespace DataPrecisionGlobals; - int NumOfRadiantEnclosures(0); // Number of radiant enclosures int NumOfSolarEnclosures(0); // Number of solar enclosures diff --git a/src/EnergyPlus/DataWater.cc b/src/EnergyPlus/DataWater.cc index a81f7c0ec7e..df9d229d94a 100644 --- a/src/EnergyPlus/DataWater.cc +++ b/src/EnergyPlus/DataWater.cc @@ -46,7 +46,6 @@ // POSSIBILITY OF SUCH DAMAGE. // EnergyPlus Headers -#include #include namespace EnergyPlus { @@ -75,8 +74,6 @@ namespace DataWater { // na // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLI diff --git a/src/EnergyPlus/DataWindowEquivalentLayer.cc b/src/EnergyPlus/DataWindowEquivalentLayer.cc index 60b6452a7c3..30312eb7886 100644 --- a/src/EnergyPlus/DataWindowEquivalentLayer.cc +++ b/src/EnergyPlus/DataWindowEquivalentLayer.cc @@ -46,7 +46,6 @@ // POSSIBILITY OF SUCH DAMAGE. // EnergyPlus Headers -#include #include namespace EnergyPlus { @@ -71,8 +70,6 @@ namespace DataWindowEquivalentLayer { // na // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // CFSTY: Complex Fenestration System int const CFSMAXNL(6); // max # of glaze or shade layers diff --git a/src/EnergyPlus/DataZoneControls.cc b/src/EnergyPlus/DataZoneControls.cc index a885a332260..42a964f741d 100644 --- a/src/EnergyPlus/DataZoneControls.cc +++ b/src/EnergyPlus/DataZoneControls.cc @@ -46,7 +46,6 @@ // POSSIBILITY OF SUCH DAMAGE. // EnergyPlus Headers -#include #include namespace EnergyPlus { @@ -76,7 +75,6 @@ namespace DataZoneControls { // na // Using/Aliasing - using namespace DataPrecisionGlobals; // // Data diff --git a/src/EnergyPlus/DataZoneEnergyDemands.cc b/src/EnergyPlus/DataZoneEnergyDemands.cc index 9e91f3be7ea..77fe244cbb1 100644 --- a/src/EnergyPlus/DataZoneEnergyDemands.cc +++ b/src/EnergyPlus/DataZoneEnergyDemands.cc @@ -46,7 +46,6 @@ // POSSIBILITY OF SUCH DAMAGE. // EnergyPlus Headers -#include #include namespace EnergyPlus { @@ -62,8 +61,6 @@ namespace DataZoneEnergyDemands { // loop managers as well as the coil simulations // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // -only module should be available to other modules and routines. // Thus, all variables in this module must be PUBLIC. diff --git a/src/EnergyPlus/DataZoneEquipment.cc b/src/EnergyPlus/DataZoneEquipment.cc index da1a572cd6b..115ad251655 100644 --- a/src/EnergyPlus/DataZoneEquipment.cc +++ b/src/EnergyPlus/DataZoneEquipment.cc @@ -57,7 +57,6 @@ #include #include #include -#include #include #include #include @@ -83,7 +82,6 @@ namespace DataZoneEquipment { // This module contains variable declarations for zone equipment configuration data // Using/Aliasing - using namespace DataPrecisionGlobals; using DataGlobals::NumOfZones; // Data diff --git a/src/EnergyPlus/DaylightingDevices.cc b/src/EnergyPlus/DaylightingDevices.cc index ef803afde5d..8e28cdbd94a 100644 --- a/src/EnergyPlus/DaylightingDevices.cc +++ b/src/EnergyPlus/DaylightingDevices.cc @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include @@ -168,7 +167,6 @@ namespace DaylightingDevices { // Mills, A. F. Heat and Mass Transfer, 1995, p. 499. (Shape factor for adjacent rectangles.) // Using/Aliasing - using namespace DataPrecisionGlobals; using DataGlobals::NumOfZones; using DataHeatBalance::MinimalShadowing; using DataHeatBalance::SolarDistribution; diff --git a/src/EnergyPlus/DaylightingManager.cc b/src/EnergyPlus/DaylightingManager.cc index 378271bfbd3..55f0bfcec36 100644 --- a/src/EnergyPlus/DaylightingManager.cc +++ b/src/EnergyPlus/DaylightingManager.cc @@ -148,7 +148,6 @@ namespace DaylightingManager { // DLUMEF DayltgLuminousEfficacy WeatherManager WeatherManager // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataGlobals; using namespace DataHeatBalance; using namespace DataSurfaces; @@ -9130,7 +9129,7 @@ namespace DaylightingManager { Z = DataGlobalConstants::PiOvr2() - PHSUN; if (ISky >= 1 && ISky <= 3) { // Following not needed for overcast sky COSG = SPHSKY * SPHSUN + std::cos(PHSKY) * CPHSUN * std::cos(THSKY - THSUN); - COSG = max(constant_minusone, min(COSG, 1.0)); // Prevent out of range due to roundoff + COSG = max(DataPrecisionGlobals::constant_minusone, min(COSG, 1.0)); // Prevent out of range due to roundoff G = std::acos(COSG); } diff --git a/src/EnergyPlus/EarthTube.cc b/src/EnergyPlus/EarthTube.cc index 4a75f27e03c..1a0b2e5cd8e 100644 --- a/src/EnergyPlus/EarthTube.cc +++ b/src/EnergyPlus/EarthTube.cc @@ -59,7 +59,6 @@ #include #include #include -#include #include #include #include @@ -88,7 +87,6 @@ namespace EarthTube { // Cambridge Massachusetts, MIT Press, 1989, pp 206-212 // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataGlobals; using namespace DataEnvironment; using namespace DataHeatBalFanSys; diff --git a/src/EnergyPlus/EcoRoofManager.cc b/src/EnergyPlus/EcoRoofManager.cc index 23c009f8f43..469b7fd5941 100644 --- a/src/EnergyPlus/EcoRoofManager.cc +++ b/src/EnergyPlus/EcoRoofManager.cc @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include @@ -97,7 +96,6 @@ namespace EcoRoofManager { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataSurfaces; using namespace DataGlobals; using namespace DataLoopNode; diff --git a/src/EnergyPlus/EvaporativeCoolers.cc b/src/EnergyPlus/EvaporativeCoolers.cc index 97b612262b8..916583a1743 100644 --- a/src/EnergyPlus/EvaporativeCoolers.cc +++ b/src/EnergyPlus/EvaporativeCoolers.cc @@ -68,7 +68,6 @@ #include #include #include -#include #include #include #include @@ -120,7 +119,6 @@ namespace EvaporativeCoolers { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using DataGlobals::BeginDayFlag; using DataGlobals::BeginEnvrnFlag; using DataGlobals::DisplayExtraWarnings; @@ -247,15 +245,15 @@ namespace EvaporativeCoolers { InitEvapCooler(EvapCoolNum); // Initialize all related parameters { - auto const SELECT_CASE_var(EvapCond(EvapCoolNum).EvapCoolerType); + auto const SELECT_CASE_var(EvapCond(EvapCoolNum).evapCoolerType); if (SELECT_CASE_var == EvapCoolerType::DirectCELDEKPAD) { CalcDirectEvapCooler(EvapCoolNum, ZoneEvapCoolerPLR); - } else if (SELECT_CASE_var == EvapCoolerType::InDirectCELDEKPAD) { + } else if (SELECT_CASE_var == EvapCoolerType::IndirectCELDEKPAD) { CalcDryIndirectEvapCooler(EvapCoolNum, ZoneEvapCoolerPLR); - } else if (SELECT_CASE_var == EvapCoolerType::InDirectWETCOIL) { + } else if (SELECT_CASE_var == EvapCoolerType::IndirectWETCOIL) { CalcWetIndirectEvapCooler(EvapCoolNum, ZoneEvapCoolerPLR); - } else if (SELECT_CASE_var == EvapCoolerType::InDirectRDDSpecial) { + } else if (SELECT_CASE_var == EvapCoolerType::IndirectRDDSpecial) { CalcResearchSpecialPartLoad(state, EvapCoolNum); CalcIndirectResearchSpecialEvapCooler(state, EvapCoolNum, ZoneEvapCoolerPLR); } else if (SELECT_CASE_var == EvapCoolerType::DirectResearchSpecial) { @@ -345,7 +343,7 @@ namespace EvaporativeCoolers { cNumericFieldNames); GlobalNames::VerifyUniqueInterObjectName(UniqueEvapCondNames, cAlphaArgs(1), cCurrentModuleObject, cAlphaFieldNames(1), ErrorsFound); EvapCond(EvapCoolNum).EvapCoolerName = cAlphaArgs(1); - EvapCond(EvapCoolNum).EvapCoolerType = EvapCoolerType::DirectCELDEKPAD; + EvapCond(EvapCoolNum).evapCoolerType = EvapCoolerType::DirectCELDEKPAD; EvapCond(EvapCoolNum).Schedule = cAlphaArgs(2); if (lAlphaFieldBlanks(2)) { @@ -418,7 +416,7 @@ namespace EvaporativeCoolers { cNumericFieldNames); GlobalNames::VerifyUniqueInterObjectName(UniqueEvapCondNames, cAlphaArgs(1), cCurrentModuleObject, cAlphaFieldNames(1), ErrorsFound); EvapCond(EvapCoolNum).EvapCoolerName = cAlphaArgs(1); - EvapCond(EvapCoolNum).EvapCoolerType = EvapCoolerType::InDirectCELDEKPAD; //'EvaporativeCooler:Indirect:CelDekPad' + EvapCond(EvapCoolNum).evapCoolerType = EvapCoolerType::IndirectCELDEKPAD; //'EvaporativeCooler:Indirect:CelDekPad' EvapCond(EvapCoolNum).Schedule = cAlphaArgs(2); if (lAlphaFieldBlanks(2)) { @@ -521,7 +519,7 @@ namespace EvaporativeCoolers { cNumericFieldNames); GlobalNames::VerifyUniqueInterObjectName(UniqueEvapCondNames, cAlphaArgs(1), cCurrentModuleObject, cAlphaFieldNames(1), ErrorsFound); EvapCond(EvapCoolNum).EvapCoolerName = cAlphaArgs(1); - EvapCond(EvapCoolNum).EvapCoolerType = EvapCoolerType::InDirectWETCOIL; //'EvaporativeCooler:Indirect:WetCoil' + EvapCond(EvapCoolNum).evapCoolerType = EvapCoolerType::IndirectWETCOIL; //'EvaporativeCooler:Indirect:WetCoil' EvapCond(EvapCoolNum).Schedule = cAlphaArgs(2); if (lAlphaFieldBlanks(2)) { @@ -615,7 +613,7 @@ namespace EvaporativeCoolers { cNumericFieldNames); GlobalNames::VerifyUniqueInterObjectName(UniqueEvapCondNames, cAlphaArgs(1), cCurrentModuleObject, cAlphaFieldNames(1), ErrorsFound); EvapCond(EvapCoolNum).EvapCoolerName = cAlphaArgs(1); - EvapCond(EvapCoolNum).EvapCoolerType = EvapCoolerType::InDirectRDDSpecial; //'EvaporativeCooler:Indirect:ResearchSpecial' + EvapCond(EvapCoolNum).evapCoolerType = EvapCoolerType::IndirectRDDSpecial; //'EvaporativeCooler:Indirect:ResearchSpecial' EvapCond(EvapCoolNum).Schedule = cAlphaArgs(2); if (lAlphaFieldBlanks(2)) { @@ -757,7 +755,7 @@ namespace EvaporativeCoolers { cNumericFieldNames); GlobalNames::VerifyUniqueInterObjectName(UniqueEvapCondNames, cAlphaArgs(1), cCurrentModuleObject, cAlphaFieldNames(1), ErrorsFound); EvapCond(EvapCoolNum).EvapCoolerName = cAlphaArgs(1); - EvapCond(EvapCoolNum).EvapCoolerType = EvapCoolerType::DirectResearchSpecial; + EvapCond(EvapCoolNum).evapCoolerType = EvapCoolerType::DirectResearchSpecial; EvapCond(EvapCoolNum).Schedule = cAlphaArgs(2); if (lAlphaFieldBlanks(2)) { @@ -980,8 +978,8 @@ namespace EvaporativeCoolers { for (EvapUnitNum = 1; EvapUnitNum <= NumEvapCool; ++EvapUnitNum) { // only check evap coolers that are supposed to have a control node - if ((EvapCond(EvapCoolNum).EvapCoolerType != EvapCoolerType::InDirectRDDSpecial) && - (EvapCond(EvapCoolNum).EvapCoolerType != EvapCoolerType::DirectResearchSpecial)) + if ((EvapCond(EvapCoolNum).evapCoolerType != EvapCoolerType::IndirectRDDSpecial) && + (EvapCond(EvapCoolNum).evapCoolerType != EvapCoolerType::DirectResearchSpecial)) continue; ControlNode = EvapCond(EvapUnitNum).EvapControlNodeNum; @@ -1161,12 +1159,12 @@ namespace EvaporativeCoolers { } { - auto const SELECT_CASE_var(EvapCond(EvapCoolNum).EvapCoolerType); - if (SELECT_CASE_var == EvapCoolerType::InDirectCELDEKPAD) { + auto const SELECT_CASE_var(EvapCond(EvapCoolNum).evapCoolerType); + if (SELECT_CASE_var == EvapCoolerType::IndirectCELDEKPAD) { CompType = "EvaporativeCooler:Indirect:CelDekPad"; - } else if (SELECT_CASE_var == EvapCoolerType::InDirectWETCOIL) { + } else if (SELECT_CASE_var == EvapCoolerType::IndirectWETCOIL) { CompType = "EvaporativeCooler:Indirect:WetCoil"; - } else if (SELECT_CASE_var == EvapCoolerType::InDirectRDDSpecial) { + } else if (SELECT_CASE_var == EvapCoolerType::IndirectRDDSpecial) { CompType = "EvaporativeCooler:Indirect:ResearchSpecial"; } else if (SELECT_CASE_var == EvapCoolerType::DirectResearchSpecial) { CompType = "EvaporativeCooler:Direct:ResearchSpecial"; @@ -1202,9 +1200,9 @@ namespace EvaporativeCoolers { if (CurSysNum > 0) { // central system if (!IsAutoSize && !SizingDesRunThisAirSys) { if (EvapCond(EvapCoolNum).IndirectVolFlowRate > 0.0) { - if (EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::InDirectCELDEKPAD || - EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::InDirectWETCOIL || - EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::InDirectRDDSpecial) { + if (EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::IndirectCELDEKPAD || + EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::IndirectWETCOIL || + EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::IndirectRDDSpecial) { BaseSizer::reportSizerOutput(CompType, EvapCond(EvapCoolNum).EvapCoolerName, "User-Specified Secondary Fan Flow Rate [m3/s]", @@ -1219,7 +1217,7 @@ namespace EvaporativeCoolers { IndirectVolFlowRateDes = max(FinalSysSizing(CurSysNum).DesOutAirVolFlow, 0.5 * FinalSysSizing(CurSysNum).DesMainVolFlow); } // apply scaling factor the secondary air fan flow rate - if (EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::InDirectRDDSpecial) { + if (EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::IndirectRDDSpecial) { IndirectVolFlowRateDes = IndirectVolFlowRateDes * EvapCond(EvapCoolNum).IndirectVolFlowScalingFactor; } } @@ -1227,9 +1225,9 @@ namespace EvaporativeCoolers { if (!IsAutoSize && !SizingDesRunThisAirSys) { if (EvapCond(EvapCoolNum).IndirectVolFlowRate > 0.0) { // report for the indirect evap cooler types only - if (EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::InDirectCELDEKPAD || - EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::InDirectWETCOIL || - EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::InDirectRDDSpecial) { + if (EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::IndirectCELDEKPAD || + EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::IndirectWETCOIL || + EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::IndirectRDDSpecial) { BaseSizer::reportSizerOutput(CompType, EvapCond(EvapCoolNum).EvapCoolerName, "User-Specified Secondary Fan Flow Rate [m3/s]", @@ -1240,7 +1238,7 @@ namespace EvaporativeCoolers { // zone equip evap coolers IndirectVolFlowRateDes = FinalZoneSizing(CurZoneEqNum).DesCoolVolFlow; // apply scaling factor the secondary air fan flow rate - if (EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::InDirectRDDSpecial) { + if (EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::IndirectRDDSpecial) { IndirectVolFlowRateDes = IndirectVolFlowRateDes * EvapCond(EvapCoolNum).IndirectVolFlowScalingFactor; } } @@ -1250,9 +1248,9 @@ namespace EvaporativeCoolers { if (!HardSizeNoDesRun) { if (IsAutoSize) { EvapCond(EvapCoolNum).IndirectVolFlowRate = IndirectVolFlowRateDes; - if (EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::InDirectCELDEKPAD || - EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::InDirectWETCOIL || - EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::InDirectRDDSpecial) { + if (EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::IndirectCELDEKPAD || + EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::IndirectWETCOIL || + EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::IndirectRDDSpecial) { BaseSizer::reportSizerOutput(CompType, EvapCond(EvapCoolNum).EvapCoolerName, "Design Size Secondary Fan Flow Rate [m3/s]", @@ -1326,7 +1324,7 @@ namespace EvaporativeCoolers { if (IsAutoSize) { EvapCond(EvapCoolNum).DesVolFlowRate = volFlowRateDes; // only these two evap coolers has primary air design flow rate - if (EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::InDirectRDDSpecial) { + if (EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::IndirectRDDSpecial) { BaseSizer::reportSizerOutput("EvaporativeCooler:Indirect:ResearchSpecial", EvapCond(EvapCoolNum).EvapCoolerName, "Primary Air Design Flow Rate [m3/s]", @@ -1335,7 +1333,7 @@ namespace EvaporativeCoolers { EvapCond(EvapCoolNum).EvapCoolerName, "Secondary Air Design Flow Rate [m3/s]", EvapCond(EvapCoolNum).IndirectVolFlowRate); - } else if (EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::DirectResearchSpecial) { + } else if (EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::DirectResearchSpecial) { BaseSizer::reportSizerOutput("EvaporativeCooler:Direct:ResearchSpecial", EvapCond(EvapCoolNum).EvapCoolerName, "Primary Air Design Flow Rate [m3/s]", @@ -1361,7 +1359,7 @@ namespace EvaporativeCoolers { } } - if (EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::DirectCELDEKPAD) { + if (EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::DirectCELDEKPAD) { IsAutoSize = false; if (EvapCond(EvapCoolNum).PadArea == AutoSize) { IsAutoSize = true; @@ -1480,7 +1478,7 @@ namespace EvaporativeCoolers { } } - if (EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::InDirectCELDEKPAD) { + if (EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::IndirectCELDEKPAD) { IsAutoSize = false; if (EvapCond(EvapCoolNum).IndirectPadArea == AutoSize) { @@ -1609,7 +1607,7 @@ namespace EvaporativeCoolers { } } - if (EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::InDirectRDDSpecial) { + if (EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::IndirectRDDSpecial) { // secondary air fan sizing: Secondary flow Rate (m3/s) * Fan Flow Sizing Factor (W/(m3/s) if (EvapCond(EvapCoolNum).IndirectFanPower == AutoSize) { EvapCond(EvapCoolNum).IndirectFanPower = EvapCond(EvapCoolNum).IndirectVolFlowRate * EvapCond(EvapCoolNum).FanSizingSpecificPower; @@ -1629,7 +1627,7 @@ namespace EvaporativeCoolers { } } - if (EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::DirectResearchSpecial) { + if (EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::DirectResearchSpecial) { // recirculating water pump sizing: Primary Air Design flow Rate (m3/s) * Pump Sizing Factor (W/(m3/s) if (EvapCond(EvapCoolNum).RecircPumpPower == AutoSize) { EvapCond(EvapCoolNum).RecircPumpPower = EvapCond(EvapCoolNum).DesVolFlowRate * EvapCond(EvapCoolNum).RecircPumpSizingFactor; @@ -2148,8 +2146,8 @@ namespace EvaporativeCoolers { // Get full load result, depending on model EvapCond(EvapCoolNum).PartLoadFract = 1.0; { - auto const SELECT_CASE_var(EvapCond(EvapCoolNum).EvapCoolerType); - if (SELECT_CASE_var == EvapCoolerType::InDirectRDDSpecial) { + auto const SELECT_CASE_var(EvapCond(EvapCoolNum).evapCoolerType); + if (SELECT_CASE_var == EvapCoolerType::IndirectRDDSpecial) { CalcIndirectResearchSpecialEvapCooler(state, EvapCoolNum); UpdateEvapCooler(EvapCoolNum); FullOutput = Node(InletNode).MassFlowRate * (PsyHFnTdbW(Node(OutletNode).Temp, Node(InletNode).HumRat) - @@ -3483,7 +3481,7 @@ namespace EvaporativeCoolers { if (EvapCond(EvapCoolNum).SecondaryOutletNode > 0) { // set outlet nodes of the secondary air side of the EvapCooler (mass Flow Rate Only) - if (EvapCond(EvapCoolNum).EvapCoolerType == EvapCoolerType::InDirectRDDSpecial && EvapCond(EvapCoolNum).EvapCoolerOperationControlFlag) { + if (EvapCond(EvapCoolNum).evapCoolerType == EvapCoolerType::IndirectRDDSpecial && EvapCond(EvapCoolNum).EvapCoolerOperationControlFlag) { Node(OutletNodeSec).Temp = EvapCond(EvapCoolNum).SecOutletTemp; Node(OutletNodeSec).HumRat = EvapCond(EvapCoolNum).SecOutletHumRat; Node(OutletNodeSec).Enthalpy = EvapCond(EvapCoolNum).SecOutletEnthalpy; @@ -3856,13 +3854,13 @@ namespace EvaporativeCoolers { ZoneEvapUnit(UnitLoop).EvapCooler_1_Type_Num = EvapCoolerType::DirectResearchSpecial; } else if (SELECT_CASE_var == "EVAPORATIVECOOLER:INDIRECT:CELDEKPAD") { ZoneEvapUnit(UnitLoop).EvapCooler_1_ObjectClassName = "EvaporativeCooler:Indirect:CelDekPad"; - ZoneEvapUnit(UnitLoop).EvapCooler_1_Type_Num = EvapCoolerType::InDirectCELDEKPAD; + ZoneEvapUnit(UnitLoop).EvapCooler_1_Type_Num = EvapCoolerType::IndirectCELDEKPAD; } else if (SELECT_CASE_var == "EVAPORATIVECOOLER:INDIRECT:WETCOIL") { ZoneEvapUnit(UnitLoop).EvapCooler_1_ObjectClassName = "EvaporativeCooler:Indirect:WetCoil"; - ZoneEvapUnit(UnitLoop).EvapCooler_1_Type_Num = EvapCoolerType::InDirectWETCOIL; + ZoneEvapUnit(UnitLoop).EvapCooler_1_Type_Num = EvapCoolerType::IndirectWETCOIL; } else if (SELECT_CASE_var == "EVAPORATIVECOOLER:INDIRECT:RESEARCHSPECIAL") { ZoneEvapUnit(UnitLoop).EvapCooler_1_ObjectClassName = "EvaporativeCooler:Indirect:ResearchSpecial"; - ZoneEvapUnit(UnitLoop).EvapCooler_1_Type_Num = EvapCoolerType::InDirectRDDSpecial; + ZoneEvapUnit(UnitLoop).EvapCooler_1_Type_Num = EvapCoolerType::IndirectRDDSpecial; } else { ShowSevereError(CurrentModuleObject + "=\"" + ZoneEvapUnit(UnitLoop).Name + "\" invalid data."); ShowContinueError("invalid choice found " + cAlphaFields(11) + "=\"" + Alphas(11) + "\"."); @@ -3890,13 +3888,13 @@ namespace EvaporativeCoolers { ZoneEvapUnit(UnitLoop).EvapCooler_2_Type_Num = EvapCoolerType::DirectResearchSpecial; } else if (SELECT_CASE_var == "EVAPORATIVECOOLER:INDIRECT:CELDEKPAD") { ZoneEvapUnit(UnitLoop).EvapCooler_2_ObjectClassName = "EvaporativeCooler:Indirect:CelDekPad"; - ZoneEvapUnit(UnitLoop).EvapCooler_2_Type_Num = EvapCoolerType::InDirectCELDEKPAD; + ZoneEvapUnit(UnitLoop).EvapCooler_2_Type_Num = EvapCoolerType::IndirectCELDEKPAD; } else if (SELECT_CASE_var == "EVAPORATIVECOOLER:INDIRECT:WETCOIL") { ZoneEvapUnit(UnitLoop).EvapCooler_2_ObjectClassName = "EvaporativeCooler:Indirect:WetCoil"; - ZoneEvapUnit(UnitLoop).EvapCooler_2_Type_Num = EvapCoolerType::InDirectWETCOIL; + ZoneEvapUnit(UnitLoop).EvapCooler_2_Type_Num = EvapCoolerType::IndirectWETCOIL; } else if (SELECT_CASE_var == "EVAPORATIVECOOLER:INDIRECT:RESEARCHSPECIAL") { ZoneEvapUnit(UnitLoop).EvapCooler_2_ObjectClassName = "EvaporativeCooler:Indirect:ResearchSpecial"; - ZoneEvapUnit(UnitLoop).EvapCooler_2_Type_Num = EvapCoolerType::InDirectRDDSpecial; + ZoneEvapUnit(UnitLoop).EvapCooler_2_Type_Num = EvapCoolerType::IndirectRDDSpecial; } else { ShowSevereError(CurrentModuleObject + "=\"" + ZoneEvapUnit(UnitLoop).Name + "\" invalid data."); ShowContinueError("invalid choice found " + cAlphaFields(13) + "=\"" + Alphas(13) + "\"."); @@ -4237,13 +4235,13 @@ namespace EvaporativeCoolers { // place default cold setpoints on control nodes of select evap coolers if ((ZoneEvapUnit(UnitNum).EvapCooler_1_Type_Num == EvapCoolerType::DirectResearchSpecial) || - (ZoneEvapUnit(UnitNum).EvapCooler_1_Type_Num == EvapCoolerType::InDirectRDDSpecial)) { + (ZoneEvapUnit(UnitNum).EvapCooler_1_Type_Num == EvapCoolerType::IndirectRDDSpecial)) { if (EvapCond(ZoneEvapUnit(UnitNum).EvapCooler_1_Index).EvapControlNodeNum > 0) { Node(EvapCond(ZoneEvapUnit(UnitNum).EvapCooler_1_Index).EvapControlNodeNum).TempSetPoint = -20.0; } } if ((ZoneEvapUnit(UnitNum).EvapCooler_2_Type_Num == EvapCoolerType::DirectResearchSpecial) || - (ZoneEvapUnit(UnitNum).EvapCooler_2_Type_Num == EvapCoolerType::InDirectRDDSpecial)) { + (ZoneEvapUnit(UnitNum).EvapCooler_2_Type_Num == EvapCoolerType::IndirectRDDSpecial)) { if (EvapCond(ZoneEvapUnit(UnitNum).EvapCooler_2_Index).EvapControlNodeNum > 0) { Node(EvapCond(ZoneEvapUnit(UnitNum).EvapCooler_2_Index).EvapControlNodeNum).TempSetPoint = -20.0; } diff --git a/src/EnergyPlus/EvaporativeCoolers.hh b/src/EnergyPlus/EvaporativeCoolers.hh index 4b1ee1de3da..c7cbb5c189d 100644 --- a/src/EnergyPlus/EvaporativeCoolers.hh +++ b/src/EnergyPlus/EvaporativeCoolers.hh @@ -99,9 +99,9 @@ namespace EvaporativeCoolers { enum class EvapCoolerType { Unassigned, DirectCELDEKPAD, - InDirectCELDEKPAD, - InDirectWETCOIL, - InDirectRDDSpecial, + IndirectCELDEKPAD, + IndirectWETCOIL, + IndirectRDDSpecial, DirectResearchSpecial }; @@ -114,7 +114,7 @@ namespace EvaporativeCoolers { // Members std::string EvapCoolerName; // Name of the EvapCooler int EquipIndex; - EvapCoolerType EvapCoolerType; // Type of the EvapCooler (parameters in DataGlobalConstants.cc + EvapCoolerType evapCoolerType; // Type of the EvapCooler std::string EvapControlType; // Type of Control for the EvapCooler std::string Schedule; // HeatingCoil Operation Schedule int SchedPtr; // Pointer to the correct schedule @@ -213,7 +213,7 @@ namespace EvaporativeCoolers { // Default Constructor EvapConditions() - : EquipIndex(0), EvapCoolerType(EvapCoolerType::Unassigned), SchedPtr(0), VolFlowRate(0.0), DesVolFlowRate(0.0), + : EquipIndex(0), evapCoolerType(EvapCoolerType::Unassigned), SchedPtr(0), VolFlowRate(0.0), DesVolFlowRate(0.0), OutletTemp(0.0), OuletWetBulbTemp(0.0), OutletHumRat(0.0), OutletEnthalpy(0.0), OutletPressure(0.0), OutletMassFlowRate(0.0), OutletMassFlowRateMaxAvail(0.0), OutletMassFlowRateMinAvail(0.0), InitFlag(false), InletNode(0), OutletNode(0), SecondaryInletNode(0), SecondaryOutletNode(0), @@ -335,9 +335,7 @@ namespace EvaporativeCoolers { Array1D_string FieldNames; // Default Constructor - ZoneEvapCoolerUnitFieldData() - { - } + ZoneEvapCoolerUnitFieldData() = default; }; // Object Data @@ -347,7 +345,7 @@ namespace EvaporativeCoolers { // Functions - void SimEvapCooler(EnergyPlusData &state, std::string const &CompName, int &CompIndex, Real64 const PartLoadRatio = 1.0); + void SimEvapCooler(EnergyPlusData &state, std::string const &CompName, int &CompIndex, Real64 PartLoadRatio = 1.0); // Get Input Section of the Module //****************************************************************************** @@ -360,9 +358,9 @@ namespace EvaporativeCoolers { // Beginning Initialization Section of the Module //****************************************************************************** - void InitEvapCooler(int const EvapCoolNum); + void InitEvapCooler(int EvapCoolNum); - void SizeEvapCooler(int const EvapCoolNum); + void SizeEvapCooler(int EvapCoolNum); // End Initialization Section of the Module //****************************************************************************** @@ -370,58 +368,58 @@ namespace EvaporativeCoolers { // Begin Algorithm Section of the Module //****************************************************************************** - void CalcDirectEvapCooler(int &EvapCoolNum, Real64 const PartLoadRatio); + void CalcDirectEvapCooler(int &EvapCoolNum, Real64 PartLoadRatio); - void CalcDryIndirectEvapCooler(int &EvapCoolNum, Real64 const PartLoadRatio); + void CalcDryIndirectEvapCooler(int &EvapCoolNum, Real64 PartLoadRatio); - void CalcWetIndirectEvapCooler(int &EvapCoolNum, Real64 const PartLoadRatio); + void CalcWetIndirectEvapCooler(int &EvapCoolNum, Real64 PartLoadRatio); void CalcResearchSpecialPartLoad(EnergyPlusData &state, int &EvapCoolNum); void CalcIndirectResearchSpecialEvapCoolerAdvanced(EnergyPlusData &state, - int const EvapCoolNum, - Real64 const InletDryBulbTempSec, - Real64 const InletWetBulbTempSec, - Real64 const InletDewPointTempSec, - Real64 const InletHumRatioSec); - - int IndirectResearchSpecialEvapCoolerOperatingMode(int const EvapCoolNum, - Real64 const InletDryBulbTempSec, - Real64 const InletWetBulbTempSec, - Real64 const TdbOutSysWetMin, - Real64 const TdbOutSysDryMin); - - void CalcSecondaryAirOutletCondition(int const EvapCoolNum, - int const OperatingMode, - Real64 const AirMassFlowSec, - Real64 const EDBTSec, - Real64 const EWBTSec, - Real64 const EHumRatSec, - Real64 const QHXTotal, + int EvapCoolNum, + Real64 InletDryBulbTempSec, + Real64 InletWetBulbTempSec, + Real64 InletDewPointTempSec, + Real64 InletHumRatioSec); + + int IndirectResearchSpecialEvapCoolerOperatingMode(int EvapCoolNum, + Real64 InletDryBulbTempSec, + Real64 InletWetBulbTempSec, + Real64 TdbOutSysWetMin, + Real64 TdbOutSysDryMin); + + void CalcSecondaryAirOutletCondition(int EvapCoolNum, + int OperatingMode, + Real64 AirMassFlowSec, + Real64 EDBTSec, + Real64 EWBTSec, + Real64 EHumRatSec, + Real64 QHXTotal, Real64 &QHXLatent); void CalcIndirectRDDEvapCoolerOutletTemp(EnergyPlusData &state, - int const EvapCoolNum, - int const DryOrWetOperatingMode, - Real64 const AirMassFlowSec, - Real64 const EDBTSec, - Real64 const EWBTSec, - Real64 const EHumRatSec); + int EvapCoolNum, + int DryOrWetOperatingMode, + Real64 AirMassFlowSec, + Real64 EDBTSec, + Real64 EWBTSec, + Real64 EHumRatSec); Real64 CalcEvapCoolRDDSecFlowResidual(EnergyPlusData &state, - Real64 const AirMassFlowSec, + Real64 AirMassFlowSec, Array1D const &Par // Par( 6 ) is desired temperature C ); Real64 IndEvapCoolerPower(EnergyPlusData &state, - int const EvapCoolIndex, // Unit index - int const DryWetMode, // dry or wet operating mode of evaporator cooler - Real64 const FlowRatio // secondary air flow fraction + int EvapCoolIndex, // Unit index + int DryWetMode, // dry or wet operating mode of evaporator cooler + Real64 FlowRatio // secondary air flow fraction ); - void CalcIndirectResearchSpecialEvapCooler(EnergyPlusData &state, int const EvapCoolNum, Real64 const FanPLR = 1.0); + void CalcIndirectResearchSpecialEvapCooler(EnergyPlusData &state, int EvapCoolNum, Real64 FanPLR = 1.0); - void CalcDirectResearchSpecialEvapCooler(EnergyPlusData &state, int const EvapCoolNum, Real64 const FanPLR = 1.0); + void CalcDirectResearchSpecialEvapCooler(EnergyPlusData &state, int EvapCoolNum, Real64 FanPLR = 1.0); // End Algorithm Section of the Module // ***************************************************************************** @@ -429,7 +427,7 @@ namespace EvaporativeCoolers { // Beginning of Update subroutines for the EvapCooler Module // ***************************************************************************** - void UpdateEvapCooler(int const EvapCoolNum); + void UpdateEvapCooler(int EvapCoolNum); // End of Update subroutines for the EvapCooler Module // ***************************************************************************** @@ -437,7 +435,7 @@ namespace EvaporativeCoolers { // Beginning of Reporting subroutines for the EvapCooler Module // ***************************************************************************** - void ReportEvapCooler(int const EvapCoolNum); + void ReportEvapCooler(int EvapCoolNum); //*************** // Begin routines for zone HVAC Evaporative cooler unit @@ -445,7 +443,7 @@ namespace EvaporativeCoolers { //*************** void SimZoneEvaporativeCoolerUnit(EnergyPlusData &state, std::string const &CompName, // name of the packaged terminal heat pump - int const ZoneNum, // number of zone being served + int ZoneNum, // number of zone being served Real64 &SensibleOutputProvided, // sensible capacity delivered to zone Real64 &LatentOutputProvided, // Latent add/removal (kg/s), dehumid = negative int &CompIndex // index to zone hvac unit @@ -453,42 +451,42 @@ namespace EvaporativeCoolers { void GetInputZoneEvaporativeCoolerUnit(EnergyPlusData &state); - void InitZoneEvaporativeCoolerUnit(EnergyPlusData &state, int const UnitNum, // unit number - int const ZoneNum // number of zone being served + void InitZoneEvaporativeCoolerUnit(EnergyPlusData &state, int UnitNum, // unit number + int ZoneNum // number of zone being served ); - void SizeZoneEvaporativeCoolerUnit(EnergyPlusData &state, int const UnitNum); // unit number + void SizeZoneEvaporativeCoolerUnit(EnergyPlusData &state, int UnitNum); // unit number - void CalcZoneEvaporativeCoolerUnit(EnergyPlusData &state, int const UnitNum, // unit number - int const ZoneNum, // number of zone being served + void CalcZoneEvaporativeCoolerUnit(EnergyPlusData &state, int UnitNum, // unit number + int ZoneNum, // number of zone being served Real64 &SensibleOutputProvided, // sensible capacity delivered to zone Real64 &LatentOutputProvided // Latent add/removal (kg/s), dehumid = negative ); - void CalcZoneEvapUnitOutput(EnergyPlusData &state, int const UnitNum, // unit number - Real64 const PartLoadRatio, // zone evap unit part load ratiod + void CalcZoneEvapUnitOutput(EnergyPlusData &state, int UnitNum, // unit number + Real64 PartLoadRatio, // zone evap unit part load ratiod Real64 &SensibleOutputProvided, // sensible capacity delivered to zone Real64 &LatentOutputProvided // Latent add/removal (kg/s), dehumid = negative ); - void ControlZoneEvapUnitOutput(EnergyPlusData &state, int const UnitNum, // unit number - Real64 const ZoneCoolingLoad // target cooling load + void ControlZoneEvapUnitOutput(EnergyPlusData &state, int UnitNum, // unit number + Real64 ZoneCoolingLoad // target cooling load ); - Real64 ZoneEvapUnitLoadResidual(EnergyPlusData &state, Real64 const PartLoadRatio, // zone evap unit part load ratiod + Real64 ZoneEvapUnitLoadResidual(EnergyPlusData &state, Real64 PartLoadRatio, // zone evap unit part load ratiod Array1D const &Par // parameters ); - void ControlVSEvapUnitToMeetLoad(EnergyPlusData &state, int const UnitNum, // unit number - int const ZoneNum, // number of zone being served - Real64 const ZoneCoolingLoad // target cooling load + void ControlVSEvapUnitToMeetLoad(EnergyPlusData &state, int UnitNum, // unit number + int ZoneNum, // number of zone being served + Real64 ZoneCoolingLoad // target cooling load ); - Real64 VSEvapUnitLoadResidual(EnergyPlusData &state, Real64 const FanSpeedRatio, + Real64 VSEvapUnitLoadResidual(EnergyPlusData &state, Real64 FanSpeedRatio, Array1D const &Par // parameters ); - void ReportZoneEvaporativeCoolerUnit(int const UnitNum); // unit number + void ReportZoneEvaporativeCoolerUnit(int UnitNum); // unit number // End of Reporting subroutines for the EvaporativeCoolers Module // ***************************************************************************** diff --git a/src/EnergyPlus/FanCoilUnits.cc b/src/EnergyPlus/FanCoilUnits.cc index 6e4be0a2dd1..8a025dfc441 100644 --- a/src/EnergyPlus/FanCoilUnits.cc +++ b/src/EnergyPlus/FanCoilUnits.cc @@ -127,7 +127,6 @@ namespace FanCoilUnits { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataSizing; using DataEnvironment::OutBaroPress; @@ -2691,8 +2690,8 @@ namespace FanCoilUnits { QTotUnitOut = AirMassFlow * (Node(OutletNode).Enthalpy - Node(InletNode).Enthalpy); // report variables FanCoil(FanCoilNum).HeatPower = max(0.0, QUnitOut); - FanCoil(FanCoilNum).SensCoolPower = std::abs(min(constant_zero, QUnitOut)); - FanCoil(FanCoilNum).TotCoolPower = std::abs(min(constant_zero, QTotUnitOut)); + FanCoil(FanCoilNum).SensCoolPower = std::abs(min(DataPrecisionGlobals::constant_zero, QUnitOut)); + FanCoil(FanCoilNum).TotCoolPower = std::abs(min(DataPrecisionGlobals::constant_zero, QTotUnitOut)); if (FanCoil(FanCoilNum).FanType_Num != DataHVACGlobals::FanType_SystemModelObject) { FanCoil(FanCoilNum).ElecPower = Fans::GetFanPower(FanCoil(FanCoilNum).FanIndex); } else { @@ -3017,8 +3016,8 @@ namespace FanCoilUnits { QTotUnitOut = AirMassFlow * (Node(OutletNode).Enthalpy - Node(InletNode).Enthalpy); // report variables FanCoil(FanCoilNum).HeatPower = max(0.0, QUnitOut); - FanCoil(FanCoilNum).SensCoolPower = std::abs(min(constant_zero, QUnitOut)); - FanCoil(FanCoilNum).TotCoolPower = std::abs(min(constant_zero, QTotUnitOut)); + FanCoil(FanCoilNum).SensCoolPower = std::abs(min(DataPrecisionGlobals::constant_zero, QUnitOut)); + FanCoil(FanCoilNum).TotCoolPower = std::abs(min(DataPrecisionGlobals::constant_zero, QTotUnitOut)); if (FanCoil(FanCoilNum).FanType_Num != DataHVACGlobals::FanType_SystemModelObject) { FanCoil(FanCoilNum).ElecPower = Fans::GetFanPower(FanCoil(FanCoilNum).FanIndex); } else { @@ -3352,8 +3351,8 @@ namespace FanCoilUnits { QTotUnitOut = AirMassFlow * (Node(OutletNode).Enthalpy - Node(InletNode).Enthalpy); // report variables FanCoil(FanCoilNum).HeatPower = max(0.0, QSensUnitOutNoATM); - FanCoil(FanCoilNum).SensCoolPower = std::abs(min(constant_zero, QSensUnitOutNoATM)); - FanCoil(FanCoilNum).TotCoolPower = std::abs(min(constant_zero, QTotUnitOut)); + FanCoil(FanCoilNum).SensCoolPower = std::abs(min(DataPrecisionGlobals::constant_zero, QSensUnitOutNoATM)); + FanCoil(FanCoilNum).TotCoolPower = std::abs(min(DataPrecisionGlobals::constant_zero, QTotUnitOut)); if (FanCoil(FanCoilNum).FanType_Num != DataHVACGlobals::FanType_SystemModelObject) { FanCoil(FanCoilNum).ElecPower = Fans::GetFanPower(FanCoil(FanCoilNum).FanIndex); } else { @@ -3374,8 +3373,8 @@ namespace FanCoilUnits { QTotUnitOut = AirMassFlow * (Node(OutletNode).Enthalpy - Node(InletNode).Enthalpy); // report variables FanCoil(FanCoilNum).HeatPower = max(0.0, QSensUnitOutNoATM); - FanCoil(FanCoilNum).SensCoolPower = std::abs(min(constant_zero, QSensUnitOutNoATM)); - FanCoil(FanCoilNum).TotCoolPower = std::abs(min(constant_zero, QTotUnitOut)); + FanCoil(FanCoilNum).SensCoolPower = std::abs(min(DataPrecisionGlobals::constant_zero, QSensUnitOutNoATM)); + FanCoil(FanCoilNum).TotCoolPower = std::abs(min(DataPrecisionGlobals::constant_zero, QTotUnitOut)); if (FanCoil(FanCoilNum).FanType_Num != DataHVACGlobals::FanType_SystemModelObject) { FanCoil(FanCoilNum).ElecPower = Fans::GetFanPower(FanCoil(FanCoilNum).FanIndex); } else { diff --git a/src/EnergyPlus/Fans.cc b/src/EnergyPlus/Fans.cc index 4262af79a2b..e920907194b 100644 --- a/src/EnergyPlus/Fans.cc +++ b/src/EnergyPlus/Fans.cc @@ -102,7 +102,6 @@ namespace Fans { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataGlobals; using DataEnvironment::StdRhoAir; @@ -3155,7 +3154,7 @@ namespace Fans { MotEff = Fan(FanNum).MotEff; MotInAirFrac = Fan(FanNum).MotInAirFrac; RhoAir = StdRhoAir; - CpAir = PsyCpAirFnW(constant_zero); + CpAir = PsyCpAirFnW(DataPrecisionGlobals::constant_zero); DesignDeltaT = (DeltaP / (RhoAir * CpAir * TotEff)) * (MotEff + MotInAirFrac * (1.0 - MotEff)); } else { DesignDeltaT = 0.0; diff --git a/src/EnergyPlus/FluidCoolers.cc b/src/EnergyPlus/FluidCoolers.cc index bc94af4d18f..fccef8b07ec 100644 --- a/src/EnergyPlus/FluidCoolers.cc +++ b/src/EnergyPlus/FluidCoolers.cc @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include diff --git a/src/EnergyPlus/FluidProperties.cc b/src/EnergyPlus/FluidProperties.cc index 1f52f9880df..f8db0694b3a 100644 --- a/src/EnergyPlus/FluidProperties.cc +++ b/src/EnergyPlus/FluidProperties.cc @@ -57,7 +57,6 @@ // EnergyPlus Headers #include -#include #include #include #include @@ -110,7 +109,6 @@ namespace FluidProperties { // USE STATEMENTS // Using/Aliasing - using namespace DataPrecisionGlobals; using DataGlobals::WarmupFlag; using General::RoundSigDigits; diff --git a/src/EnergyPlus/GlobalNames.cc b/src/EnergyPlus/GlobalNames.cc index 3557f0a7654..20b2dc396c1 100644 --- a/src/EnergyPlus/GlobalNames.cc +++ b/src/EnergyPlus/GlobalNames.cc @@ -46,7 +46,6 @@ // POSSIBILITY OF SUCH DAMAGE. // EnergyPlus Headers -#include #include #include #include @@ -78,7 +77,6 @@ namespace GlobalNames { // na // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataGlobals; // Data diff --git a/src/EnergyPlus/HVACControllers.cc b/src/EnergyPlus/HVACControllers.cc index 93b7476d41d..c37e6eb962d 100644 --- a/src/EnergyPlus/HVACControllers.cc +++ b/src/EnergyPlus/HVACControllers.cc @@ -180,7 +180,6 @@ namespace HVACControllers { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataGlobals; using DataHVACGlobals::SetPointErrorFlag; @@ -412,7 +411,7 @@ namespace HVACControllers { HVACControllers::ControllerProps(ControlNum).HumRatCtrlOverride = false; // Put the controller tolerance (offset) back to it's original value RootFinder::SetupRootFinder( - RootFinders(ControlNum), iSlopeDecreasing, iMethodBrent, constant_zero, 1.0e-6, ControllerProps(ControlNum).Offset); + RootFinders(ControlNum), iSlopeDecreasing, iMethodBrent, DataPrecisionGlobals::constant_zero, 1.0e-6, ControllerProps(ControlNum).Offset); } // If a iControllerOpColdStart call, reset the actuator inlet flows @@ -1161,7 +1160,7 @@ namespace HVACControllers { SetupRootFinder(RootFinders(ControlNum), iSlopeIncreasing, iMethodBrent, - constant_zero, + DataPrecisionGlobals::constant_zero, 1.0e-6, ControllerProps(ControlNum).Offset); // Slope type | Method type | TolX: no relative tolerance for X variables | // ATolX: absolute tolerance for X variables | ATolY: absolute tolerance for @@ -1171,7 +1170,7 @@ namespace HVACControllers { SetupRootFinder(RootFinders(ControlNum), iSlopeDecreasing, iMethodBrent, - constant_zero, + DataPrecisionGlobals::constant_zero, 1.0e-6, ControllerProps(ControlNum).Offset); // Slope type | Method type | TolX: no relative tolerance for X variables | // ATolX: absolute tolerance for X variables | ATolY: absolute tolerance for @@ -1495,7 +1494,7 @@ namespace HVACControllers { // Check to see if the component is running; if not converged and return. This check will be done // by looking at the component mass flow rate at the sensed node. if (Node(SensedNode).MassFlowRate == 0.0) { - ExitCalcController(ControlNum, constant_zero, iModeOff, IsConvergedFlag, IsUpToDateFlag); + ExitCalcController(ControlNum, DataPrecisionGlobals::constant_zero, iModeOff, IsConvergedFlag, IsUpToDateFlag); return; } @@ -2251,7 +2250,7 @@ namespace HVACControllers { if (thisController.Action == iReverseAction) { // Cooling coil controller should always be ReverseAction, but skip this if not RootFinder::SetupRootFinder( - RootFinders(ControlNum), iSlopeDecreasing, iMethodFalsePosition, constant_zero, 1.0e-6, 1.0e-5); + RootFinders(ControlNum), iSlopeDecreasing, iMethodFalsePosition, DataPrecisionGlobals::constant_zero, 1.0e-6, 1.0e-5); } // Do a cold start reset, same as iControllerOpColdStart ResetController(ControlNum, false, IsConvergedFlag); diff --git a/src/EnergyPlus/HVACDXSystem.cc b/src/EnergyPlus/HVACDXSystem.cc index d33b67cad24..400fc1e48f6 100644 --- a/src/EnergyPlus/HVACDXSystem.cc +++ b/src/EnergyPlus/HVACDXSystem.cc @@ -62,7 +62,6 @@ #include #include #include -#include #include #include //coil report #include @@ -119,7 +118,6 @@ namespace HVACDXSystem { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataGlobals; using namespace DataHVACGlobals; diff --git a/src/EnergyPlus/HVACDuct.cc b/src/EnergyPlus/HVACDuct.cc index c22483f9f61..5bcac778717 100644 --- a/src/EnergyPlus/HVACDuct.cc +++ b/src/EnergyPlus/HVACDuct.cc @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -91,7 +90,6 @@ namespace HVACDuct { // USE STATEMENTS: // // Using/Aliasing - using namespace DataPrecisionGlobals; using DataGlobals::BeginEnvrnFlag; using namespace DataHVACGlobals; using namespace DataLoopNode; diff --git a/src/EnergyPlus/HVACFan.cc b/src/EnergyPlus/HVACFan.cc index dfdc79752fb..2e966a0adc0 100644 --- a/src/EnergyPlus/HVACFan.cc +++ b/src/EnergyPlus/HVACFan.cc @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include diff --git a/src/EnergyPlus/HVACHXAssistedCoolingCoil.cc b/src/EnergyPlus/HVACHXAssistedCoolingCoil.cc index d6b01479bcb..c3043f6b740 100644 --- a/src/EnergyPlus/HVACHXAssistedCoolingCoil.cc +++ b/src/EnergyPlus/HVACHXAssistedCoolingCoil.cc @@ -57,7 +57,6 @@ #include #include #include -#include #include #include #include @@ -102,7 +101,6 @@ namespace HVACHXAssistedCoolingCoil { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataGlobals; using namespace DataHVACGlobals; diff --git a/src/EnergyPlus/HVACManager.cc b/src/EnergyPlus/HVACManager.cc index 45c9a0242d6..309b4bda4f4 100644 --- a/src/EnergyPlus/HVACManager.cc +++ b/src/EnergyPlus/HVACManager.cc @@ -69,7 +69,6 @@ #include #include #include -#include #include #include #include @@ -126,7 +125,6 @@ namespace HVACManager { // REFERENCES: // Using/Aliasing - using namespace DataPrecisionGlobals; using DataGlobals::AnyEnergyManagementSystemInModel; using DataGlobals::AnyIdealCondEntSetPointInModel; using DataGlobals::BeginDayFlag; diff --git a/src/EnergyPlus/HVACSingleDuctInduc.cc b/src/EnergyPlus/HVACSingleDuctInduc.cc index afa0f98c003..e747292a3f5 100644 --- a/src/EnergyPlus/HVACSingleDuctInduc.cc +++ b/src/EnergyPlus/HVACSingleDuctInduc.cc @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include @@ -109,7 +108,6 @@ namespace HVACSingleDuctInduc { // na // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using DataEnvironment::StdRhoAir; using DataGlobals::BeginEnvrnFlag; diff --git a/src/EnergyPlus/HeatBalanceInternalHeatGains.cc b/src/EnergyPlus/HeatBalanceInternalHeatGains.cc index 3e08f88d584..a2713601680 100644 --- a/src/EnergyPlus/HeatBalanceInternalHeatGains.cc +++ b/src/EnergyPlus/HeatBalanceInternalHeatGains.cc @@ -50,7 +50,6 @@ // EnergyPlus Headers #include -#include #include #include @@ -86,7 +85,6 @@ void SetupZoneInternalGain(int const ZoneNum, // and HVAC components with skin loss models like thermal tanks, and power conditioning. // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataHeatBalance; // SUBROUTINE PARAMETER DEFINITIONS: diff --git a/src/EnergyPlus/HeatBalanceManager.cc b/src/EnergyPlus/HeatBalanceManager.cc index 6b2e14db333..747da140e03 100644 --- a/src/EnergyPlus/HeatBalanceManager.cc +++ b/src/EnergyPlus/HeatBalanceManager.cc @@ -72,7 +72,6 @@ #include #include #include -#include #include #include #include @@ -144,7 +143,6 @@ namespace HeatBalanceManager { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataComplexFenestration; using namespace DataGlobals; using namespace DataEnvironment; diff --git a/src/EnergyPlus/HeatBalanceMovableInsulation.cc b/src/EnergyPlus/HeatBalanceMovableInsulation.cc index 6ed92c31c92..2e9673d4feb 100644 --- a/src/EnergyPlus/HeatBalanceMovableInsulation.cc +++ b/src/EnergyPlus/HeatBalanceMovableInsulation.cc @@ -50,7 +50,6 @@ // EnergyPlus Headers #include -#include #include #include #include @@ -72,7 +71,6 @@ namespace HeatBalanceMovableInsulation { // movable and transparent insulation. // USE STATEMENTS: - using namespace DataPrecisionGlobals; using DataSurfaces::Surface; using ScheduleManager::GetCurrentScheduleValue; diff --git a/src/EnergyPlus/HeatPumpWaterToWaterSimple.cc b/src/EnergyPlus/HeatPumpWaterToWaterSimple.cc index 91f368f3185..ebd28bafa0a 100644 --- a/src/EnergyPlus/HeatPumpWaterToWaterSimple.cc +++ b/src/EnergyPlus/HeatPumpWaterToWaterSimple.cc @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include @@ -103,7 +102,6 @@ namespace HeatPumpWaterToWaterSimple { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using DataGlobals::BeginEnvrnFlag; using DataGlobals::BeginSimFlag; using DataGlobals::DayOfSim; diff --git a/src/EnergyPlus/HeatRecovery.cc b/src/EnergyPlus/HeatRecovery.cc index 4cf3367ace4..6c8d0b9bcbb 100644 --- a/src/EnergyPlus/HeatRecovery.cc +++ b/src/EnergyPlus/HeatRecovery.cc @@ -63,7 +63,6 @@ #include #include #include -#include #include #include #include @@ -111,7 +110,6 @@ namespace HeatRecovery { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataHVACGlobals; using DataGlobals::BeginEnvrnFlag; using DataGlobals::DisplayExtraWarnings; diff --git a/src/EnergyPlus/HighTempRadiantSystem.cc b/src/EnergyPlus/HighTempRadiantSystem.cc index 7bf013d6faf..38d1c876a95 100644 --- a/src/EnergyPlus/HighTempRadiantSystem.cc +++ b/src/EnergyPlus/HighTempRadiantSystem.cc @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include @@ -112,7 +111,6 @@ namespace HighTempRadiantSystem { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using DataGlobals::BeginTimeStepFlag; using DataGlobals::DisplayExtraWarnings; using DataGlobals::ScheduleAlwaysOn; diff --git a/src/EnergyPlus/Humidifiers.cc b/src/EnergyPlus/Humidifiers.cc index 120c315a993..72480c1e207 100644 --- a/src/EnergyPlus/Humidifiers.cc +++ b/src/EnergyPlus/Humidifiers.cc @@ -57,7 +57,6 @@ #include #include #include -#include #include #include #include @@ -102,7 +101,6 @@ namespace Humidifiers { // REFERENCES: ASHRAE HVAC 2 Toolkit, page 4-112 // Using/Aliasing - using namespace DataPrecisionGlobals; using DataGlobals::BeginEnvrnFlag; using DataGlobals::DisplayExtraWarnings; using DataGlobals::ScheduleAlwaysOn; diff --git a/src/EnergyPlus/HybridModel.cc b/src/EnergyPlus/HybridModel.cc index 8eb29e4fb3f..37c9c91a7d4 100644 --- a/src/EnergyPlus/HybridModel.cc +++ b/src/EnergyPlus/HybridModel.cc @@ -51,7 +51,6 @@ // EnergyPlus Headers #include #include -#include #include #include #include @@ -80,7 +79,6 @@ namespace HybridModel { // Using/Aliasing using namespace DataGlobals; using namespace DataHeatBalance; - using namespace DataPrecisionGlobals; using namespace DataRoomAirModel; using DataGlobals::ScheduleAlwaysOn; using General::CheckCreatedZoneItemName; diff --git a/src/EnergyPlus/IntegratedHeatPump.cc b/src/EnergyPlus/IntegratedHeatPump.cc index 0a790ecf895..65340145ad0 100644 --- a/src/EnergyPlus/IntegratedHeatPump.cc +++ b/src/EnergyPlus/IntegratedHeatPump.cc @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -73,7 +72,6 @@ namespace EnergyPlus { namespace IntegratedHeatPump { // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataGlobals; using General::RoundSigDigits; diff --git a/src/EnergyPlus/InternalHeatGains.cc b/src/EnergyPlus/InternalHeatGains.cc index f3213361c1d..d59d521ff07 100644 --- a/src/EnergyPlus/InternalHeatGains.cc +++ b/src/EnergyPlus/InternalHeatGains.cc @@ -124,7 +124,6 @@ namespace InternalHeatGains { // OTHER NOTES: none // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataGlobals; using namespace DataEnvironment; using namespace DataHeatBalance; @@ -1571,7 +1570,7 @@ namespace InternalHeatGains { if (Zone(zonePt).FloorArea > 0.0) { PreDefTableEntry(pdchInLtDens, liteName, Lights(Loop).DesignLevel / Zone(zonePt).FloorArea, 4); } else { - PreDefTableEntry(pdchInLtDens, liteName, constant_zero, 4); + PreDefTableEntry(pdchInLtDens, liteName, DataPrecisionGlobals::constant_zero, 4); } PreDefTableEntry(pdchInLtArea, liteName, Zone(zonePt).FloorArea * mult); PreDefTableEntry(pdchInLtPower, liteName, Lights(Loop).DesignLevel * mult); @@ -1585,7 +1584,7 @@ namespace InternalHeatGains { if (sumArea > 0.0) { PreDefTableEntry(pdchInLtDens, "Interior Lighting Total", sumPower / sumArea, 4); //** line 792 } else { - PreDefTableEntry(pdchInLtDens, "Interior Lighting Total", constant_zero, 4); + PreDefTableEntry(pdchInLtDens, "Interior Lighting Total", DataPrecisionGlobals::constant_zero, 4); } PreDefTableEntry(pdchInLtArea, "Interior Lighting Total", sumArea); PreDefTableEntry(pdchInLtPower, "Interior Lighting Total", sumPower); diff --git a/src/EnergyPlus/MixedAir.cc b/src/EnergyPlus/MixedAir.cc index 484f388d815..e2e4a8ca5e7 100644 --- a/src/EnergyPlus/MixedAir.cc +++ b/src/EnergyPlus/MixedAir.cc @@ -68,7 +68,6 @@ #include #include #include -#include #include #include #include @@ -146,7 +145,6 @@ namespace MixedAir { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataAirLoop; using DataGlobals::AnyEnergyManagementSystemInModel; diff --git a/src/EnergyPlus/OutAirNodeManager.cc b/src/EnergyPlus/OutAirNodeManager.cc index 4e21ce68bce..b59e2fa125f 100644 --- a/src/EnergyPlus/OutAirNodeManager.cc +++ b/src/EnergyPlus/OutAirNodeManager.cc @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include @@ -91,7 +90,6 @@ namespace OutAirNodeManager { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataGlobals; using namespace DataEnvironment; diff --git a/src/EnergyPlus/OutputProcessor.cc b/src/EnergyPlus/OutputProcessor.cc index 229ba6bf5f3..c269a1cb6fa 100644 --- a/src/EnergyPlus/OutputProcessor.cc +++ b/src/EnergyPlus/OutputProcessor.cc @@ -72,7 +72,6 @@ #include #include #include -#include #include #include #include @@ -113,7 +112,6 @@ namespace OutputProcessor { // na // Using/Aliasing - using namespace DataPrecisionGlobals; using DataEnvironment::DayOfMonth; using DataEnvironment::DayOfWeek; using DataEnvironment::DSTIndicator; @@ -4036,8 +4034,6 @@ namespace OutputProcessor { // na // Using/Aliasing - using namespace DataPrecisionGlobals; - // Locals // FUNCTION ARGUMENT DEFINITIONS: @@ -4903,7 +4899,6 @@ namespace OutputProcessor { // na // Using/Aliasing - using namespace DataPrecisionGlobals; using General::strip_trailing_zeros; // Locals @@ -5479,7 +5474,6 @@ void SetupOutputVariable(EnergyPlusData &state, // Pointers (as pointers), pointers (as indices), and lots of other KEWL data stuff. // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace OutputProcessor; using General::TrimSigDigits; @@ -5722,7 +5716,6 @@ void SetupOutputVariable(EnergyPlusData &state, // Pointers (as pointers), pointers (as indices), and lots of other KEWL data stuff. // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace OutputProcessor; using General::TrimSigDigits; @@ -5894,8 +5887,6 @@ void SetupOutputVariable(EnergyPlusData &state, // na // Using/Aliasing - using namespace DataPrecisionGlobals; - // Locals // SUBROUTINE ARGUMENT DEFINITIONS: @@ -5950,7 +5941,6 @@ void UpdateDataandReport(EnergyPlusData &state, OutputProcessor::TimeStepType co // na // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace OutputProcessor; using DataEnvironment::EndMonthFlag; using DataEnvironment::EndYearFlag; @@ -6711,7 +6701,6 @@ void GenOutputVariablesAuditReport() // na // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace OutputProcessor; using DataGlobals::DisplayAdvancedReportVariables; @@ -6814,7 +6803,6 @@ void UpdateMeterReporting(EnergyPlusData &state) // Using/Aliasing using namespace DataIPShortCuts; - using namespace DataPrecisionGlobals; using namespace OutputProcessor; // SUBROUTINE LOCAL VARIABLE DECLARATIONS: @@ -7075,7 +7063,6 @@ void SetInitialMeterReportingAndOutputNames(EnergyPlusData &state, // na // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace OutputProcessor; using General::TrimSigDigits; @@ -7437,7 +7424,6 @@ int GetMeterIndex(std::string const &MeterName) // obtain a meter "value". // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace OutputProcessor; using SortAndStringUtilities::SetupAndSort; @@ -7491,7 +7477,6 @@ std::string GetMeterResourceType(int const MeterNumber) // Which Meter Number (f // na // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace OutputProcessor; // Return value @@ -7538,7 +7523,6 @@ Real64 GetCurrentMeterValue(int const MeterNumber) // Which Meter Number (from G // na // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace OutputProcessor; // Return value @@ -7590,7 +7574,6 @@ Real64 GetInstantMeterValue(int const MeterNumber, / // na // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace OutputProcessor; // Return value @@ -7779,7 +7762,6 @@ Real64 GetInternalVariableValue(int const varType, // 1=integer, 2=real, 3=me // na // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace OutputProcessor; using ScheduleManager::GetCurrentScheduleValue; @@ -7863,7 +7845,6 @@ Real64 GetInternalVariableValueExternalInterface(int const varType, // 1=inte // na // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace OutputProcessor; using ScheduleManager::GetCurrentScheduleValue; @@ -7942,7 +7923,6 @@ int GetNumMeteredVariables(std::string const &EP_UNUSED(ComponentType), // Given // na // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace OutputProcessor; // Return value @@ -8005,7 +7985,6 @@ void GetMeteredVariables(std::string const &ComponentType, // for metered variables associated with the given ComponentType/Name. // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataGlobalConstants; using namespace OutputProcessor; @@ -8086,7 +8065,6 @@ void GetMeteredVariables(std::string const &ComponentType, // for metered variables associated with the given ComponentType/Name. // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataGlobalConstants; using namespace OutputProcessor; @@ -8190,7 +8168,6 @@ void GetVariableKeyCountandType(EnergyPlusData &state, // 2 = HVAC time step // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace OutputProcessor; using ScheduleManager::GetScheduleIndex; using ScheduleManager::GetScheduleType; @@ -8365,7 +8342,6 @@ void GetVariableKeys(EnergyPlusData &state, // in the data array for the // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace OutputProcessor; using ScheduleManager::GetScheduleIndex; @@ -8568,7 +8544,6 @@ void InitPollutionMeterReporting(EnergyPlusData &state, std::string const &Repor // Pollutant:Carbon Equivalent // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace OutputProcessor; // SUBROUTINE PARAMETER DEFINITIONS: // Now for the Pollution Meters diff --git a/src/EnergyPlus/OutputReportPredefined.cc b/src/EnergyPlus/OutputReportPredefined.cc index 842c4dd0cf1..23e3de81ea9 100644 --- a/src/EnergyPlus/OutputReportPredefined.cc +++ b/src/EnergyPlus/OutputReportPredefined.cc @@ -49,7 +49,6 @@ #include // EnergyPlus Headers -#include #include namespace EnergyPlus { @@ -68,8 +67,6 @@ namespace OutputReportPredefined { // None. // OTHER NOTES:. // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // The following section initializes the predefined column heading variables // The variables get their value in AssignPredefined diff --git a/src/EnergyPlus/OutsideEnergySources.cc b/src/EnergyPlus/OutsideEnergySources.cc index de762305b7c..f5a5503bc2c 100644 --- a/src/EnergyPlus/OutsideEnergySources.cc +++ b/src/EnergyPlus/OutsideEnergySources.cc @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include diff --git a/src/EnergyPlus/PackagedTerminalHeatPump.cc b/src/EnergyPlus/PackagedTerminalHeatPump.cc index f7424331c73..047bc2a2cfa 100644 --- a/src/EnergyPlus/PackagedTerminalHeatPump.cc +++ b/src/EnergyPlus/PackagedTerminalHeatPump.cc @@ -72,7 +72,6 @@ #include #include #include -#include #include #include #include @@ -138,7 +137,6 @@ namespace PackagedTerminalHeatPump { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataSizing; using DataGlobals::BeginEnvrnFlag; diff --git a/src/EnergyPlus/Photovoltaics.cc b/src/EnergyPlus/Photovoltaics.cc index b655583d481..1d6c9b165e8 100644 --- a/src/EnergyPlus/Photovoltaics.cc +++ b/src/EnergyPlus/Photovoltaics.cc @@ -114,7 +114,6 @@ namespace Photovoltaics { // OTHER NOTES: none // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataPhotovoltaics; using DataGlobals::BeginDayFlag; using DataGlobals::BeginEnvrnFlag; @@ -1442,11 +1441,11 @@ namespace Photovoltaics { // NEWTON --> ISC (STARTVALUE: ISCG1 - BASED ON IL=ISC) ISCG1 = IL; - NEWTON(ISC, FUN, FI, ISC, constant_zero, IO, IL, SeriesResistance, AA, ISCG1, EPS); + NEWTON(ISC, FUN, FI, ISC, DataPrecisionGlobals::constant_zero, IO, IL, SeriesResistance, AA, ISCG1, EPS); // NEWTON --> VOC (STARTVALUE: VOCG1 - BASED ON IM=0.0) VOCG1 = (std::log(IL / IO) + 1.0) * AA; - NEWTON(VOC, FUN, FV, constant_zero, VOC, IO, IL, SeriesResistance, AA, VOCG1, EPS); + NEWTON(VOC, FUN, FV, DataPrecisionGlobals::constant_zero, VOC, IO, IL, SeriesResistance, AA, VOCG1, EPS); // maximum power point tracking diff --git a/src/EnergyPlus/PipeHeatTransfer.cc b/src/EnergyPlus/PipeHeatTransfer.cc index 75a93943769..ac1eff0963a 100644 --- a/src/EnergyPlus/PipeHeatTransfer.cc +++ b/src/EnergyPlus/PipeHeatTransfer.cc @@ -67,7 +67,6 @@ #include #include #include -#include #include #include #include @@ -116,7 +115,6 @@ namespace PipeHeatTransfer { // OTHER NOTES: Equation Numbers listed in buried pipe routines are from Piechowski's thesis // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace GroundTemperatureManager; using DataPlant::TypeOf_PipeExterior; using DataPlant::TypeOf_PipeInterior; diff --git a/src/EnergyPlus/Pipes.cc b/src/EnergyPlus/Pipes.cc index 97528b81c08..641bdaa3995 100644 --- a/src/EnergyPlus/Pipes.cc +++ b/src/EnergyPlus/Pipes.cc @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -92,7 +91,6 @@ namespace Pipes { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataHVACGlobals; using namespace DataLoopNode; using DataPlant::TypeOf_Pipe; diff --git a/src/EnergyPlus/Plant/DataPlant.cc b/src/EnergyPlus/Plant/DataPlant.cc index d3102dfb7ed..9a23dc8a2af 100644 --- a/src/EnergyPlus/Plant/DataPlant.cc +++ b/src/EnergyPlus/Plant/DataPlant.cc @@ -50,7 +50,6 @@ // EnergyPlus Headers #include -#include #include namespace EnergyPlus { @@ -62,7 +61,6 @@ namespace DataPlant { // Condenser Loops. // Using/Aliasing - using namespace DataPrecisionGlobals; using DataGlobals::DoingSizing; using DataLoopNode::NodeID; using DataLoopNode::SensedNodeFlagValue; diff --git a/src/EnergyPlus/PlantCondLoopOperation.cc b/src/EnergyPlus/PlantCondLoopOperation.cc index 9baf76076eb..d6cb0e09271 100644 --- a/src/EnergyPlus/PlantCondLoopOperation.cc +++ b/src/EnergyPlus/PlantCondLoopOperation.cc @@ -65,7 +65,6 @@ #include #include #include -#include #include #include #include @@ -107,7 +106,6 @@ namespace PlantCondLoopOperation { // REFERENCES: // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataPlant; using DataHVACGlobals::NumCondLoops; using DataHVACGlobals::NumPlantLoops; diff --git a/src/EnergyPlus/PlantLoadProfile.cc b/src/EnergyPlus/PlantLoadProfile.cc index 6ae052c9611..7b92b18697b 100644 --- a/src/EnergyPlus/PlantLoadProfile.cc +++ b/src/EnergyPlus/PlantLoadProfile.cc @@ -57,7 +57,6 @@ #include #include #include -#include #include #include #include @@ -89,7 +88,6 @@ namespace PlantLoadProfile { // manager (see NonZoneEquipmentManager.cc). // Using/Aliasing - using namespace DataPrecisionGlobals; using DataGlobals::BeginEnvrnFlag; using DataPlant::PlantLoop; using DataPlant::TypeOf_PlantLoadProfile; diff --git a/src/EnergyPlus/PlantPressureSystem.cc b/src/EnergyPlus/PlantPressureSystem.cc index 0e51546bbe4..41e568ddf8a 100644 --- a/src/EnergyPlus/PlantPressureSystem.cc +++ b/src/EnergyPlus/PlantPressureSystem.cc @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include @@ -102,7 +101,6 @@ namespace PlantPressureSystem { // -Not currently implemented // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataBranchAirLoopPlant; // Data diff --git a/src/EnergyPlus/PlantUtilities.cc b/src/EnergyPlus/PlantUtilities.cc index a04742e56ce..eaed562f1c2 100644 --- a/src/EnergyPlus/PlantUtilities.cc +++ b/src/EnergyPlus/PlantUtilities.cc @@ -59,7 +59,6 @@ #include #include #include -#include #include #include #include @@ -94,8 +93,6 @@ namespace PlantUtilities { // // // Using/Aliasing - using namespace DataPrecisionGlobals; - namespace { struct CriteriaData { diff --git a/src/EnergyPlus/PlantValves.cc b/src/EnergyPlus/PlantValves.cc index cfe63b367ac..35f0b9e6d86 100644 --- a/src/EnergyPlus/PlantValves.cc +++ b/src/EnergyPlus/PlantValves.cc @@ -58,7 +58,6 @@ #include #include #include -#include #include #include #include @@ -85,7 +84,6 @@ namespace PlantValves { // PURPOSE OF THIS MODULE: // Collect "valve" type models for Plant loops - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using General::TrimSigDigits; diff --git a/src/EnergyPlus/PoweredInductionUnits.cc b/src/EnergyPlus/PoweredInductionUnits.cc index 9574809e53f..ff34c00cc8a 100644 --- a/src/EnergyPlus/PoweredInductionUnits.cc +++ b/src/EnergyPlus/PoweredInductionUnits.cc @@ -109,7 +109,6 @@ namespace PoweredInductionUnits { // to meet the zone load. // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using DataEnvironment::StdRhoAir; using DataGlobals::BeginDayFlag; @@ -1778,7 +1777,7 @@ namespace PoweredInductionUnits { PowerMet = Node(OutletNode).MassFlowRate * (PsyHFnTdbW(Node(OutletNode).Temp, Node(ZoneNode).HumRat) - PsyHFnTdbW(Node(ZoneNode).Temp, Node(ZoneNode).HumRat)); PIU(PIUNum).HeatingRate = max(0.0, PowerMet); - PIU(PIUNum).SensCoolRate = std::abs(min(constant_zero, PowerMet)); + PIU(PIUNum).SensCoolRate = std::abs(min(DataPrecisionGlobals::constant_zero, PowerMet)); if (Node(OutletNode).MassFlowRate == 0.0) { Node(PriNode).MassFlowRate = 0.0; Node(SecNode).MassFlowRate = 0.0; @@ -2067,7 +2066,7 @@ namespace PoweredInductionUnits { PowerMet = Node(OutletNode).MassFlowRate * (PsyHFnTdbW(Node(OutletNode).Temp, Node(ZoneNode).HumRat) - PsyHFnTdbW(Node(ZoneNode).Temp, Node(ZoneNode).HumRat)); PIU(PIUNum).HeatingRate = max(0.0, PowerMet); - PIU(PIUNum).SensCoolRate = std::abs(min(constant_zero, PowerMet)); + PIU(PIUNum).SensCoolRate = std::abs(min(DataPrecisionGlobals::constant_zero, PowerMet)); if (Node(OutletNode).MassFlowRate == 0.0) { Node(PriNode).MassFlowRate = 0.0; Node(SecNode).MassFlowRate = 0.0; diff --git a/src/EnergyPlus/Psychrometrics.cc b/src/EnergyPlus/Psychrometrics.cc index 683c1424563..bcf5c2c7ccf 100644 --- a/src/EnergyPlus/Psychrometrics.cc +++ b/src/EnergyPlus/Psychrometrics.cc @@ -57,7 +57,6 @@ // EnergyPlus Headers #include #include -#include #include #include #include @@ -101,8 +100,7 @@ namespace Psychrometrics { // more research on hfg calc // Using/Aliasing - using namespace DataPrecisionGlobals; -#ifdef EP_psych_errors + #ifdef EP_psych_errors using namespace DataGlobals; using namespace DataEnvironment; #endif diff --git a/src/EnergyPlus/Pumps.cc b/src/EnergyPlus/Pumps.cc index 5ed61889a62..22c6ba2a950 100644 --- a/src/EnergyPlus/Pumps.cc +++ b/src/EnergyPlus/Pumps.cc @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include diff --git a/src/EnergyPlus/PurchasedAirManager.cc b/src/EnergyPlus/PurchasedAirManager.cc index 2ff52656872..a744bc3a956 100644 --- a/src/EnergyPlus/PurchasedAirManager.cc +++ b/src/EnergyPlus/PurchasedAirManager.cc @@ -66,7 +66,6 @@ #include #include #include -#include #include #include #include @@ -120,7 +119,6 @@ namespace PurchasedAirManager { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataGlobals; using namespace DataHVACGlobals; using DataEnvironment::OutBaroPress; diff --git a/src/EnergyPlus/ReturnAirPathManager.cc b/src/EnergyPlus/ReturnAirPathManager.cc index e388e322218..53bf6c08694 100644 --- a/src/EnergyPlus/ReturnAirPathManager.cc +++ b/src/EnergyPlus/ReturnAirPathManager.cc @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include @@ -90,7 +89,6 @@ namespace ReturnAirPathManager { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using DataGlobals::BeginDayFlag; using DataGlobals::BeginEnvrnFlag; using DataZoneEquipment::NumReturnAirPaths; diff --git a/src/EnergyPlus/RoomAirModelAirflowNetwork.cc b/src/EnergyPlus/RoomAirModelAirflowNetwork.cc index 00c9ac9e274..36b03ac6d9a 100644 --- a/src/EnergyPlus/RoomAirModelAirflowNetwork.cc +++ b/src/EnergyPlus/RoomAirModelAirflowNetwork.cc @@ -65,7 +65,6 @@ #include #include #include -#include #include #include #include @@ -114,7 +113,6 @@ namespace RoomAirModelAirflowNetwork { // na // Using/Aliasing - using namespace DataPrecisionGlobals; using DataGlobals::NumOfZones; using namespace DataRoomAirModel; using namespace DataHeatBalSurface; diff --git a/src/EnergyPlus/RoomAirModelManager.cc b/src/EnergyPlus/RoomAirModelManager.cc index d7bb95db658..de90dcf4679 100644 --- a/src/EnergyPlus/RoomAirModelManager.cc +++ b/src/EnergyPlus/RoomAirModelManager.cc @@ -67,7 +67,6 @@ #include #include #include -#include #include #include #include @@ -109,7 +108,6 @@ namespace RoomAirModelManager { // na // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataGlobals; using namespace DataRoomAirModel; using General::RoundSigDigits; diff --git a/src/EnergyPlus/RoomAirModelUserTempPattern.cc b/src/EnergyPlus/RoomAirModelUserTempPattern.cc index aabbe89e73a..3a6b2b6ea45 100644 --- a/src/EnergyPlus/RoomAirModelUserTempPattern.cc +++ b/src/EnergyPlus/RoomAirModelUserTempPattern.cc @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include @@ -104,7 +103,6 @@ namespace RoomAirModelUserTempPattern { // na // Using/Aliasing - using namespace DataPrecisionGlobals; using DataGlobals::DisplayExtraWarnings; using namespace DataRoomAirModel; diff --git a/src/EnergyPlus/RootFinder.cc b/src/EnergyPlus/RootFinder.cc index d59b9f8cb47..b7589006626 100644 --- a/src/EnergyPlus/RootFinder.cc +++ b/src/EnergyPlus/RootFinder.cc @@ -175,7 +175,6 @@ namespace RootFinder { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataRootFinder; using namespace DataGlobals; using General::TrimSigDigits; @@ -283,7 +282,7 @@ namespace RootFinder { RootFinderData.Controls.ATolY = ATolY; // Reset internal data for root finder with fictive min and max values - ResetRootFinder(RootFinderData, constant_zero, constant_zero); + ResetRootFinder(RootFinderData, DataPrecisionGlobals::constant_zero, DataPrecisionGlobals::constant_zero); } void ResetRootFinder(RootFinderDataType &RootFinderData, // Data used by root finding algorithm diff --git a/src/EnergyPlus/SZVAVModel.cc b/src/EnergyPlus/SZVAVModel.cc index 0e68befda1f..f0c9568d767 100644 --- a/src/EnergyPlus/SZVAVModel.cc +++ b/src/EnergyPlus/SZVAVModel.cc @@ -58,7 +58,6 @@ // EnergyPlus Headers #include #include -#include #include #include #include @@ -75,7 +74,6 @@ namespace SZVAVModel { // Module containing routines for general use // Using/Aliasing - using namespace DataPrecisionGlobals; using DataHVACGlobals::Bisection; using DataHVACGlobals::HVACSystemRootFinding; @@ -386,7 +384,7 @@ namespace SZVAVModel { } } } else { // too much capacity when coil off, could lower air flow rate here to meet load if air flow is above minimum - TempSolveRoot::SolveRoot(state, + TempSolveRoot::SolveRoot(state, 0.001, MaxIter, SolFlag, PartLoadRatio, PackagedTerminalHeatPump::CalcPTUnitAirAndWaterFlowResidual, 0.0, 1.0, Par); if (SolFlag < 0) { MessagePrefix = "Step 2c: "; @@ -409,7 +407,7 @@ namespace SZVAVModel { // set the water flow ratio so water coil gets proper flow if (SZVAVModel.MaxHeatCoilFluidFlow > 0.0) SZVAVModel.HeatCoilWaterFlowRatio = maxCoilFluidFlow / SZVAVModel.MaxHeatCoilFluidFlow; } - PackagedTerminalHeatPump::CalcPTUnit(state, + PackagedTerminalHeatPump::CalcPTUnit(state, SysIndex, FirstHVACIteration, PartLoadRatio, TempSensOutput, ZoneLoad, OnOffAirFlowRatio, SupHeaterLoad, HXUnitOn); coilActive = DataLoopNode::Node(coilAirInletNode).Temp - DataLoopNode::Node(coilAirOutletNode).Temp; if (!coilActive) { // if the coil is schedule off or the plant cannot provide water @@ -443,7 +441,7 @@ namespace SZVAVModel { coilBranchNum, coilCompNum); } - PackagedTerminalHeatPump::CalcPTUnit(state, + PackagedTerminalHeatPump::CalcPTUnit(state, SysIndex, FirstHVACIteration, PartLoadRatio, TempSensOutput, ZoneLoad, OnOffAirFlowRatio, SupHeaterLoad, HXUnitOn); if ((CoolingLoad && ZoneLoad < TempSensOutput) || (HeatingLoad && ZoneLoad > TempSensOutput)) { // otherwise iterate on load @@ -475,7 +473,7 @@ namespace SZVAVModel { if (SolFlag < 0) { if (SolFlag == -1) { // get capacity for warning - PackagedTerminalHeatPump::CalcPTUnit(state, + PackagedTerminalHeatPump::CalcPTUnit(state, SysIndex, FirstHVACIteration, PartLoadRatio, TempSensOutput, ZoneLoad, OnOffAirFlowRatio, SupHeaterLoad, HXUnitOn); if (std::abs(TempSensOutput - ZoneLoad) * SZVAVModel.ControlZoneMassFlowFrac > @@ -1175,7 +1173,7 @@ namespace SZVAVModel { Par[12] = minAirMassFlow; // operating air flow rate, minAirMassFlow indicates low speed air flow rate, maxAirMassFlow indicates full // air flow Par[13] = 0.0; // SA Temp target, 0 means iterate on load and not SA temperature - + TempSolveRoot::SolveRoot(state, 0.001, MaxIter, SolFlag, PartLoadRatio, thisSys.calcUnitarySystemWaterFlowResidual, 0.0, 1.0, Par); if (SolFlag < 0) { MessagePrefix = "Step 1: "; diff --git a/src/EnergyPlus/SetPointManager.cc b/src/EnergyPlus/SetPointManager.cc index 0bacb49b368..80212069447 100644 --- a/src/EnergyPlus/SetPointManager.cc +++ b/src/EnergyPlus/SetPointManager.cc @@ -135,7 +135,6 @@ namespace SetPointManager { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataAirLoop; using DataEnvironment::OutBaroPress; @@ -4791,9 +4790,9 @@ namespace SetPointManager { Node(MixedAirSetPtMgr(SetPtMgrNum).RefNode).Press = OutBaroPress; Node(MixedAirSetPtMgr(SetPtMgrNum).FanInNode).Press = OutBaroPress; Node(MixedAirSetPtMgr(SetPtMgrNum).FanOutNode).Press = OutBaroPress; - Node(MixedAirSetPtMgr(SetPtMgrNum).RefNode).Enthalpy = PsyHFnTdbW(constant_twenty, OutHumRat); - Node(MixedAirSetPtMgr(SetPtMgrNum).FanInNode).Enthalpy = PsyHFnTdbW(constant_twenty, OutHumRat); - Node(MixedAirSetPtMgr(SetPtMgrNum).FanOutNode).Enthalpy = PsyHFnTdbW(constant_twenty, OutHumRat); + Node(MixedAirSetPtMgr(SetPtMgrNum).RefNode).Enthalpy = PsyHFnTdbW(DataPrecisionGlobals::constant_twenty, OutHumRat); + Node(MixedAirSetPtMgr(SetPtMgrNum).FanInNode).Enthalpy = PsyHFnTdbW(DataPrecisionGlobals::constant_twenty, OutHumRat); + Node(MixedAirSetPtMgr(SetPtMgrNum).FanOutNode).Enthalpy = PsyHFnTdbW(DataPrecisionGlobals::constant_twenty, OutHumRat); for (CtrlNodeIndex = 1; CtrlNodeIndex <= MixedAirSetPtMgr(SetPtMgrNum).NumCtrlNodes; ++CtrlNodeIndex) { NodeNum = MixedAirSetPtMgr(SetPtMgrNum).CtrlNodes(CtrlNodeIndex); // Get the node number if (MixedAirSetPtMgr(SetPtMgrNum).CtrlTypeMode == iCtrlVarType_Temp) { @@ -4824,10 +4823,10 @@ namespace SetPointManager { Node(OAPretreatSetPtMgr(SetPtMgrNum).MixedOutNode).Press = OutBaroPress; Node(OAPretreatSetPtMgr(SetPtMgrNum).OAInNode).Press = OutBaroPress; Node(OAPretreatSetPtMgr(SetPtMgrNum).ReturnInNode).Press = OutBaroPress; - Node(OAPretreatSetPtMgr(SetPtMgrNum).RefNode).Enthalpy = PsyHFnTdbW(constant_twenty, OutHumRat); - Node(OAPretreatSetPtMgr(SetPtMgrNum).MixedOutNode).Enthalpy = PsyHFnTdbW(constant_twenty, OutHumRat); - Node(OAPretreatSetPtMgr(SetPtMgrNum).OAInNode).Enthalpy = PsyHFnTdbW(constant_twenty, OutHumRat); - Node(OAPretreatSetPtMgr(SetPtMgrNum).ReturnInNode).Enthalpy = PsyHFnTdbW(constant_twenty, OutHumRat); + Node(OAPretreatSetPtMgr(SetPtMgrNum).RefNode).Enthalpy = PsyHFnTdbW(DataPrecisionGlobals::constant_twenty, OutHumRat); + Node(OAPretreatSetPtMgr(SetPtMgrNum).MixedOutNode).Enthalpy = PsyHFnTdbW(DataPrecisionGlobals::constant_twenty, OutHumRat); + Node(OAPretreatSetPtMgr(SetPtMgrNum).OAInNode).Enthalpy = PsyHFnTdbW(DataPrecisionGlobals::constant_twenty, OutHumRat); + Node(OAPretreatSetPtMgr(SetPtMgrNum).ReturnInNode).Enthalpy = PsyHFnTdbW(DataPrecisionGlobals::constant_twenty, OutHumRat); for (CtrlNodeIndex = 1; CtrlNodeIndex <= OAPretreatSetPtMgr(SetPtMgrNum).NumCtrlNodes; ++CtrlNodeIndex) { NodeNum = OAPretreatSetPtMgr(SetPtMgrNum).CtrlNodes(CtrlNodeIndex); // Get the node number if (OAPretreatSetPtMgr(SetPtMgrNum).CtrlTypeMode == iCtrlVarType_Temp) { diff --git a/src/EnergyPlus/SimAirServingZones.cc b/src/EnergyPlus/SimAirServingZones.cc index 2102f49dbb1..837ed5dea7b 100644 --- a/src/EnergyPlus/SimAirServingZones.cc +++ b/src/EnergyPlus/SimAirServingZones.cc @@ -144,7 +144,6 @@ namespace SimAirServingZones { // USE STATEMENTS // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataAirLoop; using namespace DataGlobals; @@ -3630,7 +3629,7 @@ namespace SimAirServingZones { // CASE(DXCoil_CoolingHXAsst) ! 'CoilSystem:Cooling:DX:HeatExchangerAssisted' // CALL SimHXAssistedCoolingCoil(CompName,FirstHVACIteration,CoilOn,0.0,CompIndex,ContFanCycCoil) } else if (SELECT_CASE_var == WaterCoil_CoolingHXAsst) { // 'CoilSystem:Cooling:Water:HeatExchangerAssisted' - SimHXAssistedCoolingCoil(state, CompName, FirstHVACIteration, CoilOn, constant_zero, CompIndex, ContFanCycCoil, _, _, _, QActual); + SimHXAssistedCoolingCoil(state, CompName, FirstHVACIteration, CoilOn, DataPrecisionGlobals::constant_zero, CompIndex, ContFanCycCoil, _, _, _, QActual); if (QActual > 0.0) CoolingActive = true; // determine if coil is ON } else if (SELECT_CASE_var == WaterCoil_SimpleHeat) { // 'Coil:Heating:Water' @@ -3638,7 +3637,7 @@ namespace SimAirServingZones { if (QActual > 0.0) HeatingActive = true; // determine if coil is ON } else if (SELECT_CASE_var == SteamCoil_AirHeat) { // 'Coil:Heating:Steam' - SimulateSteamCoilComponents(state, CompName, FirstHVACIteration, CompIndex, constant_zero, QActual); + SimulateSteamCoilComponents(state, CompName, FirstHVACIteration, CompIndex, DataPrecisionGlobals::constant_zero, QActual); if (QActual > 0.0) HeatingActive = true; // determine if coil is ON } else if (SELECT_CASE_var == WaterCoil_DetailedCool) { // 'Coil:Cooling:Water:DetailedGeometry' @@ -5635,7 +5634,7 @@ namespace SimAirServingZones { SysSizing(CurOverallSimDay, AirLoopNum).SysCoolOutHumRatSeq(TimeStepInDay) = OutHumRat; // From the mixed air temp, system design supply air temp, and the mass flow rate // calculate the system sensible cooling capacity - SysSensCoolCap = PsyCpAirFnW(constant_zero) * SysSizing(CurOverallSimDay, AirLoopNum).CoolFlowSeq(TimeStepInDay) * + SysSensCoolCap = PsyCpAirFnW(DataPrecisionGlobals::constant_zero) * SysSizing(CurOverallSimDay, AirLoopNum).CoolFlowSeq(TimeStepInDay) * (SysCoolMixTemp - SysSizing(CurOverallSimDay, AirLoopNum).CoolSupTemp); SysSensCoolCap = max(0.0, SysSensCoolCap); // calculate the system total cooling capacity @@ -5757,7 +5756,7 @@ namespace SimAirServingZones { SysSizing(CurOverallSimDay, AirLoopNum).SysHeatOutTempSeq(TimeStepInDay) = OutDryBulbTemp; SysSizing(CurOverallSimDay, AirLoopNum).SysHeatOutHumRatSeq(TimeStepInDay) = OutHumRat; // From the mixed air temp, heating supply air temp, and mass flow rate calculate the system heating capacity - SysHeatCap = PsyCpAirFnW(constant_zero) * SysSizing(CurOverallSimDay, AirLoopNum).HeatFlowSeq(TimeStepInDay) * + SysHeatCap = PsyCpAirFnW(DataPrecisionGlobals::constant_zero) * SysSizing(CurOverallSimDay, AirLoopNum).HeatFlowSeq(TimeStepInDay) * (SysSizing(CurOverallSimDay, AirLoopNum).HeatSupTemp - SysHeatMixTemp); SysHeatCap = max(0.0, SysHeatCap); // save the system heating capacity for the time step @@ -5847,7 +5846,7 @@ namespace SimAirServingZones { SysSizing(CurOverallSimDay, AirLoopNum).SysHeatOutTempSeq(TimeStepInDay) = OutDryBulbTemp; SysSizing(CurOverallSimDay, AirLoopNum).SysHeatOutHumRatSeq(TimeStepInDay) = OutHumRat; // From the mixed air temp, heating supply air temp, and mass flow rate calculate the system heating capacity - SysHeatCap = PsyCpAirFnW(constant_zero) * SysSizing(CurOverallSimDay, AirLoopNum).HeatFlowSeq(TimeStepInDay) * + SysHeatCap = PsyCpAirFnW(DataPrecisionGlobals::constant_zero) * SysSizing(CurOverallSimDay, AirLoopNum).HeatFlowSeq(TimeStepInDay) * (SysSizing(CurOverallSimDay, AirLoopNum).HeatSupTemp - SysHeatMixTemp); SysHeatCap = max(0.0, SysHeatCap); // save the system heating capacity for the time step @@ -6663,7 +6662,7 @@ namespace SimAirServingZones { } SysCoolMixTemp = OutAirTemp * OutAirFrac + SysCoolRetTemp * (1.0 - OutAirFrac); SysCoolMixHumRat = OutAirHumRat * OutAirFrac + SysCoolRetHumRat * (1.0 - OutAirFrac); - SysSensCoolCap = PsyCpAirFnW(constant_zero) * CalcSysSizing(AirLoopNum).NonCoinCoolMassFlow * + SysSensCoolCap = PsyCpAirFnW(DataPrecisionGlobals::constant_zero) * CalcSysSizing(AirLoopNum).NonCoinCoolMassFlow * (SysCoolMixTemp - CalcSysSizing(AirLoopNum).CoolSupTemp); SysSensCoolCap = max(0.0, SysSensCoolCap); SysTotCoolCap = CalcSysSizing(AirLoopNum).NonCoinCoolMassFlow * @@ -6724,7 +6723,7 @@ namespace SimAirServingZones { } SysHeatMixTemp = OutAirTemp * OutAirFrac + SysHeatRetTemp * (1.0 - OutAirFrac); SysHeatMixHumRat = OutAirHumRat * OutAirFrac + SysHeatRetHumRat * (1.0 - OutAirFrac); - SysHeatCap = PsyCpAirFnW(constant_zero) * CalcSysSizing(AirLoopNum).NonCoinHeatMassFlow * + SysHeatCap = PsyCpAirFnW(DataPrecisionGlobals::constant_zero) * CalcSysSizing(AirLoopNum).NonCoinHeatMassFlow * (CalcSysSizing(AirLoopNum).HeatSupTemp - SysHeatMixTemp); SysHeatCap = max(0.0, SysHeatCap); } @@ -6768,7 +6767,7 @@ namespace SimAirServingZones { } SysHeatMixTemp = OutAirTemp * OutAirFrac + SysHeatRetTemp * (1.0 - OutAirFrac); SysHeatMixHumRat = OutAirHumRat * OutAirFrac + SysHeatRetHumRat * (1.0 - OutAirFrac); - SysHeatCap = PsyCpAirFnW(constant_zero) * CalcSysSizing(AirLoopNum).NonCoinHeatMassFlow * + SysHeatCap = PsyCpAirFnW(DataPrecisionGlobals::constant_zero) * CalcSysSizing(AirLoopNum).NonCoinHeatMassFlow * (CalcSysSizing(AirLoopNum).HeatSupTemp - SysHeatMixTemp); SysHeatCap = max(0.0, SysHeatCap); } @@ -6943,7 +6942,7 @@ namespace SimAirServingZones { FinalSysSizing(AirLoopNum).SysCoolRetTempSeq(TimeStepIndex) * (1.0 - OutAirFrac); SysCoolMixHumRat = FinalSysSizing(AirLoopNum).SysCoolOutHumRatSeq(TimeStepIndex) * OutAirFrac + FinalSysSizing(AirLoopNum).SysCoolRetHumRatSeq(TimeStepIndex) * (1.0 - OutAirFrac); - SysSensCoolCap = PsyCpAirFnW(constant_zero) * FinalSysSizing(AirLoopNum).CoolFlowSeq(TimeStepIndex) * + SysSensCoolCap = PsyCpAirFnW(DataPrecisionGlobals::constant_zero) * FinalSysSizing(AirLoopNum).CoolFlowSeq(TimeStepIndex) * (SysCoolMixTemp - FinalSysSizing(AirLoopNum).CoolSupTemp); SysSensCoolCap = max(0.0, SysSensCoolCap); SysTotCoolCap = FinalSysSizing(AirLoopNum).CoolFlowSeq(TimeStepIndex) * @@ -6966,7 +6965,7 @@ namespace SimAirServingZones { FinalSysSizing(AirLoopNum).MixHumRatAtCoolPeak = FinalSysSizing(AirLoopNum).OutHumRatAtCoolPeak * OutAirFrac + FinalSysSizing(AirLoopNum).RetHumRatAtCoolPeak * (1.0 - OutAirFrac); FinalSysSizing(AirLoopNum).SensCoolCap = - PsyCpAirFnW(constant_zero) * RhoAir * FinalSysSizing(AirLoopNum).DesCoolVolFlow * + PsyCpAirFnW(DataPrecisionGlobals::constant_zero) * RhoAir * FinalSysSizing(AirLoopNum).DesCoolVolFlow * (FinalSysSizing(AirLoopNum).MixTempAtCoolPeak - FinalSysSizing(AirLoopNum).CoolSupTemp); FinalSysSizing(AirLoopNum).SensCoolCap = max(0.0, FinalSysSizing(AirLoopNum).SensCoolCap); FinalSysSizing(AirLoopNum).TotCoolCap = @@ -7024,7 +7023,7 @@ namespace SimAirServingZones { FinalSysSizing(AirLoopNum).SysHeatRetTempSeq(TimeStepIndex) * (1.0 - OutAirFrac); SysHeatMixHumRat = FinalSysSizing(AirLoopNum).SysHeatOutHumRatSeq(TimeStepIndex) * OutAirFrac + FinalSysSizing(AirLoopNum).SysHeatRetHumRatSeq(TimeStepIndex) * (1.0 - OutAirFrac); - SysHeatCap = PsyCpAirFnW(constant_zero) * FinalSysSizing(AirLoopNum).HeatFlowSeq(TimeStepIndex) * + SysHeatCap = PsyCpAirFnW(DataPrecisionGlobals::constant_zero) * FinalSysSizing(AirLoopNum).HeatFlowSeq(TimeStepIndex) * (FinalSysSizing(AirLoopNum).HeatSupTemp - SysHeatMixTemp); SysHeatCap = max(0.0, SysHeatCap); FinalSysSizing(AirLoopNum).HeatCapSeq(TimeStepIndex) = SysHeatCap; @@ -7041,7 +7040,7 @@ namespace SimAirServingZones { FinalSysSizing(AirLoopNum).HeatOutTemp * OutAirFrac + FinalSysSizing(AirLoopNum).HeatRetTemp * (1.0 - OutAirFrac); FinalSysSizing(AirLoopNum).HeatMixHumRat = FinalSysSizing(AirLoopNum).HeatOutHumRat * OutAirFrac + FinalSysSizing(AirLoopNum).HeatRetHumRat * (1.0 - OutAirFrac); - FinalSysSizing(AirLoopNum).HeatCap = PsyCpAirFnW(constant_zero) * RhoAir * FinalSysSizing(AirLoopNum).DesHeatVolFlow * + FinalSysSizing(AirLoopNum).HeatCap = PsyCpAirFnW(DataPrecisionGlobals::constant_zero) * RhoAir * FinalSysSizing(AirLoopNum).DesHeatVolFlow * (FinalSysSizing(AirLoopNum).HeatSupTemp - FinalSysSizing(AirLoopNum).HeatMixTemp); FinalSysSizing(AirLoopNum).HeatCap = max(0.0, FinalSysSizing(AirLoopNum).HeatCap); } @@ -7290,7 +7289,6 @@ namespace SimAirServingZones { // Modifies the design sizing flow rates for system scalable sizing method // Using/Aliasing - using namespace DataPrecisionGlobals; using DataEnvironment::StdRhoAir; using DataSizing::CalcSysSizing; using DataSizing::FinalSysSizing; @@ -7427,7 +7425,7 @@ namespace SimAirServingZones { OutAirFrac * FinalSysSizing(AirLoopNum).HeatOutTemp + (1.0 - OutAirFrac) * FinalSysSizing(AirLoopNum).HeatRetTemp; } CoilOutTemp = FinalSysSizing(AirLoopNum).HeatSupTemp; - CpAirStd = PsyCpAirFnW(constant_zero); + CpAirStd = PsyCpAirFnW(DataPrecisionGlobals::constant_zero); AutosizedCapacity = StdRhoAir * FinalSysSizing(AirLoopNum).DesHeatVolFlow * CpAirStd * (CoilOutTemp - CoilInTemp); TempSize = FinalSysSizing(AirLoopNum).FlowPerHeatingCapacity * AutosizedCapacity * FractionOfAutosize; } else if (FinalSysSizing(AirLoopNum).HeatingCapMethod == HeatingDesignCapacity) { @@ -7450,7 +7448,7 @@ namespace SimAirServingZones { OutAirFrac * FinalSysSizing(AirLoopNum).HeatOutTemp + (1.0 - OutAirFrac) * FinalSysSizing(AirLoopNum).HeatRetTemp; } CoilOutTemp = FinalSysSizing(AirLoopNum).HeatSupTemp; - CpAirStd = PsyCpAirFnW(constant_zero); + CpAirStd = PsyCpAirFnW(DataPrecisionGlobals::constant_zero); AutosizedCapacity = StdRhoAir * FinalSysSizing(AirLoopNum).DesHeatVolFlow * CpAirStd * (CoilOutTemp - CoilInTemp); TempSize = FinalSysSizing(AirLoopNum).FlowPerHeatingCapacity * AutosizedCapacity * FractionOfAutosize; } else { diff --git a/src/EnergyPlus/SimulationManager.cc b/src/EnergyPlus/SimulationManager.cc index 6c216b896b2..12ab1babc23 100644 --- a/src/EnergyPlus/SimulationManager.cc +++ b/src/EnergyPlus/SimulationManager.cc @@ -84,7 +84,6 @@ extern "C" { #include #include #include -#include #include #include #include @@ -172,7 +171,6 @@ namespace SimulationManager { // and internal Evolutionary Engineering documentation. // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataGlobals; using namespace DataSizing; using namespace DataReportingFlags; @@ -3143,7 +3141,6 @@ void Resimulate(EnergyPlusData &state, // ReportHeatBalance // Using/Aliasing - using namespace DataPrecisionGlobals; using DataHeatBalFanSys::iGetZoneSetPoints; using DataHeatBalFanSys::iPredictStep; using DemandManager::DemandManagerExtIterations; diff --git a/src/EnergyPlus/SingleDuct.cc b/src/EnergyPlus/SingleDuct.cc index e05a5045856..86c977d2896 100644 --- a/src/EnergyPlus/SingleDuct.cc +++ b/src/EnergyPlus/SingleDuct.cc @@ -67,7 +67,6 @@ #include #include #include -#include #include #include #include @@ -110,7 +109,6 @@ namespace SingleDuct { // simulate single duct systems as a single driver or inter-connecting controllers. // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using BranchNodeConnections::SetUpCompSets; using BranchNodeConnections::TestCompSet; diff --git a/src/EnergyPlus/SteamBaseboardRadiator.cc b/src/EnergyPlus/SteamBaseboardRadiator.cc index b74f6778e16..2bdc2840951 100644 --- a/src/EnergyPlus/SteamBaseboardRadiator.cc +++ b/src/EnergyPlus/SteamBaseboardRadiator.cc @@ -63,7 +63,6 @@ #include #include #include -#include #include #include #include @@ -113,7 +112,6 @@ namespace SteamBaseboardRadiator { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataGlobals; using DataHVACGlobals::SmallLoad; using DataHVACGlobals::SysTimeElapsed; diff --git a/src/EnergyPlus/SteamCoils.cc b/src/EnergyPlus/SteamCoils.cc index 9f01c5654d9..8ad7549a0c8 100644 --- a/src/EnergyPlus/SteamCoils.cc +++ b/src/EnergyPlus/SteamCoils.cc @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include @@ -109,7 +108,6 @@ namespace SteamCoils { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataGlobals; using namespace DataHVACGlobals; diff --git a/src/EnergyPlus/SurfaceGroundHeatExchanger.cc b/src/EnergyPlus/SurfaceGroundHeatExchanger.cc index 885e644017b..190aa40cdfe 100644 --- a/src/EnergyPlus/SurfaceGroundHeatExchanger.cc +++ b/src/EnergyPlus/SurfaceGroundHeatExchanger.cc @@ -119,7 +119,6 @@ namespace SurfaceGroundHeatExchanger { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; // Use statements for access to subroutines in other modules @@ -519,7 +518,7 @@ namespace SurfaceGroundHeatExchanger { if (errFlag) { ShowFatalError("InitSurfaceGroundHeatExchanger: Program terminated due to previous condition(s)."); } - rho = GetDensityGlycol(state, PlantLoop(this->LoopNum).FluidName, constant_zero, PlantLoop(this->LoopNum).FluidIndex, RoutineName); + rho = GetDensityGlycol(state, PlantLoop(this->LoopNum).FluidName, DataPrecisionGlobals::constant_zero, PlantLoop(this->LoopNum).FluidIndex, RoutineName); this->DesignMassFlowRate = DataGlobalConstants::Pi() / 4.0 * pow_2(this->TubeDiameter) * DesignVelocity * rho * this->TubeCircuits; InitComponentNodes(0.0, this->DesignMassFlowRate, @@ -1228,7 +1227,7 @@ namespace SurfaceGroundHeatExchanger { NTU = DataGlobalConstants::Pi() * Kactual * NuD * PipeLength / (WaterMassFlow * CpWater); // Calculate Epsilon*MassFlowRate*Cp - if (-NTU >= EXP_LowerLimit) { + if (-NTU >= DataPrecisionGlobals::EXP_LowerLimit) { CalcHXEffectTerm = (1.0 - std::exp(-NTU)) * WaterMassFlow * CpWater; } else { CalcHXEffectTerm = 1.0 * WaterMassFlow * CpWater; diff --git a/src/EnergyPlus/TARCOGCommon.cc b/src/EnergyPlus/TARCOGCommon.cc index 2f5e6ee305a..4b6c690d5a7 100644 --- a/src/EnergyPlus/TARCOGCommon.cc +++ b/src/EnergyPlus/TARCOGCommon.cc @@ -51,7 +51,6 @@ // EnergyPlus Headers #include -#include #include #include @@ -82,8 +81,6 @@ namespace TARCOGCommon { // USE STATEMENTS: // Using/Aliasing - using namespace DataPrecisionGlobals; - // Functions bool IsShadingLayer(int const layertype) diff --git a/src/EnergyPlus/TARCOGGassesParams.cc b/src/EnergyPlus/TARCOGGassesParams.cc index d9aa4ae495a..f4e556ff203 100644 --- a/src/EnergyPlus/TARCOGGassesParams.cc +++ b/src/EnergyPlus/TARCOGGassesParams.cc @@ -46,7 +46,6 @@ // POSSIBILITY OF SUCH DAMAGE. // EnergyPlus Headers -#include #include namespace EnergyPlus { @@ -74,8 +73,6 @@ namespace TARCOGGassesParams { // USE STATEMENTS: // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // Max number of gasses int const maxgas(10); diff --git a/src/EnergyPlus/TARCOGOutput.cc b/src/EnergyPlus/TARCOGOutput.cc index 9df853d260e..2a36b4f863f 100644 --- a/src/EnergyPlus/TARCOGOutput.cc +++ b/src/EnergyPlus/TARCOGOutput.cc @@ -51,7 +51,6 @@ // EnergyPlus Headers #include -#include #include #include #include @@ -85,7 +84,6 @@ namespace TARCOGOutput { // USE STATEMENTS: // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace TARCOGCommon; using namespace TARCOGGassesParams; using namespace TARCOGParams; diff --git a/src/EnergyPlus/TARCOGParams.cc b/src/EnergyPlus/TARCOGParams.cc index 00b999b1679..988df425023 100644 --- a/src/EnergyPlus/TARCOGParams.cc +++ b/src/EnergyPlus/TARCOGParams.cc @@ -46,7 +46,6 @@ // POSSIBILITY OF SUCH DAMAGE. // EnergyPlus Headers -#include #include namespace EnergyPlus { @@ -78,8 +77,6 @@ namespace TARCOGParams { // USE STATEMENTS: // Using/Aliasing - using namespace DataPrecisionGlobals; - // Data // REAL(r64), parameter :: StefanBoltzmannConst = 5.6697d-8 ! Stefan-Boltzman constant (5.6697e-8 [W/m^2K^4]) // REAL(r64), parameter :: GravityConstant = 9.807d0 diff --git a/src/EnergyPlus/ThermalComfort.cc b/src/EnergyPlus/ThermalComfort.cc index 7e12761303d..4fd099aa6c9 100644 --- a/src/EnergyPlus/ThermalComfort.cc +++ b/src/EnergyPlus/ThermalComfort.cc @@ -101,7 +101,6 @@ namespace ThermalComfort { // the people statements and perform the requested thermal comfort evaluations // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataGlobals; using DataEnvironment::OutBaroPress; using DataEnvironment::OutDryBulbTemp; @@ -917,7 +916,7 @@ namespace ThermalComfort { // Calculate the Fanger PPD (Predicted Percentage of Dissatisfied), as a % Real64 expTest1 = -0.03353 * pow_4(PMV) - 0.2179 * pow_2(PMV); - if (expTest1 > EXP_LowerLimit) { + if (expTest1 > DataPrecisionGlobals::EXP_LowerLimit) { PPD = 100.0 - 95.0 * std::exp(expTest1); } else { PPD = 100.0; diff --git a/src/EnergyPlus/ThermalISO15099Calc.cc b/src/EnergyPlus/ThermalISO15099Calc.cc index 56bb2f2e2a2..922abb1ba65 100644 --- a/src/EnergyPlus/ThermalISO15099Calc.cc +++ b/src/EnergyPlus/ThermalISO15099Calc.cc @@ -54,7 +54,6 @@ // EnergyPlus Headers #include -#include #include #include #include @@ -102,7 +101,6 @@ namespace ThermalISO15099Calc { // USE STATEMENTS: // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace TARCOGGassesParams; using namespace TARCOGParams; using namespace TARCOGArgs; diff --git a/src/EnergyPlus/UFADManager.cc b/src/EnergyPlus/UFADManager.cc index 63ac23070af..9227ddc1b68 100644 --- a/src/EnergyPlus/UFADManager.cc +++ b/src/EnergyPlus/UFADManager.cc @@ -63,7 +63,6 @@ #include #include #include -#include #include #include #include @@ -105,7 +104,6 @@ namespace UFADManager { // na // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataGlobals; using namespace DataLoopNode; using namespace DataEnvironment; diff --git a/src/EnergyPlus/UnitHeater.cc b/src/EnergyPlus/UnitHeater.cc index add7a66e7f8..c16e8938519 100644 --- a/src/EnergyPlus/UnitHeater.cc +++ b/src/EnergyPlus/UnitHeater.cc @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include @@ -116,7 +115,6 @@ namespace UnitHeater { // module (FanCoilUnits.cc) // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using DataGlobals::BeginDayFlag; using DataGlobals::BeginEnvrnFlag; diff --git a/src/EnergyPlus/UnitVentilator.cc b/src/EnergyPlus/UnitVentilator.cc index 432488d28d5..36b7722af46 100644 --- a/src/EnergyPlus/UnitVentilator.cc +++ b/src/EnergyPlus/UnitVentilator.cc @@ -66,7 +66,6 @@ #include #include #include -#include #include #include #include @@ -122,7 +121,6 @@ namespace UnitVentilator { // Fred Buhl's fan coil module (FanCoilUnits.cc) // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using DataGlobals::BeginDayFlag; using DataGlobals::BeginEnvrnFlag; diff --git a/src/EnergyPlus/WaterCoils.cc b/src/EnergyPlus/WaterCoils.cc index cd2ce63574c..8f77fa0c66d 100644 --- a/src/EnergyPlus/WaterCoils.cc +++ b/src/EnergyPlus/WaterCoils.cc @@ -82,7 +82,6 @@ #include #include #include -#include #include #include #include @@ -134,7 +133,6 @@ namespace WaterCoils { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataGlobals; using DataEnvironment::OutBaroPress; diff --git a/src/EnergyPlus/WaterToAirHeatPumpSimple.cc b/src/EnergyPlus/WaterToAirHeatPumpSimple.cc index 032fc47f04d..82180b83ca4 100644 --- a/src/EnergyPlus/WaterToAirHeatPumpSimple.cc +++ b/src/EnergyPlus/WaterToAirHeatPumpSimple.cc @@ -115,7 +115,6 @@ namespace WaterToAirHeatPumpSimple { // Use statements for data only modules // Use statements for access to subroutines in other modules // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataGlobals; using namespace DataSizing; @@ -235,7 +234,7 @@ namespace WaterToAirHeatPumpSimple { HPTimeConstant, FanDelayTime, SensLoad, - constant_zero, + DataPrecisionGlobals::constant_zero, CyclingScheme, OnOffAirFlowRatio, FirstHVACIteration); diff --git a/src/EnergyPlus/WindTurbine.cc b/src/EnergyPlus/WindTurbine.cc index 23b8557f200..66ca35f299a 100644 --- a/src/EnergyPlus/WindTurbine.cc +++ b/src/EnergyPlus/WindTurbine.cc @@ -92,8 +92,6 @@ namespace WindTurbine { // Mazharul Islam, David S.K. Ting, and Amir Fartaj. 2008. Aerodynamic Models for Darrieus-type sSraight-bladed // Vertical Axis Wind Turbines. Renewable & Sustainable Energy Reviews, Volume 12, pp.1087-1109 - // using namespace DataPrecisionGlobals; - // using namespace DataGenerators; using DataGlobals::BeginEnvrnFlag; using DataGlobals::ScheduleAlwaysOn; static std::string const BlankString; diff --git a/src/EnergyPlus/WindowAC.cc b/src/EnergyPlus/WindowAC.cc index c1ee6478ed6..5187bdcb1af 100644 --- a/src/EnergyPlus/WindowAC.cc +++ b/src/EnergyPlus/WindowAC.cc @@ -65,7 +65,6 @@ #include #include #include -#include #include #include #include @@ -110,7 +109,6 @@ namespace WindowAC { // modeled - instead cycling inefficiencies must be included in the efficiency // curves of the DX module. - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using namespace DataSizing; using DataEnvironment::OutBaroPress; diff --git a/src/EnergyPlus/ZoneDehumidifier.cc b/src/EnergyPlus/ZoneDehumidifier.cc index d00eaa50713..a81b3e45c82 100644 --- a/src/EnergyPlus/ZoneDehumidifier.cc +++ b/src/EnergyPlus/ZoneDehumidifier.cc @@ -58,7 +58,6 @@ #include #include #include -#include #include #include #include @@ -109,7 +108,6 @@ namespace ZoneDehumidifier { // http://www.thermastor.com/HI-E-DRY-195/HI-E-DRY-195-Spec.pdf // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataLoopNode; using DataEnvironment::OutBaroPress; using DataEnvironment::StdBaroPress; diff --git a/src/EnergyPlus/ZoneTempPredictorCorrector.cc b/src/EnergyPlus/ZoneTempPredictorCorrector.cc index d8d29e6ad32..7e7af9d0c5e 100644 --- a/src/EnergyPlus/ZoneTempPredictorCorrector.cc +++ b/src/EnergyPlus/ZoneTempPredictorCorrector.cc @@ -56,8 +56,6 @@ // EnergyPlus Headers #include -#include - #include #include #include @@ -71,7 +69,6 @@ #include #include #include -#include #include #include #include @@ -124,7 +121,6 @@ namespace ZoneTempPredictorCorrector { // "correct" step determines zone air temp with available HVAC // Using/Aliasing - using namespace DataPrecisionGlobals; using namespace DataGlobals; using namespace DataHVACGlobals; using namespace DataHeatBalance; @@ -4756,7 +4752,7 @@ namespace ZoneTempPredictorCorrector { // FLOW: // Initializations - ZoneTempChange = constant_zero; + ZoneTempChange = DataPrecisionGlobals::constant_zero; // Update zone temperatures for (ZoneNum = 1; ZoneNum <= NumOfZones; ++ZoneNum) { diff --git a/tst/EnergyPlus/unit/EvaporativeCoolers.unit.cc b/tst/EnergyPlus/unit/EvaporativeCoolers.unit.cc index a56d914fd9d..1611fcc9a25 100644 --- a/tst/EnergyPlus/unit/EvaporativeCoolers.unit.cc +++ b/tst/EnergyPlus/unit/EvaporativeCoolers.unit.cc @@ -492,7 +492,7 @@ TEST_F(EnergyPlusFixture, EvaporativeCoolers_SizeEvapCooler) DataSizing::FinalSysSizing(1).DesOutAirVolFlow = 0.4; // set up the structure to size the flow rates for an RDDSpecial - thisEvapCooler.EvapCoolerType = EvapCoolerType::InDirectRDDSpecial; + thisEvapCooler.evapCoolerType = EvapCoolerType::IndirectRDDSpecial; thisEvapCooler.DesVolFlowRate = DataSizing::AutoSize; thisEvapCooler.PadArea = 0.0; thisEvapCooler.PadDepth = 0.0; @@ -507,7 +507,7 @@ TEST_F(EnergyPlusFixture, EvaporativeCoolers_SizeEvapCooler) EXPECT_NEAR(1.0, thisEvapCooler.DesVolFlowRate, 0.0001); // now let's try to size some of the pad properties - thisEvapCooler.EvapCoolerType = EvapCoolerType::DirectCELDEKPAD; + thisEvapCooler.evapCoolerType = EvapCoolerType::DirectCELDEKPAD; thisEvapCooler.DesVolFlowRate = 1.0; thisEvapCooler.PadArea = DataSizing::AutoSize; thisEvapCooler.PadDepth = DataSizing::AutoSize; @@ -524,7 +524,7 @@ TEST_F(EnergyPlusFixture, EvaporativeCoolers_SizeEvapCooler) DataAirSystems::PrimaryAirSystem(1).Branch(1).Comp(1).Name = "NOT-MyEvapCooler"; // set up the structure to size the flow rates for an indirect celdekpad - thisEvapCooler.EvapCoolerType = EvapCoolerType::InDirectCELDEKPAD; + thisEvapCooler.evapCoolerType = EvapCoolerType::IndirectCELDEKPAD; thisEvapCooler.DesVolFlowRate = DataSizing::AutoSize; thisEvapCooler.PadArea = 0.0; thisEvapCooler.PadDepth = 0.0; @@ -729,7 +729,7 @@ TEST_F(EnergyPlusFixture, DirectEvapCoolerResearchSpecialCalcTest) state.dataCurveManager->PerfCurve(CurveNum).Var1Max = 1.0; // set up the flow rates for a direct RDDSpecial - thisEvapCooler.EvapCoolerType = EvapCoolerType::DirectResearchSpecial; + thisEvapCooler.evapCoolerType = EvapCoolerType::DirectResearchSpecial; thisEvapCooler.EvapCoolerName = "MyDirectEvapCoolerRS"; thisEvapCooler.SchedPtr = DataGlobals::ScheduleAlwaysOn; thisEvapCooler.PumpPowerModifierCurveIndex = CurveNum;