Skip to content

Commit

Permalink
Merge pull request #7747 from NREL/CleanupPlantSolverAndManager
Browse files Browse the repository at this point in the history 
Cleanup plant solver and manager
  • Loading branch information
@mitchute
mitchute authored Feb 14, 2020
2 parents 801461f + 51a8cdb commit a7b2149
Show file tree
Hide file tree
Showing 148 changed files with 3,153 additions and 4,126 deletions.
2 changes: 1 addition & 1 deletion src/EnergyPlus/BaseboardRadiator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#include <EnergyPlus/DataHeatBalance.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DataZoneEnergyDemands.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/BoilerSteam.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/EMSManager.hh>
#include <EnergyPlus/FluidProperties.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/Boilers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/EMSManager.hh>
Expand Down
14 changes: 6 additions & 8 deletions src/EnergyPlus/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,6 @@ SET( SRC
DataOutputs.hh
DataPhotovoltaics.cc
DataPhotovoltaics.hh
DataPlant.cc
DataPlant.hh
DataPrecisionGlobals.cc
DataPrecisionGlobals.hh
DataReportingFlags.cc
Expand Down Expand Up @@ -398,22 +396,26 @@ SET( SRC
Pipes.cc
Pipes.hh
Plant/CallingOrder.hh
Plant/DataPlant.cc
Plant/DataPlant.hh
Plant/Enums.hh
Plant/EquipAndOperations.hh
Plant/LoopSidePumpInformation.hh
Plant/PlantAvailManager.hh
Plant/PlantConvergencePoint.hh
Plant/LoopSideReportVars.hh
Plant/MeterData.hh
Plant/ReportBranchData.hh
Plant/ReportCompData.hh
Plant/ReportLoopData.hh
Plant/ReportVars.hh
Plant/Branch.cc
Plant/Branch.hh
Plant/Component.cc
Plant/Component.hh
Plant/ConnectedLoopData.hh
Plant/Connection.hh
Plant/Loop.cc
Plant/Loop.hh
Plant/LoopSide.cc
Plant/LoopSide.hh
Plant/MixerData.hh
Plant/SplitterData.hh
Expand All @@ -432,10 +434,6 @@ SET( SRC
PlantLoadProfile.cc
PlantLoadProfile.hh
Plant/PlantLocation.hh
PlantLoopEquip.cc
PlantLoopEquip.hh
Plant/PlantLoopSolver.cc
Plant/PlantLoopSolver.hh
Plant/PlantManager.cc
Plant/PlantManager.hh
PlantPipingSystemsManager.cc
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/CTElectricGenerator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/FluidProperties.hh>
#include <EnergyPlus/General.hh>
#include <EnergyPlus/InputProcessing/InputProcessor.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/ChilledCeilingPanelSimple.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#include <EnergyPlus/DataHeatBalSurface.hh>
#include <EnergyPlus/DataHeatBalance.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DataSurfaces.hh>
#include <EnergyPlus/DataZoneEnergyDemands.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/ChillerAbsorption.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/EMSManager.hh>
#include <EnergyPlus/FaultsManager.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/ChillerElectricEIR.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/EMSManager.hh>
#include <EnergyPlus/FaultsManager.hh>
Expand Down
4 changes: 1 addition & 3 deletions src/EnergyPlus/ChillerExhaustAbsorption.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,11 @@
#include <EnergyPlus/ChillerExhaustAbsorption.hh>
#include <EnergyPlus/CurveManager.hh>
#include <EnergyPlus/DataBranchAirLoopPlant.hh>
//#include <EnergyPlus/DataEnvironment.hh>
#include <EnergyPlus/DataGlobalConstants.hh>
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
//#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/EMSManager.hh>
#include <EnergyPlus/FluidProperties.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/ChillerGasAbsorption.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/EMSManager.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/ChillerIndirectAbsorption.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/EMSManager.hh>
#include <EnergyPlus/FaultsManager.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/ChillerReformulatedEIR.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/EMSManager.hh>
#include <EnergyPlus/FaultsManager.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/CondenserLoopTowers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DataWater.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/DataAirSystems.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@

// EnergyPlus Headers
#include <EnergyPlus/DataGlobals.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataHVACSystems.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/EnergyPlus.hh>

namespace EnergyPlus {
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/DesiccantDehumidifiers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
#include <EnergyPlus/DataHeatBalance.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DesiccantDehumidifiers.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/ElectricPowerServiceManager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataHeatBalance.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/EMSManager.hh>
#include <EnergyPlus/ElectricPowerServiceManager.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/EvaporativeFluidCoolers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DataWater.hh>
#include <EnergyPlus/EvaporativeFluidCoolers.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/FanCoilUnits.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#include <EnergyPlus/DataHeatBalance.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DataZoneEnergyDemands.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/FluidCoolers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/FluidCoolers.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/FuelCellElectricGenerator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
#include <EnergyPlus/DataHeatBalance.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/FluidProperties.hh>
#include <EnergyPlus/FuelCellElectricGenerator.hh>
#include <EnergyPlus/General.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/GeneratorDynamicsManager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
#include <EnergyPlus/DataGlobals.hh>
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/GeneratorDynamicsManager.hh>
#include <EnergyPlus/MicroCHPElectricGenerator.hh>
#include <EnergyPlus/PlantUtilities.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/GroundHeatExchangers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataStringGlobals.hh>
#include <EnergyPlus/DataSystemVariables.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/HVACControllers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#include <EnergyPlus/DataEnvironment.hh>
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DataSystemVariables.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/HVACCooledBeam.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DataZoneEnergyDemands.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/HVACFourPipeBeam.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DataZoneEnergyDemands.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/HVACInterfaceManager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
#include <EnergyPlus/DataGlobals.hh>
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/FluidProperties.hh>
#include <EnergyPlus/HVACInterfaceManager.hh>
Expand Down
4 changes: 1 addition & 3 deletions src/EnergyPlus/HVACManager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
#include <EnergyPlus/DataHeatBalFanSys.hh>
#include <EnergyPlus/DataHeatBalance.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataReportingFlags.hh>
#include <EnergyPlus/DataRoomAirModel.hh>
Expand All @@ -80,7 +80,6 @@
#include <EnergyPlus/DataZoneEquipment.hh>
#include <EnergyPlus/DemandManager.hh>
#include <EnergyPlus/DisplayRoutines.hh>
//#include <EarthTube.hh>
#include <EnergyPlus/EMSManager.hh>
#include <EnergyPlus/Fans.hh>
#include <EnergyPlus/General.hh>
Expand All @@ -105,7 +104,6 @@
#include <EnergyPlus/SizingManager.hh>
#include <EnergyPlus/SystemAvailabilityManager.hh>
#include <EnergyPlus/SystemReports.hh>
//#include <ThermalChimney.hh>
#include <EnergyPlus/ElectricPowerServiceManager.hh>
#include <EnergyPlus/HVACSizingSimulationManager.hh>
#include <EnergyPlus/UtilityRoutines.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/HVACMultiSpeedHeatPump.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
#include <EnergyPlus/DataHeatBalFanSys.hh>
#include <EnergyPlus/DataHeatBalance.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DataZoneControls.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/HVACSingleDuctInduc.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DataZoneEnergyDemands.hh>
Expand Down
7 changes: 3 additions & 4 deletions src/EnergyPlus/HVACSizingSimulationManager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
#include <EnergyPlus/DataEnvironment.hh>
#include <EnergyPlus/DataErrorTracking.hh>
#include <EnergyPlus/DataGlobals.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataReportingFlags.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DataSystemVariables.hh>
Expand Down Expand Up @@ -131,7 +131,6 @@ void HVACSizingSimulationManager::CreateNewCoincidentPlantAnalysisObject(std::st
void HVACSizingSimulationManager::SetupSizingAnalyses()
{
using DataLoopNode::Node;
using DataPlant::PlantReport;
using DataSizing::CondenserLoop;
using DataSizing::CoolingLoop;
using DataSizing::HeatingLoop;
Expand All @@ -143,9 +142,9 @@ void HVACSizingSimulationManager::SetupSizingAnalyses()
P.supplyInletNodeFlow_LogIndex = sizingLogger.SetupVariableSizingLog(Node(P.supplySideInletNodeNum).MassFlowRate, P.numTimeStepsInAvg);
P.supplyInletNodeTemp_LogIndex = sizingLogger.SetupVariableSizingLog(Node(P.supplySideInletNodeNum).Temp, P.numTimeStepsInAvg);
if (PlantSizData(P.plantSizingIndex).LoopType == HeatingLoop || PlantSizData(P.plantSizingIndex).LoopType == SteamLoop) {
P.loopDemand_LogIndex = sizingLogger.SetupVariableSizingLog(PlantReport(P.plantLoopIndex).HeatingDemand, P.numTimeStepsInAvg);
P.loopDemand_LogIndex = sizingLogger.SetupVariableSizingLog(DataPlant::PlantLoop(P.plantLoopIndex).HeatingDemand, P.numTimeStepsInAvg);
} else if (PlantSizData(P.plantSizingIndex).LoopType == CoolingLoop || PlantSizData(P.plantSizingIndex).LoopType == CondenserLoop) {
P.loopDemand_LogIndex = sizingLogger.SetupVariableSizingLog(PlantReport(P.plantLoopIndex).CoolingDemand, P.numTimeStepsInAvg);
P.loopDemand_LogIndex = sizingLogger.SetupVariableSizingLog(DataPlant::PlantLoop(P.plantLoopIndex).CoolingDemand, P.numTimeStepsInAvg);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/HVACSizingSimulationManager.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
#include <EnergyPlus/DataEnvironment.hh>
#include <EnergyPlus/DataErrorTracking.hh>
#include <EnergyPlus/DataGlobals.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataReportingFlags.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DataSystemVariables.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/HVACUnitaryBypassVAV.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#include <EnergyPlus/DataGlobals.hh>
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DataZoneControls.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/HVACVariableRefrigerantFlow.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
#include <EnergyPlus/DataHeatBalFanSys.hh>
#include <EnergyPlus/DataHeatBalance.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DataZoneControls.hh>
#include <EnergyPlus/DataZoneEnergyDemands.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/HWBaseboardRadiator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#include <EnergyPlus/DataHeatBalance.hh>
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/DataSurfaces.hh>
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/HeatPumpWaterToWaterCOOLING.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
#include <EnergyPlus/DataEnvironment.hh>
#include <EnergyPlus/DataHVACGlobals.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/DataPlant.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/FluidProperties.hh>
#include <EnergyPlus/General.hh>
Expand Down
Loading

6 comments on commit a7b2149

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (mitchute) - x86_64-MacOS-10.13-clang: OK (1961 of 1961 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (1981 of 1981 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (mitchute) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (mitchute) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (11 of 11 tests passed, 0 test warnings)

Build Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1284 of 1284 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (679 of 680 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 679
  • Timeout: 1

Build Badge Test Badge Coverage Badge

Please sign in to comment.