Prune state

NREL · Jun 22, 2023 · 8f6474f · 8f6474f · nrel-bot · Jun 22, 2023
1 parent 2583805
commit 8f6474f
Show file tree

Hide file tree

Showing 5 changed files with 359 additions and 564 deletions.
diff --git a/src/EnergyPlus/DataHVACGlobals.hh b/src/EnergyPlus/DataHVACGlobals.hh
@@ -372,62 +372,7 @@ namespace DataHVACGlobals {
 
     // Parameters for HVACSystemRootFindingAlgorithm
     int constexpr Bisection(2);
-#ifdef GET_OUT
-    enum class ZoneEquipType {
-        Invalid = -1,
-        DUMMY, // There is some back and forth with AFN enumerations here that I just don't want to mess with
-        VariableRefrigerantFlow, // VRFTerminalUnit
-        EnergyRecoveryVentilator, // ERVStandAlone
-        FourPipeFanCoil, // FanCoil4Pipe
-        OutdoorAirUnit, // OutdoorAirUnit
-        PackagedTerminalAirConditioner, // PkgTermACAirToAir
-        PackagedTerminalHeatPump, // PkgTermHPAirToAir
-        UnitHeater,  // UnitHeater
-        UnitVentilator, // UnitVentilator
-        VentilatedSlab, // VentilatedSlab
-        WaterToAirHeatPump, // PkgTermHPWaterToAir
-        WindowAirConditioner, // WindowAC
-        BaseboardRadiantConvectiveElectric, // BBElectric
-        BaseboardRadiantConvectiveWater, // BBWater
-        BaseboardRadiantConvectiveSteam, // BBSteam
-        BaseboardConvectiveElectric, // BBElectricConvective
-        BaseboardConvectiveWater, // BBWaterConvective
-        HighTemperatureRadiant, // HiTempRadiant
-        DehumidifierDX, // ZoneDXDehumidifier
-        IdealLoadsAirSystem, // PurchasedAir
-        RefrigerationChillerSet, // RefrigerationAirChillerSet
-        HybridUnitaryAirConditioners, 
-        FanZoneExhaust, // FanZoneExhaust
-        WaterHeaterHeatPump, // HPWaterHeater
-        AirTerminalDualDuctConstantVolume,
-        AirTerminalDualDuctVAV, 
-        AirTerminalSingleDuctConstantVolumeReheat,
-        AirTerminalSingleDuctConstantVolumeNoReheat, 
-        AirTerminalSingleDuctVAVReheat, 
-        AirTerminalSingleDuctVAVNoReheat, 
-        AirTerminalSingleDuctSeriesPIUReheat,
-        AirTerminalSingleDuctParallelPIUReheat, 
-        AirTerminalSingleDuctCAVFourPipeInduction,
-        AirTerminalSingleDuctVAVReheatVariableSpeedFan,
-        AirTerminalSingleDuctVAVHeatAndCoolReheat,
-        AirTerminalSingleDuctVAVHeatAndCoolNoReheat, 
-        AirTerminalSingleDuctConstantVolumeCooledBeam, 
-        AirTerminalDualDuctVAVOutdoorAir, 
-        AirLoopHVACReturnAir, 
-        Num
-    };
 
-    // ZoneEvaporativeCoolerUnit
-    // ZoneHybridEvaporativeCooler
-    // AirDistUnit
-    // LoTempRadiant
-    // HeatExchanger
-    // UserDefinedZoneHVACForcedAir
-    // CoolingPanel
-    // ZoneUnitarySys
-    extern const std::array<std::string_view, (int)ZoneEquipType::Num> zoneEquipTypeNames;
-    extern const std::array<std::string_view, (int)ZoneEquipType::Num> zoneEquipTypeNamesUC;
-#endif //
     int constexpr MaxSpeedLevels = 10;
 
     extern Array1D_string const cFanTypes;

diff --git a/src/EnergyPlus/RoomAirModelAirflowNetwork.hh b/src/EnergyPlus/RoomAirModelAirflowNetwork.hh
@@ -60,40 +60,23 @@ struct EnergyPlusData;
 namespace RoomAirModelAirflowNetwork {
 
     // Data
-    class RAFNData
-    {
-
-    private:
+    class RAFNData {
     public:
-        int ZoneNum;
-        int RoomAirNode;
-
-        // constructor
-        RAFNData() : ZoneNum(0), RoomAirNode(0)
-        {
-        }
+        int ZoneNum = 0;
+        int RoomAirNode = 0;
 
-        // functions
-
-        //*****************************************************************************************
         void InitRoomAirModelAirflowNetwork(EnergyPlusData &state, int const RoomAirNode); // index number for the specified zone and room air node
 
-        //*****************************************************************************************
         void CalcRoomAirModelAirflowNetwork(EnergyPlusData &state,
                                             int const ThisRoomAirNode); // index number for the specified zone and room air node
 
-        //*****************************************************************************************
         void UpdateRoomAirModelAirflowNetwork(EnergyPlusData &state); // index number for the specified zone
 
-        //*****************************************************************************************
         void CalcNodeSums(EnergyPlusData &state, int const RoomAirNode); // index number for the specified zone and room air node
 
-        //*****************************************************************************************
         void SumNonAirSystemResponseForNode(EnergyPlusData &state, int const RoomAirNode); // index number for the specified zone and room air node
-        //*****************************************************************************************
-        void SumSystemDepResponseForNode(EnergyPlusData &state); // index number for the specified zone and room air node
 
-        //*****************************************************************************************
+        void SumSystemDepResponseForNode(EnergyPlusData &state); // index number for the specified zone and room air node
 
         void CalcSurfaceMoistureSums(
             EnergyPlusData &state, int const RoomAirNode, Real64 &SumHmAW, Real64 &SumHmARa, Real64 &SumHmARaW, Array1D<bool> const &SurfMask);