Refactoring of interpolation functions for blinds Prof and Slat Angle

src/EnergyPlus/DataSurfaces.hh

@@ -68,35 +68,6 @@
 #define BITF(B) (1 << (int(B)))
 #define BITF_TEST_ANY(V, B) (((V) & (B)) != 0)
 
-// IS_SHADED is the flag to indicate window has no shading device or shading device is off, and no daylight glare control
-// original expression: SHADE_FLAG == ShadeOff || SHADE_FLAG == ShadeOff
-#define NOT_SHADED(SHADE_FLAG) BITF_TEST_ANY(BITF(SHADE_FLAG), BITF(WinShadingType::NoShade) | BITF(WinShadingType::ShadeOff))
-
-// IS_SHADED is the flag to indicate window has shade on or temporarily off but may be triggered on later to control daylight glare
-// original expression: SHADE_FLAG > ShadeOff
-#define IS_SHADED(SHADE_FLAG) !NOT_SHADED(SHADE_FLAG)
-
-// IS_SHADED_NO_GLARE is the flag to indicate window has shade and no daylight glare control
-// original expression: IntShade <= SHADE_FLAG <= BGBlind
-#define IS_SHADED_NO_GLARE_CTRL(SHADE_FLAG)                                                                                                          \
-    BITF_TEST_ANY(BITF(SHADE_FLAG),                                                                                                                  \
-                  BITF(WinShadingType::IntShade) | BITF(WinShadingType::SwitchableGlazing) | BITF(WinShadingType::ExtShade) |                        \
-                      BITF(WinShadingType::ExtScreen) | BITF(WinShadingType::IntBlind) | BITF(WinShadingType::ExtBlind) |                            \
-                      BITF(WinShadingType::BGShade) | BITF(WinShadingType::BGBlind))
-
-// ANY_SHADE: if SHADE_FLAG is any of the shading types including interior, exterior or between glass shades
-#define ANY_SHADE(SHADE_FLAG)                                                                                                                        \
-    BITF_TEST_ANY(BITF(SHADE_FLAG), BITF(WinShadingType::IntShade) | BITF(WinShadingType::ExtShade) | BITF(WinShadingType::BGShade))
-#define ANY_SHADE_SCREEN(SHADE_FLAG)                                                                                                                 \
-    BITF_TEST_ANY(BITF(SHADE_FLAG),                                                                                                                  \
-                  BITF(WinShadingType::IntShade) | BITF(WinShadingType::ExtShade) | BITF(WinShadingType::BGShade) | BITF(WinShadingType::ExtScreen))
-#define ANY_BLIND(SHADE_FLAG)                                                                                                                        \
-    BITF_TEST_ANY(BITF(SHADE_FLAG), BITF(WinShadingType::IntBlind) | BITF(WinShadingType::ExtBlind) | BITF(WinShadingType::BGBlind))
-#define ANY_INTERIOR_SHADE_BLIND(SHADE_FLAG) BITF_TEST_ANY(BITF(SHADE_FLAG), BITF(WinShadingType::IntShade) | BITF(WinShadingType::IntBlind))
-#define ANY_EXTERIOR_SHADE_BLIND_SCREEN(SHADE_FLAG)                                                                                                  \
-    BITF_TEST_ANY(BITF(SHADE_FLAG), BITF(WinShadingType::ExtShade) | BITF(WinShadingType::ExtBlind) | BITF(WinShadingType::ExtScreen))
-#define ANY_BETWEENGLASS_SHADE_BLIND(SHADE_FLAG) BITF_TEST_ANY(BITF(SHADE_FLAG), BITF(WinShadingType::BGShade) | BITF(WinShadingType::BGBlind))
-
 namespace EnergyPlus {
 
 // Forward declarations
@@ -110,6 +81,7 @@ namespace DataSurfaces {
 
     // MODULE PARAMETER DEFINITIONS:
     constexpr int MaxSlatAngs(19);
+    constexpr int MaxProfAngs(37);
 
     // Parameters to indicate surface shape for use with the Surface
     // derived type (see below):
@@ -284,6 +256,59 @@ namespace DataSurfaces {
         }
     }
 
+    // IS_SHADED is the flag to indicate window has no shading device or shading device is off, and no daylight glare control
+    // original expression: SHADE_FLAG == ShadeOff || SHADE_FLAG == ShadeOff
+    constexpr bool NOT_SHADED(WinShadingType const ShadingFlag) {
+        return BITF_TEST_ANY(BITF(ShadingFlag), BITF(WinShadingType::NoShade) | BITF(WinShadingType::ShadeOff));
+    }
+
+    // IS_SHADED is the flag to indicate window has shade on or temporarily off but may be triggered on later to control daylight glare
+    // original expression: SHADE_FLAG > ShadeOff
+    constexpr bool IS_SHADED(WinShadingType const ShadingFlag) {
+        return !NOT_SHADED(ShadingFlag);
+    }
+
+    // IS_SHADED_NO_GLARE is the flag to indicate window has shade and no daylight glare control
+    // original expression: IntShade <= SHADE_FLAG <= BGBlind
+    constexpr bool IS_SHADED_NO_GLARE_CTRL(WinShadingType const ShadingFlag) {
+        return BITF_TEST_ANY(BITF(ShadingFlag),
+                         BITF(WinShadingType::IntShade) | BITF(WinShadingType::SwitchableGlazing) |
+                            BITF(WinShadingType::ExtShade) | BITF(WinShadingType::ExtScreen) |
+                            BITF(WinShadingType::IntBlind) | BITF(WinShadingType::ExtBlind) |
+                            BITF(WinShadingType::BGShade) | BITF(WinShadingType::BGBlind));
+    }
+
+    // ANY_SHADE: if SHADE_FLAG is any of the shading types including interior, exterior or between glass shades
+    constexpr bool ANY_SHADE(WinShadingType const ShadingFlag) {
+        return BITF_TEST_ANY(BITF(ShadingFlag),
+                          BITF(WinShadingType::IntShade) | BITF(WinShadingType::ExtShade) | BITF(WinShadingType::BGShade));
+    }
+
+    constexpr bool ANY_SHADE_SCREEN(WinShadingType const ShadingFlag) {
+        return BITF_TEST_ANY(BITF(ShadingFlag),
+                          BITF(WinShadingType::IntShade) | BITF(WinShadingType::ExtShade) | BITF(WinShadingType::BGShade) | BITF(WinShadingType::ExtScreen));
+    }
+
+    constexpr bool ANY_BLIND(WinShadingType const ShadingFlag) {
+        return BITF_TEST_ANY(BITF(ShadingFlag),
+                          BITF(WinShadingType::IntBlind) | BITF(WinShadingType::ExtBlind) | BITF(WinShadingType::BGBlind));
+    }
+
+    constexpr bool ANY_INTERIOR_SHADE_BLIND(WinShadingType const ShadingFlag) {
+        return BITF_TEST_ANY(BITF(ShadingFlag),
+                             BITF(WinShadingType::IntShade) | BITF(WinShadingType::IntBlind));
+    }
+
+    constexpr bool ANY_EXTERIOR_SHADE_BLIND_SCREEN(WinShadingType const ShadingFlag) {
+        return BITF_TEST_ANY(BITF(ShadingFlag),
+                             BITF(WinShadingType::ExtShade) | BITF(WinShadingType::ExtBlind) | BITF(WinShadingType::ExtScreen));
+    }
+
+    constexpr bool ANY_BETWEENGLASS_SHADE_BLIND(WinShadingType const ShadingFlag) {
+        return BITF_TEST_ANY(BITF(ShadingFlag),
+                             BITF(WinShadingType::BGShade) | BITF(WinShadingType::BGBlind));
+    }
+
     // Parameters for classification of outside face of surfaces
     constexpr int OutConvClass_WindwardVertWall(101);
     constexpr int OutConvClass_LeewardVertWall(102);
@@ -1513,6 +1538,12 @@ struct SurfacesData : BaseGlobalStruct
     Array1D<bool> SurfWinSlatAngThisTSDegEMSon;      // flag that indicate EMS system is actuating SlatAngThisTSDeg
     Array1D<Real64> SurfWinSlatAngThisTSDegEMSValue; // value that EMS sets for slat angle in degrees
     Array1D<bool> SurfWinSlatsBlockBeam;             // True if blind slats block incident beam solar
+    Array1D<int> SurfWinSlatsAngIndex;
+    Array1D<Real64> SurfWinSlatsAngInterpFac;
+    Array1D<Real64> SurfWinProfileAng;
+    Array1D<int> SurfWinProfAngIndex;
+    Array1D<Real64> SurfWinProfAngInterpFac;
+    Array1D<Real64> SurfWinBlindBmBmTrans;
     Array1D<Real64> SurfWinBlindAirFlowPermeability; // Blind air-flow permeability for calculation of convective flow in gap between blind and glass
     Array1D<Real64> SurfWinTotGlazingThickness;      // Total glazing thickness from outside of outer glass to inside of inner glass (m)
     Array1D<Real64> SurfWinTanProfileAngHor;         // Tangent of horizontal profile angle
@@ -1778,6 +1809,12 @@ struct SurfacesData : BaseGlobalStruct
         this->SurfWinSlatAngThisTSDegEMSon.deallocate();
         this->SurfWinSlatAngThisTSDegEMSValue.deallocate();
         this->SurfWinSlatsBlockBeam.deallocate();
+        this->SurfWinSlatsAngIndex.deallocate();
+        this->SurfWinSlatsAngInterpFac.deallocate();
+        this->SurfWinProfileAng.deallocate();
+        this->SurfWinProfAngIndex.deallocate();
+        this->SurfWinProfAngInterpFac.deallocate();
+        this->SurfWinBlindBmBmTrans.deallocate();
         this->SurfWinBlindAirFlowPermeability.deallocate();
         this->SurfWinTotGlazingThickness.deallocate();
         this->SurfWinTanProfileAngHor.deallocate();