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

Conflicts: CMakeLists.txt
NREL · Jul 11, 2014 · 22f4a7e · 22f4a7e · nrel-bot · Jul 11, 2014
2 parents fa08362 + 8ca433f
commit 22f4a7e
Show file tree

Hide file tree

Showing 36 changed files with 5,668 additions and 3,524 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -666,7 +666,7 @@ if(BUILD_QT)
   if(APPLE)
     # We're going to explicitly use the SDK specified in the configuration by the user
     #set(APPLE_SDK_COMMAND "-sdk \"${CMAKE_OSX_SYSROOT}\"" )
-    set(APPLE_SDK_COMMAND "")
+    set(APPLE_SDK_COMMAND "-sdk macosx10.9")
 
     if(CMAKE_OSX_SYSROOT MATCHES ".*10.7.sdk")
       set(APPLE_PATCH_COMMAND "${CMAKE_COMMAND}" -E rename "${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a" "${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a.bak" COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceLion.a" "${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a")
@@ -678,20 +678,19 @@ if(BUILD_QT)
     # it would appear that calling "make" in some way that CMake can detect that we are calling
     # make (and attempt to pass parameters to the child make jobs) is breaking our ability to install
     # the below code circumvents that by calling make through a call to "sh"
-    message(WARNING "Qt5 super build is currently untested")
     ExternalProject_Add(Qt
-      URL http://download.qt-project.org/official_releases/qt/5.3/5.3.1/single/qt-everywhere-opensource-src-5.3.1.tar.gz
+      URL http://developer.nrel.gov/downloads/buildings/openstudio/src/qt-everywhere-opensource-src-5.3.1.tar.gz
       URL_MD5 a355749e4f200a6392ecad151d1d0cdc
-      CONFIGURE_COMMAND /bin/sh -c "cd ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt/ && ./configure -v ${APPLE_SDK_COMMAND} -debug-and-release -opensource -openssl -qt-sql-sqlite -plugin-sql-sqlite -nomake examples -nomake tests -confirm-license -prefix ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt-install"
-      PATCH_COMMAND ${APPLE_PATCH_COMMAND}
-      BUILD_COMMAND  /bin/sh -c "cd ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt && make"
-      INSTALL_COMMAND /bin/sh -c "cd ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt && make -j1 install"
+      CONFIGURE_COMMAND /bin/sh -c "cd ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt/ && ./configure -v ${APPLE_SDK_COMMAND} -platform macx-clang-32-64 -debug-and-release -opensource -openssl -no-pch -no-sse3 -qt-sql-sqlite -skip enginio -no-compile-examples -nomake examples -nomake tests -nomake tools -skip qtmultimedia -confirm-license -prefix ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt-install"
+      PATCH_COMMAND ${APPLE_PATCH_COMMAND} COMMAND "${CMAKE_COMMAND}" -E copy_directory ${CMAKE_SOURCE_DIR}/dependencies/qt/macx-clang-32-64/  ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt/qtbase/mkspecs/macx-clang-32-64/
+      BUILD_COMMAND  /bin/sh -c "cd ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt/ && make -j${CPUCOUNT}"
+      INSTALL_COMMAND /bin/sh -c "cd ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt/ && make -j1 install"
     )
   elseif(UNIX)
     message(WARNING "Qt5 super build is currently untested")
     ExternalProject_Add(Qt
-      URL http://developer.nrel.gov/downloads/buildings/openstudio/src/qt-everywhere-opensource-src-5.2.1.tar.gz
-      URL_MD5 a78408c887c04c34ce615da690e0b4c8
+      URL http://developer.nrel.gov/downloads/buildings/openstudio/src/qt-everywhere-opensource-src-5.3.1.tar.gz
+      URL_MD5 a355749e4f200a6392ecad151d1d0cdc
       CONFIGURE_COMMAND ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt/configure -debug-and-release -opensource -confirm-license -shared -qt-sql-sqlite -qt-xcb -openssl -nomake examples -nomake tests -plugindir ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt-install/share/openstudio/qtplugins -qtlibinfix OpenStudio -prefix ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt-install
       BUILD_COMMAND $(MAKE) -f ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt-build/Makefile
       INSTALL_COMMAND cd ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt-build && $(MAKE) install
@@ -701,8 +700,8 @@ if(BUILD_QT)
     #find_program(NMAKE_EXE nmake)
 
     #ExternalProject_Add(Qt
-    #  URL http://developer.nrel.gov/downloads/buildings/openstudio/src/qt-everywhere-opensource-src-5.2.1.tar.gz
-    #  URL_MD5 a78408c887c04c34ce615da690e0b4c8
+    #  URL http://developer.nrel.gov/downloads/buildings/openstudio/src/qt-everywhere-opensource-src-5.3.1.tar.gz
+    #  URL_MD5 a355749e4f200a6392ecad151d1d0cdc
     #  CONFIGURE_COMMAND cd ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt && configure -debug-and-release -opensource -confirm-license -shared -plugin-sql-sqlite -no-qt3support -nomake examples -nomake docs -nomake demos -mp -prefix ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt-install -L ${OPENSSL_ROOT_DIR}/lib -I ${OPENSSL_ROOT_DIR}/include -openssl
     #  BUILD_COMMAND cd ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt && ${NMAKE_EXE}
     #  INSTALL_COMMAND cd ${CMAKE_BINARY_DIR}/Qt-prefix/src/Qt && ${NMAKE_EXE} install

diff --git a/dependencies/qt/macx-clang-32-64/Info.plist.app b/dependencies/qt/macx-clang-32-64/Info.plist.app
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>CFBundleIconFile</key>
+	<string>@ICON@</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Created by Qt/QMake</string>
+	<key>CFBundleSignature</key>
+	<string>@TYPEINFO@</string>
+	<key>CFBundleExecutable</key>
+	<string>@EXECUTABLE@</string>
+	<key>CFBundleIdentifier</key>
+	<string>@BUNDLEIDENTIFIER@</string>
+	<key>NOTE</key>
+	<string>This file was generated by Qt/QMake.</string>
+</dict>
+</plist>
diff --git a/dependencies/qt/macx-clang-32-64/Info.plist.lib b/dependencies/qt/macx-clang-32-64/Info.plist.lib
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>@SHORT_VERSION@</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Created by Qt/QMake</string>
+	<key>CFBundleSignature</key>
+	<string>@TYPEINFO@</string>
+	<key>CFBundleExecutable</key>
+	<string>@LIBRARY@</string>
+	<key>NOTE</key>
+	<string>Please, do NOT change this file -- It was generated by Qt/QMake.</string>
+</dict>
+</plist>
diff --git a/dependencies/qt/macx-clang-32-64/qmake.conf b/dependencies/qt/macx-clang-32-64/qmake.conf
@@ -0,0 +1,21 @@
+#
+# qmake configuration for 32-bit Clang on OS X
+#
+
+MAKEFILE_GENERATOR      = UNIX
+CONFIG                 += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(../common/macx.conf)
+include(../common/gcc-base-mac.conf)
+include(../common/clang.conf)
+include(../common/clang-mac.conf)
+
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+
+QMAKE_CFLAGS           += -arch i386 -arch x86_64
+QMAKE_OBJECTIVE_CFLAGS += -arch i386 -arch x86_64
+QMAKE_CXXFLAGS         += -arch i386 -arch x86_64
+QMAKE_LFLAGS           += -arch i386 -arch x86_64
+
+load(qt_config)
diff --git a/dependencies/qt/macx-clang-32-64/qplatformdefs.h b/dependencies/qt/macx-clang-32-64/qplatformdefs.h
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../common/mac/qplatformdefs.h"
+
diff --git a/doc/ContinuousIntegration.md b/doc/ContinuousIntegration.md
@@ -22,4 +22,4 @@ Additionally, OpenStudio requires that the following packages be installed
 
 ## Linux 
 
- * Official builds of Qt, openssl and Boost: `sudo apt-get install libboost-all-dev qtbase5-dev libssl-dev`
+ * Official builds of Qt, openssl and Boost: `sudo apt-get install libboost-all-dev qtbase5-dev libssl-dev libqt5webkit5-dev`
diff --git a/openstudiocore/resources/model/OpenStudio.idd b/openstudiocore/resources/model/OpenStudio.idd
@@ -14507,6 +14507,74 @@ OS:SetpointManager:OutdoorAirReset,
        \note 2nd outdoor air temperature reset rule
        \units C
 
+OS:SetpointManager:OutdoorAirPretreat,
+       \min-fields 12
+       \memo This setpoint manager determines the required
+       \memo conditions at the outdoor air stream node which will
+       \memo produce the reference setpoint condition at the
+       \memo mixed air node when mixed with the return air stream
+  A1,  \field Handle
+       \type handle
+       \required-field
+  A2,  \field Name
+       \required-field
+       \reference SetpointManagers
+  A3,  \field Control Variable
+       \type choice
+       \key Temperature
+       \key HumidityRatio
+       \key MaximumHumidityRatio
+       \key MinimumHumidityRatio
+       \default Temperature
+  N1,  \field Minimum Setpoint Temperature
+       \units C
+       \default -99
+       \note Applicable only if Control variable is Temperature
+  N2,  \field Maximum Setpoint Temperature
+       \units C
+       \default 99
+       \note Applicable only if Control variable is Temperature
+  N3,  \field Minimum Setpoint Humidity Ratio
+       \units kgWater/kgDryAir
+       \maximum 1.0
+       \default 0.00001
+       \note Applicable only if Control variable is
+       \note MaximumHumidityRatio, MinimumHumidityRatio, or HumidityRatio - then minimum is 0.00001
+  N4,  \field Maximum Setpoint Humidity Ratio
+       \units kgWater/kgDryAir
+       \maximum 1.0
+       \default 1.0
+       \note Applicable only if Control variable is
+       \note MaximumHumidityRatio, MinimumHumidityRatio, or HumidityRatio - then minimum is 0.00001
+  A4,  \field Reference Setpoint Node Name
+       \type object-list
+       \object-list Node
+       \note The current setpoint at this node is the
+       \note desired condition for the Mixed Air Node
+       \note This node must have a valid setpoint
+       \note which has been set by another setpoint manager
+  A5,  \field Mixed Air Stream Node Name
+       \type object-list
+       \object-list Node
+       \note Name of Mixed Air Node
+       \required-field
+  A6,  \field Outdoor Air Stream Node Name
+       \type object-list
+       \object-list Node
+       \note Name of Outdoor Air Stream Node
+       \required-field
+  A7,  \field Return Air Stream Node Name
+       \type object-list
+       \object-list Node
+       \note Name of Return Air Stream Node
+       \required-field
+  A8;  \field Setpoint Node or NodeList Name
+       \type object-list
+       \object-list Node
+       \required-field
+       \note Node(s) at which the temperature or humidity
+       \note ratio will be set
+
 OS:SetpointManager:SingleZone:Reheat,
        \min-fields 1
   A1, \field Handle
@@ -14567,6 +14635,34 @@ OS:SetpointManager:Scheduled,
        \required-field
        \object-list Node
 
+OS:SetpointManager:Scheduled:DualSetpoint,
+     \memo This setpoint manager places a high and low schedule value
+     \memo on one or more nodes.
+     \min-fields 6
+  A1,  \field Handle
+       \type handle
+       \required-field
+  A2,  \field Name
+       \required-field
+       \reference SetpointManagers
+  A3,  \field Control Variable
+       \type choice
+       \key Temperature
+       \default Temperature
+  A4,  \field High Setpoint Schedule Name
+       \type object-list
+       \object-list ScheduleNames
+       \required-field
+  A5,  \field Low Setpoint Schedule Name
+       \type object-list
+       \object-list ScheduleNames
+       \required-field
+  A6;  \field Setpoint Node or NodeList Name
+       \note Node(s) at which temperature will be set
+       \required-field
+       \type object-list
+       \object-list Node
+
 OS:SetpointManager:Warmest,
        \min-fields 1
   A1, \field Handle

diff --git a/openstudiocore/src/energyplus/CMakeLists.txt b/openstudiocore/src/energyplus/CMakeLists.txt
@@ -153,8 +153,10 @@ set(${target_name}_src
   ForwardTranslator/ForwardTranslateScheduleYear.cpp
   ForwardTranslator/ForwardTranslateSetpointManagerFollowOutdoorAirTemperature.cpp
   ForwardTranslator/ForwardTranslateSetpointManagerMixedAir.cpp
+  ForwardTranslator/ForwardTranslateSetpointManagerOutdoorAirPretreat.cpp
   ForwardTranslator/ForwardTranslateSetpointManagerOutdoorAirReset.cpp
   ForwardTranslator/ForwardTranslateSetpointManagerScheduled.cpp
+  ForwardTranslator/ForwardTranslateSetpointManagerScheduledDualSetpoint.cpp
   ForwardTranslator/ForwardTranslateSetpointManagerSingleZoneReheat.cpp
   ForwardTranslator/ForwardTranslateSetpointManagerWarmest.cpp
   ForwardTranslator/ForwardTranslateShade.cpp

diff --git a/openstudiocore/src/energyplus/ForwardTranslator.cpp b/openstudiocore/src/energyplus/ForwardTranslator.cpp
@@ -1384,6 +1384,12 @@ boost::optional<IdfObject> ForwardTranslator::translateAndMapModelObject(ModelOb
       retVal = translateSetpointManagerScheduled(spm);
       break;
     }
+  case  openstudio::IddObjectType::OS_SetpointManager_Scheduled_DualSetpoint :
+    {
+      model::SetpointManagerScheduledDualSetpoint spm = modelObject.cast<SetpointManagerScheduledDualSetpoint>();
+      retVal = translateSetpointManagerScheduledDualSetpoint(spm);
+      break;
+    }
   case  openstudio::IddObjectType::OS_SetpointManager_MixedAir :
     {
       model::SetpointManagerMixedAir spm = modelObject.cast<SetpointManagerMixedAir>();
@@ -1396,6 +1402,12 @@ boost::optional<IdfObject> ForwardTranslator::translateAndMapModelObject(ModelOb
       retVal = translateSetpointManagerOutdoorAirReset(spm);
       break;
     }
+  case  openstudio::IddObjectType::OS_SetpointManager_OutdoorAirPretreat :
+    {
+      model::SetpointManagerOutdoorAirPretreat spm = modelObject.cast<SetpointManagerOutdoorAirPretreat>();
+      retVal = translateSetpointManagerOutdoorAirPretreat(spm);
+      break;
+    }
   case  openstudio::IddObjectType::OS_SetpointManager_Warmest :
     {
       model::SetpointManagerWarmest spm = modelObject.cast<SetpointManagerWarmest>();

diff --git a/openstudiocore/src/energyplus/ForwardTranslator.hpp b/openstudiocore/src/energyplus/ForwardTranslator.hpp
@@ -168,8 +168,10 @@ class RunPeriodControlSpecialDays;
 class Screen;
 class SetpointManagerFollowOutdoorAirTemperature;
 class SetpointManagerMixedAir;
+class SetpointManagerOutdoorAirPretreat;
 class SetpointManagerOutdoorAirReset;
 class SetpointManagerScheduled;
+class SetpointManagerScheduledDualSetpoint;
 class SetpointManagerSingleZoneReheat;
 class SetpointManagerWarmest;
 class ShadowCalculation;
@@ -589,10 +591,14 @@ class ENERGYPLUS_API ForwardTranslator {
 
   boost::optional<IdfObject> translateSetpointManagerMixedAir( model::SetpointManagerMixedAir & modelObject );
 
+  boost::optional<IdfObject> translateSetpointManagerOutdoorAirPretreat( model::SetpointManagerOutdoorAirPretreat & modelObject );
+
   boost::optional<IdfObject> translateSetpointManagerOutdoorAirReset( model::SetpointManagerOutdoorAirReset & modelObject );
 
   boost::optional<IdfObject> translateSetpointManagerScheduled( model::SetpointManagerScheduled & modelObject );
 
+  boost::optional<IdfObject> translateSetpointManagerScheduledDualSetpoint( model::SetpointManagerScheduledDualSetpoint & modelObject );
+
   boost::optional<IdfObject> translateSetpointManagerSingleZoneReheat( model::SetpointManagerSingleZoneReheat & modelObject);
 
   boost::optional<IdfObject> translateSetpointManagerWarmest( model::SetpointManagerWarmest & modelObject);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,4 @@ Additionally, OpenStudio requires that the following packages be installed

		## Linux

		* Official builds of Qt, openssl and Boost: `sudo apt-get install libboost-all-dev qtbase5-dev libssl-dev`
		* Official builds of Qt, openssl and Boost: `sudo apt-get install libboost-all-dev qtbase5-dev libssl-dev libqt5webkit5-dev`