partial moving HPWH to plantCompPtr

NREL · Nov 21, 2019 · f1d12a3 · f1d12a3 · nrel-bot-3 · Nov 22, 2019
1 parent 00772c3
commit f1d12a3
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 36 deletions.
diff --git a/src/EnergyPlus/IntegratedHeatPump.cc b/src/EnergyPlus/IntegratedHeatPump.cc
@@ -2204,9 +2204,6 @@ namespace IntegratedHeatPump {
         using WaterThermalTanks::GetWaterThermalTankInput;
 
         Real64 MyLoad(0.0);
-//        Real64 MaxCap(0.0);
-//        Real64 MinCap(0.0);
-//        Real64 OptCap(0.0);
         Real64 WHHeatTimeSav(0.0); // time accumulation for water heating
         Real64 WHHeatVolSave(0.0); // volume accumulation for water heating
 
@@ -2261,17 +2258,6 @@ namespace IntegratedHeatPump {
                 PlantLocation A(0, 0, 0, 0);
                 HPWH.simulate(A, true, MyLoad, true);
 
-//                WaterThermalTanks::SimWaterThermalTank_HeatPump(tankType,
-//                                                                IntegratedHeatPumps(DXCoilNum).WHtankName,
-//                                                                IntegratedHeatPumps(DXCoilNum).WHtankID,
-//                                                                false,
-//                                                                false,
-//                                                                MyLoad,
-//                                                                MaxCap,
-//                                                                MinCap,
-//                                                                OptCap,
-//                                                                true);
-
                 tank.callerLoopNum = 0;
 
             }

diff --git a/src/EnergyPlus/PlantLoopEquip.cc b/src/EnergyPlus/PlantLoopEquip.cc
@@ -637,9 +637,7 @@ namespace PlantLoopEquip {
                 int tankIDX = WaterThermalTanks::getTankIDX(sim_component.Name, EquipNum);
                 auto &tank = WaterThermalTanks::WaterThermalTank(tankIDX);
                 tank.callerLoopNum = LoopNum;
-
                 sim_component.compPtr->simulate(sim_component_location, FirstHVACIteration, CurLoad, RunFlag);
-
                 tank.callerLoopNum = 0;
 
                 // HEAT PUMP WATER HEATER
@@ -650,29 +648,9 @@ namespace PlantLoopEquip {
                 int tankIDX = HPWH.WaterHeaterTankNum;
                 auto &tank = WaterThermalTanks::WaterThermalTank(tankIDX);
                 tank.callerLoopNum = LoopNum;
-
                 sim_component.compPtr->simulate(sim_component_location, FirstHVACIteration, CurLoad, RunFlag);
-
-//                SimWaterThermalTank_HeatPump(EquipTypeNum,
-//                                             sim_component.Name,
-//                                             EquipNum,
-//                                             RunFlag,
-//                                             InitLoopEquip,
-//                                             CurLoad,
-//                                             MaxLoad,
-//                                             MinLoad,
-//                                             OptLoad,
-//                                             FirstHVACIteration); // DSU
-
                 tank.callerLoopNum = 0;
 
-//                if (InitLoopEquip) {
-//                    sim_component.MaxLoad = MaxLoad;
-//                    sim_component.MinLoad = MinLoad;
-//                    sim_component.OptLoad = OptLoad;
-//                    sim_component.CompNum = EquipNum;
-//                }
-
             } else {
                 ShowSevereError("SimPlantEquip: Invalid Water Heater Type=" + sim_component.TypeOf);
                 ShowContinueError("Occurs in Plant Loop=" + PlantLoop(LoopNum).Name);