Merge remote-tracking branch 'origin/develop' into HVACSizingSim_Coin…

…cidentPlant
NREL · Jan 27, 2015 · 756693c · 756693c · nrel-bot · Jan 27, 2015
2 parents a5fedff + 1b4e5ec
commit 756693c
Show file tree

Hide file tree

Showing 126 changed files with 7,254 additions and 1,422 deletions.
diff --git a/.decent_ci-Linux.yaml b/.decent_ci-Linux.yaml
@@ -18,8 +18,8 @@ compilers:
     cmake_extra_flags: -DBUILD_FORTRAN=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=OFF -DREGRESSION_BASELINE_PATH:PATH=$REGRESSION_BASELINE -DREGRESSION_SCRIPT_PATH:PATH=$REGRESSION_DIR -DREGRESSION_BASELINE_SHA:STRING=$REGRESSION_BASELINE_SHA -DCOMMIT_SHA=$COMMIT_SHA -DENABLE_COVERAGE:BOOL=ON
     coverage_enabled: true
     coverage_base_dir: src/EnergyPlus
-    coverage_pass_limit: 90
-    coverage_warn_limit: 80
+    coverage_pass_limit: 2.32
+    coverage_warn_limit: 2.30
     coverage_s3_bucket: energyplus
     build_tag: UnitTestsCoverage
     ctest_filter: -E "integration.*"
@@ -34,8 +34,8 @@ compilers:
     cmake_extra_flags: -DBUILD_FORTRAN=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=OFF -DREGRESSION_BASELINE_PATH:PATH=$REGRESSION_BASELINE -DREGRESSION_SCRIPT_PATH:PATH=$REGRESSION_DIR -DREGRESSION_BASELINE_SHA:STRING=$REGRESSION_BASELINE_SHA -DCOMMIT_SHA=$COMMIT_SHA -DENABLE_COVERAGE:BOOL=ON
     coverage_enabled: true
     coverage_base_dir: src/EnergyPlus
-    coverage_pass_limit: 90
-    coverage_warn_limit: 80
+    coverage_pass_limit: 68.88
+    coverage_warn_limit: 66
     coverage_s3_bucket: energyplus
     build_tag: IntegrationCoverage
     skip_regression: true

diff --git a/CMakeLists.txt b/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 7 ) 
+set( CMAKE_VERSION_PATCH 8 ) 
 
 set( ENERGYPLUS_VERSION "${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH}" )