Global Baseboards

src/EnergyPlus/BaseboardElectric.hh

@@ -57,28 +57,12 @@
 
 namespace EnergyPlus {
 
+    // Forward declarations
     struct EnergyPlusData;
+    struct BaseboardElectricData;
 
 namespace BaseboardElectric {
 
-    // Using/Aliasing
-
-    // Data
-    // MODULE PARAMETER DEFINITIONS
-    extern std::string const cCMO_BBRadiator_Electric;
-    extern Real64 const SimpConvAirFlowSpeed; // m/s
-
-    // DERIVED TYPE DEFINITIONS
-
-    // MODULE VARIABLE DECLARATIONS:
-    extern int NumBaseboards;
-    extern Array1D_bool MySizeFlag;
-    extern Array1D_bool CheckEquipName;
-
-    // SUBROUTINE SPECIFICATIONS FOR MODULE BaseboardRadiator
-
-    // Types
-
     struct BaseboardParams
     {
         // Members
@@ -95,15 +79,18 @@ namespace BaseboardElectric {
         Real64 Energy;
         Real64 ElecUseLoad;
         Real64 ElecUseRate;
-        int ZonePtr;                  // point to teh zone where the basebaord is located
+        int ZonePtr;                  // point to the zone where the basebaord is located
         int HeatingCapMethod;         // - Method for heating capacity scaledsizing calculation- (HeatingDesignCapacity, CapacityPerFloorArea,
                                       // FracOfAutosizedHeatingCapacity)
         Real64 ScaledHeatingCapacity; // - scaled maximum heating capacity {W} or scalable variable of zone HVAC equipment, {-}, or {W/m2}
+        bool MySizeFlag;
+        bool CheckEquipName;
 
         // Default Constructor
         BaseboardParams()
             : SchedPtr(0), NominalCapacity(0.0), BaseboardEfficiency(0.0), AirInletTemp(0.0), AirInletHumRat(0.0), AirOutletTemp(0.0), Power(0.0),
-              Energy(0.0), ElecUseLoad(0.0), ElecUseRate(0.0), ZonePtr(0), HeatingCapMethod(0.0), ScaledHeatingCapacity(0.0)
+              Energy(0.0), ElecUseLoad(0.0), ElecUseRate(0.0), ZonePtr(0), HeatingCapMethod(0.0), ScaledHeatingCapacity(0.0), MySizeFlag(true),
+              CheckEquipName(true)
         {
         }
     };
@@ -114,30 +101,18 @@ namespace BaseboardElectric {
         Array1D_string FieldNames;
 
         // Default Constructor
-        BaseboardNumericFieldData()
-        {
-        }
+        BaseboardNumericFieldData() = default;
     };
 
-    // Object Data
-    extern Array1D<BaseboardParams> Baseboard;
-    extern Array1D<BaseboardNumericFieldData> BaseboardNumericFields;
-
-    // Functions
-
-    void clear_state();
-
-    void SimElectricBaseboard(EnergyPlus::EnergyPlusData &state, std::string const &EquipName, int const ActualZoneNum, int const ControlledZoneNum, Real64 &PowerMet, int &CompIndex);
-
-    void GetBaseboardInput();
+    void SimElectricBaseboard(EnergyPlusData &state, std::string const &EquipName, int ActualZoneNum, int ControlledZoneNum, Real64 &PowerMet, int &CompIndex);
 
-    void InitBaseboard(EnergyPlus::EnergyPlusData &state, int const BaseboardNum, int const ControlledZoneNum);
+    void GetBaseboardInput(BaseboardElectricData &baseboard);
 
-    void SizeElectricBaseboard(EnergyPlus::EnergyPlusData &state, int const BaseboardNum);
+    void InitBaseboard(EnergyPlusData &state, BaseboardElectricData &baseboard, int BaseboardNum, int ControlledZoneNum);
 
-    void SimElectricConvective(int const BaseboardNum, Real64 const LoadMet);
+    void SizeElectricBaseboard(EnergyPlusData &state, BaseboardElectricData &baseboard, int BaseboardNum);
 
-    void ReportBaseboard(int const BaseboardNum);
+    void SimElectricConvective(BaseboardElectricData &baseboard, int BaseboardNum, Real64 LoadMet);
 
 } // namespace BaseboardElectric