Initial changes to VS coils

NREL · Sep 3, 2015 · 26117aa · 26117aa · nrel-bot · Sep 3, 2015
1 parent 8a9575f
commit 26117aa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/EnergyPlus/HVACUnitarySystem.cc b/src/EnergyPlus/HVACUnitarySystem.cc
@@ -6794,13 +6794,13 @@ namespace HVACUnitarySystem {
 
 		// Calculate residual based on output calculation flag
 		if ( SensibleLoad ) {
-			if ( std::abs( LoadToBeMet ) < 100.0) {
+			if ( std::abs( LoadToBeMet ) == 0.0) {
 				Residuum = ( SensOutput - LoadToBeMet ) / 100.0;
 			} else {
-				Residuum = 100.0 * ( SensOutput - LoadToBeMet ) / LoadToBeMet;
+				Residuum = ( SensOutput - LoadToBeMet ) / LoadToBeMet;
 			}
 		} else {
-			if ( std::abs( LoadToBeMet ) < 100.0 ) {
+			if ( std::abs( LoadToBeMet ) == 0.0 ) {
 				Residuum = ( LatOutput - LoadToBeMet ) / 100.0;
 			} else {
 				Residuum = ( LatOutput - LoadToBeMet ) / LoadToBeMet;
@@ -10537,7 +10537,7 @@ namespace HVACUnitarySystem {
 			assert( false );
 		}}
 
-		Residuum = ( Par( 2 ) - OutletAirTemp ) * 10.0; // need tight control on temperature
+		Residuum = Par( 2 ) - OutletAirTemp;
 
 		return Residuum;
 	}
@@ -10660,7 +10660,7 @@ namespace HVACUnitarySystem {
 			assert( false );
 		}}
 
-		Residuum = ( Par( 2 ) - OutletAirTemp ) * 10.0; // need tight control on temperature
+		Residuum = Par( 2 ) - OutletAirTemp;
 
 		return Residuum;
 	}
@@ -10883,7 +10883,7 @@ namespace HVACUnitarySystem {
 			assert( false );
 		}}
 
-		Residuum = ( Par( 2 ) - OutletAirTemp ) * 10.0; // need tight control on temperature
+		Residuum = Par( 2 ) - OutletAirTemp;
 
 		return Residuum;
 	}
@@ -11015,7 +11015,7 @@ namespace HVACUnitarySystem {
 			assert( false );
 		}}
 
-		Residuum = ( Par( 2 ) - OutletAirTemp ) * 10.0; // need tight control on temperature
+		Residuum = Par( 2 ) - OutletAirTemp;
 
 		return Residuum;
 	}

diff --git a/tst/EnergyPlus/unit/Fixtures/EnergyPlusFixture.cc b/tst/EnergyPlus/unit/Fixtures/EnergyPlusFixture.cc
@@ -21,7 +21,10 @@
 #include <EnergyPlus/GlobalNames.hh>
 #include <EnergyPlus/HeatBalanceManager.hh>
 
-#include <EnergyPlus/HVACVariableRefrigerantFlow.hh>#include <EnergyPlus/HVACUnitarySystem.hh>#include <EnergyPlus/MixedAir.hh>#include <EnergyPlus/InputProcessor.hh>
+#include <EnergyPlus/HVACVariableRefrigerantFlow.hh>
+#include <EnergyPlus/HVACUnitarySystem.hh>
+#include <EnergyPlus/MixedAir.hh>
+#include <EnergyPlus/InputProcessor.hh>
 #include <EnergyPlus/OutputProcessor.hh>
 #include <EnergyPlus/ScheduleManager.hh>