Merge remote-tracking branch 'origin/develop' into iteration

NREL · Feb 4, 2016 · 5d8a342 · 5d8a342 · nrel-bot · Feb 9, 2016
2 parents 25786f8 + 13c8dc4
commit 5d8a342
Show file tree

Hide file tree

Showing 59 changed files with 30,406 additions and 164 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## OpenStudio v1.10.2
+###### 2016-01-21 — [Diff]( https://github.com/NREL/OpenStudio/compare/v1.10.1...v1.10.2 )
+
+Closed Issues: 3 (#1713, #1947, #2028)
+- ![Fixed:][fixed] [#1713]( https://github.com/NREL/OpenStudio/issues/1713 ), open studio not working on windows 8.1
+- ![Fixed:][fixed] [#1947]( https://github.com/NREL/OpenStudio/issues/1947 ), Expose all fields of the Sizing:Zone object
+- ![Fixed:][fixed] [#2028]( https://github.com/NREL/OpenStudio/issues/2028 ), Forward Translation error when multiple spaces of same space type in a zone when load type is design load
+
 ## OpenStudio v1.10.1
 ###### 2016-01-08 — [Diff]( https://github.com/NREL/OpenStudio/compare/v1.10.0...v1.10.1 )
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ project(OpenStudio)
 
 set(CMAKE_VERSION_MAJOR 1)
 set(CMAKE_VERSION_MINOR 10)
-set(CMAKE_VERSION_PATCH 2)
+set(CMAKE_VERSION_PATCH 3)
 
 set(CMAKE_VERSION_BUILD "Unknown" CACHE STRING "Build number")
 find_package(Git)

diff --git a/developer/ruby/GitHubIssueStats.rb b/developer/ruby/GitHubIssueStats.rb
@@ -2,10 +2,10 @@
 require 'date'
 require 'yaml'
 
-begin_date = Time.parse('2015-12-11' + 'T06:00:00Z')
+begin_date = Time.parse('2016-01-08' + 'T06:00:00Z')
 
 end_date = Time.now
-end_date = Time.parse('2016-01-08' + 'T006:00:00Z')
+end_date = Time.parse('2016-01-21' + 'T006:00:00Z')
 
 repo_owner = 'NREL'
 repo = 'OpenStudio'

diff --git a/doc/Building and Testing OpenStudio.md b/doc/Building and Testing OpenStudio.md
@@ -72,7 +72,7 @@ In CMake check the following:
 - BUILD\_PACKAGE
 - BUILD\_SWIG
 - CMAKE\_BUILD\_TYPE = Release
-- CMAKE\_BINARY\_DEB
+- CPACK\_BINARY\_DEB
 
 In CMake type the following:
 
@@ -285,6 +285,8 @@ Sanity Testing Release Builds
 - Open PAT, make a project, and select the model above as your baseline model
 
 ### Tests to run
+- Test prior version of OpenStudio model
+- Test prior version of PAT project
 - Use SketchUp to make a model on Windows 32 bit, Windows 64 bit, and Mac
 - Test running PAT on the cloud on at least one platform
 - Test BCL downloads
@@ -314,17 +316,19 @@ In the docroot folder\
 Version Update
 ==============
 
+The current version (X.Y.Z) being built, and the updated version (X.Y.Z+1) for the upcoming iteration need to be correctly incorporated into their respective documents.
+
 - In `build\OSCore-prefix\src\OSCore-build\resources\osversion` copy directory X.Y.Z to `openstudiocore\resources\osversion` (new folder, 3 files)
-- In the top level of your OpenStudio folder, update `CMakeLists.txt` version (1 line)
-- In `openstudiocore\resources` update `CMakeLists.txt` version (3 lines, 1 location)
-- In `openstudiocore\resources\model` update `OpenStudio.idd` version (1 line)
-- In `openstudiocore\src\osversion` update `VersionTranslator.cpp` version
+- In the top level of your OpenStudio folder, update `CMakeLists.txt` version to X.Y.Z+1 (1 line)
+- In `openstudiocore\resources` update `CMakeLists.txt` version to X.Y.Z (3 lines, 1 location)
+- In `openstudiocore\resources\model` update `OpenStudio.idd` version to X.Y.Z+1 (1 line)
+- In `openstudiocore\src\osversion` update `VersionTranslator.cpp` version to X.Y.Z+1 in first location, and X.Y.Z in second location
 
 At https://github.com/NREL/OpenStudio/blob/develop/openstudiocore/src/osversion/VersionTranslator.cpp
 
-- Select "History", see edits if needed (usually use `defaultUpdate`, 2 lines)
+- Select "History", see edits if needed (usually use `defaultUpdate` in first location, 1 line for each of 2 locations)
 
-With Git, commit above files (Commit Message = `Updating version to X.Y.Z`)
+With Git, commit above files (Commit Message = `Updating version to X.Y.Z+1`)
 
 AMI BUILD
 =========

diff --git a/doc/ReleaseNotes/OpenStudio_Release_Notes_1_10_0_20151218.docx b/doc/ReleaseNotes/OpenStudio_Release_Notes_1_10_0_20151218.docx
diff --git a/doc/ReleaseNotes/OpenStudio_Release_Notes_1_10_0_20151218.pdf b/doc/ReleaseNotes/OpenStudio_Release_Notes_1_10_0_20151218.pdf
diff --git a/openstudiocore/OpenStudioCoreConfig.cmake.in b/openstudiocore/OpenStudioCoreConfig.cmake.in
@@ -20,8 +20,9 @@ set(OpenStudioCore_INCLUDE_DIRS "${OpenStudioCore_INSTALL_PREFIX}/../src"
                                 "@BoostLog_INCLUDE_DIRS@"
                                 "@QJSON_INCLUDE_DIR@"
                                 "@GTEST_INCLUDE_DIR@"
+                                "@GEOGRAPHIC_INCLUDE_DIR@"
 )
-set(OpenStudioCore_LIBRARY_DIRS  "${OpenStudioCore_INSTALL_PREFIX}/Products" "@GTEST_LIB_DIR@" "@QJSON_LIBRARY_DIRS@")
+set(OpenStudioCore_LIBRARY_DIRS  "${OpenStudioCore_INSTALL_PREFIX}/Products" "@GTEST_LIB_DIR@" "@QJSON_LIBRARY_DIRS@" "@GEOGRAPHIC_LIB_DIR@")
 set(OpenStudioCore_CMAKE_DIR "@CMAKE_SOURCE_DIR@")
 set(OpenStudioCore_SWIG_INCLUDE_DIR "@CMAKE_SOURCE_DIR@/src")
 

diff --git a/openstudiocore/resources/CMakeLists.txt b/openstudiocore/resources/CMakeLists.txt
@@ -413,6 +413,9 @@ set(osversion_resources_src
   osversion/1_10_1/OpenStudio.idd
   osversion/1_10_1/example.osm
   osversion/1_10_1/example.osc
+  osversion/1_10_2/OpenStudio.idd
+  osversion/1_10_2/example.osm
+  osversion/1_10_2/example.osc
   osversion/unknown.osc
 )
 

diff --git a/openstudiocore/resources/isomodel/SimulationMeasure/measure.rb b/openstudiocore/resources/isomodel/SimulationMeasure/measure.rb
@@ -1,6 +1,6 @@
 
 #see the URL below for information on how to write OpenStudio measures
-# http://nrel.github.io/OpenStudio-user-documentation/measures/measure_writing_guide/
+# http://nrel.github.io/OpenStudio-user-documentation/reference/measure_writing_guide/
 
 #see the URL below for access to C++ documentation on model objects
 # https://s3.amazonaws.com/openstudio-sdk-documentation/cpp/OpenStudio-1.5.0-doc/model/html/classes.html