Merge remote-tracking branch 'remotes/origin/develop' into Beyond1Air…

…loop Conflicts: src/EnergyPlus/HVACSingleDuctInduc.cc src/EnergyPlus/ReportSizingManager.cc src/EnergyPlus/SingleDuct.cc
NREL · May 30, 2017 · e4284b6 · e4284b6 · nrel-bot-3 · May 30, 2017
2 parents 8ec055e + b3a9254
commit e4284b6
Show file tree

Hide file tree

Showing 724 changed files with 10,457 additions and 5,267 deletions.
diff --git a/bin/IDFEditor/IDFEditor.exe b/bin/IDFEditor/IDFEditor.exe
diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake
@@ -29,6 +29,7 @@ IF ( MSVC AND NOT ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" ) ) # Visual C++
     ADD_CXX_DEFINITIONS("/wd4068 /wd4101 /wd4102 /wd4244 /wd4258 /wd4355 /wd4996") # Disables warning messages listed above
     ADD_CXX_DEFINITIONS("/DNOMINMAX") # Avoid build errors due to STL/Windows min-max conflicts
     ADD_CXX_DEFINITIONS("/DWIN32_LEAN_AND_MEAN") # Excludes rarely used services and headers from compilation
+    #    ADD_CXX_DEFINITIONS("-d2SSAOptimizer-") # this disables this optimizer which has known major issues
 
     # ADDITIONAL RELEASE-MODE-SPECIFIC FLAGS
     ADD_CXX_RELEASE_DEFINITIONS("/GS-") # Disable buffer overrun checks for performance in release mode

diff --git a/cmake/Install.cmake b/cmake/Install.cmake
@@ -299,3 +299,9 @@ endif ()
 
 INCLUDE(CPack)
 
+SET(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
+
+INCLUDE(InstallRequiredSystemLibraries)
+
+INSTALL(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION "./" COMPONENT Libraries)
+
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -5,7 +5,7 @@ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/doc-build)
 
 # add a configure rule to the header file though
 configure_file(${CMAKE_SOURCE_DIR}/doc/header.tex ${CMAKE_BINARY_DIR}/doc-build/header.tex COPYONLY)
-configure_file(${CMAKE_SOURCE_DIR}/doc/title.tex ${CMAKE_BINARY_DIR}/doc-build/title.tex COPYONLY)
+configure_file(${CMAKE_SOURCE_DIR}/doc/title.tex.in ${CMAKE_BINARY_DIR}/doc-build/title.tex)
 configure_file(${CMAKE_SOURCE_DIR}/doc/index.html ${CMAKE_BINARY_DIR}/doc-build/index.html COPYONLY)
 
 # add each of the documents, they have their own CMakeLists.txt files
@@ -28,15 +28,15 @@ if (BUILD_VALIDATION_REPORTS)
 
   # wkhtmltopdf
   if(MSVC)
-    find_program(WKHTMLTOPDF_EXECUTABLE 
+    find_program(WKHTMLTOPDF_EXECUTABLE
       wkhtmltopdf
       PATHS "C:/Program Files/wkhtmltopdf/bin" "C:/Program Files (x86)/wkhtmltopdf/bin")
   else()
-    find_program(WKHTMLTOPDF_EXECUTABLE 
+    find_program(WKHTMLTOPDF_EXECUTABLE
       wkhtmltopdf
       )
   endif()
-  execute_process(COMMAND ${WKHTMLTOPDF_EXECUTABLE} -V 
+  execute_process(COMMAND ${WKHTMLTOPDF_EXECUTABLE} -V
     OUTPUT_VARIABLE wkhtmltopdfversionout)
   string(REGEX MATCH "([0-9]+\\.?)+" WKHTMLTOPDF_VER "${wkhtmltopdfversionout}")
   string(FIND "${wkhtmltopdfversionout}" "with patched qt" WKHTMLTOPDF_PATCHEDQT )
@@ -46,11 +46,11 @@ if (BUILD_VALIDATION_REPORTS)
   if (WKHTMLTOPDF_PATCHEDQT LESS "0")
     message(FATAL_ERROR "wkhtmltopdf with special patchedqt build required")
   endif()
-  
+
   # pandoc
   find_program(PANDOC_EXECUTABLE pandoc)
   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Products)
-  execute_process(COMMAND ${PANDOC_EXECUTABLE} -v 
+  execute_process(COMMAND ${PANDOC_EXECUTABLE} -v
     OUTPUT_VARIABLE pandocversionout)
   string(REGEX MATCH "([0-9]+\\.?)+" PANDOC_VER "${pandocversionout}")
   if (PANDOC_VER VERSION_LESS "1.13.2")

diff --git a/doc/acknowledgements/CMakeLists.txt b/doc/acknowledgements/CMakeLists.txt
@@ -1,20 +1,20 @@
 
 # to get the list of input files, go to the root of the document folder, and:
-# grep -r '\\input{' * | cut -d ':' -f 2 | cut -c 8- | rev | cut -c 2- | rev | sed 's|^|  ${CMAKE_SOURCE_DIR}/doc/acknowledgements/|g' | sed 's/$/.tex/g' 
+# grep -r '\\input{' * | cut -d ':' -f 2 | cut -c 8- | rev | cut -c 2- | rev | sed 's|^|  ${CMAKE_SOURCE_DIR}/doc/acknowledgements/|g' | sed 's/$/.tex/g'
 SET( INCLUDED_TEX
   ${CMAKE_SOURCE_DIR}/doc/header.tex
   ${CMAKE_SOURCE_DIR}/doc/acknowledgements/acknowledgements.tex
   ${CMAKE_SOURCE_DIR}/doc/acknowledgements/src/notices-and-acknowledgments.tex
   ${CMAKE_SOURCE_DIR}/doc/acknowledgements/src/notices-and-acknowledgments/copyright-notice.tex
   ${CMAKE_SOURCE_DIR}/doc/acknowledgements/src/notices-and-acknowledgments/other-software-included-or-referenced.tex
   ${CMAKE_SOURCE_DIR}/doc/acknowledgements/src/notices-and-acknowledgments/other-acknowledgments.tex
-  ${CMAKE_SOURCE_DIR}/doc/title.tex
+  ${CMAKE_BINARY_DIR}/doc-build/title.tex
 )
 
 # to get the list of inluded images, go to the root of the document folder and:
 # grep -r '\\includegraphics' * | cut -d ':' -f 2 | rev | cut -d '{' -f 1 | rev | cut -d '}' -f 1 | sed 's/^/  /g' | sort -n -t'.' -k 1.14
-SET( INCLUDED_IMAGES 
-) 
+SET( INCLUDED_IMAGES
+)
 
 SET( SOURCE_FILENAME "acknowledgements" )
 SET( OUTPUT_FILENAME "Acknowledgements" )
@@ -25,7 +25,7 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/doc-build/${OUTPUT_FILENAME}.pdf
 	COMMAND ${CMAKE_COMMAND} -DXELATEX=${XELATEX} -DINNAME=${SOURCE_FILENAME} -DOUTNAME=${OUTPUT_FILENAME} -DORIGINAL_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DORIGINAL_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/BuildDocumentation.cmake
 		    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc-build/${SOURCE_FILENAME}
 		    DEPENDS ${INCLUDED_TEX} ${INCLUDED_IMAGES}
-                 ) 
+                 )
 add_custom_target( zPDF_${OUTPUT_FILENAME} ALL
                    DEPENDS ${CMAKE_BINARY_DIR}/doc-build/${OUTPUT_FILENAME}.pdf
                  )
diff --git a/doc/auxiliary-programs/CMakeLists.txt b/doc/auxiliary-programs/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # to get the list of input files, go to the root of the document folder, and:
-# grep -r '\\input{' * | cut -d ':' -f 2 | cut -c 8- | rev | cut -c 2- | rev | sed 's|^|  ${CMAKE_SOURCE_DIR}/doc/acknowledgements/|g' | sed 's/$/.tex/g' 
+# grep -r '\\input{' * | cut -d ':' -f 2 | cut -c 8- | rev | cut -c 2- | rev | sed 's|^|  ${CMAKE_SOURCE_DIR}/doc/acknowledgements/|g' | sed 's/$/.tex/g'
 SET( INCLUDED_TEX
   ${CMAKE_SOURCE_DIR}/doc/auxiliary-programs/../header.tex
   ${CMAKE_SOURCE_DIR}/doc/auxiliary-programs/auxiliary-programs.tex
@@ -107,12 +107,12 @@ SET( INCLUDED_TEX
   ${CMAKE_SOURCE_DIR}/doc/auxiliary-programs/src/creating-input-files/idfeditor.tex
   ${CMAKE_SOURCE_DIR}/doc/auxiliary-programs/src/manipulating-output-files.tex
   ${CMAKE_SOURCE_DIR}/doc/auxiliary-programs/src/manipulating-output-files/ep-compare.tex
-  ${CMAKE_SOURCE_DIR}/doc/auxiliary-programs/../title.tex
+  ${CMAKE_BINARY_DIR}/doc-build/title.tex
 )
 
 # to get the list of inluded images, go to the root of the document folder and:
 # grep -r '\\includegraphics' * | cut -d ':' -f 2 | rev | cut -d '{' -f 1 | rev | cut -d '}' -f 1 | sed 's/^/  /g' | sort -n -t'.' -k 1.14
-SET( INCLUDED_IMAGES 
+SET( INCLUDED_IMAGES
   ${CMAKE_SOURCE_DIR}/doc/auxiliary-programs/media/image001.jpg
   ${CMAKE_SOURCE_DIR}/doc/auxiliary-programs/media/image002.jpg
   ${CMAKE_SOURCE_DIR}/doc/auxiliary-programs/media/image003.jpg
@@ -190,7 +190,7 @@ SET( INCLUDED_IMAGES
   ${CMAKE_SOURCE_DIR}/doc/auxiliary-programs/media/image121.png
   ${CMAKE_SOURCE_DIR}/doc/auxiliary-programs/media/image122.png
   ${CMAKE_SOURCE_DIR}/doc/auxiliary-programs/media/image123.png
-) 
+)
 
 SET( SOURCE_FILENAME "auxiliary-programs" )
 SET( OUTPUT_FILENAME "AuxiliaryPrograms" )
@@ -201,7 +201,7 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/doc-build/${OUTPUT_FILENAME}.pdf
 	COMMAND ${CMAKE_COMMAND} -DXELATEX=${XELATEX} -DINNAME=${SOURCE_FILENAME} -DOUTNAME=${OUTPUT_FILENAME} -DORIGINAL_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DORIGINAL_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/BuildDocumentation.cmake
 		    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc-build/${SOURCE_FILENAME}
 		    DEPENDS ${INCLUDED_TEX} ${INCLUDED_IMAGES}
-                 ) 
+                 )
 add_custom_target( zPDF_${OUTPUT_FILENAME} ALL
                    DEPENDS ${CMAKE_BINARY_DIR}/doc-build/${OUTPUT_FILENAME}.pdf
                  )
diff --git a/doc/ems-application-guide/CMakeLists.txt b/doc/ems-application-guide/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # to get the list of input files, go to the root of the document folder, and:
-# grep -r '\\input{' * | cut -d ':' -f 2 | cut -c 8- | rev | cut -c 2- | rev | sed 's|^|  ${CMAKE_SOURCE_DIR}/doc/acknowledgements/|g' | sed 's/$/.tex/g' 
+# grep -r '\\input{' * | cut -d ':' -f 2 | cut -c 8- | rev | cut -c 2- | rev | sed 's|^|  ${CMAKE_SOURCE_DIR}/doc/acknowledgements/|g' | sed 's/$/.tex/g'
 SET( INCLUDED_TEX
   ${CMAKE_SOURCE_DIR}/doc/header.tex
   ${CMAKE_SOURCE_DIR}/doc/ems-application-guide/ems-application-guide.tex
@@ -70,17 +70,17 @@ SET( INCLUDED_TEX
   ${CMAKE_SOURCE_DIR}/doc/ems-application-guide/src/debugging-ems-programs/edd-file.tex
   ${CMAKE_SOURCE_DIR}/doc/ems-application-guide/src/debugging-ems-programs/line-trace.tex
   ${CMAKE_SOURCE_DIR}/doc/ems-application-guide/src/debugging-ems-programs/debugging-strategies.tex
-  ${CMAKE_SOURCE_DIR}/doc/ems-application-guide/../title.tex
+  ${CMAKE_BINARY_DIR}/doc-build/title.tex
 )
 
 # to get the list of inluded images, go to the root of the document folder and:
 # grep -r '\\includegraphics' * | cut -d ':' -f 2 | rev | cut -d '{' -f 1 | rev | cut -d '}' -f 1 | sed 's/^/  /g' | sort -n -t'.' -k 1.14
-SET( INCLUDED_IMAGES 
+SET( INCLUDED_IMAGES
   ${CMAKE_SOURCE_DIR}/doc/ems-application-guide/media/image003.jpg
   ${CMAKE_SOURCE_DIR}/doc/ems-application-guide/media/image004.jpg
   ${CMAKE_SOURCE_DIR}/doc/ems-application-guide/media/image005.jpg
   ${CMAKE_SOURCE_DIR}/doc/ems-application-guide/media/image011.jpg
-) 
+)
 
 SET( SOURCE_FILENAME "ems-application-guide" )
 SET( OUTPUT_FILENAME "EMSApplicationGuide" )
@@ -91,7 +91,7 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/doc-build/${OUTPUT_FILENAME}.pdf
 	COMMAND ${CMAKE_COMMAND} -DXELATEX=${XELATEX} -DINNAME=${SOURCE_FILENAME} -DOUTNAME=${OUTPUT_FILENAME} -DORIGINAL_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DORIGINAL_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/BuildDocumentation.cmake
 		    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc-build/${SOURCE_FILENAME}
 		    DEPENDS ${INCLUDED_TEX} ${INCLUDED_IMAGES}
-                 ) 
+                 )
 add_custom_target( zPDF_${OUTPUT_FILENAME} ALL
                    DEPENDS ${CMAKE_BINARY_DIR}/doc-build/${OUTPUT_FILENAME}.pdf
                  )
diff --git a/doc/engineering-reference/CMakeLists.txt b/doc/engineering-reference/CMakeLists.txt
@@ -85,6 +85,8 @@ SET( INCLUDED_TEX
   ${CMAKE_SOURCE_DIR}/doc/engineering-reference/src/demand-limiting.tex
   ${CMAKE_SOURCE_DIR}/doc/engineering-reference/src/alternative-modeling-processes.tex
   ${CMAKE_SOURCE_DIR}/doc/engineering-reference/src/alternative-modeling-processes/airflownetwork-model.tex
+  ${CMAKE_SOURCE_DIR}/doc/engineering-reference/src/alternative-modeling-processes/room-air-models.tex
+  ${CMAKE_SOURCE_DIR}/doc/engineering-reference/src/alternative-modeling-processes/hybrid-model.tex
   ${CMAKE_SOURCE_DIR}/doc/engineering-reference/src/engineering-reference-encyclopedia.tex
   ${CMAKE_SOURCE_DIR}/doc/engineering-reference/src/simulation-models-encyclopedic-reference.tex
   ${CMAKE_SOURCE_DIR}/doc/engineering-reference/src/simulation-models-encyclopedic-reference/air-system-distribution-terminals.tex
@@ -145,7 +147,7 @@ SET( INCLUDED_TEX
   ${CMAKE_SOURCE_DIR}/doc/engineering-reference/src/special-modules-reporting/environmental-impacts.tex
   ${CMAKE_SOURCE_DIR}/doc/engineering-reference/src/special-modules-reporting/zone-component-loads-summary.tex
   ${CMAKE_SOURCE_DIR}/doc/engineering-reference/src/special-modules-reporting/output-table-annual.tex
-  ${CMAKE_SOURCE_DIR}/doc/title.tex
+  ${CMAKE_BINARY_DIR}/doc-build/title.tex
 )
 
 # to get the list of inluded images, go to the root of the document folder and:
@@ -519,6 +521,13 @@ SET( INCLUDED_IMAGES
   ${CMAKE_SOURCE_DIR}/doc/engineering-reference/media/image8006.png
   ${CMAKE_SOURCE_DIR}/doc/engineering-reference/media/image8007.png
   ${CMAKE_SOURCE_DIR}/doc/engineering-reference/media/image8008.png
+  ${CMAKE_SOURCE_DIR}/doc/engineering-reference/media/ss-chart1.png
+  ${CMAKE_SOURCE_DIR}/doc/engineering-reference/media/ss-chart2.png
+  ${CMAKE_SOURCE_DIR}/doc/engineering-reference/media/ss-figure1.png
+  ${CMAKE_SOURCE_DIR}/doc/engineering-reference/media/ss-figure3.png
+  ${CMAKE_SOURCE_DIR}/doc/engineering-reference/media/ss-figure4.png
+  ${CMAKE_SOURCE_DIR}/doc/engineering-reference/media/ss-figure5.png
+  ${CMAKE_SOURCE_DIR}/doc/engineering-reference/media/ss-figure6.png
 )
 
 SET( SOURCE_FILENAME "engineering-reference" )

diff --git a/doc/engineering-reference/engineering-reference.tex b/doc/engineering-reference/engineering-reference.tex
@@ -178,6 +178,10 @@
 
 \input{src/alternative-modeling-processes/airflownetwork-model}
 
+\input{src/alternative-modeling-processes/room-air-models}
+
+\input{src/alternative-modeling-processes/hybrid-model}
+
 \input{src/engineering-reference-encyclopedia}
 
 \input{src/simulation-models-encyclopedic-reference}

diff --git a/doc/engineering-reference/media/ss-chart1.png b/doc/engineering-reference/media/ss-chart1.png
diff --git a/doc/engineering-reference/media/ss-chart2.png b/doc/engineering-reference/media/ss-chart2.png
diff --git a/doc/engineering-reference/media/ss-figure1.png b/doc/engineering-reference/media/ss-figure1.png
diff --git a/doc/engineering-reference/media/ss-figure3.png b/doc/engineering-reference/media/ss-figure3.png
diff --git a/doc/engineering-reference/media/ss-figure4.png b/doc/engineering-reference/media/ss-figure4.png
diff --git a/doc/engineering-reference/media/ss-figure5.png b/doc/engineering-reference/media/ss-figure5.png
diff --git a/doc/engineering-reference/media/ss-figure6.png b/doc/engineering-reference/media/ss-figure6.png