Merge branch 'develop' into 69208874-LBNL_CoilVsSpacePeak

Conflicts:
	idd/Energy+.idd.in
	src/EnergyPlus/DataSizing.hh
	src/EnergyPlus/SimAirServingZones.cc

.gitignore

@@ -2,6 +2,8 @@
 *.d
 *.dll
 *.exe
+*.gcda
+*.ilk
 *.lib
 *.log
 *.map

CMakeLists.txt

@@ -6,7 +6,7 @@ set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}
 
 set( CMAKE_VERSION_MAJOR 8 )
 set( CMAKE_VERSION_MINOR 2 )
-set( CMAKE_VERSION_PATCH 3 ) 
+set( CMAKE_VERSION_PATCH 6 ) 
 
 set( ENERGYPLUS_VERSION "${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH}" )
 

LICENSE.txt

@@ -1,4 +1,4 @@
-ENERGYPLUS(tm)
+ENERGYPLUS (tm)
 END  USER  LICENSE  AGREEMENT
 Software: EnergyPlus
 Version: 8.2

README.md

@@ -7,7 +7,7 @@ This is the EnergyPlus Development Repository.
 
  - The Department of Energy maintains a [public website for EnergyPlus](www.energyplus.gov) where you can find much more information about the program.  
  - For detailed developer information, consult the [wiki](https://github.com/nrel/EnergyPlusTeam/wiki).  
- - For support questions, plese utilize the [EnergyPlus Helpdesk](http://energyplus.helpserve.com/).
+ - For support questions, please utilize the [EnergyPlus Helpdesk](http://energyplus.helpserve.com/).
 
 # Releases
 Although iteration **(pre-)releases** will be posted to this repository during a development cycle, users should generally avoid these, as input syntax may change which won't be supported by the major release version transition tools, and could require manual intervention to remedy.  If a release is intended for active use by users, such as a bug-fix-only or performance-only re-release, it will be clearly specified on the release notes and a public announcement will accompany this type of release.
@@ -31,7 +31,7 @@ The C++ code in EnergyPlus utilizes many C++11 features, and so a modern compile
 6. Check the configuration settings, keeping them default should suffice, and click Generate.
 7. Browse to the build folder and there will be a Visual Studio solution file you can click on, and it will include multiple projects for each build target.  Choose the type of build (Debug or Release), then right click on EnergyPlus in the solution explorer and "Build".  This will build EnergyPlus and all of its dependencies.  The target executables will be found in the Products subfolder.
 8. The solution will include the ZERO_CHECK project as the default target to run when you execute, so when you are ready to debug, manually set the default target to EnergyPlus.
-9. In the EnergyPlus and EnergyPlusLib projects: right click on each project and select Properties. Under Configuration Properties select Debugging. In the Enviroment field, enter ```_NO_DEBUG_HEAP=1```, without quote marks.  The debug heap in Visual Studio doesn't play nicely with the input processor in EnergyPlus, and for debug builds, skipping this will result in a _very_ long IDD reading time.
+9. In the EnergyPlus and EnergyPlusLib projects: right click on each project and select Properties. Under Configuration Properties select Debugging. In the Enviroment field, enter ```_NO_DEBUG_HEAP=1```.  The debug heap in Visual Studio doesn't play nicely with the input processor in EnergyPlus, and for debug builds, skipping this will result in a _very_ long IDD reading time.
 
 ## Linux
 

cmake/CMakeCPackOptions.cmake.in

@@ -69,7 +69,7 @@ if(CPACK_GENERATOR MATCHES "NSIS")
 
   set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
     WriteRegStr HKEY_CURRENT_USER \"Software\\VB and VBA Program Settings\\EP-Launch\\UpdateCheck\" \"AutoCheck\" \"True\"
-    WriteRegStr HKEY_CURRENT_USER \"Software\\VB and VBA Program Settings\\EP-Launch\\UpdateCheck\" \"CheckURL\" \"https://raw.githubusercontent.com/NREL/EnergyPlusRelease/master/.epupdate\"
+    WriteRegStr HKEY_CURRENT_USER \"Software\\VB and VBA Program Settings\\EP-Launch\\UpdateCheck\" \"CheckURL\" \"http://nrel.github.io/EnergyPlus/epupdate.htm\"
     StrCpy $0 \"#@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@.@CPACK_PACKAGE_VERSION_PATCH@-@CPACK_PACKAGE_VERSION_BUILD@\"
     WriteRegStr HKEY_CURRENT_USER \"Software\\VB and VBA Program Settings\\EP-Launch\\UpdateCheck\" \"LastAnchor\" $0
     \${If} \${RunningX64}
@@ -80,7 +80,7 @@ if(CPACK_GENERATOR MATCHES "NSIS")
       CopyFiles \"$INSTDIR\\temp\\Gswdll32.dll\" \"$WINDIR\\SysWOW64\\Gswdll32.dll\"
       CopyFiles \"$INSTDIR\\temp\\Gsw32.exe\" \"$WINDIR\\SysWOW64\\Gsw32.exe\"
       CopyFiles \"$INSTDIR\\temp\\Graph32.ocx\" \"$WINDIR\\SysWOW64\\Graph32.ocx\"
-      CopyFiles \"$INSTDIR\\temp\\MSINET.OCX\" \"$WINDIR\\SysWOW64\\MSINET.OCX]\"
+      CopyFiles \"$INSTDIR\\temp\\MSINET.OCX\" \"$WINDIR\\SysWOW64\\MSINET.OCX\"
       CopyFiles \"$INSTDIR\\temp\\Vsflex7L.ocx\" \"$WINDIR\\SysWOW64\\Vsflex7L.ocx\"
       CopyFiles \"$INSTDIR\\temp\\Msflxgrd.ocx\" \"$WINDIR\\SysWOW64\\Msflxgrd.ocx\"
       RegDLL \"$WINDIR\\SysWOW64\\MSCOMCTL.OCX\"
@@ -97,7 +97,7 @@ if(CPACK_GENERATOR MATCHES "NSIS")
       CopyFiles \"$INSTDIR\\temp\\Gswdll32.dll\" \"$WINDIR\\System32\\Gswdll32.dll\"
       CopyFiles \"$INSTDIR\\temp\\Gsw32.exe\" \"$WINDIR\\System32\\Gsw32.exe\"
       CopyFiles \"$INSTDIR\\temp\\Graph32.ocx\" \"$WINDIR\\System32\\Graph32.ocx\"
-      CopyFiles \"$INSTDIR\\temp\\MSINET.OCX\" \"$WINDIR\\System32\\MSINET.OCX]\"
+      CopyFiles \"$INSTDIR\\temp\\MSINET.OCX\" \"$WINDIR\\System32\\MSINET.OCX\"
       CopyFiles \"$INSTDIR\\temp\\Vsflex7L.ocx\" \"$WINDIR\\System32\\Vsflex7L.ocx\"
       CopyFiles \"$INSTDIR\\temp\\Msflxgrd.ocx\" \"$WINDIR\\System32\\Msflxgrd.ocx\"
       RegDLL \"$WINDIR\\System32\\MSCOMCTL.OCX\"

cmake/RunCallbackTest.cmake

@@ -13,7 +13,7 @@
   else()
     set(ECHO_CMD "echo")
   endif()
-  find_program(TEST_EXE TestEnergyPlusCallbacks PATHS "${BINARY_DIR}/Products/" NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH)
+  find_program(TEST_EXE TestEnergyPlusCallbacks PATHS "${BINARY_DIR}/Products/" "${BINARY_DIR}/Products/Release/" "${BINARY_DIR}/Products/Debug/" )
   execute_process(COMMAND ${ECHO_CMD} COMMAND "${TEST_EXE}" "${BINARY_DIR}/${TEST_DIR}")
 
   # Clean up