Multiple Airloops - Fix SetupZoneInternalGain for Lights

NREL · Feb 21, 2017 · 7ebff60 · 7ebff60 · nrel-bot-3 · Feb 21, 2017
1 parent c9b530e
commit 7ebff60
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/EnergyPlus/HeatBalanceInternalHeatGains.cc b/src/EnergyPlus/HeatBalanceInternalHeatGains.cc
@@ -71,7 +71,7 @@ SetupZoneInternalGain(
 	Optional< Real64 > ReturnAirLatentGainRate,
 	Optional< Real64 > CarbonDioxideGainRate,
 	Optional< Real64 > GenericContamGainRate,
-	Optional< int > ReturnAirNodeNum // for return air heat gains
+	Optional< int > RetNodeNum // for return air heat gains
 )
 {
 
@@ -207,8 +207,8 @@ SetupZoneInternalGain(
 		ZoneIntGain( ZoneNum ).Device( ZoneIntGain( ZoneNum ).NumberOfDevices ).PtrGenericContamGainRate >>= ZeroPointerVal;
 	}
 
-	if ( present( ReturnAirNodeNum ) ) {
-
+	if ( present( RetNodeNum ) ) {
+		ZoneIntGain( ZoneNum ).Device( ZoneIntGain( ZoneNum ).NumberOfDevices ).ReturnAirNodeNum = RetNodeNum;
 	}
 }
 

diff --git a/src/EnergyPlus/HeatBalanceInternalHeatGains.hh b/src/EnergyPlus/HeatBalanceInternalHeatGains.hh
@@ -68,7 +68,7 @@ SetupZoneInternalGain(
 	Optional< Real64 > ReturnAirLatentGainRate = _,
 	Optional< Real64 > CarbonDioxideGainRate = _,
 	Optional< Real64 > GenericContamGainRate = _,
-	Optional< int > ReturnAirNodeNum = _ // for return air heat gains
+	Optional< int > RetNodeNum = _ // for return air heat gains
 );
 
 } // EnergyPlus

diff --git a/src/EnergyPlus/InternalHeatGains.cc b/src/EnergyPlus/InternalHeatGains.cc
@@ -1187,7 +1187,7 @@ namespace InternalHeatGains {
 						SetupEMSInternalVariable( "Lighting Power Design Level", Lights( Loop ).Name, "[W]", Lights( Loop ).DesignLevel );
 					} // EMS
 					//setup internal gains
-					if ( ! ErrorsFound ) SetupZoneInternalGain( Lights( Loop ).ZonePtr, "Lights", Lights( Loop ).Name, IntGainTypeOf_Lights, Lights( Loop ).ConGainRate, Lights( Loop ).RetAirGainRate, Lights( Loop ).RadGainRate, _, _, _, Lights(Loop).ReturnNodePtr );
+					if ( ! ErrorsFound ) SetupZoneInternalGain( Lights( Loop ).ZonePtr, "Lights", Lights( Loop ).Name, IntGainTypeOf_Lights, Lights( Loop ).ConGainRate, Lights( Loop ).RetAirGainRate, Lights( Loop ).RadGainRate, _, _, _, _, Lights(Loop).ReturnNodePtr );
 
 					// send values to predefined lighting summary report
 					liteName = Lights( Loop ).Name;