Multiple Airloops - Fix test failures due to late allocation

NREL · Mar 2, 2017 · 8ed0200 · 8ed0200 · nrel-bot-3 · Mar 3, 2017
1 parent 5bc2139
commit 8ed0200
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/EnergyPlus/ZoneAirLoopEquipmentManager.cc b/src/EnergyPlus/ZoneAirLoopEquipmentManager.cc
@@ -298,8 +298,6 @@ namespace ZoneAirLoopEquipmentManager {
 		static Array1D_bool lAlphaBlanks( 5 ); // Logical array, alpha field input BLANK = .TRUE. //Tuned Made static
 		static Array1D_bool lNumericBlanks( 2 ); // Logical array, numeric field input BLANK = .TRUE. //Tuned Made static
 		bool DualDuctRecircIsUsed; // local temporary for deciding if recirc side used by dual duct terminal
-		static int ATMixerPriNode( 0 ); // primary air inlet node for air terminal mixers
-		static int ATMixerTypeNum( 0 ); // terminal mixer type number
 		// make sure the input data is read in only once
 		if ( ! GetAirDistUnitsFlag ) {
 			return;

diff --git a/src/EnergyPlus/ZoneEquipmentManager.cc b/src/EnergyPlus/ZoneEquipmentManager.cc
@@ -407,6 +407,8 @@ namespace ZoneEquipmentManager {
 
 		if ( InitZoneEquipmentOneTimeFlag ) {
 			InitZoneEquipmentOneTimeFlag = false;
+			int numTerminalUnits = InputProcessor::GetNumObjectsFound( "AirTerminal:SingleDuct:Uncontrolled" ) + InputProcessor::GetNumObjectsFound( "ZoneHVAC:AirDistributionUnit" );
+			TermUnitSizing.allocate( numTerminalUnits );
 			ZoneEqSizing.allocate( NumOfZones );
 			// setup zone equipment sequenced demand storage
 			for ( ControlledZoneNum = 1; ControlledZoneNum <= NumOfZones; ++ControlledZoneNum ) {
@@ -1034,7 +1036,6 @@ namespace ZoneEquipmentManager {
 		CalcZoneSizing.allocate( TotDesDays + TotRunDesPersDays, NumOfZones );
 		CalcFinalZoneSizing.allocate( NumOfZones );
 		int numTerminalUnits = InputProcessor::GetNumObjectsFound( "AirTerminal:SingleDuct:Uncontrolled" ) + InputProcessor::GetNumObjectsFound( "ZoneHVAC:AirDistributionUnit" );
-		TermUnitSizing.allocate( numTerminalUnits );
 		TermUnitFinalZoneSizing.allocate( numTerminalUnits );
 		DesDayWeath.allocate( TotDesDays + TotRunDesPersDays );
 		NumOfTimeStepInDay = NumOfTimeStepInHour * 24;