move EvapCoolerType ints to enum and move from DataGlobalConstants to…

… EvaporativeCoolers
NREL · Oct 11, 2020 · 2d501c8 · 2d501c8 · nrel-bot-2c · Oct 11, 2020
1 parent 52146b6
commit 2d501c8
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 84 deletions.
diff --git a/src/EnergyPlus/DataGlobalConstants.cc b/src/EnergyPlus/DataGlobalConstants.cc
@@ -303,22 +303,6 @@ namespace DataGlobalConstants {
     int const iGeneratorWindTurbine(7);
     int const iGeneratorPVWatts(8);
 
-    int const iEvapCoolerDirectCELDEKPAD(1001);
-    int const iEvapCoolerInDirectCELDEKPAD(1002);
-    int const iEvapCoolerInDirectWETCOIL(1003);
-    int const iEvapCoolerInDirectRDDSpecial(1004);
-    int const iEvapCoolerDirectResearchSpecial(1005);
-
-    // DERIVED TYPE DEFINITIONS:
-    // na
-
-    // MODULE VARIABLE DECLARATIONS:
-    // na
-
-    // SUBROUTINE SPECIFICATIONS FOR MODULE DataGlobalConstants
-
-    // Functions
-
     int AssignResourceTypeNum(std::string const &ResourceTypeChar)
     {
 

diff --git a/src/EnergyPlus/DataGlobalConstants.hh b/src/EnergyPlus/DataGlobalConstants.hh
@@ -233,12 +233,6 @@ namespace DataGlobalConstants {
     extern int const iGeneratorWindTurbine;
     extern int const iGeneratorPVWatts;
 
-    extern int const iEvapCoolerDirectCELDEKPAD;
-    extern int const iEvapCoolerInDirectCELDEKPAD;
-    extern int const iEvapCoolerInDirectWETCOIL;
-    extern int const iEvapCoolerInDirectRDDSpecial;
-    extern int const iEvapCoolerDirectResearchSpecial;
-
     enum class CallIndicator {
         BeginDay,
         DuringDay,
@@ -286,7 +280,7 @@ namespace DataGlobalConstants {
     Real64 constexpr MaxEXPArg () { return 709.78; }                        // maximum exponent in EXP() function
     Real64 constexpr Pi () { return 3.14159265358979324; }                  // Pi 3.1415926535897932384626435
     Real64 constexpr PiOvr2 () { return Pi() / 2.0; }                       // Pi/2
-    Real64 constexpr TwoPi () { return 2.0 * Pi(); }                        // 2*Pi 6.2831853071795864769252868r
+    Real64 constexpr TwoPi () { return 2.0 * Pi(); }                        // 2*Pi 6.2831853071795864769252868
     Real64 constexpr GravityConstant () { return 9.807; }
     Real64 constexpr DegToRadians () { return Pi() / 180.0; }               // Conversion for Degrees to Radians
     Real64 constexpr RadToDeg () { return 180.0 / Pi(); }                   // Conversion for Radians to Degrees