Space - vectorize People reporting

NREL · Aug 21, 2021 · c73e8e6 · c73e8e6 · nrel-bot-2b · Aug 21, 2021
1 parent 107541a
commit c73e8e6
Show file tree

Hide file tree

Showing 3 changed files with 106 additions and 66 deletions.
diff --git a/src/EnergyPlus/DataHeatBalance.hh b/src/EnergyPlus/DataHeatBalance.hh
@@ -642,21 +642,6 @@ namespace DataHeatBalance {
         Real64 UserSpecSensFrac;         // User specified sensible fraction
         bool Show55Warning;              // show the warning messages about ASHRAE 55-2004
         Real64 CO2RateFactor;            // Carbon Dioxide Generation Rate [m3/s-W]
-        // Report variables
-        Real64 NumOcc;                 // Number of occupants at current timestep []
-        Real64 TemperatureInZone;      // Temperature in zone (C)
-        Real64 RelativeHumidityInZone; // Relative humidity in zone
-        Real64 RadGainRate;            // Radiant heat gain [W]
-        Real64 ConGainRate;            // Convective heat gain [W]
-        Real64 SenGainRate;            // Sensible heat gain [W]
-        Real64 LatGainRate;            // Latent heat gain [W]
-        Real64 TotGainRate;            // Total heat gain [W]
-        Real64 CO2GainRate;            // Carbon Dioxide Gain Rate [m3/s]
-        Real64 RadGainEnergy;          // Radiant heat gain [J]
-        Real64 ConGainEnergy;          // Convective heat gain [J]
-        Real64 SenGainEnergy;          // Sensible heat gain [J]
-        Real64 LatGainEnergy;          // Latent heat gain [J]
-        Real64 TotGainEnergy;          // Total heat gain [J]
         // Air velocity check during run time for thermal comfort control
         int AirVelErrIndex; // Air velocity error index
         // For AdaptiveComfort tabular report
@@ -673,9 +658,7 @@ namespace DataHeatBalance {
               ClothingMethodPtr(-1), ClothingType(-1), AirVelocityPtr(-1), AnkleAirVelocityPtr(-1), Fanger(false), Pierce(false), KSU(false),
               AdaptiveASH55(false), AdaptiveCEN15251(false), CoolingEffectASH55(false), AnkleDraftASH55(false),
               MRTCalcType(DataHeatBalance::CalcMRT::Unassigned), SurfacePtr(-1), AngleFactorListPtr(-1), UserSpecSensFrac(0.0), Show55Warning(false),
-              CO2RateFactor(0.0), NumOcc(0.0), TemperatureInZone(0.0), RelativeHumidityInZone(0.0), RadGainRate(0.0), ConGainRate(0.0),
-              SenGainRate(0.0), LatGainRate(0.0), TotGainRate(0.0), CO2GainRate(0.0), RadGainEnergy(0.0), ConGainEnergy(0.0), SenGainEnergy(0.0),
-              LatGainEnergy(0.0), TotGainEnergy(0.0), AirVelErrIndex(0), TimeNotMetASH5580(0.0), TimeNotMetASH5590(0.0), TimeNotMetCEN15251CatI(0.0),
+              CO2RateFactor(0.0), AirVelErrIndex(0), TimeNotMetASH5580(0.0), TimeNotMetASH5590(0.0), TimeNotMetCEN15251CatI(0.0),
               TimeNotMetCEN15251CatII(0.0), TimeNotMetCEN15251CatIII(0.0)
         {
         }
@@ -2328,6 +2311,22 @@ struct HeatBalanceData : BaseGlobalStruct
     bool MundtFirstTimeFlag = true;
     EPVector<std::string> spaceTypes;
 
+    // People Report variables
+    EPVector<Real64> PeopleRepNumOcc;                 // Number of occupants at current timestep []
+    EPVector<Real64> PeopleRepTemperatureInZone;      // Temperature in zone (C)
+    EPVector<Real64> PeopleRepRelativeHumidityInZone; // Relative humidity in zone
+    EPVector<Real64> PeopleRepRadGainRate;            // Radiant heat gain [W]
+    EPVector<Real64> PeopleRepConGainRate;            // Convective heat gain [W]
+    EPVector<Real64> PeopleRepSenGainRate;            // Sensible heat gain [W]
+    EPVector<Real64> PeopleRepLatGainRate;            // Latent heat gain [W]
+    EPVector<Real64> PeopleRepTotGainRate;            // Total heat gain [W]
+    EPVector<Real64> PeopleRepCO2GainRate;            // Carbon Dioxide Gain Rate [m3/s]
+    EPVector<Real64> PeopleRepRadGainEnergy;          // Radiant heat gain [J]
+    EPVector<Real64> PeopleRepConGainEnergy;          // Convective heat gain [J]
+    EPVector<Real64> PeopleRepSenGainEnergy;          // Sensible heat gain [J]
+    EPVector<Real64> PeopleRepLatGainEnergy;          // Latent heat gain [J]
+    EPVector<Real64> PeopleRepTotGainEnergy;          // Total heat gain [J]
+
     void clear_state() override
     {
         this->MaxSolidWinLayers = 0;
@@ -2605,6 +2604,21 @@ struct HeatBalanceData : BaseGlobalStruct
         this->ZoneLocalEnvironment.deallocate();
         this->MundtFirstTimeFlag = true;
         this->spaceTypes.deallocate();
+
+        this->PeopleRepNumOcc.deallocate();
+        this->PeopleRepTemperatureInZone.deallocate();
+        this->PeopleRepRelativeHumidityInZone.deallocate();
+        this->PeopleRepRadGainRate.deallocate();
+        this->PeopleRepConGainRate.deallocate();
+        this->PeopleRepSenGainRate.deallocate();
+        this->PeopleRepLatGainRate.deallocate();
+        this->PeopleRepTotGainRate.deallocate();
+        this->PeopleRepCO2GainRate.deallocate();
+        this->PeopleRepRadGainEnergy.deallocate();
+        this->PeopleRepConGainEnergy.deallocate();
+        this->PeopleRepSenGainEnergy.deallocate();
+        this->PeopleRepLatGainEnergy.deallocate();
+        this->PeopleRepTotGainEnergy.deallocate();
     }
 };