Final fixes for prototype branch.

NREL · Oct 30, 2016 · 2f89682 · 2f89682 · nrel-bot-3 · Oct 30, 2016
1 parent 8c42d64
commit 2f89682
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/src/EnergyPlus/HeatBalanceKivaManager.cc b/src/EnergyPlus/HeatBalanceKivaManager.cc
@@ -257,7 +257,7 @@ void KivaManager::setupKivaInstances() {
             if (Surfaces(wl).Vertex[i].z > maxZ) {maxZ = Surfaces(wl).Vertex[i].z;}
           }
           Real64 surfHeight = maxZ - minZ;
-          if (std::abs(surfHeight - wallHeight) > 0.00001) {
+          if (std::abs(surfHeight - wallHeight) > 0.001) {
             // TODO Kiva: all walls must be the same height
             ShowSevereError( "all walls must be the same height" );
             ShowFatalError( "KivaManager: Program terminates due to preceding conditions." );

diff --git a/src/EnergyPlus/SurfaceGeometry.cc b/src/EnergyPlus/SurfaceGeometry.cc
@@ -5869,6 +5869,7 @@ namespace SurfaceGeometry {
 		using InputProcessor::SameString;
 		using DataSurfaces::Surface;
 		using General::TrimSigDigits;
+		using General::RoundSigDigits;
 
 		int IOStatus; // Used in GetObjectItem
 		int NumAlphas;
@@ -5896,7 +5897,18 @@ namespace SurfaceGeometry {
 			Data data;
 			data.useDetailedExposedPerimeter = true;
 			int optionsUsed = 0;
-			if ( !lNumericFieldBlanks( numF ) ) {data.exposedFraction = rNumericArgs( numF ) / Surface(Found).Perimeter; data.useDetailedExposedPerimeter = false; optionsUsed++;} numF++;
+			if ( !lNumericFieldBlanks( numF ) ) {
+				data.exposedFraction = rNumericArgs( numF ) / Surface(Found).Perimeter;
+				if (data.exposedFraction > 1.0) {
+					ShowWarningError( cCurrentModuleObject + ": " + Surface(Found).Name + ", "+ cNumericFieldNames( numF ) + " is greater than the perimeter of " + Surface(Found).Name);
+					ShowContinueError( Surface(Found).Name + " perimeter = " + RoundSigDigits(Surface(Found).Perimeter) + ", " + cCurrentModuleObject + " exposed perimeter = " + RoundSigDigits(rNumericArgs( numF )) );
+					ShowContinueError( cNumericFieldNames( numF ) + " will be set equal to " + Surface(Found).Name + " perimeter");
+					data.exposedFraction = 1.0;
+				}
+
+				data.useDetailedExposedPerimeter = false;
+				optionsUsed++;
+			} numF++;
 			if ( !lNumericFieldBlanks( numF ) ) {data.exposedFraction = rNumericArgs( numF ); data.useDetailedExposedPerimeter = false; optionsUsed++;} numF++;
 
 			int numRemainingFields = NumAlphas - (alpF - 1) + NumNumbers - (numF -1);
@@ -5917,11 +5929,10 @@ namespace SurfaceGeometry {
 						ErrorsFound = true;
 					} alpF++;
 				}
-			} else {
-				if (lNumericFieldBlanks( numF - 1 )) {
-					ShowSevereError( cCurrentModuleObject + ": " + Surface(Found).Name + ", must define either \"" + cAlphaFieldNames( alpF ) + "\" or \"" + cNumericFieldNames(numF - 1) +"\"");
-					ErrorsFound = true;
-				}
+			}
+			if (optionsUsed == 0) {
+				ShowSevereError( cCurrentModuleObject + ": " + Surface(Found).Name + ", must define at least one of \"" + cNumericFieldNames( 1 ) + "\", \"" + cNumericFieldNames( 2 ) + "\", or \""  + cAlphaFieldNames( 2 ) + "\"");
+				ErrorsFound = true;
 			}
 
 			if (optionsUsed > 1) {

diff --git a/third_party/cmake/kiva.cmake b/third_party/cmake/kiva.cmake
@@ -10,6 +10,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} --build . WORKING_DIRECTORY ${CMAKE_BIN
 add_subdirectory("${CMAKE_SOURCE_DIR}/third_party/kiva/vendor/lis-1.5.66/")
 add_subdirectory("${CMAKE_SOURCE_DIR}/third_party/kiva/src/libkiva/")
 if (BUILD_GROUND_PLOT)
+  add_definitions("-DBOOST_ALL_NO_LIB")  
   include_directories( SYSTEM "${CMAKE_SOURCE_DIR}/third_party/kiva/vendor/mathgl-2.3.5.1/include/")
   include_directories( SYSTEM "${CMAKE_BINARY_DIR}/third_party/kiva/vendor/mathgl-2.3.5.1/include/")
   add_subdirectory("${CMAKE_SOURCE_DIR}/third_party/kiva/vendor/zlib-1.2.8/")