diff --git a/.gitignore b/.gitignore index b773dba85ef..0e71d5ad384 100644 --- a/.gitignore +++ b/.gitignore @@ -4,20 +4,21 @@ .vs test_gems test_fails.txt -/build/ -/build_debug/ -/build-debug/ -/build-meta/ -/build_release/ -/build-release/ -/build_64/ -/build-64/ -/build-relwithdebinfo/ -/build_relwithdebinfo/ -/build_profile/ -/build-profile/ -/core-build/ -/super-build/ +# Ignore build folders, no matter where in the tree they might be +build/ +build_debug/ +build-debug/ +build-meta/ +build_release/ +build-release/ +build_64/ +build-64/ +build-relwithdebinfo/ +build_relwithdebinfo/ +build_profile/ +build-profile/ +core-build/ +super-build/ /super-build-shared/ /super-build-static/ @@ -28,4 +29,6 @@ cmake-build-debug developer/msvc/Visualizers/all_concat.natvis .vscode/ +.vs/ +*.cache diff --git a/openstudiocore/CMake/FindEnergyPlus.cmake b/openstudiocore/CMake/FindEnergyPlus.cmake index 5491fb48805..19228e4dcc1 100644 --- a/openstudiocore/CMake/FindEnergyPlus.cmake +++ b/openstudiocore/CMake/FindEnergyPlus.cmake @@ -8,6 +8,7 @@ # 'EnergyPlusV${Major}-${Minor}-${Patch}-${Build}'. This finder assumes that # internal releases of the same major/minor/patch versions are prefered to official # release builds. +# Note: after 9.1.0 included, E+ doesn't ship with a sublevel 'EnergyPlusV${Major}-${Minor}-${Patch}' anymore # # The module defines the following variables: # ENERGYPLUS_FOUND - was a compatible version of EnergyPlus found @@ -42,8 +43,7 @@ # (To distributed this file outside of CMake, substitute the full # License text for the above reference.) -file(GLOB ENERGYPLUS_POSSIBLE_PATHS "${CMAKE_BINARY_DIR}/../../../[eE]nergy[pP]lus?*") - +file(GLOB ENERGYPLUS_POSSIBLE_PATHS "${CMAKE_BINARY_DIR}/[eE]nergy[pP]lus-*") #if(WIN32) # file(GLOB ENERGYPLUS_POSSIBLE_PATHS "C:/[eE]nergy[pP]lus?*") #elseif(APPLE) @@ -57,21 +57,34 @@ list(SORT ENERGYPLUS_POSSIBLE_PATHS) list(APPEND ENERGYPLUS_POSSIBLE_PATHS $ENV{ENERGYPLUSDIR}) list(REVERSE ENERGYPLUS_POSSIBLE_PATHS) +# If modifying this file, you may want to uncomment these lines (they are only cleared when redownloading the E+ package) +# unset(ENERGYPLUS_FOUND CACHE) +# unset(ENERGYPLUS_EXE CACHE) +# unset(ENERGYPLUS_IDD CACHE) +# unset(ENERGYPLUS_WEATHER_DIR CACHE) + # try to find the first path that matches all of the version requirements where EnergyPlus is found foreach(PATH ${ENERGYPLUS_POSSIBLE_PATHS}) - # extract version from path - string(REGEX REPLACE "^.*[eE]nergy[pP]lus[vV]?[-]?" "" VERSION ${PATH}) + # extract version from path, in the format X.Y.Z.buildsha (where '.' here can also be '-', and build sha could be omitted) + # (could also just get BUILD_SHA there isn't of opening IDD below...) + string(REGEX REPLACE "^.*[eE]nergy[pP]lus[vV]?[-]?([0-9]+[\\.|-][0-9]+[\\.|-][0-9]+)([\\.|-][0-9a-z]+)?.*$" "\\1" VERSION ${PATH}) string(REGEX REPLACE "-" "." VERSION ${VERSION}) string(REGEX REPLACE "^([0-9]+\\.[0-9]+)\\..*" "\\1" VERSION_MAJOR_MINOR ${VERSION}) # if 8.2.0 or greater then look for a build number in the idd file - if((${VERSION} VERSION_EQUAL 8.2.0) OR (${VERSION} VERSION_GREATER 8.2.0)) + if(${VERSION} VERSION_GREATER_EQUAL 8.2.0) + # Check that the file actually exists first, if not skip iteration + find_file(ENERGYPLUS_IDD "Energy+.idd" PATHS "${PATH}" "${PATH}/bin" NO_DEFAULT_PATH) + if(NOT EXISTS "${ENERGYPLUS_IDD}") + continue() + endif() + # we just need to read the first part of this large file - file(READ "${PATH}/Energy+.idd" IDD_TEXT LIMIT 1000) + file(READ "${ENERGYPLUS_IDD}" IDD_TEXT LIMIT 1000) string(REGEX MATCH "!IDD_BUILD [0-9a-z][0-9a-z][0-9a-z][0-9a-z][0-9a-z][0-9a-z][0-9a-z][0-9a-z][0-9a-z][0-9a-z]" BUILD_SHA_LINE "${IDD_TEXT}") string(REGEX MATCH "[0-9a-z][0-9a-z][0-9a-z][0-9a-z][0-9a-z][0-9a-z][0-9a-z][0-9a-z][0-9a-z][0-9a-z]" BUILD_SHA "${BUILD_SHA_LINE}") - set(ENERGYPLUS_GE_8_2_0 true) + set(ENERGYPLUS_GE_8_2_0 TRUE) endif() # set is match false @@ -79,6 +92,7 @@ foreach(PATH ${ENERGYPLUS_POSSIBLE_PATHS}) # if a build SHA is provided then assume we need an exact match if(ENERGYPLUS_GE_8_2_0 AND ENERGYPLUS_BUILD_SHA) + # EnergyPlus_FIND_VERSION is the argument passed by `find_package(EnergyPlus "${ENERGYPLUS_VERSION}" REQUIRED)` if(${VERSION} VERSION_EQUAL ${EnergyPlus_FIND_VERSION}) if(ENERGYPLUS_BUILD_SHA STREQUAL BUILD_SHA) set(IS_MATCH TRUE) diff --git a/openstudiocore/CMakeLists.txt b/openstudiocore/CMakeLists.txt index c12c87dc077..338fe24a5be 100644 --- a/openstudiocore/CMakeLists.txt +++ b/openstudiocore/CMakeLists.txt @@ -68,14 +68,15 @@ set(OPENSTUDIO_LONG_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.$ # EnergyPlus Idd version set(ENERGYPLUS_VERSION_MAJOR 9) -set(ENERGYPLUS_VERSION_MINOR 0) -set(ENERGYPLUS_VERSION_PATCH 1) +set(ENERGYPLUS_VERSION_MINOR 1) +set(ENERGYPLUS_VERSION_PATCH 0) set(ENERGYPLUS_VERSION "${ENERGYPLUS_VERSION_MAJOR}.${ENERGYPLUS_VERSION_MINOR}.${ENERGYPLUS_VERSION_PATCH}") # Build SHA is not required to have a value, but if it does OpenStudio will require this build. -set(ENERGYPLUS_BUILD_SHA "bb7ca4f0da") +set(ENERGYPLUS_BUILD_SHA "d830726d9e") + # ENERGYPLUS_RELEASE_NAME is used to locate the E+ download # from the github releases -set(ENERGYPLUS_RELEASE_NAME "v9.0.1") +set(ENERGYPLUS_RELEASE_NAME "v9.1.0-IOFreeze") # Radiance set(RADIANCE_VERSION "5.0.a.12") @@ -408,14 +409,14 @@ endif() if(UNIX) if(APPLE) - set(ENERGYPLUS_EXPECTED_HASH 7b8b8481a5f261800570de0d86e9c608) + set(ENERGYPLUS_EXPECTED_HASH e88d0ad1078c9ee7b176a9e9fbcaf4b0) set(ENERGYPLUS_PLATFORM "Darwin-x86_64") elseif(EXISTS "/etc/redhat-release") # TODO: There aren't any redhat releases anymore, see PR #3145 too set(ENERGYPLUS_EXPECTED_HASH 42b2fe2ef5df1d4cfef2160e46529a2f) set(ENERGYPLUS_PLATFORM "Redhat-x86_64") else() - set(ENERGYPLUS_EXPECTED_HASH 135e17dd5e4ca355b25bf77b61fc8cf2) + set(ENERGYPLUS_EXPECTED_HASH 00c6e9ca936927efe719e2c0244ac56b) set(ENERGYPLUS_PLATFORM "Linux-x86_64") endif() set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-${ENERGYPLUS_PLATFORM}") @@ -436,12 +437,19 @@ if(UNIX) execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_BINARY_DIR}/${ENERGYPLUS_PATH}") execute_process(COMMAND ${CMAKE_COMMAND} -E tar xfz "${CMAKE_BINARY_DIR}/${ENERGYPLUS_PATH}.tar.gz" WORKING_DIRECTORY "${CMAKE_BINARY_DIR}") endif() - set(ENV{ENERGYPLUSDIR} "${CMAKE_BINARY_DIR}/${ENERGYPLUS_PATH}/EnergyPlus-${ENERGYPLUS_VERSION_MAJOR}-${ENERGYPLUS_VERSION_MINOR}-${ENERGYPLUS_VERSION_PATCH}") + # Prior to E+ 9.1.0 (OS 2.7.2), zip/tar.gz would extract to something like `./EnergyPlus-9.0.0-buildsha-Linux-x86_64/EnergyPlus-9-0-0` + if (ENERGYPLUS_VERSION VERSION_LESS "9.1.0") + set(ENV{ENERGYPLUSDIR} "${CMAKE_BINARY_DIR}/${ENERGYPLUS_PATH}/EnergyPlus-${ENERGYPLUS_VERSION_MAJOR}-${ENERGYPLUS_VERSION_MINOR}-${ENERGYPLUS_VERSION_PATCH}") + else() + # After 9.1.0, due to QtIFW/Mac packaging (NREL/EnergPlus#7148), it is going directly to `./EnergyPlus-9.1.0-buildsha-Linux-x86_64/` + set(ENV{ENERGYPLUSDIR} "${CMAKE_BINARY_DIR}/${ENERGYPLUS_PATH}") + endif() + elseif(WIN32) if(CMAKE_CL_64) set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-x86_64") set(ENERGYPLUS_ARCH 64) - set(ENERGYPLUS_EXPECTED_HASH 4094c49b908ba2feb3f0b352126ea0ac) + set(ENERGYPLUS_EXPECTED_HASH 11926295eddb3d7b6d5bcd851a1a0849) else() set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-i386") set(ENERGYPLUS_ARCH 32) @@ -1441,7 +1449,9 @@ add_subdirectory(resources) add_subdirectory(ruby) -add_subdirectory(sketchup_plugin) +if(BUILD_OS_APP) + add_subdirectory(sketchup_plugin) +endif() foreach(D ${project_directories}) add_subdirectory(src/${D}) @@ -1865,11 +1875,6 @@ endif() include(CPack) include(CPackIFW) -cpack_add_component(SketchUpPlugin - DISPLAY_NAME "SketchUp Plugin" - DESCRIPTION "SketchUp Plugin" -) - cpack_add_component(CLI DISPLAY_NAME "Command Line Interface" DESCRIPTION "Command Line Interface" @@ -1880,26 +1885,6 @@ cpack_add_component(RubyAPI DESCRIPTION "Ruby API" ) -cpack_add_component(CSharpAPI - DISPLAY_NAME "C# API" - DESCRIPTION "C# API" -) - -cpack_add_component(PAT - DISPLAY_NAME "Parametric Analysis Tool" - DESCRIPTION "Parametric Analysis Tool" -) - -cpack_add_component(OpenStudioApp - DISPLAY_NAME "OpenStudio Application" - DESCRIPTION "OpenStudio Application" -) - -cpack_add_component(DView - DISPLAY_NAME "DView" - DESCRIPTION "DView Application for viewing results" -) - cpack_add_component(EnergyPlus DISPLAY_NAME "EnergyPlus" DESCRIPTION "Minimal EnergyPlus installation" @@ -1910,17 +1895,6 @@ cpack_add_component(Radiance DESCRIPTION "Full Radiance installation" ) -cpack_add_component(Resources - DISPLAY_NAME "Application Resources" - DESCRIPTION "Resource Files used by the OpenStudio Application and SketchUp Plugin" -) - -cpack_ifw_configure_component(SketchUpPlugin - DEPENDS Resources - SCRIPT sketchup_plugin/install_operations.qs - REQUIRES_ADMIN_RIGHTS -) - cpack_ifw_configure_component(CLI SCRIPT src/cli/install_operations.qs REQUIRES_ADMIN_RIGHTS @@ -1930,42 +1904,87 @@ cpack_ifw_configure_component(RubyAPI REQUIRES_ADMIN_RIGHTS ) -cpack_ifw_configure_component(CSharpAPI +cpack_ifw_configure_component(EnergyPlus REQUIRES_ADMIN_RIGHTS ) -cpack_ifw_configure_component(PAT - DEPENDS CLI RubyAPI - SCRIPT pat/install_operations.qs +cpack_ifw_configure_component(Radiance REQUIRES_ADMIN_RIGHTS ) -cpack_ifw_configure_component(OpenStudioApp - DEPENDS Resources CLI - SCRIPT src/openstudio_app/install_operations.qs +cpack_ifw_configure_component(Unspecified + SCRIPT src/install_utility/install_operations.qs REQUIRES_ADMIN_RIGHTS ) -cpack_ifw_configure_component(DView - REQUIRES_ADMIN_RIGHTS -) +if(BUILD_CSHARP_BINDINGS) + cpack_add_component(CSharpAPI + DISPLAY_NAME "C# API" + DESCRIPTION "C# API" + ) -cpack_ifw_configure_component(EnergyPlus - REQUIRES_ADMIN_RIGHTS -) + cpack_ifw_configure_component(CSharpAPI + REQUIRES_ADMIN_RIGHTS + ) +endif() -cpack_ifw_configure_component(Radiance - REQUIRES_ADMIN_RIGHTS -) +if(BUILD_OS_APP) + + cpack_add_component(Resources + DISPLAY_NAME "Application Resources" + DESCRIPTION "Resource Files used by the OpenStudio Application and SketchUp Plugin" + ) + + cpack_add_component(SketchUpPlugin + DISPLAY_NAME "SketchUp Plugin" + DESCRIPTION "SketchUp Plugin" + ) -cpack_ifw_configure_component(Resources - REQUIRES_ADMIN_RIGHTS -) + cpack_add_component(OpenStudioApp + DISPLAY_NAME "OpenStudio Application" + DESCRIPTION "OpenStudio Application" + ) -cpack_ifw_configure_component(Unspecified - SCRIPT src/install_utility/install_operations.qs - REQUIRES_ADMIN_RIGHTS -) + cpack_ifw_configure_component(Resources + REQUIRES_ADMIN_RIGHTS + ) + + cpack_ifw_configure_component(SketchUpPlugin + DEPENDS Resources + SCRIPT sketchup_plugin/install_operations.qs + REQUIRES_ADMIN_RIGHTS + ) + + cpack_ifw_configure_component(OpenStudioApp + DEPENDS Resources CLI + SCRIPT src/openstudio_app/install_operations.qs + REQUIRES_ADMIN_RIGHTS + ) +endif() + +if(BUILD_PAT) + cpack_add_component(PAT + DISPLAY_NAME "Parametric Analysis Tool" + DESCRIPTION "Parametric Analysis Tool" + ) + + cpack_ifw_configure_component(PAT + DEPENDS CLI RubyAPI + SCRIPT pat/install_operations.qs + REQUIRES_ADMIN_RIGHTS + ) +endif() + +if(BUILD_DVIEW) + cpack_add_component(DView + DISPLAY_NAME "DView" + DESCRIPTION "DView Application for viewing results" + ) + + cpack_ifw_configure_component(DView + REQUIRES_ADMIN_RIGHTS + ) +endif() if( BUILD_NUGET_PACKAGE ) configure_file( OpenStudio.nuspec.in OpenStudio.nuspec ) diff --git a/openstudiocore/resources/eefg/dummy.idf b/openstudiocore/resources/eefg/dummy.idf index 299109b95c4..7f4c046a2fe 100644 --- a/openstudiocore/resources/eefg/dummy.idf +++ b/openstudiocore/resources/eefg/dummy.idf @@ -8,10 +8,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + Building, Building1, !- Name Big, !- North Axis {deg} diff --git a/openstudiocore/resources/energyplus/5ZoneAirCooled/in.idf b/openstudiocore/resources/energyplus/5ZoneAirCooled/in.idf index 206aab17147..94c5ab4e064 100644 --- a/openstudiocore/resources/energyplus/5ZoneAirCooled/in.idf +++ b/openstudiocore/resources/energyplus/5ZoneAirCooled/in.idf @@ -100,7 +100,7 @@ ! Environmental Emissions: None ! Utility Tariffs: None - Version,9.0; + Version,9.1; Building, Building, !- Name @@ -173,7 +173,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual Site:Location, CHICAGO_IL_USA TMY2-94846, !- Name @@ -2216,7 +2216,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type SPACE1-1 ATU, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, SPACE2-1 Eq, !- Name @@ -2224,7 +2226,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type SPACE2-1 ATU, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, SPACE3-1 Eq, !- Name @@ -2232,7 +2236,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type SPACE3-1 ATU, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, SPACE4-1 Eq, !- Name @@ -2240,7 +2246,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type SPACE4-1 ATU, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, SPACE5-1 Eq, !- Name @@ -2248,7 +2256,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type SPACE5-1 ATU, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, SPACE1-1 ATU, !- Name diff --git a/openstudiocore/resources/energyplus/BestestEx/in.idf b/openstudiocore/resources/energyplus/BestestEx/in.idf index fc392c048ca..00b5dbcc58f 100644 --- a/openstudiocore/resources/energyplus/BestestEx/in.idf +++ b/openstudiocore/resources/energyplus/BestestEx/in.idf @@ -5,7 +5,7 @@ !BESTEST-EX Case L200EX-PH BASE-CASE, developed by NREL !Use EnergyPlus IDFEditor to view inputs in IP units - Version,9.0; + Version,9.1; SimulationControl, No, !- Do Zone Sizing Calculation @@ -50,7 +50,7 @@ No, !- Apply Weekend Holiday Rule No, !- Use Weather File Rain Indicators No, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual Site:GroundReflectance,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2; @@ -1314,7 +1314,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZONE ONE Purchased Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentConnections, ZONE ONE, !- Zone Name diff --git a/openstudiocore/resources/energyplus/Components/idf_designday_1/Annual_Humidification_99_6.idf b/openstudiocore/resources/energyplus/Components/idf_designday_1/Annual_Humidification_99_6.idf index 4172b1df706..ae0af3d6602 100644 --- a/openstudiocore/resources/energyplus/Components/idf_designday_1/Annual_Humidification_99_6.idf +++ b/openstudiocore/resources/energyplus/Components/idf_designday_1/Annual_Humidification_99_6.idf @@ -11,10 +11,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + SizingPeriod:DesignDay, Wrangell Ann Hum_n 99.6% Condns DP=>MCDB, !- Name 1, !- Month diff --git a/openstudiocore/resources/energyplus/Components/idf_designday_2/Annual_Heating_Wind_99.idf b/openstudiocore/resources/energyplus/Components/idf_designday_2/Annual_Heating_Wind_99.idf index 7503db167a9..485e3d45cb8 100644 --- a/openstudiocore/resources/energyplus/Components/idf_designday_2/Annual_Heating_Wind_99.idf +++ b/openstudiocore/resources/energyplus/Components/idf_designday_2/Annual_Heating_Wind_99.idf @@ -11,10 +11,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + SizingPeriod:DesignDay, WILMINGTON Ann Htg Wind 99% Condns WS=>MCDB, !- Name 1, !- Month diff --git a/openstudiocore/resources/energyplus/Components/idf_designday_3/Annual_Cooling_DP_MDB_2.idf b/openstudiocore/resources/energyplus/Components/idf_designday_3/Annual_Cooling_DP_MDB_2.idf index 745537bc4ec..1d7a4a1e537 100644 --- a/openstudiocore/resources/energyplus/Components/idf_designday_3/Annual_Cooling_DP_MDB_2.idf +++ b/openstudiocore/resources/energyplus/Components/idf_designday_3/Annual_Cooling_DP_MDB_2.idf @@ -11,10 +11,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + SizingPeriod:DesignDay, Montrose Co Arpt Ann Clg 2% Condns DP=>MDB, !- Name 7, !- Month diff --git a/openstudiocore/resources/energyplus/Components/idf_designday_4/Annual_Cooling_WB_MDB_1.idf b/openstudiocore/resources/energyplus/Components/idf_designday_4/Annual_Cooling_WB_MDB_1.idf index 82112a30d24..eee2320fc67 100644 --- a/openstudiocore/resources/energyplus/Components/idf_designday_4/Annual_Cooling_WB_MDB_1.idf +++ b/openstudiocore/resources/energyplus/Components/idf_designday_4/Annual_Cooling_WB_MDB_1.idf @@ -11,10 +11,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + SizingPeriod:DesignDay, Youngstown Regional Airport Ann Clg 1% Condns WB=>MDB, !- Name 7, !- Month diff --git a/openstudiocore/resources/energyplus/Components/idf_designday_5/Annual_Heating_Wind_99.idf b/openstudiocore/resources/energyplus/Components/idf_designday_5/Annual_Heating_Wind_99.idf index eb831514ae1..074c03a69f5 100644 --- a/openstudiocore/resources/energyplus/Components/idf_designday_5/Annual_Heating_Wind_99.idf +++ b/openstudiocore/resources/energyplus/Components/idf_designday_5/Annual_Heating_Wind_99.idf @@ -11,10 +11,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + SizingPeriod:DesignDay, Bishop Airport Ann Htg Wind 99% Condns WS=>MCDB, !- Name 12, !- Month diff --git a/openstudiocore/resources/energyplus/Components/idf_roof_1/Large Office TSD_Nonresidential_3A_Roof_Attic and Other.idf b/openstudiocore/resources/energyplus/Components/idf_roof_1/Large Office TSD_Nonresidential_3A_Roof_Attic and Other.idf index 94e9a2295ee..3f2986ef560 100644 --- a/openstudiocore/resources/energyplus/Components/idf_roof_1/Large Office TSD_Nonresidential_3A_Roof_Attic and Other.idf +++ b/openstudiocore/resources/energyplus/Components/idf_roof_1/Large Office TSD_Nonresidential_3A_Roof_Attic and Other.idf @@ -16,10 +16,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + Material, Roof Membrane, !- Name VeryRough, !- Roughness diff --git a/openstudiocore/resources/energyplus/Components/idf_roof_2/CEC Title 24-2008_Nonresidential_9_Roof_Insulation Entirely Above Deck.idf b/openstudiocore/resources/energyplus/Components/idf_roof_2/CEC Title 24-2008_Nonresidential_9_Roof_Insulation Entirely Above Deck.idf index 94bea5b509a..e1c8bbaf889 100644 --- a/openstudiocore/resources/energyplus/Components/idf_roof_2/CEC Title 24-2008_Nonresidential_9_Roof_Insulation Entirely Above Deck.idf +++ b/openstudiocore/resources/energyplus/Components/idf_roof_2/CEC Title 24-2008_Nonresidential_9_Roof_Insulation Entirely Above Deck.idf @@ -17,10 +17,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + Material, Wood Shingles [1], !- Name VeryRough, !- Roughness diff --git a/openstudiocore/resources/energyplus/Components/idf_roof_3/ASHRAE Std189_Residential_5B_Roof_Attic and Other.idf b/openstudiocore/resources/energyplus/Components/idf_roof_3/ASHRAE Std189_Residential_5B_Roof_Attic and Other.idf index df788411c3a..52f23ea2e82 100644 --- a/openstudiocore/resources/energyplus/Components/idf_roof_3/ASHRAE Std189_Residential_5B_Roof_Attic and Other.idf +++ b/openstudiocore/resources/energyplus/Components/idf_roof_3/ASHRAE Std189_Residential_5B_Roof_Attic and Other.idf @@ -15,10 +15,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + Material, Metal Roofing, !- Name MediumSmooth, !- Roughness diff --git a/openstudiocore/resources/energyplus/Components/idf_roof_4/ASHRAE 90.1-2007_Residential_7A_Roof_Metal Building.idf b/openstudiocore/resources/energyplus/Components/idf_roof_4/ASHRAE 90.1-2007_Residential_7A_Roof_Metal Building.idf index f3f4d43caad..21fcf3b1160 100644 --- a/openstudiocore/resources/energyplus/Components/idf_roof_4/ASHRAE 90.1-2007_Residential_7A_Roof_Metal Building.idf +++ b/openstudiocore/resources/energyplus/Components/idf_roof_4/ASHRAE 90.1-2007_Residential_7A_Roof_Metal Building.idf @@ -16,10 +16,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + Material, Roof Membrane, !- Name VeryRough, !- Roughness diff --git a/openstudiocore/resources/energyplus/Components/idf_roof_5/ASHRAE 90.1-1999_Residential_B-14_Roof_Insulation Entirely Above Deck.idf b/openstudiocore/resources/energyplus/Components/idf_roof_5/ASHRAE 90.1-1999_Residential_B-14_Roof_Insulation Entirely Above Deck.idf index f2a76b11f1b..16e5cee5b79 100644 --- a/openstudiocore/resources/energyplus/Components/idf_roof_5/ASHRAE 90.1-1999_Residential_B-14_Roof_Insulation Entirely Above Deck.idf +++ b/openstudiocore/resources/energyplus/Components/idf_roof_5/ASHRAE 90.1-1999_Residential_B-14_Roof_Insulation Entirely Above Deck.idf @@ -15,10 +15,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + Material, GP01 1/2 GYPSUM, !- Name Smooth, !- Roughness diff --git a/openstudiocore/resources/energyplus/Daylighting_Office/in.idf b/openstudiocore/resources/energyplus/Daylighting_Office/in.idf index 92a01a4426c..eff73685349 100644 --- a/openstudiocore/resources/energyplus/Daylighting_Office/in.idf +++ b/openstudiocore/resources/energyplus/Daylighting_Office/in.idf @@ -140,7 +140,7 @@ ! schedule types, always on schedule, misc ! ***GENERAL SIMULATION PARAMETERS*** - Version,9.0; + Version,9.1; SimulationControl, YES, !- Do Zone Sizing Calculation @@ -173,7 +173,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual ! ***HOLIDAYS & DAYLIGHT SAVINGS*** @@ -2378,7 +2378,9 @@ AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 1 Object Type Core_ZN Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_ZN_1 Equipment,!- Name @@ -2386,7 +2388,9 @@ AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 1 Object Type Perimeter_ZN_1 Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_ZN_2 Equipment,!- Name @@ -2394,7 +2398,9 @@ AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 1 Object Type Perimeter_ZN_2 Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_ZN_3 Equipment,!- Name @@ -2402,7 +2408,9 @@ AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 1 Object Type Perimeter_ZN_3 Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_ZN_4 Equipment,!- Name @@ -2410,7 +2418,9 @@ AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 1 Object Type Perimeter_ZN_4 Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ! ***SIZING & CONTROLS*** diff --git a/openstudiocore/resources/energyplus/Daylighting_School/in.idf b/openstudiocore/resources/energyplus/Daylighting_School/in.idf index 733ecc72e79..10a21a7c310 100644 --- a/openstudiocore/resources/energyplus/Daylighting_School/in.idf +++ b/openstudiocore/resources/energyplus/Daylighting_School/in.idf @@ -33,7 +33,7 @@ ! WeatherFileName=USA_CO_Boulder_TMY2.epw ! End SimMetaData - Version,9.0; + Version,9.1; Timestep,6; @@ -58,7 +58,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual SurfaceConvectionAlgorithm:Inside,TARP; @@ -1252,7 +1252,9 @@ AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 1 Object Type Classroom Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, Classroom Direct Air, !- Name diff --git a/openstudiocore/resources/energyplus/HospitalBaseline/in.idf b/openstudiocore/resources/energyplus/HospitalBaseline/in.idf index eae5c34bf5f..4bd68788484 100644 --- a/openstudiocore/resources/energyplus/HospitalBaseline/in.idf +++ b/openstudiocore/resources/energyplus/HospitalBaseline/in.idf @@ -100,7 +100,7 @@ ! End SimMetaData ! Number of Zones: 130 - Version,9.0; + Version,9.1; Timestep,6; @@ -125,7 +125,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual SurfaceConvectionAlgorithm:Inside,TARP; @@ -2080,7 +2080,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Cafe VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Cafe VAV Box, !- Name @@ -2810,7 +2812,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Clean VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Clean VAV Box, !- Name @@ -3256,7 +3260,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Conference VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Conference VAV Box, !- Name @@ -3686,7 +3692,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Dining VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Dining VAV Box, !- Name @@ -4116,7 +4124,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Elevator VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Elevator VAV Box,!- Name @@ -4546,7 +4556,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Exam VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Exam VAV Box, !- Name @@ -4989,7 +5001,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Food Storage VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Food Storage VAV Box, !- Name @@ -5565,10 +5579,14 @@ Floor 1 Gas Storage VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 2 Object Type Floor 1 Gas Storage Exhaust Fan 1, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Gas Storage VAV Box, !- Name @@ -5992,7 +6010,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Imaging VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Imaging VAV Box, !- Name @@ -6442,18 +6462,26 @@ Floor 1 Kitchen VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 2 Object Type Floor 1 Kitchen Exhaust Fan 1, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + , !- Zone Equipment 2 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 3 Object Type Floor 1 Kitchen Exhaust Fan 2, !- Zone Equipment 3 Name 3, !- Zone Equipment 3 Cooling Sequence 3, !- Zone Equipment 3 Heating or No-Load Sequence + , !- Zone Equipment 3 Sequential Cooling Fraction + , !- Zone Equipment 3 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 4 Object Type Floor 1 Kitchen Exhaust Fan 3, !- Zone Equipment 4 Name 4, !- Zone Equipment 4 Cooling Sequence - 4; !- Zone Equipment 4 Heating or No-Load Sequence + 4, !- Zone Equipment 4 Heating or No-Load Sequence + , !- Zone Equipment 4 Sequential Cooling Fraction + ; !- Zone Equipment 4 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Kitchen VAV Box, !- Name @@ -6897,7 +6925,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Lab 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Lab 1 VAV Box, !- Name @@ -7355,7 +7385,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Lab 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Lab 2 VAV Box, !- Name @@ -7819,10 +7851,14 @@ Floor 1 Laundry VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 2 Object Type Floor 1 Laundry Exhaust Fan 1, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Laundry VAV Box, !- Name @@ -8294,7 +8330,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Lobby VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Lobby VAV Box, !- Name @@ -8680,7 +8718,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Lounge VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Lounge VAV Box, !- Name @@ -9088,7 +9128,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Mech 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Mech 1 VAV Box, !- Name @@ -9543,7 +9585,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Mech 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Mech 2 VAV Box, !- Name @@ -9973,7 +10017,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Office 1 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Office 1 VAV Box,!- Name @@ -10403,7 +10449,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Office 2 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Office 2 VAV Box,!- Name @@ -10849,7 +10897,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Office 3 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Office 3 VAV Box,!- Name @@ -11279,7 +11329,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Office 3 Perimeter 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Office 3 Perimeter 1 VAV Box, !- Name @@ -11709,7 +11761,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Office 3 Perimeter 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Office 3 Perimeter 2 VAV Box, !- Name @@ -12154,7 +12208,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Office 3 Perimeter 3 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Office 3 Perimeter 3 VAV Box, !- Name @@ -12584,7 +12640,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Patient VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Patient VAV Box, !- Name @@ -12970,7 +13028,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Pharmacy VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Pharmacy VAV Box,!- Name @@ -13356,7 +13416,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Physical Therapy VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Physical Therapy VAV Box, !- Name @@ -13764,7 +13826,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Receiving VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Receiving VAV Box, !- Name @@ -14194,7 +14258,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Reception VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Reception VAV Box, !- Name @@ -14557,10 +14623,14 @@ Floor 1 Soil VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 2 Object Type Floor 1 Soil Exhaust Fan 1, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Soil VAV Box, !- Name @@ -14919,7 +14989,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Storage VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Storage VAV Box, !- Name @@ -15305,7 +15377,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 1 Waiting VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 1 Waiting VAV Box, !- Name @@ -15750,7 +15824,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Chapel VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Chapel VAV Box, !- Name @@ -16136,7 +16212,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Clean 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Clean 1 VAV Box, !- Name @@ -16522,7 +16600,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Clean 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Clean 2 VAV Box, !- Name @@ -16931,7 +17011,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Corridor VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Corridor VAV Box,!- Name @@ -17361,7 +17443,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Elevator VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Elevator VAV Box,!- Name @@ -17806,7 +17890,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Exam 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Exam 1 VAV Box, !- Name @@ -18192,7 +18278,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Exam 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Exam 2 VAV Box, !- Name @@ -18578,7 +18666,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Exam 3 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Exam 3 VAV Box, !- Name @@ -18980,7 +19070,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Exam 4 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Exam 4 VAV Box, !- Name @@ -19410,7 +19502,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Gift Shop VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Gift Shop VAV Box, !- Name @@ -19824,7 +19918,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Imaging 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Imaging 1 VAV Box, !- Name @@ -20298,7 +20394,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Imaging 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Imaging 2 VAV Box, !- Name @@ -20771,7 +20869,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Imaging 3 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Imaging 3 VAV Box, !- Name @@ -21191,7 +21291,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Lab 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Lab 1 VAV Box, !- Name @@ -21621,7 +21723,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Lab 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Lab 2 VAV Box, !- Name @@ -22012,10 +22116,14 @@ Floor 2 Lockers VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 2 Object Type Floor 2 Lockers Exhaust Fan 1, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Lockers VAV Box, !- Name @@ -22411,7 +22519,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Lounge 1 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Lounge 1 VAV Box,!- Name @@ -22856,7 +22966,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Lounge 2 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Lounge 2 VAV Box,!- Name @@ -23270,7 +23382,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Nurse Station 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Nurse Station 1 VAV Box, !- Name @@ -23744,7 +23858,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Nurse Station 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Nurse Station 2 VAV Box, !- Name @@ -24130,7 +24246,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Office 1 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Office 1 VAV Box,!- Name @@ -24560,7 +24678,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Office 2 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Office 2 VAV Box,!- Name @@ -24946,7 +25066,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Office 3 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Office 3 VAV Box,!- Name @@ -25391,7 +25513,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Office 4 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Office 4 VAV Box,!- Name @@ -25917,7 +26041,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Operating VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Operating VAV Box, !- Name @@ -26391,7 +26517,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 PACU VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 PACU VAV Box, !- Name @@ -26821,7 +26949,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Patient 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Patient 1 VAV Box, !- Name @@ -27207,7 +27337,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Patient 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Patient 2 VAV Box, !- Name @@ -27621,7 +27753,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Procedure 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Procedure 1 VAV Box, !- Name @@ -28035,7 +28169,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Procedure 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Procedure 2 VAV Box, !- Name @@ -28465,7 +28601,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Reception VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Reception VAV Box, !- Name @@ -28900,10 +29038,14 @@ Floor 2 Restroom 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 2 Object Type Floor 2 Restroom 1 Exhaust Fan 1, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Restroom 1 VAV Box, !- Name @@ -29348,10 +29490,14 @@ Floor 2 Restroom 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 2 Object Type Floor 2 Restroom 2 Exhaust Fan 1, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Restroom 2 VAV Box, !- Name @@ -29724,10 +29870,14 @@ Floor 2 Soil 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 2 Object Type Floor 2 Soil 1 Exhaust Fan 1, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Soil 1 VAV Box, !- Name @@ -30100,10 +30250,14 @@ Floor 2 Soil 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 2 Object Type Floor 2 Soil 2 Exhaust Fan 1, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Soil 2 VAV Box, !- Name @@ -30524,10 +30678,14 @@ Floor 2 Sterilizing VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 2 Object Type Floor 2 Sterilizing Exhaust Fan 1, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Sterilizing VAV Box, !- Name @@ -30886,7 +31044,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Storage 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Storage 1 VAV Box, !- Name @@ -31235,7 +31395,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Storage 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Storage 2 VAV Box, !- Name @@ -31649,7 +31811,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Trauma VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Trauma VAV Box, !- Name @@ -32090,10 +32254,14 @@ Floor 2 Triage VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 2 Object Type Floor 2 Triage Exhaust Fan 1, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Triage VAV Box, !- Name @@ -32548,7 +32716,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 2 Waiting VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 2 Waiting VAV Box, !- Name @@ -32934,7 +33104,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Clean VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Clean VAV Box, !- Name @@ -33394,7 +33566,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Elevator VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Elevator VAV Box,!- Name @@ -33780,7 +33954,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Exam VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Exam VAV Box, !- Name @@ -34259,7 +34435,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 ICU VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 ICU VAV Box, !- Name @@ -34717,7 +34895,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Nurse Station 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Nurse Station 1 VAV Box, !- Name @@ -35190,7 +35370,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Nurse Station 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Nurse Station 2 VAV Box, !- Name @@ -35620,7 +35802,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Nursery VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Nursery VAV Box, !- Name @@ -36050,7 +36234,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Office VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Office VAV Box, !- Name @@ -36508,7 +36694,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Operating VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Operating VAV Box, !- Name @@ -36953,7 +37141,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Patient 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Patient 1 VAV Box, !- Name @@ -37398,7 +37588,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Patient 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Patient 2 VAV Box, !- Name @@ -37859,7 +38051,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Patient 3 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Patient 3 VAV Box, !- Name @@ -38304,7 +38498,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Patient 4 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Patient 4 VAV Box, !- Name @@ -38712,7 +38908,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Patient Corridor 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Patient Corridor 1 VAV Box, !- Name @@ -39120,7 +39318,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Patient Corridor 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Patient Corridor 2 VAV Box, !- Name @@ -39578,7 +39778,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Procedure VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Procedure VAV Box, !- Name @@ -39941,10 +40143,14 @@ Floor 3 Soil VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 2 Object Type Floor 3 Soil Exhaust Fan 1, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Soil VAV Box, !- Name @@ -40347,7 +40553,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Supply VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Supply VAV Box, !- Name @@ -40788,10 +40996,14 @@ Floor 3 Triage VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 2 Object Type Floor 3 Triage Exhaust Fan 1, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Triage VAV Box, !- Name @@ -41231,7 +41443,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 3 Waiting VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 3 Waiting VAV Box, !- Name @@ -41617,7 +41831,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 4-6 Clean VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 4-6 Clean VAV Box, !- Name @@ -42077,7 +42293,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 4-6 Elevator VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 4-6 Elevator VAV Box, !- Name @@ -42535,7 +42753,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 4-6 Nurse Station VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 4-6 Nurse Station VAV Box, !- Name @@ -42965,7 +43185,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 4-6 Office VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 4-6 Office VAV Box,!- Name @@ -43410,7 +43632,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 4-6 Patient 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 4-6 Patient 1 VAV Box, !- Name @@ -43855,7 +44079,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 4-6 Patient 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 4-6 Patient 2 VAV Box, !- Name @@ -44300,7 +44526,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 4-6 Patient 3 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 4-6 Patient 3 VAV Box, !- Name @@ -44745,7 +44973,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 4-6 Patient 4 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 4-6 Patient 4 VAV Box, !- Name @@ -45153,7 +45383,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 4-6 Patient Corridor 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 4-6 Patient Corridor 1 VAV Box, !- Name @@ -45561,7 +45793,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 4-6 Patient Corridor 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 4-6 Patient Corridor 2 VAV Box, !- Name @@ -45924,10 +46158,14 @@ Floor 4-6 Soil VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 2 Object Type Floor 4-6 Soil Exhaust Fan 1, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 4-6 Soil VAV Box, !- Name @@ -46330,7 +46568,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 4-6 Supply VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 4-6 Supply VAV Box,!- Name @@ -46716,7 +46956,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 7 Clean VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 7 Clean VAV Box, !- Name @@ -47176,7 +47418,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 7 Elevator VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 7 Elevator VAV Box,!- Name @@ -47634,7 +47878,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 7 Nurse Station VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 7 Nurse Station VAV Box, !- Name @@ -48064,7 +48310,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 7 Office VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 7 Office VAV Box, !- Name @@ -48509,7 +48757,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 7 Patient 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 7 Patient 1 VAV Box, !- Name @@ -48954,7 +49204,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 7 Patient 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 7 Patient 2 VAV Box, !- Name @@ -49399,7 +49651,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 7 Patient 3 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 7 Patient 3 VAV Box, !- Name @@ -49844,7 +50098,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 7 Patient 4 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 7 Patient 4 VAV Box, !- Name @@ -50252,7 +50508,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 7 Patient Corridor 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 7 Patient Corridor 1 VAV Box, !- Name @@ -50660,7 +50918,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 7 Patient Corridor 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 7 Patient Corridor 2 VAV Box, !- Name @@ -51023,10 +51283,14 @@ Floor 7 Soil VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction Fan:ZoneExhaust, !- Zone Equipment 2 Object Type Floor 7 Soil Exhaust Fan 1, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 7 Soil VAV Box, !- Name @@ -51429,7 +51693,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Floor 7 Supply VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, Floor 7 Supply VAV Box, !- Name @@ -51815,7 +52081,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type MOB Floor 1 Core VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, MOB Floor 1 Core VAV Box,!- Name @@ -52245,7 +52513,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type MOB Floor 1 Perimeter 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, MOB Floor 1 Perimeter 1 VAV Box, !- Name @@ -52675,7 +52945,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type MOB Floor 1 Perimeter 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, MOB Floor 1 Perimeter 2 VAV Box, !- Name @@ -53105,7 +53377,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type MOB Floor 1 Perimeter 3 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, MOB Floor 1 Perimeter 3 VAV Box, !- Name @@ -53491,7 +53765,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type MOB Floor 2-4 Core VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, MOB Floor 2-4 Core VAV Box, !- Name @@ -53921,7 +54197,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type MOB Floor 2-4 Perimeter 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, MOB Floor 2-4 Perimeter 1 VAV Box, !- Name @@ -54351,7 +54629,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type MOB Floor 2-4 Perimeter 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, MOB Floor 2-4 Perimeter 2 VAV Box, !- Name @@ -54781,7 +55061,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type MOB Floor 2-4 Perimeter 3 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, MOB Floor 2-4 Perimeter 3 VAV Box, !- Name @@ -55211,7 +55493,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type MOB Floor 2-4 Perimeter 4 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, MOB Floor 2-4 Perimeter 4 VAV Box, !- Name @@ -55597,7 +55881,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type MOB Floor 5 Core VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, MOB Floor 5 Core VAV Box,!- Name @@ -56027,7 +56313,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type MOB Floor 5 Perimeter 1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, MOB Floor 5 Perimeter 1 VAV Box, !- Name @@ -56457,7 +56745,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type MOB Floor 5 Perimeter 2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, MOB Floor 5 Perimeter 2 VAV Box, !- Name @@ -56887,7 +57177,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type MOB Floor 5 Perimeter 3 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, MOB Floor 5 Perimeter 3 VAV Box, !- Name @@ -57339,7 +57631,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type MOB Floor 5 Perimeter 4 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, MOB Floor 5 Perimeter 4 VAV Box, !- Name diff --git a/openstudiocore/resources/energyplus/NewFileTemplate.idf b/openstudiocore/resources/energyplus/NewFileTemplate.idf index 3f6280b3834..12ccfc404fb 100644 --- a/openstudiocore/resources/energyplus/NewFileTemplate.idf +++ b/openstudiocore/resources/energyplus/NewFileTemplate.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== diff --git a/openstudiocore/resources/energyplus/Office_With_Many_HVAC_Types/in.idf b/openstudiocore/resources/energyplus/Office_With_Many_HVAC_Types/in.idf index 2511bd61357..ceac0e15bca 100644 --- a/openstudiocore/resources/energyplus/Office_With_Many_HVAC_Types/in.idf +++ b/openstudiocore/resources/energyplus/Office_With_Many_HVAC_Types/in.idf @@ -1,4 +1,4 @@ - Version,9.0; + Version,9.1; Building, Building 1, !- Name @@ -462,7 +462,9 @@ ZoneHVAC:PackagedTerminalAirConditioner, !- Zone Equipment 1 Object Type PTAC DX Clg HW Htg, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction Sizing:Zone, Thermal Zone: Story 1 Core Space, !- Zone or ZoneList Name @@ -888,7 +890,9 @@ ZoneHVAC:PackagedTerminalHeatPump, !- Zone Equipment 1 Object Type PTHP, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction Sizing:Zone, Thermal Zone: Story 1 East Perimeter Space, !- Zone or ZoneList Name @@ -1094,7 +1098,9 @@ AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 1 Object Type Air Terminal Single Duct Uncontrolled 1, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction Sizing:Zone, Thermal Zone: Story 1 North Perimeter Space, !- Zone or ZoneList Name @@ -1312,7 +1318,9 @@ AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 1 Object Type Air Terminal Single Duct Uncontrolled 2, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction Sizing:Zone, Thermal Zone: Story 1 South Perimeter Space, !- Zone or ZoneList Name @@ -1531,7 +1539,9 @@ AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 1 Object Type Air Terminal Single Duct Uncontrolled 3, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction Sizing:Zone, Thermal Zone: Story 1 West Perimeter Space, !- Zone or ZoneList Name @@ -1760,7 +1770,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type ADU Air Terminal Single Duct VAV Reheat 1, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction Sizing:Zone, Thermal Zone: Story 2 Core Space, !- Zone or ZoneList Name @@ -2017,7 +2029,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type ADU Air Terminal Single Duct VAV Reheat 2, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction Sizing:Zone, Thermal Zone: Story 2 East Perimeter Space, !- Zone or ZoneList Name @@ -2223,7 +2237,9 @@ AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 1 Object Type Air Terminal Single Duct Uncontrolled 4, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction Sizing:Zone, Thermal Zone: Story 2 North Perimeter Space, !- Zone or ZoneList Name @@ -2487,7 +2503,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Air Terminal Single Duct Parallel PIU Reheat 1 Air Distribution Unit, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction Sizing:Zone, Thermal Zone: Story 2 South Perimeter Space, !- Zone or ZoneList Name @@ -2754,7 +2772,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Air Terminal Single Duct Parallel PIU Reheat 2 Air Distribution Unit, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction Sizing:Zone, Thermal Zone: Story 2 West Perimeter Space, !- Zone or ZoneList Name @@ -2983,7 +3003,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type ADU Air Terminal Single Duct VAV Reheat 3, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction Sizing:Zone, Thermal Zone: Story 3 Core Space, !- Zone or ZoneList Name @@ -3243,7 +3265,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type ADU Air Terminal Single Duct VAV Reheat 4, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction Sizing:Zone, Thermal Zone: Story 3 East Perimeter Space, !- Zone or ZoneList Name @@ -3495,7 +3519,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type ADU Air Terminal Single Duct VAV Reheat 5, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction Sizing:Zone, Thermal Zone: Story 3 North Perimeter Space, !- Zone or ZoneList Name @@ -3749,7 +3775,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Air Terminal Single Duct Parallel PIU Reheat 3 Air Distribution Unit, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction Sizing:Zone, Thermal Zone: Story 3 South Perimeter Space, !- Zone or ZoneList Name @@ -4016,7 +4044,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Air Terminal Single Duct Parallel PIU Reheat 4 Air Distribution Unit, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction Sizing:Zone, Thermal Zone: Story 3 West Perimeter Space, !- Zone or ZoneList Name @@ -4074,7 +4104,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual ShadowCalculation, AverageOverDaysInFrequency, !- Calculation Method diff --git a/openstudiocore/resources/energyplus/ProposedEnergy+.idd b/openstudiocore/resources/energyplus/ProposedEnergy+.idd index 4fb85a499b9..23a0fbfdcd2 100644 --- a/openstudiocore/resources/energyplus/ProposedEnergy+.idd +++ b/openstudiocore/resources/energyplus/ProposedEnergy+.idd @@ -1,4 +1,4 @@ -!IDD_Version 9.0.1 +!IDD_Version 9.1.0 !IDD_BUILD TBD ! ************************************************************************** ! This file is the Input Data Dictionary (IDD) for EnergyPlus. @@ -240,7 +240,7 @@ ! GJ => ton-hrs 78.9889415481832 ! J => Wh 0.000277777777777778 ! J/K => Btu/F 526.565 -! J/kg => Btu/lb 0.00042986 +! J/kg => Btu/lb 0.00042986 (plus 7.686) ! J/kg-K => Btu/lb-F 0.000239005736137667 ! J/kg-K2 => Btu/lb-F2 0.000132889924714692 ! J/kg-K3 => Btu/lb-F3 7.38277359526066E-05 @@ -392,7 +392,7 @@ Version, \format singleLine \min-fields 1 A1 ; \field Version Identifier - \default 9.0 + \default 9.1 SimulationControl, \unique-object @@ -10752,7 +10752,7 @@ RoomAirSettings:UnderFloorAirDistributionExterior, RoomAir:Node:AirflowNetwork, \memo define an air node for some types of nodal air models A1, \field Name - \type Alpha + \type alpha \reference RoomAirflowNetworkNodes A2, \field Zone Name \required-field @@ -10776,7 +10776,7 @@ RoomAir:Node:AirflowNetwork, \extensible:1 \min-fields 2 A1, \field Name - \type Alpha + \type alpha \reference RoomAirNodeSurfaceLists A2; \field Surface Name \begin-extensible @@ -10788,7 +10788,7 @@ RoomAir:Node:AirflowNetwork:InternalGains, \min-fields 4 \memo define the internal gains that are associated with one particular RoomAir:Node A1, \field Name - \type Alpha + \type alpha \reference RoomAirNodeGains A2, \field Internal Gain Object 1 Type \begin-extensible @@ -10850,7 +10850,7 @@ RoomAir:Node:AirflowNetwork:HVACEquipment, \extensible:4 \memo define the zone equipment associated with one particular RoomAir:Node A1, \field Name - \type Alpha + \type alpha \reference RoomAirNodeHVACEquipment A2, \field ZoneHVAC or Air Terminal Equipment Object Type 1 \begin-extensible @@ -11727,13 +11727,13 @@ ElectricEquipment:ITE:AirCooled, \type object-list \object-list ScheduleNames N11, \field Return Temperature Difference - \note The difference of the return outlet temperature from the well mixed zone temperature. + \note The difference of the the actual AHU return air temperature to the IT equipment outlet temperature. \note Either Return Temperature Difference or Return Temperature Difference Schedule is required if Air Flow Calculation Method is set to FlowControlWithApproachTemperatures. \note This field is ignored when Air Flow Calculation Method is FlowFromSystem. \type real \units deltaC A21; \field Return Temperature Difference Schedule - \note The difference schedule of the return outlet temperature from the well mixed zone temperature. + \note The difference schedule of the actual AHU return air temperature to the IT equipment outlet temperature. \note Either Return Temperature Difference or Return Temperature Difference Schedule is required if Air Flow Calculation Method is set to FlowControlWithApproachTemperatures. \note This field is ignored when Air Flow Calculation Method is FlowFromSystem. \type object-list @@ -15300,6 +15300,7 @@ HVACTemplate:Zone:FanCoil, \type choice \key ChilledWater \key ChilledWaterDetailedFlatModel + \key HeatExchangerAssistedChilledWater \default ChilledWater A6, \field Cooling Coil Availability Schedule Name \note If blank, always on @@ -15312,7 +15313,8 @@ HVACTemplate:Zone:FanCoil, \units C A7, \field Heating Coil Type \type choice - \key HotWater + \key HotWater + \key Electric \default HotWater A8, \field Heating Coil Availability Schedule Name \note If blank, always on @@ -15375,6 +15377,7 @@ HVACTemplate:Zone:FanCoil, \key CyclingFan \key VariableFanVariableFlow \key VariableFanConstantFlow + \key MultiSpeedFan \key ASHRAE90VariableFan N15, \field Low Speed Supply Air Flow Ratio \type real @@ -24476,15 +24479,15 @@ ZoneHVAC:HybridUnitaryHVAC, \key User Defined \default Automatic A9, \field Return Air Node Name - \required-field + \required-field \type node \note Return air node for the hybrid unit must be a zone exhaust node. A10, \field Outdoor Air Node Name - \required-field + \required-field \type node \note Outdoor air node for the hybrid unit must be an outdoor air node. A11, \field Supply Air Node Name - \required-field + \required-field \type node \note Supply air node for the hybrid unit must be a zone air inlet node. A12, \field Relief Node Name @@ -27660,7 +27663,7 @@ ZoneHVAC:AirDistributionUnit, !Zone Heating and Cooling Equipment are attached to zones by the following statements: ZoneHVAC:EquipmentList, - \extensible:4 Duplicate the four fields Zone Equipment Object Type through Heating Priority + \extensible:6 Duplicate the six fields Zone Equipment Object Type through Sequential Heating Fraction \memo List equipment in simulation order. Note that an ZoneHVAC:AirDistributionUnit or \memo AirTerminal:SingleDuct:Uncontrolled object must be listed in this statement if there is a forced \memo air system serving the zone from the air loop. @@ -27673,7 +27676,7 @@ ZoneHVAC:EquipmentList, \memo should be assigned Heating Sequence = 1 and Cooling Sequence = 1. Any other equipment should \memo be assigned sequence 2 or higher so that it will see the net load after the DOAS air is added \memo to the zone. - \min-fields 6 + \min-fields 8 A1 , \field Name \required-field \reference ZoneEquipmentLists @@ -27732,12 +27735,26 @@ ZoneHVAC:EquipmentList, \minimum 0 \note Specifies the zone equipment simulation order \note when the zone thermostat requests cooling - N2 ; \field Zone Equipment 1 Heating or No-Load Sequence + N2 , \field Zone Equipment 1 Heating or No-Load Sequence \required-field \type integer \minimum 0 \note Specifies the zone equipment simulation order \note when the zone thermostat requests heating or no load + N3 , \field Zone Equipment 1 Sequential Cooling Fraction + \note The fraction of the remaining cooling load this equipment will attempt to serve + \note if the load distribution scheme is SequentialLoad, otherwise ignored. + \type real + \minimum 0.0 + \maximum 1.0 + \default 1.0 + N4 ; \field Zone Equipment 1 Sequential Heating Fraction + \note The fraction of the remaining heating load this equipment will attempt to serve + \note if the load distribution scheme is SequentialLoad, otherwise ignored. + \type real + \minimum 0.0 + \maximum 1.0 + \default 1.0 ZoneHVAC:EquipmentConnections, \memo Specifies the HVAC equipment connections for a zone. Node names are specified for the @@ -27788,7 +27805,13 @@ Fan:SystemModel, \reference Fans \reference FansCV \reference FansCVandOnOff + \reference FansVAV + \reference FansCVandVAV \reference FansCVandOnOffandVAV + \reference-class-name validBranchEquipmentTypes + \reference validBranchEquipmentNames + \reference-class-name validOASysEquipmentTypes + \reference validOASysEquipmentNames A2 , \field Availability Schedule Name \note Availability schedule name for this fan. Schedule value > 0 means the fan is available. \note If this field is blank, the fan is always available. @@ -28144,7 +28167,6 @@ Fan:ZoneExhaust, \object-list ScheduleNames A9 ; \field Balanced Exhaust Fraction Schedule Name \note Used to control fan's impact on flow at the return air node. Enter the portion of the exhaust that is balanced by simple airflows. - \note \type object-list \object-list ScheduleNames @@ -32488,7 +32510,7 @@ Coil:WaterHeating:AirToWaterHeatPump:VariableSpeed, \minimum 0 \required-field N17, \field Speed 1 Reference Unit Water Pump Input Power At Rated Conditions - \units dimensionless + \units W \type real \minimum 0 \required-field @@ -32985,7 +33007,6 @@ CoilSystem:IntegratedHeatPump:AirSource, Coil:Cooling:DX:SingleSpeed:ThermalStorage, \memo Direct expansion (DX) cooling coil and condensing unit (includes electric compressor \memo and condenser fan), single-speed with packaged integrated thermal storage for cooling. - \memo \min-fields 89 A1 , \field Name \required-field @@ -33040,7 +33061,6 @@ Coil:Cooling:DX:SingleSpeed:ThermalStorage, \units hr \note If one of the previous two fields is set to autocalculate, this determines the storage capacity \note as a function of Cooling Only Mode Rated Total Evaporator Cooling Capacity - \note A7 , \field Storage Tank Ambient Temperature Node Name \type node \required-field @@ -34153,14 +34173,14 @@ EvaporativeCooler:Direct:ResearchSpecial, \units W/(m3/s) \ip-units W/(gal/min) \default 90.0 - \note This field is used when the previous field is set to autosize. The pump power is scaled with Secondary Air + \note This field is used when the previous field is set to autosize. The pump power is scaled with Primary Air \note Design Air Flow Rate. This value was backed out from inputs in energy plus example files. Average Pump Power \note sizing factor was estimated from pump power and primary air design flow rates inputs from energyplus example \note files is about 90.0 [W/(m3/s)] (=90.0 ~ Pump Power / Primary Air Design Flow Rate). The factor ranges from \note 55.0 to 150.0 [W/(m3/s)]. The pump power can be sized to zero by setting this factor to zero. A4 , \field Water Pump Power Modifier Curve Name \note this curve modifies the pump power in the previous field by multiplying the design power by the result of this curve. - \note x = ff = flow fraction on the primary air. The flow fraction is the secondary air flow rate during current operation divided + \note x = ff = flow fraction on the primary air. The flow fraction is the primary air flow rate during current operation divided \note by Primary Air Design Flow Rate \type object-list \object-list UnivariateFunctions @@ -37647,7 +37667,7 @@ AirConditioner:VariableRefrigerantFlow:FluidTemperatureControl, \note OnDemand to defrost only when necessary A10, \field Defrost Energy Input Ratio Modifier Function of Temperature Curve Name \type object-list - \object-list UnivariateFunctions + \object-list BivariateFunctions \note A valid performance curve must be used if ReverseCycle defrost strategy is selected N27, \field Defrost Time Period Fraction \type real @@ -37961,7 +37981,7 @@ AirConditioner:VariableRefrigerantFlow:FluidTemperatureControl:HR, \note OnDemand to defrost only when necessary A10, \field Defrost Energy Input Ratio Modifier Function of Temperature Curve Name \type object-list - \object-list UnivariateFunctions + \object-list BivariateFunctions \note A valid performance curve must be used if ReverseCycle defrost strategy is selected N34, \field Defrost Time Period Fraction \type real @@ -38027,7 +38047,7 @@ AirConditioner:VariableRefrigerantFlow:FluidTemperatureControl:HR, \note the steady-state value according to the inputs for \note Heat Recovery Heating Capacity Modifier and Heat Recovery \note Heating Capacity Time Constant - N43, \field Heat Recovery Heating Capacity Time Constant + N42, \field Heat Recovery Heating Capacity Time Constant \type real \units hr \default 0 @@ -38733,6 +38753,7 @@ Connector:Splitter, \memo within a single Splitter list. A1, \field Name \required-field + \reference PlantConnectors A2, \field Inlet Branch Name \required-field \type object-list @@ -38750,6 +38771,7 @@ Connector:Mixer, \memo a single mixer list. A1 , \field Name \required-field + \reference PlantConnectors A2 , \field Outlet Branch Name \required-field \type object-list @@ -38777,6 +38799,8 @@ ConnectorList, \begin-extensible A3; \field Connector 1 Name \required-field + \type object-list + \object-list PlantConnectors NodeList, \min-fields 2 @@ -39452,12 +39476,17 @@ Pump:VariableSpeed, \note units W/((m3/s)-Pa) \note ip-units W/((gal/min)-ftH20) \minimum> 0 - N15; \field Design Minimum Flow Rate Fraction + N15, \field Design Minimum Flow Rate Fraction \type real \note Used to size Design Minimum Flow Rate \default 0.0 \minimum 0 \maximum 1.0 + A15; \field End-Use Subcategory + \note Any text may be used here to categorize the end-uses in the ABUPS End Uses by Subcategory table. + \type alpha + \retaincase + \default General Pump:ConstantSpeed, \memo This pump model is described in the ASHRAE secondary HVAC toolkit. @@ -39555,13 +39584,18 @@ Pump:ConstantSpeed, \units W/(m3/s) \ip-units W/(gal/min) \minimum> 0 - N10; \field Design Shaft Power per Unit Flow Rate per Unit Head + N10, \field Design Shaft Power per Unit Flow Rate per Unit Head \type real \note Used to size Design Power Consumption from design flow rate for head and motor efficiency \default 1.282051282 \note units W/((m3/s)-Pa) \note ip-units W/((gal/min)-ftH20) \minimum> 0 + A9; \field End-Use Subcategory + \note Any text may be used here to categorize the end-uses in the ABUPS End Uses by Subcategory table. + \type alpha + \retaincase + \default General Pump:VariableSpeed:Condensate, \memo This pump model is described in the ASHRAE secondary HVAC toolkit. @@ -39645,13 +39679,18 @@ Pump:VariableSpeed:Condensate, \units W/(m3/s) \ip-units W/(gal/min) \minimum> 0 - N12; \field Design Shaft Power per Unit Flow Rate per Unit Head + N12, \field Design Shaft Power per Unit Flow Rate per Unit Head \type real \note Used to size Design Power Consumption from design flow rate for head and motor efficiency \default 1.282051282 \note units W/((m3/s)-Pa) \note ip-units W/((gal/min)-ftH20) \minimum> 0 + A7; \field End-Use Subcategory + \note Any text may be used here to categorize the end-uses in the ABUPS End Uses by Subcategory table. + \type alpha + \retaincase + \default General HeaderedPumps:ConstantSpeed, \memo This Headered pump object describes a pump bank with more than 1 pump in parallel @@ -39740,13 +39779,18 @@ HeaderedPumps:ConstantSpeed, \units W/(m3/s) \ip-units W/(gal/min) \minimum> 0 - N9; \field Design Shaft Power per Unit Flow Rate per Unit Head + N9, \field Design Shaft Power per Unit Flow Rate per Unit Head \type real \note Used to size Design Power Consumption from design flow rate for head and motor efficiency \default 1.282051282 \note units W/((m3/s)-Pa) \note ip-units W/((gal/min)-ftH20) \minimum> 0 + A9; \field End-Use Subcategory + \note Any text may be used here to categorize the end-uses in the ABUPS End Uses by Subcategory table. + \type alpha + \retaincase + \default General HeaderedPumps:VariableSpeed, \memo This Headered pump object describes a pump bank with more than 1 pump in parallel @@ -39848,13 +39892,18 @@ HeaderedPumps:VariableSpeed, \units W/(m3/s) \ip-units W/(gal/min) \minimum> 0 - N14; \field Design Shaft Power per Unit Flow Rate per Unit Head + N14, \field Design Shaft Power per Unit Flow Rate per Unit Head \type real \note Used to size Design Power Consumption from design flow rate for head and motor efficiency \default 1.282051282 \note units W/((m3/s)-Pa) \note ip-units W/((gal/min)-ftH20) \minimum> 0 + A9; \field End-Use Subcategory + \note Any text may be used here to categorize the end-uses in the ABUPS End Uses by Subcategory table. + \type alpha + \retaincase + \default General \group Plant-Condenser Flow Control @@ -40482,6 +40531,7 @@ Boiler:HotWater, \autosizable \ip-units gal/min \minimum 0.0 + \default autosize N4 , \field Minimum Part Load Ratio \type real \minimum 0.0 @@ -40519,6 +40569,7 @@ Boiler:HotWater, \type real \units W \minimum 0.0 + \default 0.0 N9, \field Sizing Factor \note Multiplies the autosized capacity and flow rates \type real @@ -42305,6 +42356,180 @@ ChillerHeater:Absorption:DoubleEffect, \minimum> 0.0 \default 1.0 +HeatPump:WaterToWater:EIR:Cooling, + \memo An EIR formulated water to water heat pump model, cooling operation. + \min-fields 15 + A1, \field Name + \type alpha + \reference WWHPCoolingNames + \required-field + \reference-class-name validPlantEquipmentTypes + \reference validPlantEquipmentNames + \reference-class-name validBranchEquipmentTypes + \reference validBranchEquipmentNames + A2, \field Load Side Inlet Node Name + \required-field + \type node + A3, \field Load Side Outlet Node Name + \required-field + \type node + A4, \field Source Side Inlet Node Name + \required-field + \type node + A5, \field Source Side Outlet Node Name + \required-field + \type node + A6, \field Companion Heat Pump Name + \note This field allows the user to specify a companion heating + \note object for this cooling object. The companion is used in + \note sizing the heat pump as well as to allow checks for unexpected + \note simultaneous operation of the two objects. + N1, \field Load Side Reference Flow Rate + \note This component is currently a constant-flow device, meaning it will always + \note try to request the full design flow from the central plant manager. + \type real + \minimum> 0.0 + \units m3/s + \ip-units gal/min + \autosizable + \default autosize + N2, \field Source Side Reference Flow Rate + \type real + \minimum> 0.0 + \units m3/s + \ip-units gal/min + \autosizable + \default autosize + N3, \field Reference Capacity + \type real + \minimum> 0.0 + \units W + \autosizable + \default autosize + N4, \field Reference Coefficient of Performance + \type real + \minimum> 0.0 + \default 7.5 + \units W/W + N5, \field Sizing Factor + \note Multiplies the autosized capacity and flow rates + \type real + \minimum> 0.0 + \default 1.0 + A7, \field Capacity Modifier Function of Temperature Curve Name + \note Cooling capacity modifier as a function of CW supply temp and entering condenser temp + \required-field + \type object-list + \object-list BivariateFunctions + \note curve = a + b*CWS + c*CWS**2 + d*ECT + e*ECT**2 + f*CWS*ECT + \note CWS = supply (leaving) chilled water temperature(C) + \note ECT = entering condenser fluid temperature(C) + A8, \field Electric Input to Output Ratio Modifier Function of Temperature Curve Name + \note Electric Input Ratio (EIR) modifier as a function of temperature + \note EIR = 1/COP + \required-field + \type object-list + \object-list BivariateFunctions + \note curve = a + b*CWS + c*CWS**2 + d*ECT + e*ECT**2 + f*CWS*ECT + \note CWS = supply (leaving) chilled water temperature(C) + \note ECT = entering condenser fluid temperature(C) + A9; \field Electric Input to Output Ratio Modifier Function of Part Load Ratio Curve Name + \note Electric Input Ratio (EIR) modifier as a function of Part Load Ratio (PLR) + \note EIR = 1/COP + \required-field + \type object-list + \object-list UniVariateFunctions + \note quadratic curve = a + b*PLR + c*PLR**2 is typical, other univariate curves may be used + \note PLR = part load ratio (cooling load/steady state capacity) + +HeatPump:WaterToWater:EIR:Heating, + \memo An EIR formulated water to water heat pump model, heating operation + \min-fields 15 + A1, \field Name + \type alpha + \reference WWHPHeatingNames + \required-field + \reference-class-name validPlantEquipmentTypes + \reference validPlantEquipmentNames + \reference-class-name validBranchEquipmentTypes + \reference validBranchEquipmentNames + A2, \field Load Side Inlet Node Name + \required-field + \type node + A3, \field Load Side Outlet Node Name + \required-field + \type node + A4, \field Source Side Inlet Node Name + \required-field + \type node + A5, \field Source Side Outlet Node Name + \required-field + \type node + A6, \field Companion Heat Pump Name + \note This field allows the user to specify a companion cooling + \note object for this heating object. The companion is used in + \note sizing the heat pump as well as to allow checks for unexpected + \note simultaneous operation of the two objects. + \type object-list + \object-list WWHPCoolingNames + N1, \field Load Side Reference Flow Rate + \note This component is currently a constant-flow device, meaning it will always + \note try to request the full design flow from the central plant manager. + \type real + \minimum> 0.0 + \units m3/s + \ip-units gal/min + \autosizable + \default autosize + N2, \field Source Side Reference Flow Rate + \type real + \minimum> 0.0 + \units m3/s + \ip-units gal/min + \autosizable + \default autosize + N3, \field Reference Capacity + \type real + \minimum> 0.0 + \units W + \autosizable + \default autosize + N4, \field Reference Coefficient of Performance + \type real + \minimum> 0.0 + \default 7.5 + \units W/W + N5, \field Sizing Factor + \note Multiplies the autosized capacity and flow rates + \type real + \minimum> 0.0 + \default 1.0 + A7, \field Capacity Modifier Function of Temperature Curve Name + \note Heating capacity modifier as a function of CW supply temp and entering condenser temp + \required-field + \type object-list + \object-list BivariateFunctions + \note curve = a + b*CWS + c*CWS**2 + d*ECT + e*ECT**2 + f*CWS*ECT + \note CWS = supply (leaving) hot water temperature(C) + \note ECT = entering condenser fluid temperature(C) + A8, \field Electric Input to Output Ratio Modifier Function of Temperature Curve Name + \note Electric Input Ratio (EIR) modifier as a function of temperature + \note EIR = 1/COP + \required-field + \type object-list + \object-list BiVariateFunctions + \note curve = a + b*CWS + c*CWS**2 + d*ECT + e*ECT**2 + f*CWS*ECT + \note CWS = supply (leaving) hot water temperature(C) + \note ECT = entering condenser fluid temperature(C) + A9; \field Electric Input to Output Ratio Modifier Function of Part Load Ratio Curve Name + \note Electric Input Ratio (EIR) modifier as a function of Part Load Ratio (PLR) + \note EIR = 1/COP + \required-field + \type object-list + \object-list UnivariateFunctions + \note quadratic curve = a + b*PLR + c*PLR**2 is typical, other univariate curves may be used + \note PLR = part load ratio (hot load/steady state capacity) + HeatPump:WaterToWater:EquationFit:Heating, \memo simple water-water hp curve-fit model \min-fields 19 @@ -47598,7 +47823,6 @@ PlantEquipmentList, \memo should be OFF (not operate) within the specified lower/upper limit. \extensible:2 \min-fields 1 - \max-fields 21 A1 , \field Name \required-field \reference PlantAndCondenserEquipmentLists @@ -48417,6 +48641,8 @@ EnergyManagementSystem:ProgramCallingManager, \type choice \key BeginNewEnvironment \key AfterNewEnvironmentWarmUpIsComplete + \key BeginZoneTimestepBeforeInitHeatBalance + \key BeginZoneTimestepAfterInitHeatBalance \key BeginTimestepBeforePredictor \key AfterPredictorBeforeHVACManagers \key AfterPredictorAfterHVACManagers @@ -55309,34 +55535,6 @@ FaultModel:EnthalpySensorOffset:OutdoorAir, \default 0.0 \units J/kg -FaultModel:PressureSensorOffset:OutdoorAir, - \memo This object describes outdoor air pressure sensor offset - \min-fields 6 - A1, \field Name - \note Enter the name of the fault - \required-field - \type alpha - A2, \field Availability Schedule Name - \type object-list - \object-list ScheduleNames - A3, \field Severity Schedule Name - \type object-list - \object-list ScheduleNames - A4, \field Controller Object Type - \required-field - \type choice - \key Controller:OutdoorAir - A5, \field Controller Object Name - \required-field - \type object-list - \object-list OAControllerNames - N1; \field Pressure Sensor Offset - \type real - \minimum> -10000 - \maximum< 10000 - \default 0.0 - \units Pa - FaultModel:TemperatureSensorOffset:ReturnAir, \memo This object describes return air temperature sensor offset \min-fields 6 @@ -55842,21 +56040,94 @@ HybridModel:Zone, \type object-list \object-list ZoneNames A3 , \field Calculate Zone Internal Thermal Mass - \note Use measured temperature data to calculate zone temperature capacity multiplier - \note Zone Air Infiltration Rate and Zone Internal Thermal Mass calculations cannot be performed simultaneously + \note Use measured zone air temperature to calculate zone internal thermal mass. + \note If set to Yes, the measured zone air temperature should be provided to calculate the thermal mass. + \note If set to No, the inverse calculation of thermal mass will not be activated. \type choice \key No \key Yes \default No A4 , \field Calculate Zone Air Infiltration Rate - \note Use measured temperature data to calculate zone air infiltration air flow rate - \note Zone Air Infiltration Rate and Zone Internal Thermal Mass calculations cannot be performed simultaneously + \note Use measured temperature data (temperature, humidity ratio, or CO2 concentration) to calculate zone air infiltration air flow rate. + \note Only one of field Calculate Zone Internal Thermal Mass, Calculate Zone Air Infiltration Rate, and Calculate Zone People Count can be set to YES at a time. + \note By default, this field is set to NO. When set to NO, the inverse calculation of the zone air infiltration rate will not be activated. + \note If this field is set to YES, one of the following fields (combinations) should be provided: + \note 1. Measurements were conducted when HVAC is free-floating: + \note 1.1 Zone Measured Air Temperature Schedule Name + \note 1.2 Zone Measured Air Humidity Ratio Schedule Name + \note 1.3 Zone Measured Air CO2 Concentration Schedule Name + \note 2. Measurements were conducted when HVAC is on: + \note 2.1 Zone Measured Air Temperature Schedule Name, Zone Input Supply Air Temperature Schedule Name, and Zone Input Supply Air Mass Flow Rate Schedule Name + \note 2.2 Zone Measured Air Humidity Ratio Schedule Name, Zone Input Supply Air Temperature Schedule Name, Zone Input Supply Air Mass Flow Rate Schedule Name, and Zone Input Supply Air Humidity Ratio Schedule Name + \note 2.3 Zone Measured Air CO2 Concentration Schedule Name, Zone Input Supply Air Mass Flow Rate Schedule Name, and Zone Input Supply Air CO2 Concentration Schedule Name \type choice \key No \key Yes \default No - A5 , \field Zone Measured Air Temperature Schedule Name - \required-field + A5 , \field Calculate Zone People Count + \note Use measured humidity ratio data (temperature, humidity ratio, or CO2 concentration) to calculate zone people count. + \note Only one of field Calculate Zone Internal Thermal Mass, Calculate Zone Air Infiltration Rate, and Calculate Zone People Count can be set to YES at a time. + \note By default, this field is set to NO. When set to NO, the inverse calculation of the zone people count will not be activated. + \note If this field is set to YES, one of the following fields (combinations) should be provided: + \note 1. Measurements were conducted when HVAC is free-floating: + \note 1.1 Zone Measured Air Temperature Schedule Name + \note 1.2 Zone Measured Air Humidity Ratio Schedule Name + \note 1.3 Zone Measured Air CO2 Concentration Schedule Name + \note 2. Measurements were conducted when HVAC is on: + \note 2.1 Zone Measured Air Temperature Schedule Name, Zone Input Supply Air Temperature Schedule Name, and Zone Input Supply Air Mass Flow Rate Schedule Name + \note 2.2 Zone Measured Air Humidity Ratio Schedule Name, Zone Input Supply Air Temperature Schedule Name, Zone Input Supply Air Mass Flow Rate Schedule Name, and Zone Input Supply Air Humidity Ratio Schedule Name + \note 2.3 Zone Measured Air CO2 Concentration Schedule Name, Zone Input Supply Air Mass Flow Rate Schedule Name, and Zone Input Supply Air CO2 Concentration Schedule Name + \note Field Zone Input People Activity Schedule Name, Zone Input People Sensible Heat Fraction Schedule Name, Zone Input People Radiant Heat Fraction Schedule Name, Zone Input People CO2 Generation Rate Schedule Name are optional. + \note If provided, the default people activity level (130W), sensible heat generation rate (78W), latent heat generation (52W) rate, and CO2 generation rate (0.0000000382 [m3/(s*W)]) will be overwritten correspondingly. + \type choice + \key No + \key Yes + \default No + A6 , \field Zone Measured Air Temperature Schedule Name + \type object-list + \object-list ScheduleNames + \note from Schedule:File + A7 , \field Zone Measured Air Humidity Ratio Schedule Name + \type object-list + \object-list ScheduleNames + \note from Schedule:File + A8 , \field Zone Measured Air CO2 Concentration Schedule Name + \type object-list + \object-list ScheduleNames + \note from Schedule:File + A9 , \field Zone Input People Activity Schedule Name + \note When this field is provided and valid, the default people activity level (used to calculate people count) will be overwritten. + \type object-list + \object-list ScheduleNames + \note from Schedule:File + A10 , \field Zone Input People Sensible Heat Fraction Schedule Name + \note When this field is provided and valid, the default sensible heat fraction from people (used to calculate people count) will be overwritten. + \type object-list + \object-list ScheduleNames + \note from Schedule:File + A11 , \field Zone Input People Radiant Heat Fraction Schedule Name + \note When this field is provided and valid, the default radiant heat portion of the sensible heat from people (used to calculate people count) will be overwritten. + \type object-list + \object-list ScheduleNames + \note from Schedule:File + A12 , \field Zone Input People CO2 Generation Rate Schedule Name + \note When this field is provided and valid, the default people CO2 generation rate (used to calculate people count) will be overwritten. + \type object-list + \object-list ScheduleNames + \note from Schedule:File + A13 , \field Zone Input Supply Air Temperature Schedule Name + \type object-list + \object-list ScheduleNames + \note from Schedule:File + A14 , \field Zone Input Supply Air Mass Flow Rate Schedule Name + \type object-list + \object-list ScheduleNames + \note from Schedule:File + A15 , \field Zone Input Supply Air Humidity Ratio Schedule Name + \type object-list + \object-list ScheduleNames + \note from Schedule:File + A16 , \field Zone Input Supply Air CO2 Concentration Schedule Name \type object-list \object-list ScheduleNames \note from Schedule:File @@ -55930,6 +56201,7 @@ Curve:Linear, \key Dimensionless \key Capacity \key Power + \key Temperature \default Dimensionless Curve:QuadLinear, @@ -56087,6 +56359,7 @@ Curve:Quadratic, \key Dimensionless \key Capacity \key Power + \key Temperature \default Dimensionless Curve:Cubic, @@ -56141,6 +56414,7 @@ Curve:Cubic, \key Dimensionless \key Capacity \key Power + \key Temperature \default Dimensionless Curve:Quartic, @@ -56199,6 +56473,7 @@ Curve:Quartic, \key Dimensionless \key Capacity \key Power + \key Temperature \default Dimensionless Curve:Exponent, @@ -56254,6 +56529,7 @@ Curve:Exponent, \key Dimensionless \key Capacity \key Power + \key Temperature \default Dimensionless Curve:Bicubic, @@ -56344,6 +56620,7 @@ Curve:Bicubic, \key Dimensionless \key Capacity \key Power + \key Temperature \default Dimensionless Curve:Biquadratic, @@ -56421,6 +56698,7 @@ Curve:Biquadratic, \key Dimensionless \key Capacity \key Power + \key Temperature \default Dimensionless Curve:QuadraticLinear, @@ -56498,6 +56776,7 @@ Curve:QuadraticLinear, \key Dimensionless \key Capacity \key Power + \key Temperature \default Dimensionless Curve:CubicLinear, @@ -56695,6 +56974,7 @@ Curve:Triquadratic, \key Dimensionless \key Capacity \key Power + \key Temperature \default Dimensionless Curve:Functional:PressureDrop, @@ -57241,6 +57521,7 @@ Table:OneIndependentVariable, \key Dimensionless \key Capacity \key Power + \key Temperature \default Dimensionless N5 , \field Normalization Reference \type real @@ -57326,6 +57607,7 @@ Table:TwoIndependentVariables, \key Dimensionless \key Capacity \key Power + \key Temperature \default Dimensionless N7 , \field Normalization Reference \type real @@ -57505,6 +57787,7 @@ Table:MultiVariableLookup, \key Dimensionless \key Capacity \key Power + \key Temperature \default Dimensionless N15, \field Number of Independent Variables \type integer @@ -57535,6 +57818,7 @@ FluidProperties:GlycolConcentration, \memo glycol and what concentration it is A1, \field Name \required-field + \reference FluidAndGlycolNames A2, \field Glycol Type \required-field \type choice @@ -58976,6 +59260,8 @@ Output:Table:SummaryReports, \key AirLoopSystemComponentLoadsMonthly \key AirLoopSystemComponentEnergyUseMonthly \key MechanicalVentilationLoadsMonthly + \key HeatEmissionsSummary + \key HeatEmissionsReportMonthly Output:Table:TimeBins, \memo Produces a bin report in the table output file which shows the amount of time in hours @@ -59460,6 +59746,30 @@ Meter:CustomDecrement, \begin-extensible A5; \field Output Variable or Meter Name 1 +Output:JSON, + \memo Output from EnergyPlus can be written to JSON format files. + \unique-object + A1 , \field Option Type + \required-field + \type choice + \key TimeSeries + \key TimeSeriesAndTabular + A2 , \field Output JSON + \type choice + \key Yes + \key No + \default Yes + A3 , \field Output CBOR + \type choice + \key Yes + \key No + \default No + A4 ; \field Output MessagePack + \type choice + \key Yes + \key No + \default No + Output:SQLite, \memo Output from EnergyPlus can be written to an SQLite format file. \unique-object diff --git a/openstudiocore/resources/energyplus/RefLargeOffice/RefBldgLargeOfficeNew2004_Chicago.idf b/openstudiocore/resources/energyplus/RefLargeOffice/RefBldgLargeOfficeNew2004_Chicago.idf index c427734ddb0..1f90755a33c 100644 --- a/openstudiocore/resources/energyplus/RefLargeOffice/RefBldgLargeOfficeNew2004_Chicago.idf +++ b/openstudiocore/resources/energyplus/RefLargeOffice/RefBldgLargeOfficeNew2004_Chicago.idf @@ -68,7 +68,7 @@ ! ***GENERAL SIMULATION PARAMETERS*** ! Number of Zones: 19 - Version,9.0; + Version,9.1; SimulationControl, YES, !- Do Zone Sizing Calculation @@ -101,7 +101,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual ! ***HOLIDAYS & DAYLIGHT SAVINGS*** @@ -5255,7 +5255,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Basement VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Core_bottom Equipment, !- Name @@ -5263,7 +5265,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Core_bottom VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Core_mid Equipment, !- Name @@ -5271,7 +5275,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Core_mid VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Core_top Equipment, !- Name @@ -5279,7 +5285,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Core_top VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_bot_ZN_1 Equipment, !- Name @@ -5287,7 +5295,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Perimeter_bot_ZN_1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_bot_ZN_2 Equipment, !- Name @@ -5295,7 +5305,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Perimeter_bot_ZN_2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_bot_ZN_3 Equipment, !- Name @@ -5303,7 +5315,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Perimeter_bot_ZN_3 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_bot_ZN_4 Equipment, !- Name @@ -5311,7 +5325,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Perimeter_bot_ZN_4 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_mid_ZN_1 Equipment, !- Name @@ -5319,7 +5335,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Perimeter_mid_ZN_1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_mid_ZN_2 Equipment, !- Name @@ -5327,7 +5345,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Perimeter_mid_ZN_2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_mid_ZN_3 Equipment, !- Name @@ -5335,7 +5355,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Perimeter_mid_ZN_3 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_mid_ZN_4 Equipment, !- Name @@ -5343,7 +5365,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Perimeter_mid_ZN_4 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_top_ZN_1 Equipment, !- Name @@ -5351,7 +5375,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Perimeter_top_ZN_1 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_top_ZN_2 Equipment, !- Name @@ -5359,7 +5385,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Perimeter_top_ZN_2 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_top_ZN_3 Equipment, !- Name @@ -5367,7 +5395,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Perimeter_top_ZN_3 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Perimeter_top_ZN_4 Equipment, !- Name @@ -5375,7 +5405,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type Perimeter_top_ZN_4 VAV Box, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ! ***SIZING & CONTROLS*** diff --git a/openstudiocore/resources/energyplus/SimpleSurfaces/4ZoneWithShading_Simple_2.idf b/openstudiocore/resources/energyplus/SimpleSurfaces/4ZoneWithShading_Simple_2.idf index 4a64c0df31c..271c9c79c6d 100644 --- a/openstudiocore/resources/energyplus/SimpleSurfaces/4ZoneWithShading_Simple_2.idf +++ b/openstudiocore/resources/energyplus/SimpleSurfaces/4ZoneWithShading_Simple_2.idf @@ -81,7 +81,7 @@ ! Environmental Emissions: None ! Utility Tariffs: None - Version,9.0; + Version,9.1; Timestep,4; @@ -196,7 +196,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual ! No location information present in original BLAST file @@ -1005,7 +1005,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZONE 1 Ideal Loads, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZONE 1 Ideal Loads, !- Name @@ -1066,7 +1068,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZONE 2 Ideal Loads, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZONE 2 Ideal Loads, !- Name @@ -1127,7 +1131,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZONE 3 Ideal Loads, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZONE 3 Ideal Loads, !- Name @@ -1188,7 +1194,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZONE 4 Ideal Loads, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZONE 4 Ideal Loads, !- Name diff --git a/openstudiocore/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Reference.idf b/openstudiocore/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Reference.idf index 6b655f0e4c8..4f5a85943a6 100644 --- a/openstudiocore/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Reference.idf +++ b/openstudiocore/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Reference.idf @@ -1,7 +1,7 @@ ! Basecase reference for SimpleSurfaces_Test !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -42,7 +42,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: LOCATION =========== diff --git a/openstudiocore/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Relative.idf b/openstudiocore/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Relative.idf index 2cd5058f3fa..8442a39d01f 100644 --- a/openstudiocore/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Relative.idf +++ b/openstudiocore/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Relative.idf @@ -1,7 +1,7 @@ ! File to test the import of simple surfaces !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -42,7 +42,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: LOCATION =========== diff --git a/openstudiocore/resources/energyplus/TranslatorV2_Tests/Simple_Construction.idf b/openstudiocore/resources/energyplus/TranslatorV2_Tests/Simple_Construction.idf index 411d6178f9c..0b696ba37d9 100644 --- a/openstudiocore/resources/energyplus/TranslatorV2_Tests/Simple_Construction.idf +++ b/openstudiocore/resources/energyplus/TranslatorV2_Tests/Simple_Construction.idf @@ -15,10 +15,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + Material, Metal Roofing, !- Name MediumSmooth, !- Roughness diff --git a/openstudiocore/resources/energyplus/ZoneBoundaryCondition/Bug_486_zone_bdr_test.idf b/openstudiocore/resources/energyplus/ZoneBoundaryCondition/Bug_486_zone_bdr_test.idf index 02c12ca31a0..f076bb63ba5 100644 --- a/openstudiocore/resources/energyplus/ZoneBoundaryCondition/Bug_486_zone_bdr_test.idf +++ b/openstudiocore/resources/energyplus/ZoneBoundaryCondition/Bug_486_zone_bdr_test.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== diff --git a/openstudiocore/resources/model/OpenStudio.idd b/openstudiocore/resources/model/OpenStudio.idd index 3ce95937211..6b0610aa8e3 100644 --- a/openstudiocore/resources/model/OpenStudio.idd +++ b/openstudiocore/resources/model/OpenStudio.idd @@ -1319,6 +1319,7 @@ OS:SizingPeriod:DesignDay, \key ZhangHuang \key Schedule \key ASHRAETau + \key ASHRAETau2017 A9, \field Beam Solar Day Schedule Name \note if Solar Model Indicator = Schedule, then beam schedule name (for day) \type object-list @@ -1328,16 +1329,16 @@ OS:SizingPeriod:DesignDay, \type object-list \object-list DayScheduleNames N13, \field ASHRAE Taub - \note Required if Solar Model Indicator = ASHRAETau - \type real \units dimensionless + \note Required if Solar Model Indicator = ASHRAETau or ASHRAETau2017 + \note ASHRAETau2017 solar model can be used with 2013 and 2017 HOF matching taub \minimum 0 - \maximum 1 + \maximum 1.2 \default 0 N14, \field ASHRAE Taud - \note Required if Solar Model Indicator = ASHRAETau - \type real \units dimensionless + \note required if solar model indicator = ashraetau or ashraetau2017 + \note ashraetau2017 solar model can be used with 2013 and 2017 hof matching taud \minimum 0 \maximum 3 \default 0 @@ -2024,7 +2025,7 @@ OS:BuildingUnit, \default Residential OS:DefaultConstructionSet, - \min-fields 11 + \min-fields 12 A1, \field Handle \type handle \required-field @@ -2056,7 +2057,10 @@ OS:DefaultConstructionSet, A10, \field Building Shading Construction Name \type object-list \object-list ConstructionNames - A11; \field Site Shading Construction Name + A11, \field Site Shading Construction Name + \type object-list + \object-list ConstructionNames + A12; \field Adiabatic Surface Construction Name \type object-list \object-list ConstructionNames @@ -4046,7 +4050,7 @@ OS:ElectricEquipment:ITE:AirCooled:Definition, \type real \units W \ip-units W - \minimum 0 + \minimum 0 N2 , \field Watts per Zone Floor Area \type real \units W/m2 @@ -4059,7 +4063,7 @@ OS:ElectricEquipment:ITE:AirCooled:Definition, \note Design Entering Air Temperature). \note A default curve named “Data Center Servers Power fLoadTemp†is assigned. \type object-list - \required-field + \required-field \object-list BicubicBiquadraticCurves \object-list BiVariateTables N3 , \field Design Fan Power Input Fraction @@ -4180,7 +4184,7 @@ OS:ElectricEquipment:ITE:AirCooled:Definition, \type object-list \object-list ScheduleNames N10, \field Return Temperature Difference - \note The difference of the AHU return air temperature from IT outlet temperature. + \note The difference of the the actual AHU return air temperature to the IT equipment outlet temperature. \note Either Return Temperature Difference or Return Temperature Difference Schedule is required if Air Flow Calculation Method is set to FlowControlWithApproachTemperatures. \note This field is ignored when Air Flow Calculation Method is FlowFromSystem. \type real @@ -4188,7 +4192,7 @@ OS:ElectricEquipment:ITE:AirCooled:Definition, \ip-units F \default 2.0 A13; \field Return Temperature Difference Schedule - \note The difference schedule of the AHU return air temperature from IT outlet temperature. + \note The difference schedule of the actual AHU return air temperature to the IT equipment outlet temperature. \note Either Return Temperature Difference or Return Temperature Difference Schedule is required if Air Flow Calculation Method is set to FlowControlWithApproachTemperatures. \note This field is ignored when Air Flow Calculation Method is FlowFromSystem. \type object-list @@ -6692,7 +6696,7 @@ OS:ElectricEquipment:ITE:AirCooled, \type alpha \retaincase \default ITE-UPS - + OS:GasEquipment, \min-fields 1 A1, \field Handle @@ -17429,6 +17433,7 @@ OS:Connector:Mixer, \type alpha \required-field \reference ConnectionObject + \reference PlantConnectors A3, \field Outlet Branch Name \type object-list \required-field @@ -17451,6 +17456,7 @@ OS:Connector:Splitter, \type alpha \required-field \reference ConnectionObject + \reference PlantConnectors A3, \field Inlet Branch Name \type object-list \required-field @@ -18909,6 +18915,7 @@ OS:Table:MultiVariableLookup, \key Dimensionless \key Capacity \key Power + \key Temperature \default Dimensionless N15, \field Number of Independent Variables \type integer @@ -19190,6 +19197,9 @@ OS:EvaporativeCooler:Indirect:ResearchSpecial, \autosizable OS:EvaporativeCooler:Direct:ResearchSpecial, + \memo Direct evaporative cooler with user-specified effectiveness (can represent rigid pad + \memo or similar media), and recirculating water pump, and secondary air fan. This model is + \memo controlled to meet the primary air outlet temperature setpoint. \min-fields 1 A1, \field Handle \type handle @@ -19202,7 +19212,7 @@ OS:EvaporativeCooler:Direct:ResearchSpecial, \type object-list \required-field \object-list ScheduleNames - N1, \field Cooler Effectiveness + N1, \field Cooler Design Effectiveness \note effectiveness with respect to wetbulb depression \type real \required-field @@ -19262,15 +19272,20 @@ OS:EvaporativeCooler:Direct:ResearchSpecial, \note Table:OneIndependentVariable N6, \field Water Pump Power Sizing Factor \type real - \required-field \units W/(m3/s) + \ip-units W/(gal/min) + \default 90.0 \note this field is used when the previous field is set to autosize. The pump power is scaled with Primary Air Design Air Flow Rate + \note This value was backed out from inputs in energy plus example files. Average Pump Power + \note sizing factor was estimated from pump power and primary air design flow rates inputs from energyplus example + \note files is about 90.0 [W/(m3/s)] (=90.0 ~ Pump Power / Primary Air Design Flow Rate). The factor ranges from + \note 55.0 to 150.0 [W/(m3/s)]. The pump power can be sized to zero by setting this factor to zero. A8, \field Water Pump Power Modifier Curve Name \note this curve modifies the pump power in the previous field by multiplying the design power by the result of this curve. - \note x = ff = flow fraction on the primary air. The flow fraction is the secondary air flow rate during current operation divided + \note x = ff = flow fraction on the primary air. The flow fraction is the primary air flow rate during current operation divided \note by Primary Air Design Flow Rate \type object-list - \object-list AllCurves + \object-list UniVariateCurves \note Any curve or table with one independent variable can be used: \note Curve:Linear, Curve:Quadratic, Curve:Cubic, Curve:Quartic, Curve:Exponent, \note Curve:ExponentialSkewNormal, Curve:Sigmoid, Curve:RectuangularHyperbola1, @@ -19914,7 +19929,6 @@ OS:Fan:ZoneExhaust, \object-list ScheduleNames A10; \field Balanced Exhaust Fraction Schedule Name \note Used to control fan's impact on flow at the return air node. Enter the portion of the exhaust that is balanced by simple airflows. - \note \type object-list \object-list ScheduleNames @@ -20794,13 +20808,18 @@ OS:Pump:ConstantSpeed, \units W/(m3/s) \ip-units W/(gal/min) \minimum> 0 - N10; \field Design Shaft Power per Unit Flow Rate per Unit Head + N10, \field Design Shaft Power per Unit Flow Rate per Unit Head \required-field \type real \note Used to size Design Power Consumption from design flow rate for head and motor efficiency \units W-s/m3-Pa \ip-units W-min/gal-ftH2O \minimum> 0 + A10; \field End-Use Subcategory + \note Any text may be used here to categorize the end-uses in the ABUPS End Uses by Subcategory table. + \type alpha + \retaincase + \default General OS:Pump:VariableSpeed, \memo This pump model is described in the ASHRAE secondary HVAC toolkit. @@ -20928,30 +20947,35 @@ OS:Pump:VariableSpeed, \minimum 0.0 \maximum 1.0 A15, \field Design Power Sizing Method - \required-field + \required-field \type choice \key PowerPerFlow \key PowerPerFlowPerPressure N13, \field Design Electric Power per Unit Flow Rate - \required-field + \required-field \type real \note Used to size Design Power Consumption from design flow rate \units W/(m3/s) \ip-units W/(gal/min) \minimum> 0 N14, \field Design Shaft Power per Unit Flow Rate per Unit Head - \required-field + \required-field \type real \note Used to size Design Power Consumption from design flow rate for head and motor efficiency \units W-s/m3-Pa \ip-units W-min/gal-ftH2O \minimum> 0 - N15; \field Design Minimum Flow Rate Fraction - \required-field + N15, \field Design Minimum Flow Rate Fraction + \required-field \type real \note Used to size Design Minimum Flow Rate \minimum 0 \maximum 1.0 + A16; \field End-Use Subcategory + \note Any text may be used here to categorize the end-uses in the ABUPS End Uses by Subcategory table. + \type alpha + \retaincase + \default General OS:HeaderedPumps:ConstantSpeed, \memo This Headered pump object describes a pump bank with more than 1 pump in parallel @@ -21041,12 +21065,17 @@ OS:HeaderedPumps:ConstantSpeed, \units W/(m3/s) \ip-units W/(gal/min) \minimum> 0 - N9; \field Design Shaft Power per Unit Flow Rate per Unit Head + N9, \field Design Shaft Power per Unit Flow Rate per Unit Head \type real \required-field \units W-s/m3-Pa \ip-units W-min/gal-ftH2O \minimum> 0 + A10; \field End-Use Subcategory + \note Any text may be used here to categorize the end-uses in the ABUPS End Uses by Subcategory table. + \type alpha + \retaincase + \default General OS:HeaderedPumps:VariableSpeed, \memo This Headered pump object describes a pump bank with more than 1 pump in parallel @@ -21148,12 +21177,17 @@ OS:HeaderedPumps:VariableSpeed, \units W/(m3/s) \ip-units W/(gal/min) \minimum> 0 - N14; \field Design Shaft Power per Unit Flow Rate per Unit Head + N14, \field Design Shaft Power per Unit Flow Rate per Unit Head \required-field \type real \units W-s/m3-Pa \ip-units W-min/gal-ftH2O \minimum> 0 + A10; \field End-Use Subcategory + \note Any text may be used here to categorize the end-uses in the ABUPS End Uses by Subcategory table. + \type alpha + \retaincase + \default General OS:TemperingValve, \memo Temperature-controlled diversion valve used to divert flow around one or more plant @@ -22689,7 +22723,7 @@ OS:ZoneControl:Thermostat:StagedDualSetpoint, OS:ZoneHVAC:EquipmentList, \min-fields 1 - \extensible:3 Duplicate the three fields Zone Equipment Object Type through Heating Priority + \extensible:5 Duplicate the five fields Zone Equipment Object Type through Sequential Heating Fraction \memo List equipment in simulation order. Note that an ZoneHVAC:AirDistributionUnit or \memo AirTerminal:SingleDuct:Uncontrolled object must be listed in this statement if there is a forced \memo air system serving the zone from the air loop. @@ -22726,15 +22760,30 @@ OS:ZoneHVAC:EquipmentList, N1 , \field Zone Equipment 1 Cooling Sequence \required-field \type integer - \minimum 1 + \minimum 0 \note Specifies the zone equipment simulation order \note when the zone thermostat requests cooling - N2 ; \field Zone Equipment 1 Heating or No-Load Sequence + N2 , \field Zone Equipment 1 Heating or No-Load Sequence \required-field \type integer - \minimum 1 + \minimum 0 \note Specifies the zone equipment simulation order \note when the zone thermostat requests heating or no load + N3 , \field Zone Equipment 1 Sequential Cooling Fraction + \note The fraction of the remaining cooling load this equipment will attempt to serve + \note if the load distribution scheme is SequentialLoad, otherwise ignored. + \type real + \minimum 0.0 + \maximum 1.0 + \default 1.0 + N4 ; \field Zone Equipment 1 Sequential Heating Fraction + \note The fraction of the remaining heating load this equipment will attempt to serve + \note if the load distribution scheme is SequentialLoad, otherwise ignored. + \type real + \minimum 0.0 + \maximum 1.0 + \default 1.0 + OS:ZoneVentilation:DesignFlowRate, A1, \field Handle @@ -29481,6 +29530,8 @@ OS:EnergyManagementSystem:ProgramCallingManager, \type choice \key BeginNewEnvironment \key AfterNewEnvironmentWarmUpIsComplete + \key BeginZoneTimestepBeforeInitHeatBalance + \key BeginZoneTimestepAfterInitHeatBalance \key BeginTimestepBeforePredictor \key AfterPredictorBeforeHVACManagers \key AfterPredictorAfterHVACManagers diff --git a/openstudiocore/resources/resultsviewer/1ZoneEvapCooler/in.idf b/openstudiocore/resources/resultsviewer/1ZoneEvapCooler/in.idf index 9be0fbd3d44..c07ff293717 100644 --- a/openstudiocore/resources/resultsviewer/1ZoneEvapCooler/in.idf +++ b/openstudiocore/resources/resultsviewer/1ZoneEvapCooler/in.idf @@ -60,7 +60,7 @@ ! Floor Area: 232.25 m2 ! Number of Stories: 1 - Version,9.0; + Version,9.1; Timestep,6; @@ -101,7 +101,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual Site:Location, Denver Centennial CO USA WMO=724666, !- Name @@ -521,10 +521,14 @@ Main Zone Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 2, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:Baseboard:Convective:Electric, !- Zone Equipment 2 Object Type Main Zone Baseboard, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 1; !- Zone Equipment 2 Heating or No-Load Sequence + 1, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, Main Zone Direct Air, !- Name diff --git a/openstudiocore/resources/resultsviewer/1ZoneUncontrolled/in.idf b/openstudiocore/resources/resultsviewer/1ZoneUncontrolled/in.idf index 5ab6ebe728f..6610b8b3470 100644 --- a/openstudiocore/resources/resultsviewer/1ZoneUncontrolled/in.idf +++ b/openstudiocore/resources/resultsviewer/1ZoneUncontrolled/in.idf @@ -88,7 +88,7 @@ ! Environmental Emissions: None ! Utility Tariffs: None - Version,9.0; + Version,9.1; Timestep,4; @@ -129,7 +129,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual Site:Location, Denver Centennial Golden N_CO_USA Design_Conditions, !- Name diff --git a/openstudiocore/resources/resultsviewer/DaylightingDeviceShelf/in.idf b/openstudiocore/resources/resultsviewer/DaylightingDeviceShelf/in.idf index 435e67174f7..f9efdccf0c2 100644 --- a/openstudiocore/resources/resultsviewer/DaylightingDeviceShelf/in.idf +++ b/openstudiocore/resources/resultsviewer/DaylightingDeviceShelf/in.idf @@ -14,7 +14,7 @@ ! FCW, 6/17/04: changed height for daylighting illuminance maps from 0.0m to 0.8m to correspond ! to reference point height - Version,9.0; + Version,9.1; Building, Daylighting Shelf Example, !- Name @@ -124,7 +124,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual SimulationControl, NO, !- Do Zone Sizing Calculation diff --git a/openstudiocore/resources/resultsviewer/QkSvcRest/in.idf b/openstudiocore/resources/resultsviewer/QkSvcRest/in.idf index 54614c99a0a..8707ab3c492 100644 --- a/openstudiocore/resources/resultsviewer/QkSvcRest/in.idf +++ b/openstudiocore/resources/resultsviewer/QkSvcRest/in.idf @@ -69,7 +69,7 @@ ! ExtWallConstruction=Wood-Framed and Other ! End SimMetaData - Version,9.0; + Version,9.1; Timestep,6; @@ -94,7 +94,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual RunPeriod, SummerRunPeriod, !- Name @@ -110,7 +110,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual SurfaceConvectionAlgorithm:Inside,TARP; @@ -2095,10 +2095,14 @@ Dining Exhaust Fan, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 2 Object Type Dining Direct Air, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction Fan:ZoneExhaust, Dining Exhaust Fan, !- Name @@ -2492,10 +2496,14 @@ Kitchen Exhaust Fan, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 2 Object Type Kitchen Direct Air, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 2; !- Zone Equipment 2 Heating or No-Load Sequence + 2, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction Fan:ZoneExhaust, Kitchen Exhaust Fan, !- Name diff --git a/openstudiocore/resources/resultsviewer/SmallOffice/SmallOffice.idf b/openstudiocore/resources/resultsviewer/SmallOffice/SmallOffice.idf index 06be8b38bb5..2dfeba5b9e0 100644 --- a/openstudiocore/resources/resultsviewer/SmallOffice/SmallOffice.idf +++ b/openstudiocore/resources/resultsviewer/SmallOffice/SmallOffice.idf @@ -67,7 +67,7 @@ ! ExtWallConstruction=Mass ! End SimMetaData - Version,9.0; + Version,9.1; Timestep,6; @@ -92,7 +92,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual SurfaceConvectionAlgorithm:Inside,TARP; @@ -1789,7 +1789,9 @@ AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 1 Object Type Core_ZN Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, Core_ZN Direct Air, !- Name @@ -2271,7 +2273,9 @@ AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 1 Object Type Perimeter_ZN_1 Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, Perimeter_ZN_1 Direct Air, !- Name @@ -2653,7 +2657,9 @@ AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 1 Object Type Perimeter_ZN_2 Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, Perimeter_ZN_2 Direct Air, !- Name @@ -3065,7 +3071,9 @@ AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 1 Object Type Perimeter_ZN_3 Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, Perimeter_ZN_3 Direct Air, !- Name @@ -3447,7 +3455,9 @@ AirTerminal:SingleDuct:Uncontrolled, !- Zone Equipment 1 Object Type Perimeter_ZN_4 Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, Perimeter_ZN_4 Direct Air, !- Name diff --git a/openstudiocore/resources/resultsviewer/SolarCollectorFlatPlateWater/in.idf b/openstudiocore/resources/resultsviewer/SolarCollectorFlatPlateWater/in.idf index 15902178b0d..9c3f51f492b 100644 --- a/openstudiocore/resources/resultsviewer/SolarCollectorFlatPlateWater/in.idf +++ b/openstudiocore/resources/resultsviewer/SolarCollectorFlatPlateWater/in.idf @@ -21,7 +21,7 @@ ! 2 WATER HEATER:MIXED objects serve as storage tank and instantaneous water heater. ! 1 VALVE:TEMPERING object to temper the hot storage water. - Version,9.0; + Version,9.1; !***SIMULATION CONTROL*** @@ -76,7 +76,7 @@ NO, !- Apply Weekend Holiday Rule YES, !- Use Weather File Rain Indicators YES, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual RunPeriod, , !- Name @@ -92,7 +92,7 @@ NO, !- Apply Weekend Holiday Rule YES, !- Use Weather File Rain Indicators YES, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual ! CHICAGO_IL_USA Annual Heating 99%, MaxDB=-17.3°C diff --git a/openstudiocore/resources/sketchup_plugin/examples/GeometryTest.idf b/openstudiocore/resources/sketchup_plugin/examples/GeometryTest.idf index e89ac52beb5..7fef915cf5a 100644 --- a/openstudiocore/resources/sketchup_plugin/examples/GeometryTest.idf +++ b/openstudiocore/resources/sketchup_plugin/examples/GeometryTest.idf @@ -101,7 +101,7 @@ ! Environmental Emissions: None ! Utility Tariffs: None - Version,9.0; + Version,9.1; Timestep,4; @@ -142,7 +142,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual Site:Location, COLORADO_SPRGS_CO_USA_WMO_724660, !- Name @@ -2206,7 +2206,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type PSI FOYER PURCHASED AIR, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, PSI FOYER PURCHASED AIR, !- Name @@ -2281,7 +2283,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type DORM ROOMS AND COMMON AREAS PURCHASED AIR, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, DORM ROOMS AND COMMON AREAS PURCHASED AIR, !- Name @@ -2356,7 +2360,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type LEFT FORK PURCHASED AIR, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, LEFT FORK PURCHASED AIR, !- Name @@ -2431,7 +2437,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type MIDDLE FORK PURCHASED AIR, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, MIDDLE FORK PURCHASED AIR, !- Name @@ -2506,7 +2514,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type RIGHT FORK PURCHASED AIR,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, RIGHT FORK PURCHASED AIR,!- Name diff --git a/openstudiocore/resources/sketchup_plugin/examples/HShapeOffice.idf b/openstudiocore/resources/sketchup_plugin/examples/HShapeOffice.idf index 971e550450f..55da92d9b04 100644 --- a/openstudiocore/resources/sketchup_plugin/examples/HShapeOffice.idf +++ b/openstudiocore/resources/sketchup_plugin/examples/HShapeOffice.idf @@ -111,7 +111,7 @@ ! ZONE_TERMINAL_FAN_STATIC_PRESSURE=300 ! End WebInterface Parameters - Version,9.0; + Version,9.1; Timestep,1; @@ -136,7 +136,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual SurfaceConvectionAlgorithm:Inside,TARP; @@ -2586,7 +2586,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type ZN_1_FLR_1_SEC_1 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, ZN_1_FLR_1_SEC_1 VAV Box,!- Name @@ -3761,7 +3763,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type ZN_1_FLR_2_SEC_1 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, ZN_1_FLR_2_SEC_1 VAV Box,!- Name @@ -5116,7 +5120,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type ZN_1_FLR_3_SEC_1 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, ZN_1_FLR_3_SEC_1 VAV Box,!- Name @@ -5589,7 +5595,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type ZN_1_FLR_1_SEC_2 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, ZN_1_FLR_1_SEC_2 VAV Box,!- Name @@ -6062,7 +6070,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type ZN_1_FLR_2_SEC_2 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, ZN_1_FLR_2_SEC_2 VAV Box,!- Name @@ -6580,7 +6590,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type ZN_1_FLR_3_SEC_2 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, ZN_1_FLR_3_SEC_2 VAV Box,!- Name @@ -7755,7 +7767,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type ZN_1_FLR_1_SEC_3 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, ZN_1_FLR_1_SEC_3 VAV Box,!- Name @@ -8930,7 +8944,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type ZN_1_FLR_2_SEC_3 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, ZN_1_FLR_2_SEC_3 VAV Box,!- Name @@ -10285,7 +10301,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type ZN_1_FLR_3_SEC_3 VAV Box,!- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, ZN_1_FLR_3_SEC_3 VAV Box,!- Name diff --git a/openstudiocore/resources/sketchup_plugin/examples/HVACTemplate-5ZoneFanCoil.idf b/openstudiocore/resources/sketchup_plugin/examples/HVACTemplate-5ZoneFanCoil.idf index f508f0f488f..0a5cc9e7813 100644 --- a/openstudiocore/resources/sketchup_plugin/examples/HVACTemplate-5ZoneFanCoil.idf +++ b/openstudiocore/resources/sketchup_plugin/examples/HVACTemplate-5ZoneFanCoil.idf @@ -99,7 +99,7 @@ ! Environmental Emissions: None ! Utility Tariffs: None - Version,9.0; + Version,9.1; Building, Building, !- Name @@ -184,7 +184,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual RunPeriod, , !- Name @@ -200,7 +200,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual ! diff --git a/openstudiocore/resources/sketchup_plugin/examples/PassiveSolarDormitory.idf b/openstudiocore/resources/sketchup_plugin/examples/PassiveSolarDormitory.idf index d4258a4d78d..ecc5e5e62d8 100644 --- a/openstudiocore/resources/sketchup_plugin/examples/PassiveSolarDormitory.idf +++ b/openstudiocore/resources/sketchup_plugin/examples/PassiveSolarDormitory.idf @@ -1,4 +1,4 @@ - Version,9.0; + Version,9.1; Timestep,4; @@ -33,7 +33,7 @@ NO, !- Apply Weekend Holiday Rule YES, !- Use Weather File Rain Indicators YES, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual ! NOTE: Values overridden by weather file, if used @@ -4450,7 +4450,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type Bedroom1 Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, Bedroom1 Air, !- Name @@ -4502,7 +4504,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type Bedroom2 Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, Bedroom2 Air, !- Name @@ -4554,7 +4558,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type Bedroom3 Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, Bedroom3 Air, !- Name @@ -4606,7 +4612,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type Bedroom4 Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, Bedroom4 Air, !- Name diff --git a/openstudiocore/resources/sketchup_plugin/examples/PhilipMerrillEnvironmentalCenter.idf b/openstudiocore/resources/sketchup_plugin/examples/PhilipMerrillEnvironmentalCenter.idf index 53c8cf14197..3645125ee76 100644 --- a/openstudiocore/resources/sketchup_plugin/examples/PhilipMerrillEnvironmentalCenter.idf +++ b/openstudiocore/resources/sketchup_plugin/examples/PhilipMerrillEnvironmentalCenter.idf @@ -12,7 +12,7 @@ ! ! - VERSION,9.0; + VERSION,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== !10, ! estimated @@ -74,7 +74,7 @@ No, !- Apply Weekend Holiday Rule No, !- Use Weather File Rain Indicators No, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: LOCATION =========== @@ -64090,7 +64090,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN1-WestConf Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN1-WestConf Air, !- Name @@ -64142,7 +64144,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN2-EastConf Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN2-EastConf Air, !- Name @@ -64194,7 +64198,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN3-SWMain Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN3-SWMain Air, !- Name @@ -64246,7 +64252,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN4-NWMain Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN4-NWMain Air, !- Name @@ -64298,7 +64306,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN5-Server Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN5-Server Air, !- Name @@ -64350,7 +64360,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN6-ExhibtLobby Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN6-ExhibtLobby Air, !- Name @@ -64402,7 +64414,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN7-SEMain Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN7-SEMain Air, !- Name @@ -64454,7 +64468,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN8-NEMain Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN8-NEMain Air, !- Name @@ -64506,7 +64522,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN9-SouthConf Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN9-SouthConf Air, !- Name @@ -64558,7 +64576,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN10-KitchDine Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN10-KitchDine Air, !- Name @@ -64610,7 +64630,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN11-EastConf Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN11-EastConf Air, !- Name @@ -64662,7 +64684,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN12-Link Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN12-Link Air, !- Name @@ -64714,7 +64738,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN13-WestWindows Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN13-WestWindows Air, !- Name @@ -64766,7 +64792,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN14-SW_Main Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN14-SW_Main Air, !- Name @@ -64818,7 +64846,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN15-NW_Main Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN15-NW_Main Air, !- Name @@ -64870,7 +64900,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN16-EastWindows Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN16-EastWindows Air, !- Name @@ -64922,7 +64954,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN17-EastMain Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN17-EastMain Air, !- Name @@ -64974,7 +65008,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN18-NEMain Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN18-NEMain Air, !- Name @@ -65026,7 +65062,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZN19-AtticConf Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZN19-AtticConf Air, !- Name diff --git a/openstudiocore/resources/sketchup_plugin/examples/SurfaceTest.idf b/openstudiocore/resources/sketchup_plugin/examples/SurfaceTest.idf index fbf3baf42b0..da80065567d 100644 --- a/openstudiocore/resources/sketchup_plugin/examples/SurfaceTest.idf +++ b/openstudiocore/resources/sketchup_plugin/examples/SurfaceTest.idf @@ -86,7 +86,7 @@ ! Environmental Emissions: None ! Utility Tariffs: None - Version,9.0; + Version,9.1; Timestep,4; @@ -125,7 +125,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual Site:Location, PHOENIX_AZ_USA_WMO_722780, !- Name diff --git a/openstudiocore/resources/sketchup_plugin/testcases/4ZoneWithShading_Simple_1.idf b/openstudiocore/resources/sketchup_plugin/testcases/4ZoneWithShading_Simple_1.idf index 61f95f77352..9c3dcf364f1 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/4ZoneWithShading_Simple_1.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/4ZoneWithShading_Simple_1.idf @@ -83,7 +83,7 @@ ! Environmental Emissions: None ! Utility Tariffs: None - Version,9.0; + Version,9.1; Timestep,4; @@ -198,7 +198,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual ! No location information present in original BLAST file @@ -1042,7 +1042,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZONE 1 Ideal Loads, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZONE 1 Ideal Loads, !- Name @@ -1103,7 +1105,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZONE 2 Ideal Loads, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZONE 2 Ideal Loads, !- Name @@ -1164,7 +1168,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZONE 3 Ideal Loads, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZONE 3 Ideal Loads, !- Name @@ -1225,7 +1231,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZONE 4 Ideal Loads, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZONE 4 Ideal Loads, !- Name diff --git a/openstudiocore/resources/sketchup_plugin/testcases/4ZoneWithShading_Simple_2.idf b/openstudiocore/resources/sketchup_plugin/testcases/4ZoneWithShading_Simple_2.idf index 4a64c0df31c..271c9c79c6d 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/4ZoneWithShading_Simple_2.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/4ZoneWithShading_Simple_2.idf @@ -81,7 +81,7 @@ ! Environmental Emissions: None ! Utility Tariffs: None - Version,9.0; + Version,9.1; Timestep,4; @@ -196,7 +196,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual ! No location information present in original BLAST file @@ -1005,7 +1005,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZONE 1 Ideal Loads, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZONE 1 Ideal Loads, !- Name @@ -1066,7 +1068,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZONE 2 Ideal Loads, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZONE 2 Ideal Loads, !- Name @@ -1127,7 +1131,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZONE 3 Ideal Loads, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZONE 3 Ideal Loads, !- Name @@ -1188,7 +1194,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type ZONE 4 Ideal Loads, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, ZONE 4 Ideal Loads, !- Name diff --git a/openstudiocore/resources/sketchup_plugin/testcases/5ZoneAirCooled_SurfaceMatching.idf b/openstudiocore/resources/sketchup_plugin/testcases/5ZoneAirCooled_SurfaceMatching.idf index b143f355a0a..62dd76aa46e 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/5ZoneAirCooled_SurfaceMatching.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/5ZoneAirCooled_SurfaceMatching.idf @@ -100,7 +100,7 @@ ! Environmental Emissions: None ! Utility Tariffs: None - Version,9.0; + Version,9.1; Building, Building, !- Name @@ -181,7 +181,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual ! RunPeriod, ! 1, !- Begin Month @@ -2247,7 +2247,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type SPACE1-1 ATU, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, SPACE2-1 Eq, !- Name @@ -2255,7 +2257,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type SPACE2-1 ATU, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, SPACE3-1 Eq, !- Name @@ -2263,7 +2267,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type SPACE3-1 ATU, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, SPACE4-1 Eq, !- Name @@ -2271,7 +2277,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type SPACE4-1 ATU, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, SPACE5-1 Eq, !- Name @@ -2279,7 +2287,9 @@ ZoneHVAC:AirDistributionUnit, !- Zone Equipment 1 Object Type SPACE5-1 ATU, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:AirDistributionUnit, SPACE1-1 ATU, !- Name diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Absolute_Absolute_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Absolute_Absolute_Relative.idf index 98b3834840d..5b11fa438d1 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Absolute_Absolute_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Absolute_Absolute_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Absolute_Relative_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Absolute_Relative_Relative.idf index 8f22f9f474d..67d3bf523f3 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Absolute_Relative_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Absolute_Relative_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Absolute_Absolute_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Absolute_Absolute_Relative.idf index b3b695163ad..96adbb88ff1 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Absolute_Absolute_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Absolute_Absolute_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Absolute_Relative_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Absolute_Relative_Relative.idf index fe0a985ac91..145a3bfd84f 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Absolute_Relative_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Absolute_Relative_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Relative_Absolute_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Relative_Absolute_Relative.idf index f70aec26677..af135468f7d 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Relative_Absolute_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Relative_Absolute_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Relative_Relative_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Relative_Relative_Relative.idf index 57dbeabdff8..17881ce3a30 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Relative_Relative_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_BuildingRotated_Relative_Relative_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Relative_Absolute_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Relative_Absolute_Relative.idf index 64731355d25..955344471a4 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Relative_Absolute_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Relative_Absolute_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Relative_Relative_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Relative_Relative_Relative.idf index cd71bd35fe3..1e8eef5771a 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Relative_Relative_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_Relative_Relative_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Absolute_Absolute_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Absolute_Absolute_Relative.idf index 9b13ebc67e4..1d3f0fe108d 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Absolute_Absolute_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Absolute_Absolute_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Absolute_Relative_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Absolute_Relative_Relative.idf index 318c61b6385..4252352bebf 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Absolute_Relative_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Absolute_Relative_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Relative_Absolute_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Relative_Absolute_Relative.idf index 94db82dc500..66e5121f2ad 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Relative_Absolute_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Relative_Absolute_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Relative_Relative_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Relative_Relative_Relative.idf index 6b08c227ce3..0b69ed87be5 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Relative_Relative_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneAndBuildingRotated_Relative_Relative_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Absolute_Absolute_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Absolute_Absolute_Relative.idf index 8376bcd59a0..b556f81e628 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Absolute_Absolute_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Absolute_Absolute_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Absolute_Relative_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Absolute_Relative_Relative.idf index cc85f3c2de8..4b5e5df80ca 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Absolute_Relative_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Absolute_Relative_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Relative_Absolute_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Relative_Absolute_Relative.idf index 120754a4b80..b8c5b3ff638 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Relative_Absolute_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Relative_Absolute_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Relative_Relative_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Relative_Relative_Relative.idf index ade3457a6bc..7f95f5038eb 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Relative_Relative_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/BasicZone_ZoneRotated_Relative_Relative_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -57,7 +57,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: MATERIAL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/PurchAirWithDaylighting.idf b/openstudiocore/resources/sketchup_plugin/testcases/PurchAirWithDaylighting.idf index a391cb95b91..2f512c20c7b 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/PurchAirWithDaylighting.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/PurchAirWithDaylighting.idf @@ -109,7 +109,7 @@ ! Environmental Emissions: None ! Utility Tariffs: None - Version,9.0; + Version,9.1; Timestep,6; @@ -1340,7 +1340,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type Zone1Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Zone2Equipment, !- Name @@ -1348,7 +1350,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type Zone2Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:EquipmentList, Zone3Equipment, !- Name @@ -1356,7 +1360,9 @@ ZoneHVAC:IdealLoadsAirSystem, !- Zone Equipment 1 Object Type Zone3Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence - 1; !- Zone Equipment 1 Heating or No-Load Sequence + 1, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + ; !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:IdealLoadsAirSystem, Zone1Air, !- Name diff --git a/openstudiocore/resources/sketchup_plugin/testcases/SimpleSubsurfaces_DetailedBaseSurfaces_Relative_Relative_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/SimpleSubsurfaces_DetailedBaseSurfaces_Relative_Relative_Relative.idf index 2bd960e913c..54757826150 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/SimpleSubsurfaces_DetailedBaseSurfaces_Relative_Relative_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/SimpleSubsurfaces_DetailedBaseSurfaces_Relative_Relative_Relative.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -41,7 +41,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: LOCATION =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/SimpleSurfaces_Absolute.idf b/openstudiocore/resources/sketchup_plugin/testcases/SimpleSurfaces_Absolute.idf index c1084e514b3..71f4cfc49c2 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/SimpleSurfaces_Absolute.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/SimpleSurfaces_Absolute.idf @@ -1,7 +1,7 @@ ! File to test the import of simple surfaces !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -42,7 +42,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: LOCATION =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/SimpleSurfaces_Reference.idf b/openstudiocore/resources/sketchup_plugin/testcases/SimpleSurfaces_Reference.idf index 190511545d7..81679599f5e 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/SimpleSurfaces_Reference.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/SimpleSurfaces_Reference.idf @@ -1,7 +1,7 @@ ! Basecase reference for SimpleSurfaces_Test !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -42,7 +42,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: LOCATION =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/SimpleSurfaces_Relative.idf b/openstudiocore/resources/sketchup_plugin/testcases/SimpleSurfaces_Relative.idf index 08a8152ef9d..921d6f79e37 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/SimpleSurfaces_Relative.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/SimpleSurfaces_Relative.idf @@ -1,7 +1,7 @@ ! File to test the import of simple surfaces !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== @@ -42,7 +42,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual !- =========== ALL OBJECTS IN CLASS: LOCATION =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/t0100 man-altered wds.VCpErr b/openstudiocore/resources/sketchup_plugin/testcases/t0100 man-altered wds.VCpErr new file mode 100644 index 00000000000..63901122a5e --- /dev/null +++ b/openstudiocore/resources/sketchup_plugin/testcases/t0100 man-altered wds.VCpErr @@ -0,0 +1,228 @@ +Program Version,Conversion 9.0 => 9.1 + ************* IDF Context for following error/warning message: + ************* Note -- lines truncated at 300 characters, if necessary... + ************* 336 FenestrationSurface:Detailed, + ************* Only last 10 lines before error line shown..... + ************* 341 , !- Outside Boundary Condition Object + ************* 342 , !- View Factor to Ground + ************* 343 , !- Shading Control Name + ************* 344 , !- Frame and Divider Name + ************* 345 , !- Multiplier + ************* 346 4, !- Number of Vertices + ************* 347 9.144000,3.048000,4.572000, !- X,Y,Z ==> Vertex 1 {m} + ************* 348 9.144000,2.438400,4.572000, !- X,Y,Z ==> Vertex 2 {m} + ************* 349 9.753600,2.438400,4.572000, !- X,Y,Z ==> Vertex 3 {m} + ************* 350 9.753600,3.048000,4.572000; !- X,Y,Z ==> Vertex 4 {m} + ** Severe ** IP: IDF line~350 Error detected for Object=FenestrationSurface:Detailed + ** ~~~ ** Maximum arguments reached for this object, trying to process ->4.572000<- + ************* IDF Context for following error/warning message: + ************* Note -- lines truncated at 300 characters, if necessary... + ************* 352 FenestrationSurface:Detailed, + ************* Only last 10 lines before error line shown..... + ************* 357 , !- Outside Boundary Condition Object + ************* 358 , !- View Factor to Ground + ************* 359 , !- Shading Control Name + ************* 360 , !- Frame and Divider Name + ************* 361 , !- Multiplier + ************* 362 4, !- Number of Vertices + ************* 363 8.991600,1.324,2.133600, !- X,Y,Z ==> Vertex 1 {m} + ************* 364 8.991600,1.324,0.609600, !- X,Y,Z ==> Vertex 2 {m} + ************* 365 9.753600,1.724,0.609600, !- X,Y,Z ==> Vertex 3 {m} + ************* 366 9.753600,1.724,2.133600; !- X,Y,Z ==> Vertex 4 {m} + ** Severe ** IP: IDF line~366 Error detected for Object=FenestrationSurface:Detailed + ** ~~~ ** Maximum arguments reached for this object, trying to process ->2.133600<- + ************* IDF Context for following error/warning message: + ************* Note -- lines truncated at 300 characters, if necessary... + ************* 368 FenestrationSurface:Detailed, + ************* Only last 10 lines before error line shown..... + ************* 373 , !- Outside Boundary Condition Object + ************* 374 , !- View Factor to Ground + ************* 375 , !- Shading Control Name + ************* 376 , !- Frame and Divider Name + ************* 377 , !- Multiplier + ************* 378 4, !- Number of Vertices + ************* 379 2.438400,1.524000,2.133600, !- X,Y,Z ==> Vertex 1 {m} + ************* 380 2.438400,1.524000,0.609600, !- X,Y,Z ==> Vertex 2 {m} + ************* 381 3.200400,1.524000,0.609600, !- X,Y,Z ==> Vertex 3 {m} + ************* 382 3.200400,1.524000,2.133600; !- X,Y,Z ==> Vertex 4 {m} + ** Severe ** IP: IDF line~382 Error detected for Object=FenestrationSurface:Detailed + ** ~~~ ** Maximum arguments reached for this object, trying to process ->2.133600<- + ************* IDF Context for following error/warning message: + ************* Note -- lines truncated at 300 characters, if necessary... + ************* 384 FenestrationSurface:Detailed, + ************* Only last 10 lines before error line shown..... + ************* 389 , !- Outside Boundary Condition Object + ************* 390 , !- View Factor to Ground + ************* 391 , !- Shading Control Name + ************* 392 , !- Frame and Divider Name + ************* 393 , !- Multiplier + ************* 394 4, !- Number of Vertices + ************* 395 4.6228,1.324,2.133600, !- X,Y,Z ==> Vertex 1 {m} + ************* 396 4.622800,1.324,0.609600, !- X,Y,Z ==> Vertex 2 {m} + ************* 397 5.384800,1.324,0.609600, !- X,Y,Z ==> Vertex 3 {m} + ************* 398 5.384800,1.514,2.133600; !- X,Y,Z ==> Vertex 4 {m} + ** Severe ** IP: IDF line~398 Error detected for Object=FenestrationSurface:Detailed + ** ~~~ ** Maximum arguments reached for this object, trying to process ->2.133600<- + ************* IDF Context for following error/warning message: + ************* Note -- lines truncated at 300 characters, if necessary... + ************* 400 FenestrationSurface:Detailed, + ************* Only last 10 lines before error line shown..... + ************* 405 , !- Outside Boundary Condition Object + ************* 406 , !- View Factor to Ground + ************* 407 , !- Shading Control Name + ************* 408 , !- Frame and Divider Name + ************* 409 , !- Multiplier + ************* 410 4, !- Number of Vertices + ************* 411 6.807200,1.724,2.133600, !- X,Y,Z ==> Vertex 1 {m} + ************* 412 6.807200,1.724,0.609600, !- X,Y,Z ==> Vertex 2 {m} + ************* 413 7.569200,1.724,0.609600, !- X,Y,Z ==> Vertex 3 {m} + ************* 414 7.569200,1.724,2.133600; !- X,Y,Z ==> Vertex 4 {m} + ** Severe ** IP: IDF line~414 Error detected for Object=FenestrationSurface:Detailed + ** ~~~ ** Maximum arguments reached for this object, trying to process ->2.133600<- + ************* IDF Context for following error/warning message: + ************* Note -- lines truncated at 300 characters, if necessary... + ************* 416 FenestrationSurface:Detailed, + ************* Only last 10 lines before error line shown..... + ************* 421 , !- Outside Boundary Condition Object + ************* 422 , !- View Factor to Ground + ************* 423 , !- Shading Control Name + ************* 424 , !- Frame and Divider Name + ************* 425 , !- Multiplier + ************* 426 4, !- Number of Vertices + ************* 427 4.755340,3.048000,4.772000, !- X,Y,Z ==> Vertex 1 {m} + ************* 428 4.755340,2.438400,4.772000, !- X,Y,Z ==> Vertex 2 {m} + ************* 429 5.364940,2.438400,4.772000, !- X,Y,Z ==> Vertex 3 {m} + ************* 430 5.364940,3.048000,4.772000; !- X,Y,Z ==> Vertex 4 {m} + ** Severe ** IP: IDF line~430 Error detected for Object=FenestrationSurface:Detailed + ** ~~~ ** Maximum arguments reached for this object, trying to process ->4.772000<- + ************* IDF Context for following error/warning message: + ************* Note -- lines truncated at 300 characters, if necessary... + ************* 432 FenestrationSurface:Detailed, + ************* Only last 10 lines before error line shown..... + ************* 437 , !- Outside Boundary Condition Object + ************* 438 , !- View Factor to Ground + ************* 439 , !- Shading Control Name + ************* 440 , !- Frame and Divider Name + ************* 441 , !- Multiplier + ************* 442 4, !- Number of Vertices + ************* 443 2.561010,3.048000,4.572000, !- X,Y,Z ==> Vertex 1 {m} + ************* 444 2.561010,2.438400,4.572000, !- X,Y,Z ==> Vertex 2 {m} + ************* 445 3.170610,2.438400,4.572000, !- X,Y,Z ==> Vertex 3 {m} + ************* 446 3.170610,3.048000,4.572000; !- X,Y,Z ==> Vertex 4 {m} + ** Severe ** IP: IDF line~446 Error detected for Object=FenestrationSurface:Detailed + ** ~~~ ** Maximum arguments reached for this object, trying to process ->4.572000<- + ************* IDF Context for following error/warning message: + ************* Note -- lines truncated at 300 characters, if necessary... + ************* 448 FenestrationSurface:Detailed, + ************* Only last 10 lines before error line shown..... + ************* 453 , !- Outside Boundary Condition Object + ************* 454 , !- View Factor to Ground + ************* 455 , !- Shading Control Name + ************* 456 , !- Frame and Divider Name + ************* 457 , !- Multiplier + ************* 458 4, !- Number of Vertices + ************* 459 6.949670,3.048000,4.372000, !- X,Y,Z ==> Vertex 1 {m} + ************* 460 6.949670,2.438400,4.372000, !- X,Y,Z ==> Vertex 2 {m} + ************* 461 7.559270,2.438400,4.372000, !- X,Y,Z ==> Vertex 3 {m} + ************* 462 7.559270,3.048000,4.372000; !- X,Y,Z ==> Vertex 4 {m} + ** Severe ** IP: IDF line~462 Error detected for Object=FenestrationSurface:Detailed + ** ~~~ ** Maximum arguments reached for this object, trying to process ->4.372000<- + ************* IDF Context for following error/warning message: + ************* Note -- lines truncated at 300 characters, if necessary... + ************* 464 FenestrationSurface:Detailed, + ************* Only last 10 lines before error line shown..... + ************* 469 , !- Outside Boundary Condition Object + ************* 470 , !- View Factor to Ground + ************* 471 , !- Shading Control Name + ************* 472 , !- Frame and Divider Name + ************* 473 , !- Multiplier + ************* 474 4, !- Number of Vertices + ************* 475 9.144000,3.048000,4.772000, !- X,Y,Z ==> Vertex 1 {m} + ************* 476 9.144000,2.438400,4.772000, !- X,Y,Z ==> Vertex 2 {m} + ************* 477 9.753600,2.438400,4.372000, !- X,Y,Z ==> Vertex 3 {m} + ************* 478 9.753600,3.048000,4.372000; !- X,Y,Z ==> Vertex 4 {m} + ** Severe ** IP: IDF line~478 Error detected for Object=FenestrationSurface:Detailed + ** ~~~ ** Maximum arguments reached for this object, trying to process ->4.372000<- + ************* IDF Context for following error/warning message: + ************* Note -- lines truncated at 300 characters, if necessary... + ************* 480 FenestrationSurface:Detailed, + ************* Only last 10 lines before error line shown..... + ************* 485 , !- Outside Boundary Condition Object + ************* 486 , !- View Factor to Ground + ************* 487 , !- Shading Control Name + ************* 488 , !- Frame and Divider Name + ************* 489 , !- Multiplier + ************* 490 4, !- Number of Vertices + ************* 491 10.668000,8.839200,2.133600, !- X,Y,Z ==> Vertex 1 {m} + ************* 492 10.668000,8.839200,0.000000, !- X,Y,Z ==> Vertex 2 {m} + ************* 493 10.668000,9.753600,0.000000, !- X,Y,Z ==> Vertex 3 {m} + ************* 494 10.668000,9.753600,2.133600; !- X,Y,Z ==> Vertex 4 {m} + ** Severe ** IP: IDF line~494 Error detected for Object=FenestrationSurface:Detailed + ** ~~~ ** Maximum arguments reached for this object, trying to process ->2.133600<- + ************* IDF Context for following error/warning message: + ************* Note -- lines truncated at 300 characters, if necessary... + ************* 496 FenestrationSurface:Detailed, + ************* Only last 10 lines before error line shown..... + ************* 501 , !- Outside Boundary Condition Object + ************* 502 , !- View Factor to Ground + ************* 503 , !- Shading Control Name + ************* 504 , !- Frame and Divider Name + ************* 505 , !- Multiplier + ************* 506 4, !- Number of Vertices + ************* 507 10.868000,8.839200,2.133600, !- X,Y,Z ==> Vertex 1 {m} + ************* 508 10.468000,8.839200,0.000000, !- X,Y,Z ==> Vertex 2 {m} + ************* 509 10.468000,9.753600,0.000000, !- X,Y,Z ==> Vertex 3 {m} + ************* 510 10.868000,9.753600,2.133600; !- X,Y,Z ==> Vertex 4 {m} + ** Severe ** IP: IDF line~510 Error detected for Object=FenestrationSurface:Detailed + ** ~~~ ** Maximum arguments reached for this object, trying to process ->2.133600<- + ************* IDF Context for following error/warning message: + ************* Note -- lines truncated at 300 characters, if necessary... + ************* 512 FenestrationSurface:Detailed, + ************* Only last 10 lines before error line shown..... + ************* 517 , !- Outside Boundary Condition Object + ************* 518 , !- View Factor to Ground + ************* 519 , !- Shading Control Name + ************* 520 , !- Frame and Divider Name + ************* 521 , !- Multiplier + ************* 522 4, !- Number of Vertices + ************* 523 10.668000,2.438400,2.133600, !- X,Y,Z ==> Vertex 1 {m} + ************* 524 10.668000,2.438400,0.000000, !- X,Y,Z ==> Vertex 2 {m} + ************* 525 10.668000,3.352800,0.000000, !- X,Y,Z ==> Vertex 3 {m} + ************* 526 10.668000,3.352800,2.133600; !- X,Y,Z ==> Vertex 4 {m} + ** Severe ** IP: IDF line~526 Error detected for Object=FenestrationSurface:Detailed + ** ~~~ ** Maximum arguments reached for this object, trying to process ->2.133600<- + ************* IDF Context for following error/warning message: + ************* Note -- lines truncated at 300 characters, if necessary... + ************* 528 FenestrationSurface:Detailed, + ************* Only last 10 lines before error line shown..... + ************* 533 , !- Outside Boundary Condition Object + ************* 534 , !- View Factor to Ground + ************* 535 , !- Shading Control Name + ************* 536 , !- Frame and Divider Name + ************* 537 , !- Multiplier + ************* 538 4, !- Number of Vertices + ************* 539 10.868000,4.572000,2.133600, !- X,Y,Z ==> Vertex 1 {m} + ************* 540 10.868000,4.572000,0.000000, !- X,Y,Z ==> Vertex 2 {m} + ************* 541 10.868000,5.486400,0.000000, !- X,Y,Z ==> Vertex 3 {m} + ************* 542 10.868000,5.486400,2.133600; !- X,Y,Z ==> Vertex 4 {m} + ** Severe ** IP: IDF line~542 Error detected for Object=FenestrationSurface:Detailed + ** ~~~ ** Maximum arguments reached for this object, trying to process ->2.133600<- + ************* IDF Context for following error/warning message: + ************* Note -- lines truncated at 300 characters, if necessary... + ************* 544 FenestrationSurface:Detailed, + ************* Only last 10 lines before error line shown..... + ************* 549 , !- Outside Boundary Condition Object + ************* 550 , !- View Factor to Ground + ************* 551 , !- Shading Control Name + ************* 552 , !- Frame and Divider Name + ************* 553 , !- Multiplier + ************* 554 4, !- Number of Vertices + ************* 555 10.468000,6.705600,2.133600, !- X,Y,Z ==> Vertex 1 {m} + ************* 556 10.468000,6.705600,0.000000, !- X,Y,Z ==> Vertex 2 {m} + ************* 557 10.468000,7.620000,0.000000, !- X,Y,Z ==> Vertex 3 {m} + ************* 558 10.468000,7.620000,2.133600; !- X,Y,Z ==> Vertex 4 {m} + ** Severe ** IP: IDF line~558 Error detected for Object=FenestrationSurface:Detailed + ** ~~~ ** Maximum arguments reached for this object, trying to process ->2.133600<- + ** Severe ** Possible incorrect IDD File + ** ~~~ ** Possible Invalid Numerics or other problems + ************* Conversion Completed Successfully-- 0 Warning; 15 Severe Errors diff --git a/openstudiocore/resources/sketchup_plugin/testcases/t0100 man-altered wds.idfnew b/openstudiocore/resources/sketchup_plugin/testcases/t0100 man-altered wds.idfnew new file mode 100644 index 00000000000..ea4e6671989 --- /dev/null +++ b/openstudiocore/resources/sketchup_plugin/testcases/t0100 man-altered wds.idfnew @@ -0,0 +1,337 @@ +!-Generator IDFEditor 1.36a +!-Option SortedOrder +!-NOTE: All comments with '!-' are ignored by the IDFEditor and are generated automatically. +!- Use '!' comments if they need to be retained when using the IDFEditor. +!- =========== ALL OBJECTS IN CLASS: VERSION =========== + + Version,9.1; + +!- =========== ALL OBJECTS IN CLASS: SIMULATIONCONTROL =========== + + SimulationControl, + No, !- Do Zone Sizing Calculation + No, !- Do System Sizing Calculation + No, !- Do Plant Sizing Calculation + Yes, !- Run Simulation for Sizing Periods + Yes; !- Run Simulation for Weather File Run Periods + +!- =========== ALL OBJECTS IN CLASS: BUILDING =========== + + Building, + skylight-rotate, !- Name + 0.0, !- North Axis {deg} + City, !- Terrain + 0.04, !- Loads Convergence Tolerance Value + 0.4, !- Temperature Convergence Tolerance Value {deltaC} + FullInteriorAndExterior, !- Solar Distribution + 25, !- Maximum Number of Warmup Days + 6; !- Minimum Number of Warmup Days + +!- =========== ALL OBJECTS IN CLASS: TIMESTEP =========== + + Timestep,4; + +!- =========== ALL OBJECTS IN CLASS: SITE:LOCATION =========== + + Site:Location, + CHICAGO_IL_USA TMY2-94846, !- Name + 41.78, !- Latitude {deg} + -87.75, !- Longitude {deg} + -6.0, !- Time Zone {hr} + 190.00; !- Elevation {m} + +!- =========== ALL OBJECTS IN CLASS: MATERIAL =========== + + Material, + F08 Metal surface, !- Name + Smooth, !- Roughness + 0.0008, !- Thickness {m} + 45.28, !- Conductivity {W/m-K} + 7824, !- Density {kg/m3} + 500; !- Specific Heat {J/kg-K} + + Material, + I01 25mm insulation board, !- Name + MediumRough, !- Roughness + 0.0254, !- Thickness {m} + 0.03, !- Conductivity {W/m-K} + 43, !- Density {kg/m3} + 1210; !- Specific Heat {J/kg-K} + + Material, + I02 50mm insulation board, !- Name + MediumRough, !- Roughness + 0.0508, !- Thickness {m} + 0.03, !- Conductivity {W/m-K} + 43, !- Density {kg/m3} + 1210; !- Specific Heat {J/kg-K} + + Material, + G01a 19mm gypsum board, !- Name + MediumSmooth, !- Roughness + 0.019, !- Thickness {m} + 0.16, !- Conductivity {W/m-K} + 800, !- Density {kg/m3} + 1090; !- Specific Heat {J/kg-K} + + Material, + M11 100mm lightweight concrete, !- Name + MediumRough, !- Roughness + 0.1016, !- Thickness {m} + 0.53, !- Conductivity {W/m-K} + 1280, !- Density {kg/m3} + 840; !- Specific Heat {J/kg-K} + + Material, + F16 Acoustic tile, !- Name + MediumSmooth, !- Roughness + 0.0191, !- Thickness {m} + 0.06, !- Conductivity {W/m-K} + 368, !- Density {kg/m3} + 590; !- Specific Heat {J/kg-K} + + Material, + M01 100mm brick, !- Name + MediumRough, !- Roughness + 0.1016, !- Thickness {m} + 0.89, !- Conductivity {W/m-K} + 1920, !- Density {kg/m3} + 790; !- Specific Heat {J/kg-K} + + Material, + M15 200mm heavyweight concrete, !- Name + MediumRough, !- Roughness + 0.2032, !- Thickness {m} + 1.95, !- Conductivity {W/m-K} + 2240, !- Density {kg/m3} + 900; !- Specific Heat {J/kg-K} + + Material, + M05 200mm concrete block,!- Name + MediumRough, !- Roughness + 0.2032, !- Thickness {m} + 1.11, !- Conductivity {W/m-K} + 800, !- Density {kg/m3} + 920; !- Specific Heat {J/kg-K} + + Material, + G05 25mm wood, !- Name + MediumSmooth, !- Roughness + 0.0254, !- Thickness {m} + 0.15, !- Conductivity {W/m-K} + 608, !- Density {kg/m3} + 1630; !- Specific Heat {J/kg-K} + +!- =========== ALL OBJECTS IN CLASS: MATERIAL:AIRGAP =========== + + Material:AirGap, + F04 Wall air space resistance, !- Name + 0.15; !- Thermal Resistance {m2-K/W} + + Material:AirGap, + F05 Ceiling air space resistance, !- Name + 0.18; !- Thermal Resistance {m2-K/W} + +!- =========== ALL OBJECTS IN CLASS: WINDOWMATERIAL:GLAZING =========== + + WindowMaterial:Glazing, + Clear 3mm, !- Name + SpectralAverage, !- Optical Data Type + , !- Window Glass Spectral Data Set Name + 0.003, !- Thickness {m} + 0.837, !- Solar Transmittance at Normal Incidence + 0.075, !- Front Side Solar Reflectance at Normal Incidence + 0.075, !- Back Side Solar Reflectance at Normal Incidence + 0.898, !- Visible Transmittance at Normal Incidence + 0.081, !- Front Side Visible Reflectance at Normal Incidence + 0.081, !- Back Side Visible Reflectance at Normal Incidence + 0, !- Infrared Transmittance at Normal Incidence + 0.84, !- Front Side Infrared Hemispherical Emissivity + 0.84, !- Back Side Infrared Hemispherical Emissivity + 0.9; !- Conductivity {W/m-K} + +!- =========== ALL OBJECTS IN CLASS: WINDOWMATERIAL:GAS =========== + + WindowMaterial:Gas, + Air 13mm, !- Name + Air, !- Gas Type + 0.0127; !- Thickness {m} + +!- =========== ALL OBJECTS IN CLASS: CONSTRUCTION =========== + + Construction, + Exterior Floor, !- Name + I02 50mm insulation board, !- Outside Layer + M15 200mm heavyweight concrete; !- Layer 2 + + Construction, + Interior Floor, !- Name + F16 Acoustic tile, !- Outside Layer + F05 Ceiling air space resistance, !- Layer 2 + M11 100mm lightweight concrete; !- Layer 3 + + Construction, + Exterior Wall, !- Name + M01 100mm brick, !- Outside Layer + M15 200mm heavyweight concrete, !- Layer 2 + I02 50mm insulation board, !- Layer 3 + F04 Wall air space resistance, !- Layer 4 + G01a 19mm gypsum board; !- Layer 5 + + Construction, + Interior Wall, !- Name + G01a 19mm gypsum board, !- Outside Layer + F04 Wall air space resistance, !- Layer 2 + G01a 19mm gypsum board; !- Layer 3 + + Construction, + Exterior Roof, !- Name + M11 100mm lightweight concrete, !- Outside Layer + F05 Ceiling air space resistance, !- Layer 2 + F16 Acoustic tile; !- Layer 3 + + Construction, + Interior Ceiling, !- Name + M11 100mm lightweight concrete, !- Outside Layer + F05 Ceiling air space resistance, !- Layer 2 + F16 Acoustic tile; !- Layer 3 + + Construction, + Exterior Window, !- Name + Clear 3mm, !- Outside Layer + Air 13mm, !- Layer 2 + Clear 3mm; !- Layer 3 + + Construction, + Interior Window, !- Name + Clear 3mm; !- Outside Layer + + Construction, + Exterior Door, !- Name + F08 Metal surface, !- Outside Layer + I01 25mm insulation board; !- Layer 2 + + Construction, + Interior Door, !- Name + G05 25mm wood; !- Outside Layer + +!- =========== ALL OBJECTS IN CLASS: GLOBALGEOMETRYRULES =========== + + GlobalGeometryRules, + UpperLeftCorner, !- Starting Vertex Position + Counterclockwise, !- Vertex Entry Direction + Absolute; !- Coordinate System + +!- =========== ALL OBJECTS IN CLASS: ZONE =========== + + Zone, + zone 1, !- Name + 0.0, !- Direction of Relative North {deg} + 0.0, !- X Origin {m} + 0.0, !- Y Origin {m} + 0.0, !- Z Origin {m} + 1, !- Type + 1; !- Multiplier + +!- =========== ALL OBJECTS IN CLASS: BUILDINGSURFACE:DETAILED =========== + + BuildingSurface:Detailed, + floor-01, !- Name + Floor, !- Surface Type + Exterior Floor, !- Construction Name + zone 1, !- Zone Name + Ground, !- Outside Boundary Condition + , !- Outside Boundary Condition Object + NoSun, !- Sun Exposure + NoWind, !- Wind Exposure + 0.0, !- View Factor to Ground + 4, !- Number of Vertices + 10.668000,10.668000,0.000000, !- X,Y,Z ==> Vertex 1 {m} + 10.668000,1.524000,0.000000, !- X,Y,Z ==> Vertex 2 {m} + 1.524000,1.524000,0.000000, !- X,Y,Z ==> Vertex 3 {m} + 1.524000,10.668000,0.000000; !- X,Y,Z ==> Vertex 4 {m} + + BuildingSurface:Detailed, + wall-04, !- Name + Wall, !- Surface Type + Exterior Wall, !- Construction Name + zone 1, !- Zone Name + Outdoors, !- Outside Boundary Condition + , !- Outside Boundary Condition Object + SunExposed, !- Sun Exposure + WindExposed, !- Wind Exposure + Autocalculate, !- View Factor to Ground + 4, !- Number of Vertices + 1.524000,10.668000,4.572000, !- X,Y,Z ==> Vertex 1 {m} + 1.524000,10.668000,0.000000, !- X,Y,Z ==> Vertex 2 {m} + 1.524000,1.524000,0.000000, !- X,Y,Z ==> Vertex 3 {m} + 1.524000,1.524000,4.572000; !- X,Y,Z ==> Vertex 4 {m} + + BuildingSurface:Detailed, + wall-03, !- Name + Wall, !- Surface Type + Exterior Wall, !- Construction Name + zone 1, !- Zone Name + Outdoors, !- Outside Boundary Condition + , !- Outside Boundary Condition Object + SunExposed, !- Sun Exposure + WindExposed, !- Wind Exposure + Autocalculate, !- View Factor to Ground + 4, !- Number of Vertices + 10.668000,10.668000,4.572000, !- X,Y,Z ==> Vertex 1 {m} + 10.668000,10.668000,0.000000, !- X,Y,Z ==> Vertex 2 {m} + 1.524000,10.668000,0.000000, !- X,Y,Z ==> Vertex 3 {m} + 1.524000,10.668000,4.572000; !- X,Y,Z ==> Vertex 4 {m} + + BuildingSurface:Detailed, + wall-02, !- Name + Wall, !- Surface Type + Exterior Wall, !- Construction Name + zone 1, !- Zone Name + Outdoors, !- Outside Boundary Condition + , !- Outside Boundary Condition Object + SunExposed, !- Sun Exposure + WindExposed, !- Wind Exposure + Autocalculate, !- View Factor to Ground + 4, !- Number of Vertices + 10.668000,1.524000,4.572000, !- X,Y,Z ==> Vertex 1 {m} + 10.668000,1.524000,0.000000, !- X,Y,Z ==> Vertex 2 {m} + 10.668000,10.668000,0.000000, !- X,Y,Z ==> Vertex 3 {m} + 10.668000,10.668000,4.572000; !- X,Y,Z ==> Vertex 4 {m} + + BuildingSurface:Detailed, + roof-01, !- Name + Roof, !- Surface Type + Exterior Roof, !- Construction Name + zone 1, !- Zone Name + Outdoors, !- Outside Boundary Condition + , !- Outside Boundary Condition Object + SunExposed, !- Sun Exposure + WindExposed, !- Wind Exposure + Autocalculate, !- View Factor to Ground + 4, !- Number of Vertices + 1.524000,10.668000,4.572000, !- X,Y,Z ==> Vertex 1 {m} + 1.524000,1.524000,4.572000, !- X,Y,Z ==> Vertex 2 {m} + 10.668000,1.524000,4.572000, !- X,Y,Z ==> Vertex 3 {m} + 10.668000,10.668000,4.572000; !- X,Y,Z ==> Vertex 4 {m} + + BuildingSurface:Detailed, + wall-01, !- Name + Wall, !- Surface Type + Exterior Wall, !- Construction Name + zone 1, !- Zone Name + Outdoors, !- Outside Boundary Condition + , !- Outside Boundary Condition Object + SunExposed, !- Sun Exposure + WindExposed, !- Wind Exposure + Autocalculate, !- View Factor to Ground + 4, !- Number of Vertices + 1.524000,1.524000,4.572000, !- X,Y,Z ==> Vertex 1 {m} + 1.524000,1.524000,0.000000, !- X,Y,Z ==> Vertex 2 {m} + 10.668000,1.524000,0.000000, !- X,Y,Z ==> Vertex 3 {m} + 10.668000,1.524000,4.572000; !- X,Y,Z ==> Vertex 4 {m} + +!- =========== ALL OBJECTS IN CLASS: OUTPUT:VARIABLEDICTIONARY =========== + + Output:VariableDictionary,Regular; + diff --git a/openstudiocore/resources/sketchup_plugin/testcases/t0200 su-alt wds rotate.idf b/openstudiocore/resources/sketchup_plugin/testcases/t0200 su-alt wds rotate.idf index ea123941ee3..9c0454a91d3 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/t0200 su-alt wds rotate.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/t0200 su-alt wds rotate.idf @@ -4,7 +4,7 @@ !- Use '!' comments if they need to be retained when using the IDFEditor. !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: SIMULATIONCONTROL =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/t0300 multiple windows.idf b/openstudiocore/resources/sketchup_plugin/testcases/t0300 multiple windows.idf index 3c35beb4ef3..61006510514 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/t0300 multiple windows.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/t0300 multiple windows.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/t0400 offset window error.idf b/openstudiocore/resources/sketchup_plugin/testcases/t0400 offset window error.idf index d882c31abac..94b41635ce7 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/t0400 offset window error.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/t0400 offset window error.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== diff --git a/openstudiocore/resources/sketchup_plugin/testcases/t0500 window split into two gap.idf b/openstudiocore/resources/sketchup_plugin/testcases/t0500 window split into two gap.idf index 30866f83ec3..679679fb199 100644 --- a/openstudiocore/resources/sketchup_plugin/testcases/t0500 window split into two gap.idf +++ b/openstudiocore/resources/sketchup_plugin/testcases/t0500 window split into two gap.idf @@ -1,6 +1,6 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: BUILDING =========== diff --git a/openstudiocore/resources/utilities/Idf/CommentTest.idf b/openstudiocore/resources/utilities/Idf/CommentTest.idf index dae2ae77593..a81ba12354d 100644 --- a/openstudiocore/resources/utilities/Idf/CommentTest.idf +++ b/openstudiocore/resources/utilities/Idf/CommentTest.idf @@ -2,7 +2,7 @@ ! Written by Elaine T. Hale, 15 September 2010 ! Version object should keep up with EnergyPlus version number. - Version,9.0; + Version,9.1; ! Timestep should be > 1. @@ -31,7 +31,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual ! This building has no surfaces, no volume, no nothing. diff --git a/openstudiocore/resources/utilities/Idf/DosLineEndingTest.idf b/openstudiocore/resources/utilities/Idf/DosLineEndingTest.idf index dae2ae77593..a81ba12354d 100644 --- a/openstudiocore/resources/utilities/Idf/DosLineEndingTest.idf +++ b/openstudiocore/resources/utilities/Idf/DosLineEndingTest.idf @@ -2,7 +2,7 @@ ! Written by Elaine T. Hale, 15 September 2010 ! Version object should keep up with EnergyPlus version number. - Version,9.0; + Version,9.1; ! Timestep should be > 1. @@ -31,7 +31,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual ! This building has no surfaces, no volume, no nothing. diff --git a/openstudiocore/resources/utilities/Idf/FormatPropertyTest_Formatted.idf b/openstudiocore/resources/utilities/Idf/FormatPropertyTest_Formatted.idf index 4ee00392a52..29576e7e288 100644 --- a/openstudiocore/resources/utilities/Idf/FormatPropertyTest_Formatted.idf +++ b/openstudiocore/resources/utilities/Idf/FormatPropertyTest_Formatted.idf @@ -5,7 +5,7 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== ! \format singleLine - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: HEATBALANCEALGORITHM =========== ! \format singleLine diff --git a/openstudiocore/resources/utilities/Idf/FormatPropertyTest_Unformatted.idf b/openstudiocore/resources/utilities/Idf/FormatPropertyTest_Unformatted.idf index 4818be83263..881292c879b 100644 --- a/openstudiocore/resources/utilities/Idf/FormatPropertyTest_Unformatted.idf +++ b/openstudiocore/resources/utilities/Idf/FormatPropertyTest_Unformatted.idf @@ -5,7 +5,7 @@ !- =========== ALL OBJECTS IN CLASS: VERSION =========== ! \format singleLine - Version,9.0; + Version,9.1; !- =========== ALL OBJECTS IN CLASS: HEATBALANCEALGORITHM =========== ! \format singleLine diff --git a/openstudiocore/resources/utilities/Idf/MixedLineEndingTest.idf b/openstudiocore/resources/utilities/Idf/MixedLineEndingTest.idf index dae2ae77593..a81ba12354d 100644 --- a/openstudiocore/resources/utilities/Idf/MixedLineEndingTest.idf +++ b/openstudiocore/resources/utilities/Idf/MixedLineEndingTest.idf @@ -2,7 +2,7 @@ ! Written by Elaine T. Hale, 15 September 2010 ! Version object should keep up with EnergyPlus version number. - Version,9.0; + Version,9.1; ! Timestep should be > 1. @@ -31,7 +31,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual ! This building has no surfaces, no volume, no nothing. diff --git a/openstudiocore/resources/utilities/Idf/UnixLineEndingTest.idf b/openstudiocore/resources/utilities/Idf/UnixLineEndingTest.idf index dae2ae77593..a81ba12354d 100644 --- a/openstudiocore/resources/utilities/Idf/UnixLineEndingTest.idf +++ b/openstudiocore/resources/utilities/Idf/UnixLineEndingTest.idf @@ -2,7 +2,7 @@ ! Written by Elaine T. Hale, 15 September 2010 ! Version object should keep up with EnergyPlus version number. - Version,9.0; + Version,9.1; ! Timestep should be > 1. @@ -31,7 +31,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual ! This building has no surfaces, no volume, no nothing. diff --git a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V7-0-0.idf b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V7-0-0.idf index 4c668785438..b28a4c71ba0 100644 --- a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V7-0-0.idf +++ b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V7-0-0.idf @@ -60,7 +60,7 @@ ! Floor Area: 232.25 m2 ! Number of Stories: 1 - Version,9.0; + Version,9.1; Timestep,6; @@ -101,7 +101,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual Site:Location, Denver Centennial CO USA WMO=724666, !- Name @@ -456,10 +456,14 @@ Main Zone Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 2, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:Baseboard:Convective:Electric, !- Zone Equipment 2 Object Type Main Zone Baseboard, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 1; !- Zone Equipment 2 Heating or No-Load Sequence + 1, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, Main Zone Direct Air, !- Name diff --git a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V7-1-0.idf b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V7-1-0.idf index 36c801f4fa1..440784d5bca 100644 --- a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V7-1-0.idf +++ b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V7-1-0.idf @@ -60,7 +60,7 @@ ! Floor Area: 232.25 m2 ! Number of Stories: 1 - Version,9.0; + Version,9.1; Timestep,6; @@ -101,7 +101,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual Site:Location, Denver Centennial CO USA WMO=724666, !- Name @@ -525,10 +525,14 @@ Main Zone Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 2, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:Baseboard:Convective:Electric, !- Zone Equipment 2 Object Type Main Zone Baseboard, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 1; !- Zone Equipment 2 Heating or No-Load Sequence + 1, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, Main Zone Direct Air, !- Name diff --git a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V7-2-0.idf b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V7-2-0.idf index 36c801f4fa1..440784d5bca 100644 --- a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V7-2-0.idf +++ b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V7-2-0.idf @@ -60,7 +60,7 @@ ! Floor Area: 232.25 m2 ! Number of Stories: 1 - Version,9.0; + Version,9.1; Timestep,6; @@ -101,7 +101,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual Site:Location, Denver Centennial CO USA WMO=724666, !- Name @@ -525,10 +525,14 @@ Main Zone Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 2, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:Baseboard:Convective:Electric, !- Zone Equipment 2 Object Type Main Zone Baseboard, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 1; !- Zone Equipment 2 Heating or No-Load Sequence + 1, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, Main Zone Direct Air, !- Name diff --git a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-0-0.idf b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-0-0.idf index c44b5d22027..b48b066b89c 100644 --- a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-0-0.idf +++ b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-0-0.idf @@ -60,7 +60,7 @@ ! Floor Area: 232.25 m2 ! Number of Stories: 1 - Version,9.0; + Version,9.1; Timestep,6; @@ -101,7 +101,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual Site:Location, Denver Centennial CO USA WMO=724666, !- Name @@ -525,10 +525,14 @@ Main Zone Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 2, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:Baseboard:Convective:Electric, !- Zone Equipment 2 Object Type Main Zone Baseboard, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 1; !- Zone Equipment 2 Heating or No-Load Sequence + 1, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, Main Zone Direct Air, !- Name diff --git a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-1-0.idf b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-1-0.idf index c44b5d22027..b48b066b89c 100644 --- a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-1-0.idf +++ b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-1-0.idf @@ -60,7 +60,7 @@ ! Floor Area: 232.25 m2 ! Number of Stories: 1 - Version,9.0; + Version,9.1; Timestep,6; @@ -101,7 +101,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual Site:Location, Denver Centennial CO USA WMO=724666, !- Name @@ -525,10 +525,14 @@ Main Zone Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 2, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:Baseboard:Convective:Electric, !- Zone Equipment 2 Object Type Main Zone Baseboard, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 1; !- Zone Equipment 2 Heating or No-Load Sequence + 1, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, Main Zone Direct Air, !- Name diff --git a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-2-0.idf b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-2-0.idf index 918add48215..dbe5e3b548e 100644 --- a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-2-0.idf +++ b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-2-0.idf @@ -60,7 +60,7 @@ ! Floor Area: 232.25 m2 ! Number of Stories: 1 - Version,9.0; + Version,9.1; Timestep,6; @@ -101,7 +101,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual Site:Location, Denver Centennial CO USA WMO=724666, !- Name @@ -525,10 +525,14 @@ Main Zone Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 2, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:Baseboard:Convective:Electric, !- Zone Equipment 2 Object Type Main Zone Baseboard, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 1; !- Zone Equipment 2 Heating or No-Load Sequence + 1, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, Main Zone Direct Air, !- Name diff --git a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-3-0.idf b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-3-0.idf index 918add48215..dbe5e3b548e 100644 --- a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-3-0.idf +++ b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-3-0.idf @@ -60,7 +60,7 @@ ! Floor Area: 232.25 m2 ! Number of Stories: 1 - Version,9.0; + Version,9.1; Timestep,6; @@ -101,7 +101,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual Site:Location, Denver Centennial CO USA WMO=724666, !- Name @@ -525,10 +525,14 @@ Main Zone Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 2, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:Baseboard:Convective:Electric, !- Zone Equipment 2 Object Type Main Zone Baseboard, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 1; !- Zone Equipment 2 Heating or No-Load Sequence + 1, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, Main Zone Direct Air, !- Name diff --git a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-4-0.idf b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-4-0.idf index 918add48215..dbe5e3b548e 100644 --- a/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-4-0.idf +++ b/openstudiocore/resources/utilities/SqlFile/1ZoneEvapCooler-V8-4-0.idf @@ -60,7 +60,7 @@ ! Floor Area: 232.25 m2 ! Number of Stories: 1 - Version,9.0; + Version,9.1; Timestep,6; @@ -101,7 +101,7 @@ No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators Yes, !- Use Weather File Snow Indicators - ; !- Treat Weather as Actual + No; !- Treat Weather as Actual Site:Location, Denver Centennial CO USA WMO=724666, !- Name @@ -525,10 +525,14 @@ Main Zone Direct Air, !- Zone Equipment 1 Name 1, !- Zone Equipment 1 Cooling Sequence 2, !- Zone Equipment 1 Heating or No-Load Sequence + , !- Zone Equipment 1 Sequential Cooling Fraction + , !- Zone Equipment 1 Sequential Heating Fraction ZoneHVAC:Baseboard:Convective:Electric, !- Zone Equipment 2 Object Type Main Zone Baseboard, !- Zone Equipment 2 Name 2, !- Zone Equipment 2 Cooling Sequence - 1; !- Zone Equipment 2 Heating or No-Load Sequence + 1, !- Zone Equipment 2 Heating or No-Load Sequence + , !- Zone Equipment 2 Sequential Cooling Fraction + ; !- Zone Equipment 2 Sequential Heating Fraction AirTerminal:SingleDuct:Uncontrolled, Main Zone Direct Air, !- Name diff --git a/openstudiocore/sketchup_plugin/openstudio/sketchup_plugin/lib/PluginManager.rb b/openstudiocore/sketchup_plugin/openstudio/sketchup_plugin/lib/PluginManager.rb index f602eb4daae..b6b8f9c3f82 100644 --- a/openstudiocore/sketchup_plugin/openstudio/sketchup_plugin/lib/PluginManager.rb +++ b/openstudiocore/sketchup_plugin/openstudio/sketchup_plugin/lib/PluginManager.rb @@ -451,7 +451,7 @@ def load_default_preferences end def energyplus_version - return('9.0.0') + return('9.1.0') end def minimal_template_path diff --git a/openstudiocore/src/cli/openstudio_cli.rb b/openstudiocore/src/cli/openstudio_cli.rb index 189b7757ae7..063ac72979d 100644 --- a/openstudiocore/src/cli/openstudio_cli.rb +++ b/openstudiocore/src/cli/openstudio_cli.rb @@ -559,44 +559,26 @@ def parse_main_args(main_args) current_dir = Dir.pwd - begin - - # find final set of embedded gems that are also found on disk with equal or higher version but compatible major version - final_embedded_gems = original_embedded_gems.clone - Gem::Specification.each do |spec| - current_embedded_gem = final_embedded_gems[spec.name] - - # not an embedded gem - next if current_embedded_gem.nil? - - if spec.version > current_embedded_gem.version - # only allow higher versions with compatible major version - if spec.version.to_s.split('.').first == current_embedded_gem.version.to_s.split('.').first - $logger.debug "Found system gem #{spec.name} #{spec.version}, overrides embedded gem" - final_embedded_gems[spec.name] = spec - end - end - end - - # get a list of all the embedded gems and their dependencies - dependencies = [] - final_embedded_gems.each_value do |spec| - $logger.debug "Accumulating dependencies for #{spec.name} #{spec.version}" - dependencies << Gem::Dependency.new(spec.name) - dependencies.concat(spec.runtime_dependencies) - end - dependencies.each {|d| $logger.debug "Found dependency #{d}"} - - # resolve dependencies - activation_errors = false - original_load_path = $:.clone - resolver = Gem::Resolver.for_current_gems(dependencies) - resolver.resolve.each do |request| - do_activate = true - spec = request.spec - - # check if this is one of our embedded gems - if final_embedded_gems[spec.name] + # get a list of all the embedded gems + dependencies = [] + original_embedded_gems.each_value do |spec| + $logger.debug "Adding dependency on #{spec.name} '~> #{spec.version}'" + dependencies << Gem::Dependency.new(spec.name, "~> #{spec.version}") + end + #dependencies.each {|d| $logger.debug "Added dependency #{d}"} + + # resolve dependencies + activation_errors = false + original_load_path = $:.clone + resolver = Gem::Resolver.for_current_gems(dependencies) + activation_requests = resolver.resolve + $logger.debug "Processing #{activation_requests.size} activation requests" + activation_requests.each do |request| + do_activate = true + spec = request.spec + + # check if this is one of our embedded gems + if original_embedded_gems[spec.name] # check if gem can be loaded from RUBYLIB, this supports developer use case original_load_path.each do |lp| diff --git a/openstudiocore/src/energyplus/ForwardTranslator.hpp b/openstudiocore/src/energyplus/ForwardTranslator.hpp index 5a498aff176..3c6d2b68054 100644 --- a/openstudiocore/src/energyplus/ForwardTranslator.hpp +++ b/openstudiocore/src/energyplus/ForwardTranslator.hpp @@ -450,7 +450,7 @@ namespace detail struct ForwardTranslatorInitializer; }; -#define ENERGYPLUS_VERSION "9.0" +#define ENERGYPLUS_VERSION "9.1" class ENERGYPLUS_API ForwardTranslator { public: @@ -797,7 +797,7 @@ class ENERGYPLUS_API ForwardTranslator { boost::optional translateElectricEquipment( model::ElectricEquipment & modelObject ); boost::optional translateElectricEquipmentITEAirCooled(model::ElectricEquipmentITEAirCooled & modelObject); - + boost::optional translateElectricLoadCenterDistribution( model::ElectricLoadCenterDistribution & modelObject ); boost::optional translateElectricLoadCenterInverterLookUpTable( model::ElectricLoadCenterInverterLookUpTable & modelObject ); diff --git a/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateEvaporativeCoolerDirectResearchSpecial.cpp b/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateEvaporativeCoolerDirectResearchSpecial.cpp index 4afa689b96d..8ea955894b7 100644 --- a/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateEvaporativeCoolerDirectResearchSpecial.cpp +++ b/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateEvaporativeCoolerDirectResearchSpecial.cpp @@ -71,7 +71,7 @@ boost::optional ForwardTranslator::translateEvaporativeCoolerDirectRe idfObject.setString(EvaporativeCooler_Direct_ResearchSpecialFields::AvailabilityScheduleName,sched.name().get()); // CoolerEffectiveness - value = modelObject.coolerEffectiveness(); + value = modelObject.coolerDesignEffectiveness(); idfObject.setDouble(EvaporativeCooler_Direct_ResearchSpecialFields::CoolerDesignEffectiveness,value); // RecirculatingWaterPumpPowerConsumption diff --git a/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateHeaderedPumpsConstantSpeed.cpp b/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateHeaderedPumpsConstantSpeed.cpp index 69fe90920eb..a3ba42f2b07 100644 --- a/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateHeaderedPumpsConstantSpeed.cpp +++ b/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateHeaderedPumpsConstantSpeed.cpp @@ -139,6 +139,9 @@ boost::optional ForwardTranslator::translateHeaderedPumpsConstantSpee idfObject.setDouble(HeaderedPumps_ConstantSpeedFields::SkinLossRadiativeFraction,value); } + // End Use Subcategory + idfObject.setString(HeaderedPumps_ConstantSpeedFields::EndUseSubcategory, modelObject.endUseSubcategory()); + return idfObject; } diff --git a/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateHeaderedPumpsVariableSpeed.cpp b/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateHeaderedPumpsVariableSpeed.cpp index b1915e75a60..d63fb34fdfc 100644 --- a/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateHeaderedPumpsVariableSpeed.cpp +++ b/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateHeaderedPumpsVariableSpeed.cpp @@ -169,6 +169,9 @@ boost::optional ForwardTranslator::translateHeaderedPumpsVariableSpee idfObject.setDouble(HeaderedPumps_VariableSpeedFields::SkinLossRadiativeFraction,value); } + // End Use Subcategory + idfObject.setString(HeaderedPumps_VariableSpeedFields::EndUseSubcategory, modelObject.endUseSubcategory()); + return idfObject; } diff --git a/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslatePumpConstantSpeed.cpp b/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslatePumpConstantSpeed.cpp index 72dc6e84f80..232d639c6f4 100644 --- a/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslatePumpConstantSpeed.cpp +++ b/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslatePumpConstantSpeed.cpp @@ -178,6 +178,9 @@ boost::optional ForwardTranslator::translatePumpConstantSpeed( idfObject.setDouble(Pump_ConstantSpeedFields::DesignShaftPowerperUnitFlowRateperUnitHead,value.get()); } + // End Use Subcategory + idfObject.setString(Pump_ConstantSpeedFields::EndUseSubcategory, modelObject.endUseSubcategory()); + return idfObject; } diff --git a/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslatePumpVariableSpeed.cpp b/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslatePumpVariableSpeed.cpp index fa420b36ba2..9ffceb2ca24 100644 --- a/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslatePumpVariableSpeed.cpp +++ b/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslatePumpVariableSpeed.cpp @@ -256,6 +256,9 @@ boost::optional ForwardTranslator::translatePumpVariableSpeed( idfObject.setDouble(Pump_VariableSpeedFields::DesignMinimumFlowRateFraction,value.get()); } + // End Use Subcategory + idfObject.setString(Pump_VariableSpeedFields::EndUseSubcategory, modelObject.endUseSubcategory()); + return idfObject; } diff --git a/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateZoneHVACEquipmentList.cpp b/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateZoneHVACEquipmentList.cpp index ea7734880d7..1ffac24def8 100644 --- a/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateZoneHVACEquipmentList.cpp +++ b/openstudiocore/src/energyplus/ForwardTranslator/ForwardTranslateZoneHVACEquipmentList.cpp @@ -142,6 +142,12 @@ boost::optional ForwardTranslator::translateZoneHVACEquipmentList( Zo idfObject.setName(name); } + // LoadDistributionScheme + { + auto scheme = modelObject.loadDistributionScheme(); + idfObject.setString(ZoneHVAC_EquipmentListFields::LoadDistributionScheme,scheme); + } + for( auto & elem : stdEquipment ) { unsigned coolingPriority = coolingMap[elem]; @@ -155,6 +161,17 @@ boost::optional ForwardTranslator::translateZoneHVACEquipmentList( Zo eg.setString(ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentName,_equipment->name().get()); eg.setUnsigned(ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentCoolingSequence,coolingPriority); eg.setUnsigned(ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentHeatingorNoLoadSequence,heatingPriority); + + // Only translate the Sequential Load Fractions if appropriate (model checks for Load Distribution = SequentialLoad, and has heating/cooling + // Priority that isn't zero) + if (boost::optional _frac = modelObject.sequentialCoolingFraction(elem)) { + eg.setDouble(ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentSequentialCoolingFraction, _frac.get()); + } + + if (boost::optional _frac = modelObject.sequentialHeatingFraction(elem)) { + eg.setDouble(ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentSequentialHeatingFraction, _frac.get()); + } + } auto zoneHVAC = elem.optionalCast(); @@ -166,12 +183,6 @@ boost::optional ForwardTranslator::translateZoneHVACEquipmentList( Zo } } - // LoadDistributionScheme - { - auto scheme = modelObject.loadDistributionScheme(); - idfObject.setString(ZoneHVAC_EquipmentListFields::LoadDistributionScheme,scheme); - } - if (!airChillers.empty()) { // ZoneHVAC:RefrigerationChillerSet diff --git a/openstudiocore/src/energyplus/Resources/LCCusePriceEscalationDataSet2011.idf b/openstudiocore/src/energyplus/Resources/LCCusePriceEscalationDataSet2011.idf index 7e13310a377..c6ceaea905f 100644 --- a/openstudiocore/src/energyplus/Resources/LCCusePriceEscalationDataSet2011.idf +++ b/openstudiocore/src/energyplus/Resources/LCCusePriceEscalationDataSet2011.idf @@ -23,7 +23,7 @@ ! converted into EnergyPlus objects using a spreadsheet called ConvertENCOSTtoEnergyPlusLifeCycleCost.xls ! which is available upon request. - Version,9.0; + Version,9.1; LifeCycleCost:UsePriceEscalation, NorthEast Residential-Electricity, !- LCC Price Escalation Name diff --git a/openstudiocore/src/energyplus/Resources/NH3_FluidPropertiesDataSet.idf b/openstudiocore/src/energyplus/Resources/NH3_FluidPropertiesDataSet.idf index 06781f36eb6..4e6129a7493 100644 --- a/openstudiocore/src/energyplus/Resources/NH3_FluidPropertiesDataSet.idf +++ b/openstudiocore/src/energyplus/Resources/NH3_FluidPropertiesDataSet.idf @@ -15,10 +15,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + FluidProperties:Name, NH3, !- Fluid Name Refrigerant; !- Fluid Type diff --git a/openstudiocore/src/energyplus/Resources/R11_FluidPropertiesDataSet.idf b/openstudiocore/src/energyplus/Resources/R11_FluidPropertiesDataSet.idf index d683d2f501c..1c789524f50 100644 --- a/openstudiocore/src/energyplus/Resources/R11_FluidPropertiesDataSet.idf +++ b/openstudiocore/src/energyplus/Resources/R11_FluidPropertiesDataSet.idf @@ -15,10 +15,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + FluidProperties:Name, R11, !- Fluid Name Refrigerant; !- Fluid Type diff --git a/openstudiocore/src/energyplus/Resources/R123_FluidPropertiesDataSet.idf b/openstudiocore/src/energyplus/Resources/R123_FluidPropertiesDataSet.idf index 43551aed730..3d3687526ae 100644 --- a/openstudiocore/src/energyplus/Resources/R123_FluidPropertiesDataSet.idf +++ b/openstudiocore/src/energyplus/Resources/R123_FluidPropertiesDataSet.idf @@ -15,10 +15,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + FluidProperties:Name, R123, !- Fluid Name Refrigerant; !- Fluid Type diff --git a/openstudiocore/src/energyplus/Resources/R12_FluidPropertiesDataSet.idf b/openstudiocore/src/energyplus/Resources/R12_FluidPropertiesDataSet.idf index 554f8f8b56f..9e9d6b7f063 100644 --- a/openstudiocore/src/energyplus/Resources/R12_FluidPropertiesDataSet.idf +++ b/openstudiocore/src/energyplus/Resources/R12_FluidPropertiesDataSet.idf @@ -15,10 +15,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + FluidProperties:Name, R12, !- Fluid Name Refrigerant; !- Fluid Type diff --git a/openstudiocore/src/energyplus/Resources/R134a_FluidPropertiesDataSet.idf b/openstudiocore/src/energyplus/Resources/R134a_FluidPropertiesDataSet.idf index df9a81129c0..631080f56e7 100644 --- a/openstudiocore/src/energyplus/Resources/R134a_FluidPropertiesDataSet.idf +++ b/openstudiocore/src/energyplus/Resources/R134a_FluidPropertiesDataSet.idf @@ -15,10 +15,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + FluidProperties:Name, R134a, !- Fluid Name Refrigerant; !- Fluid Type diff --git a/openstudiocore/src/energyplus/Resources/R22_FluidPropertiesDataSet.idf b/openstudiocore/src/energyplus/Resources/R22_FluidPropertiesDataSet.idf index 7aa98093b3b..8d65034585e 100644 --- a/openstudiocore/src/energyplus/Resources/R22_FluidPropertiesDataSet.idf +++ b/openstudiocore/src/energyplus/Resources/R22_FluidPropertiesDataSet.idf @@ -15,10 +15,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + FluidProperties:Name, R22, !- Fluid Name Refrigerant; !- Fluid Type diff --git a/openstudiocore/src/energyplus/Resources/R404a_FluidPropertiesDataSet.idf b/openstudiocore/src/energyplus/Resources/R404a_FluidPropertiesDataSet.idf index 41753ca0a6d..6f3169584cd 100644 --- a/openstudiocore/src/energyplus/Resources/R404a_FluidPropertiesDataSet.idf +++ b/openstudiocore/src/energyplus/Resources/R404a_FluidPropertiesDataSet.idf @@ -15,10 +15,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + FluidProperties:Name, R404a, !- Fluid Name Refrigerant; !- Fluid Type diff --git a/openstudiocore/src/energyplus/Resources/R407a_FluidPropertiesDataSet.idf b/openstudiocore/src/energyplus/Resources/R407a_FluidPropertiesDataSet.idf index a52eca45b7d..bc181602f0c 100644 --- a/openstudiocore/src/energyplus/Resources/R407a_FluidPropertiesDataSet.idf +++ b/openstudiocore/src/energyplus/Resources/R407a_FluidPropertiesDataSet.idf @@ -15,10 +15,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + FluidProperties:Name, R407a, !- Fluid Name Refrigerant; !- Fluid Type diff --git a/openstudiocore/src/energyplus/Resources/R410a_FluidPropertiesDataSet.idf b/openstudiocore/src/energyplus/Resources/R410a_FluidPropertiesDataSet.idf index bd2498bac4b..a6611dc4f24 100644 --- a/openstudiocore/src/energyplus/Resources/R410a_FluidPropertiesDataSet.idf +++ b/openstudiocore/src/energyplus/Resources/R410a_FluidPropertiesDataSet.idf @@ -15,10 +15,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + FluidProperties:Name, R410a, !- Fluid Name Refrigerant; !- Fluid Type diff --git a/openstudiocore/src/energyplus/Resources/R507a_FluidPropertiesDataSet.idf b/openstudiocore/src/energyplus/Resources/R507a_FluidPropertiesDataSet.idf index 87ab1352d46..839bb8fd7b8 100644 --- a/openstudiocore/src/energyplus/Resources/R507a_FluidPropertiesDataSet.idf +++ b/openstudiocore/src/energyplus/Resources/R507a_FluidPropertiesDataSet.idf @@ -15,10 +15,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + FluidProperties:Name, R507A, !- Fluid Name Refrigerant; !- Fluid Type diff --git a/openstudiocore/src/energyplus/Resources/R744_FluidPropertiesDataSet.idf b/openstudiocore/src/energyplus/Resources/R744_FluidPropertiesDataSet.idf index 75bb6b201d5..60df659f864 100644 --- a/openstudiocore/src/energyplus/Resources/R744_FluidPropertiesDataSet.idf +++ b/openstudiocore/src/energyplus/Resources/R744_FluidPropertiesDataSet.idf @@ -15,10 +15,12 @@ ! 8.8; !- Version Identifier ! Version, ! 8.9; !- Version Identifier - ! Version, ! 9.0; !- Version Identifier +! Version, +! 9.1; !- Version Identifier + FluidProperties:Name, R744, !- Fluid Name Refrigerant; !- Fluid Type diff --git a/openstudiocore/src/model/CMakeLists.txt b/openstudiocore/src/model/CMakeLists.txt index 3b92fc86d5a..73bd988ffc0 100644 --- a/openstudiocore/src/model/CMakeLists.txt +++ b/openstudiocore/src/model/CMakeLists.txt @@ -2030,6 +2030,7 @@ set(${target_name}_test_src test/ZoneHVACDehumidifierDX_GTest.cpp test/ZoneHVACEnergyRecoveryVentilator_GTest.cpp test/ZoneHVACEnergyRecoveryVentilatorController_GTest.cpp + test/ZoneHVACEquipmentList_GTest.cpp test/ZoneHVACFourPipeFanCoil_GTest.cpp test/ZoneHVACHighTemperatureRadiant_GTest.cpp test/ZoneHVACLowTemperatureRadiantElectric_GTest.cpp diff --git a/openstudiocore/src/model/CoilHeatingDXSingleSpeed.cpp b/openstudiocore/src/model/CoilHeatingDXSingleSpeed.cpp index d787fe6e53b..a6693369b3e 100644 --- a/openstudiocore/src/model/CoilHeatingDXSingleSpeed.cpp +++ b/openstudiocore/src/model/CoilHeatingDXSingleSpeed.cpp @@ -93,8 +93,8 @@ namespace detail { const std::vector& CoilHeatingDXSingleSpeed_Impl::outputVariableNames() const { static std::vector result{ - "Heating Coil Total Heating Rate", - "Heating Coil Total Heating Energy", + "Heating Coil Heating Rate", + "Heating Coil Heating Energy", "Heating Coil Electric Power", "Heating Coil Electric Energy", "Heating Coil Defrost Electric Power", diff --git a/openstudiocore/src/model/DefaultConstructionSet.cpp b/openstudiocore/src/model/DefaultConstructionSet.cpp index 11ae91c9d1c..149b3eb9ba5 100644 --- a/openstudiocore/src/model/DefaultConstructionSet.cpp +++ b/openstudiocore/src/model/DefaultConstructionSet.cpp @@ -250,8 +250,11 @@ namespace detail { defaultSurfaceConstructions = this->defaultGroundContactSurfaceConstructions(); }else if (istringEqual("Surface", outsideBoundaryCondition)){ defaultSurfaceConstructions = this->defaultInteriorSurfaceConstructions(); + } else if (istringEqual("Adiabatic", outsideBoundaryCondition)) { + // Adiabatic is special - doesn't has multiple choices by orientation - so return directly + result = this->adiabaticSurfaceConstruction(); + return result; }else{ - //Adiabatic //GroundFCfactorMethod //OtherSideCoefficients //OtherSideConditionsModel @@ -696,6 +699,48 @@ namespace detail { return true; } + + // Adiabatic Surface Construction Methods + boost::optional DefaultConstructionSet_Impl::adiabaticSurfaceConstruction() const + { + return getObject().getModelObjectTarget(OS_DefaultConstructionSetFields::AdiabaticSurfaceConstructionName); + } + + bool DefaultConstructionSet_Impl::setAdiabaticSurfaceConstruction(const ConstructionBase& construction) + { + return setPointer(OS_DefaultConstructionSetFields::AdiabaticSurfaceConstructionName, construction.handle()); + } + + void DefaultConstructionSet_Impl::resetAdiabaticSurfaceConstruction() + { + setString(OS_DefaultConstructionSetFields::AdiabaticSurfaceConstructionName, ""); + } + + boost::optional DefaultConstructionSet_Impl::adiabaticSurfaceConstructionAsModelObject() const { + OptionalModelObject result; + OptionalConstructionBase intermediate = adiabaticSurfaceConstruction(); + if (intermediate) { + result = *intermediate; + } + return result; + } + + bool DefaultConstructionSet_Impl::setAdiabaticSurfaceConstructionAsModelObject(const boost::optional& modelObject) { + if (modelObject) { + OptionalConstructionBase intermediate = modelObject->optionalCast(); + if (intermediate) { + return setAdiabaticSurfaceConstruction(*intermediate); + } + else { + return false; + } + } + else { + resetAdiabaticSurfaceConstruction(); + } + return true; + } + } // detail DefaultConstructionSet::DefaultConstructionSet(const Model& model) @@ -825,6 +870,18 @@ void DefaultConstructionSet::merge(const DefaultConstructionSet& other){ getImpl()->merge(other); } +boost::optional DefaultConstructionSet::adiabaticSurfaceConstruction() const{ + return getImpl()->adiabaticSurfaceConstruction(); +} + +bool DefaultConstructionSet::setAdiabaticSurfaceConstruction(const ConstructionBase& construction){ + return getImpl()->setAdiabaticSurfaceConstruction(construction); +} + +void DefaultConstructionSet::resetAdiabaticSurfaceConstruction(){ + getImpl()->resetAdiabaticSurfaceConstruction(); +} + /// @cond DefaultConstructionSet::DefaultConstructionSet(std::shared_ptr impl) : ResourceObject(std::move(impl)) diff --git a/openstudiocore/src/model/DefaultConstructionSet.hpp b/openstudiocore/src/model/DefaultConstructionSet.hpp index 4253a8f7b68..834e19b8ad2 100644 --- a/openstudiocore/src/model/DefaultConstructionSet.hpp +++ b/openstudiocore/src/model/DefaultConstructionSet.hpp @@ -85,6 +85,8 @@ class MODEL_API DefaultConstructionSet : public ResourceObject { boost::optional siteShadingConstruction() const; + boost::optional adiabaticSurfaceConstruction() const; + //@} /** @name Setters */ //@{ @@ -125,6 +127,10 @@ class MODEL_API DefaultConstructionSet : public ResourceObject { void resetSiteShadingConstruction(); + bool setAdiabaticSurfaceConstruction(const ConstructionBase& construction); + + void resetAdiabaticSurfaceConstruction(); + //@} /// Returns the default construction for this planar surface if available. diff --git a/openstudiocore/src/model/DefaultConstructionSet_Impl.hpp b/openstudiocore/src/model/DefaultConstructionSet_Impl.hpp index 3cc97896761..f1138ca62da 100644 --- a/openstudiocore/src/model/DefaultConstructionSet_Impl.hpp +++ b/openstudiocore/src/model/DefaultConstructionSet_Impl.hpp @@ -47,16 +47,6 @@ namespace detail { /** DefaultConstructionSet_Impl is a ResourceObject_Impl that is the implementation class for DefaultConstructionSet.*/ class MODEL_API DefaultConstructionSet_Impl : public ResourceObject_Impl { - - - - - - - - - - public: /** @name Constructors and Destructors */ //@{ @@ -100,6 +90,8 @@ namespace detail { boost::optional siteShadingConstruction() const; + boost::optional adiabaticSurfaceConstruction() const; + //@} /** @name Setters */ //@{ @@ -140,6 +132,10 @@ namespace detail { void resetSiteShadingConstruction(); + bool setAdiabaticSurfaceConstruction(const ConstructionBase& construction); + + void resetAdiabaticSurfaceConstruction(); + //@} /// Returns the default construction for this planar surface if available. @@ -161,6 +157,7 @@ namespace detail { boost::optional spaceShadingConstructionAsModelObject() const; boost::optional buildingShadingConstructionAsModelObject() const; boost::optional siteShadingConstructionAsModelObject() const; + boost::optional adiabaticSurfaceConstructionAsModelObject() const; bool setDefaultExteriorSurfaceConstructionsAsModelObject(const boost::optional& modelObject); bool setDefaultInteriorSurfaceConstructionsAsModelObject(const boost::optional& modelObject); @@ -171,6 +168,7 @@ namespace detail { bool setSpaceShadingConstructionAsModelObject(const boost::optional& modelObject); bool setBuildingShadingConstructionAsModelObject(const boost::optional& modelObject); bool setSiteShadingConstructionAsModelObject(const boost::optional& modelObject); + bool setAdiabaticSurfaceConstructionAsModelObject(const boost::optional& modelObject); }; diff --git a/openstudiocore/src/model/EvaporativeCoolerDirectResearchSpecial.cpp b/openstudiocore/src/model/EvaporativeCoolerDirectResearchSpecial.cpp index 931c381b2a1..ff1e3193e8c 100644 --- a/openstudiocore/src/model/EvaporativeCoolerDirectResearchSpecial.cpp +++ b/openstudiocore/src/model/EvaporativeCoolerDirectResearchSpecial.cpp @@ -172,14 +172,14 @@ namespace detail{ return result; } - double EvaporativeCoolerDirectResearchSpecial_Impl::coolerEffectiveness() const + double EvaporativeCoolerDirectResearchSpecial_Impl::coolerDesignEffectiveness() const { - return this->getDouble(OS_EvaporativeCooler_Direct_ResearchSpecialFields::CoolerEffectiveness).get(); + return this->getDouble(OS_EvaporativeCooler_Direct_ResearchSpecialFields::CoolerDesignEffectiveness).get(); } - bool EvaporativeCoolerDirectResearchSpecial_Impl::setCoolerEffectiveness( double value ) + bool EvaporativeCoolerDirectResearchSpecial_Impl::setCoolerDesignEffectiveness( double value ) { - return this->setDouble(OS_EvaporativeCooler_Direct_ResearchSpecialFields::CoolerEffectiveness,value); + return this->setDouble(OS_EvaporativeCooler_Direct_ResearchSpecialFields::CoolerDesignEffectiveness,value); } boost::optional EvaporativeCoolerDirectResearchSpecial_Impl::recirculatingWaterPumpPowerConsumption() const @@ -394,7 +394,7 @@ EvaporativeCoolerDirectResearchSpecial::EvaporativeCoolerDirectResearchSpecial(c this->setAvailabilitySchedule(schedule); - setCoolerEffectiveness(1.0); + setCoolerDesignEffectiveness(1.0); setRecirculatingWaterPumpPowerConsumption(0.0); @@ -402,6 +402,9 @@ EvaporativeCoolerDirectResearchSpecial::EvaporativeCoolerDirectResearchSpecial(c setBlowdownConcentrationRatio(0.0); + // TODO: JM 2019-02-25: This input seems wrong given the current E+ IDD notes / IO documentation. + // This isn't a regular sizing factor, but something in W/(m3/s), with a default of 90 and a range of 55 to 150.0 + // @kbenne for review please setWaterPumpPowerSizingFactor(0.1); @@ -432,14 +435,26 @@ bool EvaporativeCoolerDirectResearchSpecial::setAvailableSchedule(Schedule & sch return getImpl()->setAvailabilitySchedule(schedule); } +double EvaporativeCoolerDirectResearchSpecial::coolerDesignEffectiveness() const +{ + return getImpl()->coolerDesignEffectiveness(); +} + double EvaporativeCoolerDirectResearchSpecial::coolerEffectiveness() const { - return getImpl()->coolerEffectiveness(); + LOG(Info, "This method is deprecated, please replace it with coolerDesignEffectiveness."); + return coolerDesignEffectiveness(); +} + +bool EvaporativeCoolerDirectResearchSpecial::setCoolerDesignEffectiveness( double value ) +{ + return getImpl()->setCoolerDesignEffectiveness(value); } bool EvaporativeCoolerDirectResearchSpecial::setCoolerEffectiveness( double value ) { - return getImpl()->setCoolerEffectiveness(value); + LOG(Info, "This method is deprecated, please replace it with setCoolerDesignEffectiveness."); + return setCoolerDesignEffectiveness(value); } boost::optional EvaporativeCoolerDirectResearchSpecial::recirculatingWaterPumpPowerConsumption() const diff --git a/openstudiocore/src/model/EvaporativeCoolerDirectResearchSpecial.hpp b/openstudiocore/src/model/EvaporativeCoolerDirectResearchSpecial.hpp index faaa2dfb709..4643819565e 100644 --- a/openstudiocore/src/model/EvaporativeCoolerDirectResearchSpecial.hpp +++ b/openstudiocore/src/model/EvaporativeCoolerDirectResearchSpecial.hpp @@ -78,11 +78,16 @@ class MODEL_API EvaporativeCoolerDirectResearchSpecial : public StraightComponen /** \deprecated */ bool setAvailableSchedule(Schedule& schedule); - /** Returns the value of the CoolerEffectiveness field. **/ - /** In EnergyPlus 8.3.0 and above this property maps to the EnergyPlus field "Cooler Design Effectiveness" **/ + /** Returns the value of the CoolerDesignEffectiveness field. **/ + double coolerDesignEffectiveness() const; + + /** Deprecated: In EnergyPlus 8.3.0 and above this property maps to the EnergyPlus field "Cooler Design Effectiveness" **/ double coolerEffectiveness() const; - /** Sets the value of the CoolerEffectiveness field. **/ + /** Sets the value of the CoolerDesignEffectiveness field. **/ + bool setCoolerDesignEffectiveness( double value ); + + /** Deprecated: In EnergyPlus 8.3.0 and above this property maps to the EnergyPlus field "Cooler Design Effectiveness" **/ bool setCoolerEffectiveness( double value ); /** Returns the value of the RecirculatingWaterPumpPowerConsumption field. **/ diff --git a/openstudiocore/src/model/EvaporativeCoolerDirectResearchSpecial_Impl.hpp b/openstudiocore/src/model/EvaporativeCoolerDirectResearchSpecial_Impl.hpp index 015700c60b7..e4087d1547c 100644 --- a/openstudiocore/src/model/EvaporativeCoolerDirectResearchSpecial_Impl.hpp +++ b/openstudiocore/src/model/EvaporativeCoolerDirectResearchSpecial_Impl.hpp @@ -84,9 +84,9 @@ namespace detail { bool setAvailabilitySchedule(Schedule& schedule); - double coolerEffectiveness() const; + double coolerDesignEffectiveness() const; - bool setCoolerEffectiveness( double value ); + bool setCoolerDesignEffectiveness( double value ); boost::optional recirculatingWaterPumpPowerConsumption() const; diff --git a/openstudiocore/src/model/HeaderedPumpsConstantSpeed.cpp b/openstudiocore/src/model/HeaderedPumpsConstantSpeed.cpp index 0d5b8879ebb..afb046ccb18 100644 --- a/openstudiocore/src/model/HeaderedPumpsConstantSpeed.cpp +++ b/openstudiocore/src/model/HeaderedPumpsConstantSpeed.cpp @@ -336,6 +336,16 @@ namespace detail { return types; } + std::string HeaderedPumpsConstantSpeed_Impl::endUseSubcategory() const { + auto value = getString(OS_HeaderedPumps_ConstantSpeedFields::EndUseSubcategory, true); + OS_ASSERT(value); + return value.get(); + } + + bool HeaderedPumpsConstantSpeed_Impl::setEndUseSubcategory(const std::string & endUseSubcategory) { + return setString(OS_HeaderedPumps_ConstantSpeedFields::EndUseSubcategory, endUseSubcategory); + } + } // detail HeaderedPumpsConstantSpeed::HeaderedPumpsConstantSpeed(const Model& model) @@ -352,6 +362,8 @@ HeaderedPumpsConstantSpeed::HeaderedPumpsConstantSpeed(const Model& model) setFractionofMotorInefficienciestoFluidStream(0.0); setPumpControlType("Continuous"); setSkinLossRadiativeFraction(0.1); + + setEndUseSubcategory("General"); } IddObjectType HeaderedPumpsConstantSpeed::iddObjectType() { @@ -480,6 +492,15 @@ bool HeaderedPumpsConstantSpeed::setSkinLossRadiativeFraction(double skinLossRad return getImpl()->setSkinLossRadiativeFraction(skinLossRadiativeFraction); } + +std::string HeaderedPumpsConstantSpeed::endUseSubcategory() const { + return getImpl()->endUseSubcategory(); +} + +bool HeaderedPumpsConstantSpeed::setEndUseSubcategory(const std::string & endUseSubcategory) { + return getImpl()->setEndUseSubcategory(endUseSubcategory); +} + /// @cond HeaderedPumpsConstantSpeed::HeaderedPumpsConstantSpeed(std::shared_ptr impl) : StraightComponent(std::move(impl)) diff --git a/openstudiocore/src/model/HeaderedPumpsConstantSpeed.hpp b/openstudiocore/src/model/HeaderedPumpsConstantSpeed.hpp index a302f1f718e..269a0d3f2ec 100644 --- a/openstudiocore/src/model/HeaderedPumpsConstantSpeed.hpp +++ b/openstudiocore/src/model/HeaderedPumpsConstantSpeed.hpp @@ -96,6 +96,8 @@ class MODEL_API HeaderedPumpsConstantSpeed : public StraightComponent { double skinLossRadiativeFraction() const; + std::string endUseSubcategory() const; + //@} /** @name Setters */ //@{ @@ -130,6 +132,8 @@ class MODEL_API HeaderedPumpsConstantSpeed : public StraightComponent { bool setSkinLossRadiativeFraction(double skinLossRadiativeFraction); + bool setEndUseSubcategory(const std::string & endUseSubcategory); + //@} /** @name Other */ //@{ diff --git a/openstudiocore/src/model/HeaderedPumpsConstantSpeed_Impl.hpp b/openstudiocore/src/model/HeaderedPumpsConstantSpeed_Impl.hpp index 326b8b81bcc..251c6a8419b 100644 --- a/openstudiocore/src/model/HeaderedPumpsConstantSpeed_Impl.hpp +++ b/openstudiocore/src/model/HeaderedPumpsConstantSpeed_Impl.hpp @@ -71,6 +71,14 @@ namespace detail { virtual std::vector getScheduleTypeKeys(const Schedule& schedule) const override; + virtual void autosize() override; + + virtual void applySizingValues() override; + + virtual std::vector emsActuatorNames() const override; + + virtual std::vector emsInternalVariableNames() const override; + //@} /** @name Getters */ //@{ @@ -101,17 +109,11 @@ namespace detail { double skinLossRadiativeFraction() const; - boost::optional autosizedTotalRatedFlowRate() const ; + boost::optional autosizedTotalRatedFlowRate() const ; - boost::optional autosizedRatedPowerConsumption() const ; + boost::optional autosizedRatedPowerConsumption() const ; - virtual void autosize() override; - - virtual void applySizingValues() override; - - virtual std::vector emsActuatorNames() const override; - - virtual std::vector emsInternalVariableNames() const override; + std::string endUseSubcategory() const; //@} /** @name Setters */ @@ -147,6 +149,8 @@ namespace detail { bool setSkinLossRadiativeFraction(double skinLossRadiativeFraction); + bool setEndUseSubcategory(const std::string & endUseSubcategory); + //@} /** @name Other */ //@{ diff --git a/openstudiocore/src/model/HeaderedPumpsVariableSpeed.cpp b/openstudiocore/src/model/HeaderedPumpsVariableSpeed.cpp index 55d0045a258..78e365f2e6d 100644 --- a/openstudiocore/src/model/HeaderedPumpsVariableSpeed.cpp +++ b/openstudiocore/src/model/HeaderedPumpsVariableSpeed.cpp @@ -395,6 +395,17 @@ namespace detail { std::vector types{"Pump Maximum Mass Flow Rate"}; return types; } + + std::string HeaderedPumpsVariableSpeed_Impl::endUseSubcategory() const { + auto value = getString(OS_HeaderedPumps_VariableSpeedFields::EndUseSubcategory, true); + OS_ASSERT(value); + return value.get(); + } + + bool HeaderedPumpsVariableSpeed_Impl::setEndUseSubcategory(const std::string & endUseSubcategory) { + return setString(OS_HeaderedPumps_VariableSpeedFields::EndUseSubcategory, endUseSubcategory); + } + } // detail HeaderedPumpsVariableSpeed::HeaderedPumpsVariableSpeed(const Model& model) @@ -416,6 +427,8 @@ HeaderedPumpsVariableSpeed::HeaderedPumpsVariableSpeed(const Model& model) setMinimumFlowRateFraction(0.0); setPumpControlType("Continuous"); setSkinLossRadiativeFraction(0.1); + + setEndUseSubcategory("General"); } IddObjectType HeaderedPumpsVariableSpeed::iddObjectType() { @@ -584,6 +597,14 @@ bool HeaderedPumpsVariableSpeed::setSkinLossRadiativeFraction(double skinLossRad return getImpl()->setSkinLossRadiativeFraction(skinLossRadiativeFraction); } +std::string HeaderedPumpsVariableSpeed::endUseSubcategory() const { + return getImpl()->endUseSubcategory(); +} + +bool HeaderedPumpsVariableSpeed::setEndUseSubcategory(const std::string & endUseSubcategory) { + return getImpl()->setEndUseSubcategory(endUseSubcategory); +} + /// @cond HeaderedPumpsVariableSpeed::HeaderedPumpsVariableSpeed(std::shared_ptr impl) : StraightComponent(std::move(impl)) diff --git a/openstudiocore/src/model/HeaderedPumpsVariableSpeed.hpp b/openstudiocore/src/model/HeaderedPumpsVariableSpeed.hpp index cfacbe87873..b2226b184e4 100644 --- a/openstudiocore/src/model/HeaderedPumpsVariableSpeed.hpp +++ b/openstudiocore/src/model/HeaderedPumpsVariableSpeed.hpp @@ -106,6 +106,8 @@ class MODEL_API HeaderedPumpsVariableSpeed : public StraightComponent { double skinLossRadiativeFraction() const; + std::string endUseSubcategory() const; + //@} /** @name Setters */ //@{ @@ -150,6 +152,8 @@ class MODEL_API HeaderedPumpsVariableSpeed : public StraightComponent { bool setSkinLossRadiativeFraction(double skinLossRadiativeFraction); + bool setEndUseSubcategory(const std::string & endUseSubcategory); + //@} /** @name Other */ //@{ diff --git a/openstudiocore/src/model/HeaderedPumpsVariableSpeed_Impl.hpp b/openstudiocore/src/model/HeaderedPumpsVariableSpeed_Impl.hpp index 695de9cb0f5..82f02573594 100644 --- a/openstudiocore/src/model/HeaderedPumpsVariableSpeed_Impl.hpp +++ b/openstudiocore/src/model/HeaderedPumpsVariableSpeed_Impl.hpp @@ -71,6 +71,14 @@ namespace detail { virtual std::vector getScheduleTypeKeys(const Schedule& schedule) const override; + virtual void autosize() override; + + virtual void applySizingValues() override; + + virtual std::vector emsActuatorNames() const override; + + virtual std::vector emsInternalVariableNames() const override; + //@} /** @name Getters */ //@{ @@ -111,17 +119,11 @@ namespace detail { double skinLossRadiativeFraction() const; - boost::optional autosizedTotalRatedFlowRate() const ; + boost::optional autosizedTotalRatedFlowRate() const ; - boost::optional autosizedRatedPowerConsumption() const ; + boost::optional autosizedRatedPowerConsumption() const ; - virtual void autosize() override; - - virtual void applySizingValues() override; - - virtual std::vector emsActuatorNames() const override; - - virtual std::vector emsInternalVariableNames() const override; + std::string endUseSubcategory() const; //@} /** @name Setters */ @@ -167,6 +169,8 @@ namespace detail { bool setSkinLossRadiativeFraction(double skinLossRadiativeFraction); + bool setEndUseSubcategory(const std::string & endUseSubcategory); + //@} /** @name Other */ //@{ diff --git a/openstudiocore/src/model/PumpConstantSpeed.cpp b/openstudiocore/src/model/PumpConstantSpeed.cpp index 9d2b8af1668..e068a0000e9 100644 --- a/openstudiocore/src/model/PumpConstantSpeed.cpp +++ b/openstudiocore/src/model/PumpConstantSpeed.cpp @@ -563,6 +563,16 @@ namespace detail { return types; } + std::string PumpConstantSpeed_Impl::endUseSubcategory() const { + auto value = getString(OS_Pump_ConstantSpeedFields::EndUseSubcategory, true); + OS_ASSERT(value); + return value.get(); + } + + bool PumpConstantSpeed_Impl::setEndUseSubcategory(const std::string & endUseSubcategory) { + return setString(OS_Pump_ConstantSpeedFields::EndUseSubcategory, endUseSubcategory); + } + } // detail PumpConstantSpeed::PumpConstantSpeed(const Model& model) @@ -586,6 +596,8 @@ PumpConstantSpeed::PumpConstantSpeed(const Model& model) setString(OS_Pump_ConstantSpeedFields::RotationalSpeed,""); setString(OS_Pump_ConstantSpeedFields::Zone,""); setString(OS_Pump_ConstantSpeedFields::SkinLossRadiativeFraction,""); + + setEndUseSubcategory("General"); } IddObjectType PumpConstantSpeed::iddObjectType() { @@ -802,6 +814,14 @@ bool PumpConstantSpeed::setDesignShaftPowerPerUnitFlowRatePerUnitHead(double des return getImpl()->setDesignShaftPowerPerUnitFlowRatePerUnitHead(designShaftPowerPerUnitFlowRatePerUnitHead); } +std::string PumpConstantSpeed::endUseSubcategory() const { + return getImpl()->endUseSubcategory(); +} + +bool PumpConstantSpeed::setEndUseSubcategory(const std::string & endUseSubcategory) { + return getImpl()->setEndUseSubcategory(endUseSubcategory); +} + /// @cond PumpConstantSpeed::PumpConstantSpeed(std::shared_ptr impl) : StraightComponent(std::move(impl)) diff --git a/openstudiocore/src/model/PumpConstantSpeed.hpp b/openstudiocore/src/model/PumpConstantSpeed.hpp index 9248fcbc910..028bfa7d5b1 100644 --- a/openstudiocore/src/model/PumpConstantSpeed.hpp +++ b/openstudiocore/src/model/PumpConstantSpeed.hpp @@ -170,6 +170,10 @@ class MODEL_API PumpConstantSpeed : public StraightComponent { bool setDesignShaftPowerPerUnitFlowRatePerUnitHead(double designShaftPowerPerUnitFlowRatePerUnitHead); + std::string endUseSubcategory() const; + + bool setEndUseSubcategory(const std::string & endUseSubcategory); + protected: /// @cond diff --git a/openstudiocore/src/model/PumpConstantSpeed_Impl.hpp b/openstudiocore/src/model/PumpConstantSpeed_Impl.hpp index 1d9de987259..4100624fdff 100644 --- a/openstudiocore/src/model/PumpConstantSpeed_Impl.hpp +++ b/openstudiocore/src/model/PumpConstantSpeed_Impl.hpp @@ -104,6 +104,8 @@ namespace detail { boost::optional skinLossRadiativeFraction() const; + std::string endUseSubcategory() const; + bool setRatedFlowRate(boost::optional ratedFlowRate); void resetRatedFlowRate(); @@ -186,6 +188,8 @@ namespace detail { virtual std::vector emsInternalVariableNames() const override; + bool setEndUseSubcategory(const std::string & endUseSubcategory); + protected: private: diff --git a/openstudiocore/src/model/PumpVariableSpeed.cpp b/openstudiocore/src/model/PumpVariableSpeed.cpp index ab5c96dde3d..5f0ceaa7604 100644 --- a/openstudiocore/src/model/PumpVariableSpeed.cpp +++ b/openstudiocore/src/model/PumpVariableSpeed.cpp @@ -894,6 +894,16 @@ namespace detail { return types; } + std::string PumpVariableSpeed_Impl::endUseSubcategory() const { + auto value = getString(OS_Pump_VariableSpeedFields::EndUseSubcategory, true); + OS_ASSERT(value); + return value.get(); + } + + bool PumpVariableSpeed_Impl::setEndUseSubcategory(const std::string & endUseSubcategory) { + return setString(OS_Pump_VariableSpeedFields::EndUseSubcategory, endUseSubcategory); + } + } // detail PumpVariableSpeed::PumpVariableSpeed(const Model& model) @@ -908,6 +918,8 @@ PumpVariableSpeed::PumpVariableSpeed(const Model& model) setDesignElectricPowerPerUnitFlowRate(348701.1); setDesignShaftPowerPerUnitFlowRatePerUnitHead(1.282051282); setDesignMinimumFlowRateFraction(0.0); + + setEndUseSubcategory("General"); } IddObjectType PumpVariableSpeed::iddObjectType() { @@ -1286,6 +1298,14 @@ bool PumpVariableSpeed::setDesignMinimumFlowRateFraction(double designMinimumFlo return getImpl()->setDesignMinimumFlowRateFraction(designMinimumFlowRateFraction); } +std::string PumpVariableSpeed::endUseSubcategory() const { + return getImpl()->endUseSubcategory(); +} + +bool PumpVariableSpeed::setEndUseSubcategory(const std::string & endUseSubcategory) { + return getImpl()->setEndUseSubcategory(endUseSubcategory); +} + /// @cond PumpVariableSpeed::PumpVariableSpeed(std::shared_ptr impl) : StraightComponent(std::move(impl)) diff --git a/openstudiocore/src/model/PumpVariableSpeed.hpp b/openstudiocore/src/model/PumpVariableSpeed.hpp index 8cefc747053..6f349deb366 100644 --- a/openstudiocore/src/model/PumpVariableSpeed.hpp +++ b/openstudiocore/src/model/PumpVariableSpeed.hpp @@ -145,6 +145,8 @@ class MODEL_API PumpVariableSpeed : public StraightComponent boost::optional maximumRPMSchedule() const; + std::string endUseSubcategory() const; + //@} /** @name Setters */ //@{ @@ -264,6 +266,8 @@ class MODEL_API PumpVariableSpeed : public StraightComponent bool setDesignMinimumFlowRateFraction(double designMinimumFlowRateFraction); + bool setEndUseSubcategory(const std::string & endUseSubcategory); + //@} protected: /// @cond diff --git a/openstudiocore/src/model/PumpVariableSpeed_Impl.hpp b/openstudiocore/src/model/PumpVariableSpeed_Impl.hpp index 69266ce3a8f..bb3c4418b89 100644 --- a/openstudiocore/src/model/PumpVariableSpeed_Impl.hpp +++ b/openstudiocore/src/model/PumpVariableSpeed_Impl.hpp @@ -80,6 +80,14 @@ namespace detail { virtual bool addToNode(Node & node) override; + virtual void autosize() override; + + virtual void applySizingValues() override; + + virtual std::vector emsActuatorNames() const override; + + virtual std::vector emsInternalVariableNames() const override; + //@} /** @name Getters */ //@{ @@ -150,17 +158,11 @@ namespace detail { boost::optional maximumRPMSchedule() const; - boost::optional autosizedRatedFlowRate() const ; + boost::optional autosizedRatedFlowRate() const ; - boost::optional autosizedRatedPowerConsumption() const ; + boost::optional autosizedRatedPowerConsumption() const ; - virtual void autosize() override; - - virtual void applySizingValues() override; - - virtual std::vector emsActuatorNames() const override; - - virtual std::vector emsInternalVariableNames() const override; + std::string endUseSubcategory() const; //@} /** @name Setters */ @@ -276,6 +278,8 @@ namespace detail { bool setDesignMinimumFlowRateFraction(double designMinimumFlowRateFraction); + bool setEndUseSubcategory(const std::string & endUseSubcategory); + //@} private: REGISTER_LOGGER("openstudio.model.PumpVariableSpeed"); diff --git a/openstudiocore/src/model/Space.cpp b/openstudiocore/src/model/Space.cpp index 185e0bd3b3c..f515b3374c1 100644 --- a/openstudiocore/src/model/Space.cpp +++ b/openstudiocore/src/model/Space.cpp @@ -2354,6 +2354,9 @@ namespace detail { std::vector surfaces = this->surfaces(); std::vector otherSurfaces = other.surfaces(); + std::sort(surfaces.begin(), surfaces.end(), [](const Surface & a, const Surface & b) -> bool {return a.grossArea() > b.grossArea(); }); + std::sort(otherSurfaces.begin(), otherSurfaces.end(), [](const Surface & a, const Surface & b) -> bool {return a.grossArea() > b.grossArea(); }); + std::map hasSubSurfaceMap; std::map hasAdjacentSurfaceMap; std::set completedIntersections; @@ -2404,6 +2407,22 @@ namespace detail { std::vector newSurfaces2 = intersection->newSurfaces2(); newOtherSurfaces.insert(newOtherSurfaces.end(), newSurfaces2.begin(), newSurfaces2.end()); + + // surfaces involved in this intersection are ineligible to be re-intersected with other surfaces in this intersection + std::vector ineligibleSurfaces; + ineligibleSurfaces.push_back(surface); + ineligibleSurfaces.insert(ineligibleSurfaces.end(), newSurfaces1.begin(), newSurfaces1.end()); + + std::vector ineligibleOtherSurfaces; + ineligibleOtherSurfaces.push_back(otherSurface); + ineligibleOtherSurfaces.insert(ineligibleOtherSurfaces.end(), newSurfaces2.begin(), newSurfaces2.end()); + for (Surface ineligibleSurface : ineligibleSurfaces){ + for (Surface ineligibleOtherSurface : ineligibleOtherSurfaces){ + std::string ineligibleIntersectionKey = toString(ineligibleSurface.handle()) + toString(ineligibleOtherSurface.handle()); + completedIntersections.insert(ineligibleIntersectionKey); + } + } + } } } @@ -3428,8 +3447,11 @@ Space::Space(std::shared_ptr impl) {} /// @endcond -void intersectSurfaces(std::vector& spaces) +void intersectSurfaces(std::vector& t_spaces) { + std::vector spaces(t_spaces); + std::sort(spaces.begin(), spaces.end(), [](const Space & a, const Space & b) -> bool {return a.floorArea() < b.floorArea(); }); + std::vector bounds; for (const Space& space : spaces){ bounds.push_back(space.transformation()*space.boundingBox()); diff --git a/openstudiocore/src/model/Surface.cpp b/openstudiocore/src/model/Surface.cpp index 92887bb9f2c..db991bef576 100644 --- a/openstudiocore/src/model/Surface.cpp +++ b/openstudiocore/src/model/Surface.cpp @@ -473,9 +473,18 @@ namespace detail { if (istringEqual("Adiabatic", outsideBoundaryCondition)){ // remove all subsurfaces + int n_subsurfaces = 0; for (auto subSurface : subSurfaces()){ subSurface.remove(); + ++n_subsurfaces; } + if (n_subsurfaces > 0) { + // Note JM 2019-03-05: Warn user, it's not obvious that this is happening and they might try to access again + // one of these subsurfaces which are now disconnected objects + LOG(Warn, "Setting the Outside Boundary Condition for Surface '" << this->nameString() + << "' to 'Adiabatic', removed " << n_subsurfaces << " SubSurfaces."); + } + } }else if(adjacentSurface){ // restore the adjacent surface if set boundary condition fails @@ -1065,6 +1074,19 @@ namespace detail { return boost::none; } + boost::optional area1 = getArea(faceVertices); + boost::optional area2 = getArea(otherFaceVertices); + if (area1) { + if (std::abs(area1.get() - intersection->area1()) > tol*tol) { + LOG(Error, "Initial area of surface '" << this->nameString() << "' " << area1.get() << " does not equal post intersection area " << intersection->area1()); + } + } + if (area2) { + if (std::abs(area2.get() - intersection->area2()) > tol*tol) { + LOG(Error, "Initial area of other surface '" << otherSurface.nameString() << "' " << area2.get() << " does not equal post intersection area " << intersection->area2()); + } + } + // non-zero intersection // could match here but will save that for other discrete operation Surface surface(std::dynamic_pointer_cast(this->shared_from_this())); diff --git a/openstudiocore/src/model/ThermalZone.cpp b/openstudiocore/src/model/ThermalZone.cpp index 33fa0a9086f..c6967022aa0 100644 --- a/openstudiocore/src/model/ThermalZone.cpp +++ b/openstudiocore/src/model/ThermalZone.cpp @@ -2270,6 +2270,26 @@ namespace detail { return zoneHVACEquipmentList().equipmentInCoolingOrder(); } + boost::optional ThermalZone_Impl::sequentialCoolingFraction(const ModelObject& equipment) const + { + return zoneHVACEquipmentList().sequentialCoolingFraction(equipment); + } + + boost::optional ThermalZone_Impl::sequentialHeatingFraction(const ModelObject& equipment) const + { + return zoneHVACEquipmentList().sequentialHeatingFraction(equipment); + } + + bool ThermalZone_Impl::setSequentialCoolingFraction(const ModelObject & equipment, double fraction) + { + return zoneHVACEquipmentList().setSequentialCoolingFraction(equipment, fraction); + } + + bool ThermalZone_Impl::setSequentialHeatingFraction(const ModelObject & equipment, double fraction) + { + return zoneHVACEquipmentList().setSequentialHeatingFraction(equipment, fraction); + } + ModelObject ThermalZone_Impl::clone(Model model) const { ThermalZone tz = HVACComponent_Impl::clone(model).cast(); @@ -3254,6 +3274,24 @@ bool ThermalZone::setHeatingPriority(const ModelObject & equipment, unsigned pri return getImpl()->setHeatingPriority(equipment,priority); } +boost::optional ThermalZone::sequentialCoolingFraction(const ModelObject& equipment) const { + return getImpl()->sequentialCoolingFraction(equipment); +} + +bool ThermalZone::setSequentialCoolingFraction(const ModelObject& equipment, double fraction) +{ + return getImpl()->setSequentialCoolingFraction(equipment, fraction); +} + +boost::optional ThermalZone::sequentialHeatingFraction(const ModelObject& equipment) const { + return getImpl()->sequentialHeatingFraction(equipment); +} + +bool ThermalZone::setSequentialHeatingFraction(const ModelObject& equipment, double fraction) +{ + return getImpl()->setSequentialHeatingFraction(equipment, fraction); +} + std::vector ThermalZone::equipment() const { return getImpl()->equipment(); diff --git a/openstudiocore/src/model/ThermalZone.hpp b/openstudiocore/src/model/ThermalZone.hpp index 2347122b3d1..f664cc9768d 100644 --- a/openstudiocore/src/model/ThermalZone.hpp +++ b/openstudiocore/src/model/ThermalZone.hpp @@ -392,6 +392,31 @@ class MODEL_API ThermalZone : public HVACComponent { /** Return all equipment. Order is determined by cooling priority */ std::vector equipmentInCoolingOrder() const; + /** Return the Sequential Cooling Fraction of equipment. + * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ + boost::optional sequentialCoolingFraction(const ModelObject& equipment) const; + + /** Return the Sequential Heating Fraction of equipment. + * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its cooling priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ + boost::optional sequentialHeatingFraction(const ModelObject& equipment) const; + + /** Set the Sequential Cooling Fraction of equipment. + * Returns false when equipment is not in the ZoneHVACEquipmentList, its cooling priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ + bool setSequentialCoolingFraction(const ModelObject& equipment, double fraction); + + /** Set the Sequential Heating Fraction of equipment. + * Returns false when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ + bool setSequentialHeatingFraction(const ModelObject& equipment, double fraction); + + /** Return true if the ThermalZone is attached to * an AirLoopHVACSupplyPlenum or AirLoopHVACReturnPlenum */ diff --git a/openstudiocore/src/model/ThermalZone_Impl.hpp b/openstudiocore/src/model/ThermalZone_Impl.hpp index 084290a5480..29319ca867a 100644 --- a/openstudiocore/src/model/ThermalZone_Impl.hpp +++ b/openstudiocore/src/model/ThermalZone_Impl.hpp @@ -367,6 +367,9 @@ namespace detail { PortList returnPortList() const; + + ZoneHVACEquipmentList zoneHVACEquipmentList() const; + bool addEquipment(const ModelObject & equipment); bool removeEquipment(const ModelObject & equipment); @@ -383,7 +386,14 @@ namespace detail { std::vector equipmentInCoolingOrder() const; - ZoneHVACEquipmentList zoneHVACEquipmentList() const; + boost::optional sequentialCoolingFraction(const ModelObject& equipment) const; + + boost::optional sequentialHeatingFraction(const ModelObject& equipment) const; + + bool setSequentialCoolingFraction(const ModelObject& equipment, double fraction); + + bool setSequentialHeatingFraction(const ModelObject& equipment, double fraction); + virtual ModelObject clone(Model model) const override; diff --git a/openstudiocore/src/model/ZoneHVACEquipmentList.cpp b/openstudiocore/src/model/ZoneHVACEquipmentList.cpp index 476c854b49e..75f8b59a41a 100644 --- a/openstudiocore/src/model/ZoneHVACEquipmentList.cpp +++ b/openstudiocore/src/model/ZoneHVACEquipmentList.cpp @@ -34,6 +34,8 @@ #include "ThermalZone.hpp" #include "ThermalZone_Impl.hpp" #include "Model.hpp" + +#include #include #include #include "../utilities/core/Assert.hpp" @@ -85,17 +87,30 @@ std::string ZoneHVACEquipmentList_Impl::loadDistributionScheme() const bool ZoneHVACEquipmentList_Impl::setLoadDistributionScheme(std::string scheme) { + // Backward compat if( istringEqual(scheme,"Sequential") ) { scheme = "SequentialLoad"; } else if( istringEqual(scheme,"Uniform") ) { scheme = "UniformLoad"; } + + // Reset the Sequential Cooling/Heating fractions if not 'SequentialLoad' + if (!istringEqual(scheme, "SequentialLoad")) { + for (IdfExtensibleGroup& eg: extensibleGroups()) { + eg.setString(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentSequentialCoolingFraction, ""); + eg.setString(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentSequentialHeatingFraction, ""); + } + } + return setString(OS_ZoneHVAC_EquipmentListFields::LoadDistributionScheme,scheme); } bool ZoneHVACEquipmentList_Impl::addEquipment(const ModelObject & equipment) { - unsigned count = this->equipment().size(); + + // Get max priorities before pushing an extensible group + unsigned heatingCount = this->equipmentInHeatingOrder().size(); + unsigned coolingCount = this->equipmentInCoolingOrder().size(); WorkspaceExtensibleGroup eg = getObject().pushExtensibleGroup().cast(); @@ -103,8 +118,8 @@ bool ZoneHVACEquipmentList_Impl::addEquipment(const ModelObject & equipment) if( ok ) { - eg.setUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentCoolingSequence,count + 1); - eg.setUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentHeatingorNoLoadSequence,count + 1); + eg.setUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentCoolingSequence, coolingCount + 1); + eg.setUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentHeatingorNoLoadSequence, heatingCount + 1); } else { @@ -117,25 +132,42 @@ bool ZoneHVACEquipmentList_Impl::setCoolingPriority(const ModelObject & equipmen { std::vector equipmentVector = equipmentInCoolingOrder(); - if ( std::find(equipmentVector.begin(),equipmentVector.end(),equipment) == equipmentVector.end() ) { + if( priority > equipmentVector.size() ) { + priority = equipmentVector.size(); + } else if (priority < 1) { + // TODO: Temp, until E+ actually allows zero priority (=unavailable) like the IDD seems to indicate + priority = 1; + } + + boost::optional _eg = getGroupForModelObject(equipment); + if (!_eg) { LOG(Warn, "Cannot set cooling priority of an equipment that isn't in the ZoneHVACEquipmentList for " << briefDescription()); return false; + } else { + // Set the priority of this one, in case we actually put it to zero + bool success = _eg->setUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentCoolingSequence, priority); + OS_ASSERT(success); } - if( priority > equipmentVector.size() ) priority = equipmentVector.size(); - if( priority < 1 ) priority = 1; - equipmentVector.erase(std::find(equipmentVector.begin(),equipmentVector.end(),equipment)); - equipmentVector.insert(equipmentVector.begin() + (priority - 1),equipment); + // If supplied priority isn't zero, we have to insert it where it belongs + if (priority > 0) { + equipmentVector.insert(equipmentVector.begin() + (priority - 1),equipment); + } else { + // If zero, we just remove it from the list of available equipment (no insertion needed now) + // and we reset the Sequential Cooling Fraction + _eg->setString(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentSequentialCoolingFraction, ""); + } + unsigned newPriority = 1; for( const auto & equipment : equipmentVector ) { - WorkspaceExtensibleGroup eg = getGroupForModelObject(equipment); - - eg.setUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentCoolingSequence,newPriority); + boost::optional eg = getGroupForModelObject(equipment); + OS_ASSERT(eg); + eg->setUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentCoolingSequence,newPriority); newPriority++; } @@ -146,32 +178,47 @@ bool ZoneHVACEquipmentList_Impl::setHeatingPriority(const ModelObject & equipmen { std::vector equipmentVector = equipmentInHeatingOrder(); - if ( std::find(equipmentVector.begin(),equipmentVector.end(),equipment) == equipmentVector.end() ) { + if( priority > equipmentVector.size() ) { + priority = equipmentVector.size(); + } else if (priority < 1) { + // TODO: Temp, until E+ actually allows zero priority (=unavailable) like the IDD seems to indicate + priority = 1; + } + boost::optional _eg = getGroupForModelObject(equipment); + if (!_eg) { LOG(Warn, "Cannot set Heating priority of an equipment that isn't in the ZoneHVACEquipmentList for " << briefDescription()); return false; + } else { + // Set the priority of this one, in case we actually put it to zero + bool success = _eg->setUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentHeatingorNoLoadSequence, priority); + OS_ASSERT(success); } - if( priority > equipmentVector.size() ) priority = equipmentVector.size(); - if( priority < 1 ) priority = 1; - equipmentVector.erase(std::find(equipmentVector.begin(),equipmentVector.end(),equipment)); - equipmentVector.insert(equipmentVector.begin() + (priority - 1),equipment); + // If supplied priority isn't zero, we have to insert it where it belongs + if (priority > 0) { + equipmentVector.insert(equipmentVector.begin() + (priority - 1),equipment); + } else { + // If zero, we just remove it from the list of available equipment (no insertion needed now) + // and we reset the Sequential Heating Fraction + _eg->setString(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentSequentialHeatingFraction, ""); + } unsigned newPriority = 1; for( const auto & equipment : equipmentVector ) { - WorkspaceExtensibleGroup eg = getGroupForModelObject(equipment); - - eg.setUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentHeatingorNoLoadSequence,newPriority); + boost::optional eg = getGroupForModelObject(equipment); + OS_ASSERT(eg); + eg->setUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentHeatingorNoLoadSequence,newPriority); newPriority++; } return true; } -WorkspaceExtensibleGroup ZoneHVACEquipmentList_Impl::getGroupForModelObject(const ModelObject & modelObject) +boost::optional ZoneHVACEquipmentList_Impl::getGroupForModelObject(const ModelObject & modelObject) const { boost::optional result; @@ -191,9 +238,7 @@ WorkspaceExtensibleGroup ZoneHVACEquipmentList_Impl::getGroupForModelObject(cons } } - OS_ASSERT(result); - - return result.get(); + return result; } std::vector ZoneHVACEquipmentList_Impl::equipment() const @@ -225,13 +270,16 @@ std::vector ZoneHVACEquipmentList_Impl::equipmentInHeatingOrder() c { unsigned heatingPriority = group.getUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentHeatingorNoLoadSequence).get(); - boost::optional wo = group.cast().getTarget(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipment); + // Filter out equipment having a priority of 0 (=unavailable for heating) + if (heatingPriority > 0) { + boost::optional wo = group.cast().getTarget(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipment); - OS_ASSERT(wo); + OS_ASSERT(wo); - ModelObject mo = wo->cast(); + ModelObject mo = wo->cast(); - equipmentMap.insert(std::make_pair(heatingPriority,mo)); + equipmentMap.insert(std::make_pair(heatingPriority,mo)); + } } std::vector equipmentVector; @@ -256,13 +304,17 @@ std::vector ZoneHVACEquipmentList_Impl::equipmentInCoolingOrder() c { unsigned coolingPriority = group.getUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentCoolingSequence).get(); - boost::optional wo = group.cast().getTarget(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipment); + // Filter out equipment having a priority of 0 (=unavailable for cooling) + if (coolingPriority > 0) { - OS_ASSERT(wo); + boost::optional wo = group.cast().getTarget(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipment); - ModelObject mo = wo->cast(); + OS_ASSERT(wo); - equipmentMap.insert(std::make_pair(coolingPriority,mo)); + ModelObject mo = wo->cast(); + + equipmentMap.insert(std::make_pair(coolingPriority,mo)); + } } std::vector equipmentVector; @@ -317,9 +369,9 @@ bool ZoneHVACEquipmentList_Impl::removeEquipment(const ModelObject & equipment) for( const auto & elem : coolingVector ) { - WorkspaceExtensibleGroup eg = getGroupForModelObject(elem); - - eg.setUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentCoolingSequence,priority); + boost::optional eg = getGroupForModelObject(elem); + OS_ASSERT(eg); + eg->setUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentCoolingSequence,priority); priority++; } @@ -328,9 +380,9 @@ bool ZoneHVACEquipmentList_Impl::removeEquipment(const ModelObject & equipment) for( const auto & elem : heatingVector ) { - WorkspaceExtensibleGroup eg = getGroupForModelObject(elem); - - eg.setUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentHeatingorNoLoadSequence,priority); + boost::optional eg = getGroupForModelObject(elem); + OS_ASSERT(eg); + eg->setUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentHeatingorNoLoadSequence,priority); priority++; } @@ -343,50 +395,125 @@ unsigned ZoneHVACEquipmentList_Impl::heatingPriority(const ModelObject & equipme { boost::optional result; - std::vector groups = extensibleGroups(); + boost::optional _eg = getGroupForModelObject(equipment); + if (!_eg) { + LOG(Warn, "Cannot get Heating Priority of an equipment that isn't in the ZoneHVACEquipmentList for " << briefDescription()); + return 0; + } else { + result = _eg->getUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentHeatingorNoLoadSequence); + OS_ASSERT(result); - for( const auto & group : groups ) - { - boost::optional wo = group.cast().getTarget(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipment); + return result.get(); + } +} - OS_ASSERT(wo); +unsigned ZoneHVACEquipmentList_Impl::coolingPriority(const ModelObject & equipment) const +{ + boost::optional result; - if( wo->handle() == equipment.handle() ) - { - result = group.getUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentHeatingorNoLoadSequence); + boost::optional _eg = getGroupForModelObject(equipment); + if (!_eg) { + LOG(Warn, "Cannot get Cooling Priority of an equipment that isn't in the ZoneHVACEquipmentList for " << briefDescription()); + return 0; + } else { + result = _eg->getUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentCoolingSequence); + OS_ASSERT(result); - break; + return result.get(); + } +} + +boost::optional ZoneHVACEquipmentList_Impl::sequentialCoolingFraction(const ModelObject& equipment) const { + + boost::optional result; + + if ( (openstudio::istringEqual(loadDistributionScheme(), "SequentialLoad")) && + (coolingPriority(equipment) > 0 ) ) { + + std::vector groups = extensibleGroups(); + + for (const auto & group : groups) { + boost::optional wo = group.cast().getTarget(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipment); + + OS_ASSERT(wo); + + if (wo->handle() == equipment.handle()) { + result = group.getDouble(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentSequentialCoolingFraction, true); + break; + } } } - OS_ASSERT(result); + return result; - return result.get(); } -unsigned ZoneHVACEquipmentList_Impl::coolingPriority(const ModelObject & equipment) const -{ - boost::optional result; +boost::optional ZoneHVACEquipmentList_Impl::sequentialHeatingFraction(const ModelObject& equipment) const { - std::vector groups = extensibleGroups(); + boost::optional result; - for( const auto & group : groups ) - { - boost::optional wo = group.cast().getTarget(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipment); + if ( (openstudio::istringEqual(loadDistributionScheme(), "SequentialLoad")) && + (heatingPriority(equipment) > 0 ) ) { - OS_ASSERT(wo); + std::vector groups = extensibleGroups(); - if( wo->handle() == equipment.handle() ) - { - result = group.getUnsigned(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentCoolingSequence); + for (const auto & group : groups) { + boost::optional wo = group.cast().getTarget(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipment); - break; + OS_ASSERT(wo); + + if (wo->handle() == equipment.handle()) { + result = group.getDouble(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentSequentialHeatingFraction, true); + break; + } } } - OS_ASSERT(result); + return result; + +} + +bool ZoneHVACEquipmentList_Impl::setSequentialCoolingFraction(const ModelObject& equipment, double fraction) +{ + boost::optional eg = getGroupForModelObject(equipment); + if (!eg) { + LOG(Info, "Cannot set Sequential Cooling Fraction for equipment " << equipment.nameString() + << " that isn't part of the ZoneHVACEquipmentList."); + return false; + } + if ( !openstudio::istringEqual(loadDistributionScheme(), "SequentialLoad")) { + LOG(Info, "Cannot set Sequential Cooling Fraction for a Load Distribution Scheme other than 'SequentialLoad'"); + return false; + } + + if (coolingPriority(equipment) == 0) { + LOG(Info, "Cannot set Sequential Cooling Fraction for an equipment that doesn't have a cooling priority strictly greater than zero."); + return false; + } - return result.get(); + return eg->setDouble(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentSequentialCoolingFraction, fraction); +} + + +bool ZoneHVACEquipmentList_Impl::setSequentialHeatingFraction(const ModelObject& equipment, double fraction) +{ + boost::optional eg = getGroupForModelObject(equipment); + if (!eg) { + LOG(Info, "Cannot set Sequential Heating Fraction for equipment " << equipment.nameString() + << " that isn't part of the ZoneHVACEquipmentList."); + return false; + } + if ( !openstudio::istringEqual(loadDistributionScheme(), "SequentialLoad")) { + LOG(Info, "Cannot set Sequential Heating Fraction for a Load Distribution Scheme other than 'SequentialLoad'"); + return false; + } + + if (heatingPriority(equipment) == 0) { + LOG(Info, "Cannot set Sequential Heating Fraction for an equipment that doesn't have a heating priority strictly greater than zero."); + return false; + } + + return eg->setDouble(OS_ZoneHVAC_EquipmentListExtensibleFields::ZoneEquipmentSequentialHeatingFraction, fraction); } } // detail @@ -408,6 +535,16 @@ std::string ZoneHVACEquipmentList::loadDistributionScheme() const return getImpl()->loadDistributionScheme(); } + +std::vector ZoneHVACEquipmentList::loadDistributionSchemeValues() { + return getIddKeyNames(IddFactory::instance().getObject(iddObjectType()).get(), + OS_ZoneHVAC_EquipmentListFields::LoadDistributionScheme); +} + +std::vector ZoneHVACEquipmentList::validLoadDistributionSchemeValues() { + return loadDistributionSchemeValues(); +} + bool ZoneHVACEquipmentList::setLoadDistributionScheme(std::string scheme) { return getImpl()->setLoadDistributionScheme(scheme); @@ -463,6 +600,26 @@ unsigned ZoneHVACEquipmentList::coolingPriority(const ModelObject & equipment) c return getImpl()->coolingPriority(equipment); } +boost::optional ZoneHVACEquipmentList::sequentialCoolingFraction(const ModelObject& equipment) const +{ + return getImpl()->sequentialCoolingFraction(equipment); +} + +bool ZoneHVACEquipmentList::setSequentialCoolingFraction(const ModelObject& equipment, double fraction) +{ + return getImpl()->setSequentialCoolingFraction(equipment, fraction); +} + +boost::optional ZoneHVACEquipmentList::sequentialHeatingFraction(const ModelObject& equipment) const +{ + return getImpl()->sequentialHeatingFraction(equipment); +} + +bool ZoneHVACEquipmentList::setSequentialHeatingFraction(const ModelObject& equipment, double fraction) +{ + return getImpl()->setSequentialHeatingFraction(equipment, fraction); +} + /// @cond ZoneHVACEquipmentList::ZoneHVACEquipmentList(std::shared_ptr impl) : ModelObject(std::move(impl)) diff --git a/openstudiocore/src/model/ZoneHVACEquipmentList.hpp b/openstudiocore/src/model/ZoneHVACEquipmentList.hpp index 476c7900637..673b8d7024d 100644 --- a/openstudiocore/src/model/ZoneHVACEquipmentList.hpp +++ b/openstudiocore/src/model/ZoneHVACEquipmentList.hpp @@ -54,6 +54,11 @@ class MODEL_API ZoneHVACEquipmentList : public ModelObject { static IddObjectType iddObjectType(); + static std::vector loadDistributionSchemeValues(); + + static std::vector validLoadDistributionSchemeValues(); + + std::string loadDistributionScheme() const; bool setLoadDistributionScheme(std::string scheme); @@ -77,7 +82,7 @@ class MODEL_API ZoneHVACEquipmentList : public ModelObject { */ bool setCoolingPriority(const ModelObject & equipment, unsigned priority); - /** Set heating priority of equipment. + /** Set heating or no-load priority of equipment. * Returns false when equipment is not in the ZoneHVACEquipmentList */ bool setHeatingPriority(const ModelObject & euqipment, unsigned priority); @@ -85,20 +90,52 @@ class MODEL_API ZoneHVACEquipmentList : public ModelObject { /** Return all equipment. Order is undetermined. */ std::vector equipment() const; - /** Return all equipment. Order is determined by heating priority */ + /** Return all equipment. Order is determined by heating priority. + * Equipment having a Heating Priority of 0 is filtered out (unavailable) + */ std::vector equipmentInHeatingOrder() const; - /** Return all equipment. Order is determined by coooling priority */ + /** Return all equipment. Order is determined by cooling priority + * Equipment having a Cooling Priority of 0 is filtered out (unavailable) + */ std::vector equipmentInCoolingOrder() const; ThermalZone thermalZone() const; - /** Return the heating priority for equipment */ + // TODO: JM 2019-02-25 These should actually return a boost::optional in case the equipment isn't actually part of the list... + /** Return the heating or no-load priority for equipment */ unsigned heatingPriority(const ModelObject & equipment) const; /** Return the cooling priority for equipment */ unsigned coolingPriority(const ModelObject & equipment) const; + + /** Return the Sequential Cooling Fraction of equipment. + * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ + boost::optional sequentialCoolingFraction(const ModelObject& equipment) const; + + /** Return the Sequential Heating Fraction of equipment. + * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its cooling priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ + boost::optional sequentialHeatingFraction(const ModelObject& equipment) const; + + /** Set the Sequential Cooling Fraction of equipment. + * Returns false when equipment is not in the ZoneHVACEquipmentList, its cooling priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ + bool setSequentialCoolingFraction(const ModelObject& equipment, double fraction); + + /** Set the Sequential Heating Fraction of equipment. + * Returns false when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ + bool setSequentialHeatingFraction(const ModelObject& equipment, double fraction); + + + protected: /// @cond diff --git a/openstudiocore/src/model/ZoneHVACEquipmentList_Impl.hpp b/openstudiocore/src/model/ZoneHVACEquipmentList_Impl.hpp index c1a393626e7..00d2b4b8078 100644 --- a/openstudiocore/src/model/ZoneHVACEquipmentList_Impl.hpp +++ b/openstudiocore/src/model/ZoneHVACEquipmentList_Impl.hpp @@ -70,7 +70,7 @@ class MODEL_API ZoneHVACEquipmentList_Impl : public ModelObject_Impl { std::vector equipmentInCoolingOrder() const; - WorkspaceExtensibleGroup getGroupForModelObject(const ModelObject & modelObject); + boost::optional getGroupForModelObject(const ModelObject & modelObject) const; virtual ~ZoneHVACEquipmentList_Impl() {} @@ -88,6 +88,12 @@ class MODEL_API ZoneHVACEquipmentList_Impl : public ModelObject_Impl { unsigned coolingPriority(const ModelObject & equipment) const; + boost::optional sequentialCoolingFraction(const ModelObject& equipment) const; + bool setSequentialCoolingFraction(const ModelObject& equipment, double fraction); + + boost::optional sequentialHeatingFraction(const ModelObject& equipment) const; + bool setSequentialHeatingFraction(const ModelObject& equipment, double fraction); + protected: private: diff --git a/openstudiocore/src/model/test/DefaultConstructionSet_GTest.cpp b/openstudiocore/src/model/test/DefaultConstructionSet_GTest.cpp index 6209ccf8c6c..e034d00e3e3 100644 --- a/openstudiocore/src/model/test/DefaultConstructionSet_GTest.cpp +++ b/openstudiocore/src/model/test/DefaultConstructionSet_GTest.cpp @@ -126,6 +126,13 @@ TEST_F(ModelFixture, DefaultConstructionSet) EXPECT_EQ(construction.handle(), defaultConstructionSet.siteShadingConstruction()->handle()); defaultConstructionSet.resetSiteShadingConstruction(); EXPECT_FALSE(defaultConstructionSet.siteShadingConstruction()); + + EXPECT_FALSE(defaultConstructionSet.adiabaticSurfaceConstruction()); + EXPECT_TRUE(defaultConstructionSet.setAdiabaticSurfaceConstruction(construction)); + ASSERT_TRUE(defaultConstructionSet.adiabaticSurfaceConstruction()); + EXPECT_EQ(construction.handle(), defaultConstructionSet.adiabaticSurfaceConstruction()->handle()); + defaultConstructionSet.resetAdiabaticSurfaceConstruction(); + EXPECT_FALSE(defaultConstructionSet.adiabaticSurfaceConstruction()); } TEST_F(ModelFixture, DefaultConstructionSet_ExteriorSurfaces) @@ -478,6 +485,33 @@ TEST_F(ModelFixture, DefaultConstructionSet_ShadingSurface) EXPECT_FALSE(defaultConstructionSet.getDefaultConstruction(surface)); } +TEST_F(ModelFixture, DefaultConstructionSet_AdiabaticSurface) +{ + Model model; + + Point3dVector points; + points.push_back(Point3d(0,1,0)); + points.push_back(Point3d(0,0,0)); + points.push_back(Point3d(1,0,0)); + Space space(model); + Surface surface(points, model); + surface.setSpace(space); + EXPECT_TRUE(surface.setOutsideBoundaryCondition("Adiabatic")); + + DefaultConstructionSet defaultConstructionSet(model); + Construction construction(model); + + EXPECT_FALSE(defaultConstructionSet.adiabaticSurfaceConstruction()); + EXPECT_FALSE(defaultConstructionSet.getDefaultConstruction(surface)); + EXPECT_TRUE(defaultConstructionSet.setAdiabaticSurfaceConstruction(construction)); + ASSERT_TRUE(defaultConstructionSet.adiabaticSurfaceConstruction()); + EXPECT_EQ(construction.handle(), defaultConstructionSet.adiabaticSurfaceConstruction()->handle()); + ASSERT_TRUE(defaultConstructionSet.getDefaultConstruction(surface)); + EXPECT_EQ(construction.handle(), defaultConstructionSet.getDefaultConstruction(surface)->handle()); + defaultConstructionSet.resetAdiabaticSurfaceConstruction(); + EXPECT_FALSE(defaultConstructionSet.getDefaultConstruction(surface)); +} + TEST_F(ModelFixture, DefaultConstructionSet_Clone) { diff --git a/openstudiocore/src/model/test/Space_GTest.cpp b/openstudiocore/src/model/test/Space_GTest.cpp index c6e2f96ef36..420cd2c12f7 100644 --- a/openstudiocore/src/model/test/Space_GTest.cpp +++ b/openstudiocore/src/model/test/Space_GTest.cpp @@ -1529,3 +1529,471 @@ TEST_F(ModelFixture, Space_hardApplySpaceType_Plenum2) ASSERT_NE(m.plenumSpaceType().handle(), s2.spaceType().get().handle()); ASSERT_NE(s1.spaceType().get().handle(), s2.spaceType().get().handle()); } + +TEST_F(ModelFixture, Space_intersectSurfaces_degenerate1) { + Model m; + std::vector vertices; + + // bottom floor + + // bottom core + vertices.clear(); + vertices.push_back(Point3d(-13.0256, 7.1598, 0)); + vertices.push_back(Point3d( 13.0256, 7.1598, 0)); + vertices.push_back(Point3d( 13.0256, -7.1598, 0)); + vertices.push_back(Point3d(-13.0256, -7.1598, 0)); + boost::optional bottomCore = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(bottomCore); + bottomCore->setZOrigin(0); + + // bottom top + vertices.clear(); + vertices.push_back(Point3d(-17.5976, 11.7318, 0)); + vertices.push_back(Point3d( 17.5976, 11.7318, 0)); + vertices.push_back(Point3d( 13.0256, 7.1598, 0)); + vertices.push_back(Point3d(-13.0256, 7.1598, 0)); + boost::optional bottomTop = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(bottomTop); + bottomTop->setZOrigin(0); + + // bottom right + vertices.clear(); + vertices.push_back(Point3d(17.5976, 11.7318, 0)); + vertices.push_back(Point3d(17.5976, -11.7318, 0)); + vertices.push_back(Point3d(13.0256, -7.1598, 0)); + vertices.push_back(Point3d(13.0256, 7.1598, 0)); + boost::optional bottomRight = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(bottomRight); + bottomRight->setZOrigin(0); + + // bottom bottom + vertices.clear(); + vertices.push_back(Point3d( 17.5976, -11.7318, 0)); + vertices.push_back(Point3d(-17.5976, -11.7318, 0)); + vertices.push_back(Point3d(-13.0256, -7.1598, 0)); + vertices.push_back(Point3d( 13.0256, -7.1598, 0)); + boost::optional bottomBottom = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(bottomBottom); + bottomBottom->setZOrigin(0); + + // bottom left + vertices.clear(); + vertices.push_back(Point3d(-17.5976, 11.7318, 0)); + vertices.push_back(Point3d(-13.0256, 7.1598, 0)); + vertices.push_back(Point3d(-13.0256, -7.1598, 0)); + vertices.push_back(Point3d(-17.5976, -11.7318, 0)); + boost::optional bottomLeft = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(bottomLeft); + bottomLeft->setZOrigin(0); + + // top floor + + // top core + vertices.clear(); + vertices.push_back(Point3d(-7.8714, 3.7236, 0)); + vertices.push_back(Point3d( 7.8714, 3.7236, 0)); + vertices.push_back(Point3d( 7.8714, -3.7236, 0)); + vertices.push_back(Point3d(-7.8714, -3.7236, 0)); + boost::optional topCore = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(topCore); + topCore->setZOrigin(3); + + // top top + vertices.clear(); + vertices.push_back(Point3d(-12.4434, 8.2956, 0)); + vertices.push_back(Point3d( 12.4434, 8.2956, 0)); + vertices.push_back(Point3d( 7.8714, 3.7236, 0)); + vertices.push_back(Point3d( -7.8714, 3.7236, 0)); + boost::optional topTop = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(topTop); + topTop->setZOrigin(3); + + // top right + vertices.clear(); + vertices.push_back(Point3d(12.4434, 8.2956, 0)); + vertices.push_back(Point3d(12.4434, -8.2956, 0)); + vertices.push_back(Point3d( 7.8714, -3.7236, 0)); + vertices.push_back(Point3d( 7.8714, 3.7236, 0)); + boost::optional topRight = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(topRight); + topRight->setZOrigin(3); + + // top bottom + vertices.clear(); + vertices.push_back(Point3d( 12.4434, -8.2956, 0)); + vertices.push_back(Point3d(-12.4434, -8.2956, 0)); + vertices.push_back(Point3d( -7.8714, -3.7236, 0)); + vertices.push_back(Point3d( 7.8714, -3.7236, 0)); + boost::optional topBottom = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(topBottom); + topBottom->setZOrigin(3); + + // top left + vertices.clear(); + vertices.push_back(Point3d(-12.4434, 8.2956, 0)); + vertices.push_back(Point3d( -7.8714, 3.7236, 0)); + vertices.push_back(Point3d( -7.8714, -3.7236, 0)); + vertices.push_back(Point3d(-12.4434, -8.2956, 0)); + boost::optional topLeft = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(topLeft); + topLeft->setZOrigin(3); + + // create thermal zones + std::vector spaces = m.getConcreteModelObjects(); + for (auto& space : spaces) { + ThermalZone z(m); + space.setThermalZone(z); + } + + intersectSurfaces(spaces); + matchSurfaces(spaces); + + double exteriorFloorArea = 0; + double interiorFloorArea = 0; + double exteriorRoofArea = 0; + double interiorRoofArea = 0; + double exteriorWallArea = 0; + double interiorWallArea = 0; + + std::vector surfaces = m.getConcreteModelObjects(); + for (auto& surface : surfaces) { + if (istringEqual(surface.surfaceType(), "RoofCeiling")) { + if (istringEqual(surface.outsideBoundaryCondition(), "Outdoors")) { + exteriorRoofArea += surface.grossArea(); + } else { + interiorRoofArea += surface.grossArea(); + } + }else if (istringEqual(surface.surfaceType(), "Floor")) { + if (istringEqual(surface.outsideBoundaryCondition(), "Ground")) { + exteriorFloorArea += surface.grossArea(); + } else { + interiorFloorArea += surface.grossArea(); + } + } else if (istringEqual(surface.surfaceType(), "Wall")) { + if (istringEqual(surface.outsideBoundaryCondition(), "Outdoors")) { + exteriorWallArea += surface.grossArea(); + } else { + interiorWallArea += surface.grossArea(); + } + } + } + + EXPECT_NEAR(exteriorFloorArea, 825.8048, 0.01); + EXPECT_NEAR(interiorFloorArea, 412.9019, 0.01); + EXPECT_NEAR(exteriorRoofArea, 825.8048, 0.01); + EXPECT_NEAR(interiorRoofArea, 412.9019, 0.01); + + //m.save("intersect1.osm", true); +} + +TEST_F(ModelFixture, Space_intersectSurfaces_degenerate2) { + Model m; + std::vector vertices; + + // bottom floor + + // bottom core + vertices.clear(); + vertices.push_back(Point3d(-13.0256, 7.1598, 0)); + vertices.push_back(Point3d(13.0256, 7.1598, 0)); + vertices.push_back(Point3d(13.0256, -7.1598, 0)); + vertices.push_back(Point3d(-13.0256, -7.1598, 0)); + boost::optional bottomCore = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(bottomCore); + bottomCore->setZOrigin(0); + + // bottom top + vertices.clear(); + vertices.push_back(Point3d(-17.5976, 11.7318, 0)); + vertices.push_back(Point3d(17.5976, 11.7318, 0)); + vertices.push_back(Point3d(13.0256, 7.1598, 0)); + vertices.push_back(Point3d(-13.0256, 7.1598, 0)); + boost::optional bottomTop = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(bottomTop); + bottomTop->setZOrigin(0); + + // bottom right + vertices.clear(); + vertices.push_back(Point3d(17.5976, 11.7318, 0)); + vertices.push_back(Point3d(17.5976, -11.7318, 0)); + vertices.push_back(Point3d(13.0256, -7.1598, 0)); + vertices.push_back(Point3d(13.0256, 7.1598, 0)); + boost::optional bottomRight = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(bottomRight); + bottomRight->setZOrigin(0); + + // bottom bottom + vertices.clear(); + vertices.push_back(Point3d(17.5976, -11.7318, 0)); + vertices.push_back(Point3d(-17.5976, -11.7318, 0)); + vertices.push_back(Point3d(-13.0256, -7.1598, 0)); + vertices.push_back(Point3d(13.0256, -7.1598, 0)); + boost::optional bottomBottom = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(bottomBottom); + bottomBottom->setZOrigin(0); + + // bottom left + vertices.clear(); + vertices.push_back(Point3d(-17.5976, 11.7318, 0)); + vertices.push_back(Point3d(-13.0256, 7.1598, 0)); + vertices.push_back(Point3d(-13.0256, -7.1598, 0)); + vertices.push_back(Point3d(-17.5976, -11.7318, 0)); + boost::optional bottomLeft = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(bottomLeft); + bottomLeft->setZOrigin(0); + + // top floor + + // top core + vertices.clear(); + vertices.push_back(Point3d(-7.8714, 3.7236, 0)); + vertices.push_back(Point3d(7.8714, 3.7236, 0)); + vertices.push_back(Point3d(7.8714, -3.7236, 0)); + vertices.push_back(Point3d(-7.8714, -3.7236, 0)); + boost::optional topCore = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(topCore); + topCore->setZOrigin(3); + + // top top + vertices.clear(); + vertices.push_back(Point3d(-14.1614, 8.2956, 0)); + vertices.push_back(Point3d(14.1614, 8.2956, 0)); + vertices.push_back(Point3d(7.8714, 3.7236, 0)); + vertices.push_back(Point3d(-7.8714, 3.7236, 0)); + boost::optional topTop = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(topTop); + topTop->setZOrigin(3); + + // top right + vertices.clear(); + vertices.push_back(Point3d(14.1614, 8.2956, 0)); + vertices.push_back(Point3d(14.1614, -8.2956, 0)); + vertices.push_back(Point3d(7.8714, -3.7236, 0)); + vertices.push_back(Point3d(7.8714, 3.7236, 0)); + boost::optional topRight = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(topRight); + topRight->setZOrigin(3); + + // top bottom + vertices.clear(); + vertices.push_back(Point3d(14.1614, -8.2956, 0)); + vertices.push_back(Point3d(-14.1614, -8.2956, 0)); + vertices.push_back(Point3d(-7.8714, -3.7236, 0)); + vertices.push_back(Point3d(7.8714, -3.7236, 0)); + boost::optional topBottom = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(topBottom); + topBottom->setZOrigin(3); + + // top left + vertices.clear(); + vertices.push_back(Point3d(-14.1614, 8.2956, 0)); + vertices.push_back(Point3d(-7.8714, 3.7236, 0)); + vertices.push_back(Point3d(-7.8714, -3.7236, 0)); + vertices.push_back(Point3d(-14.1614, -8.2956, 0)); + boost::optional topLeft = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(topLeft); + topLeft->setZOrigin(3); + + // create thermal zones + std::vector spaces = m.getConcreteModelObjects(); + for (auto& space : spaces) { + ThermalZone z(m); + space.setThermalZone(z); + } + + intersectSurfaces(spaces); + matchSurfaces(spaces); + + double exteriorFloorArea = 0; + double interiorFloorArea = 0; + double exteriorRoofArea = 0; + double interiorRoofArea = 0; + double exteriorWallArea = 0; + double interiorWallArea = 0; + + std::vector surfaces = m.getConcreteModelObjects(); + for (auto& surface : surfaces) { + if (istringEqual(surface.surfaceType(), "RoofCeiling")) { + if (istringEqual(surface.outsideBoundaryCondition(), "Outdoors")) { + exteriorRoofArea += surface.grossArea(); + } else { + interiorRoofArea += surface.grossArea(); + } + } else if (istringEqual(surface.surfaceType(), "Floor")) { + if (istringEqual(surface.outsideBoundaryCondition(), "Ground")) { + exteriorFloorArea += surface.grossArea(); + } else { + interiorFloorArea += surface.grossArea(); + } + } else if (istringEqual(surface.surfaceType(), "Wall")) { + if (istringEqual(surface.outsideBoundaryCondition(), "Outdoors")) { + exteriorWallArea += surface.grossArea(); + } else { + interiorWallArea += surface.grossArea(); + } + } + } + + EXPECT_NEAR(exteriorFloorArea, 825.8048, 0.01); + //EXPECT_NEAR(interiorFloorArea, 412.9019, 0.01); + EXPECT_NEAR(exteriorRoofArea, 825.8048, 0.01); + //EXPECT_NEAR(interiorRoofArea, 412.9019, 0.01); + + //m.save("intersect2.osm", true); +} + +TEST_F(ModelFixture, Space_intersectSurfaces_degenerate3) { + Model m; + std::vector vertices; + + // bottom floor + + // bottom core + vertices.clear(); + vertices.push_back(Point3d(-13.0256, 7.1598, 0)); + vertices.push_back(Point3d(13.0256, 7.1598, 0)); + vertices.push_back(Point3d(13.0256, -7.1598, 0)); + vertices.push_back(Point3d(-13.0256, -7.1598, 0)); + boost::optional bottomCore = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(bottomCore); + bottomCore->setZOrigin(0); + + // bottom top + vertices.clear(); + vertices.push_back(Point3d(-17.5976, 11.7318, 0)); + vertices.push_back(Point3d(17.5976, 11.7318, 0)); + vertices.push_back(Point3d(13.0256, 7.1598, 0)); + vertices.push_back(Point3d(-13.0256, 7.1598, 0)); + boost::optional bottomTop = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(bottomTop); + bottomTop->setZOrigin(0); + + // bottom right + vertices.clear(); + vertices.push_back(Point3d(17.5976, 11.7318, 0)); + vertices.push_back(Point3d(17.5976, -11.7318, 0)); + vertices.push_back(Point3d(13.0256, -7.1598, 0)); + vertices.push_back(Point3d(13.0256, 7.1598, 0)); + boost::optional bottomRight = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(bottomRight); + bottomRight->setZOrigin(0); + + // bottom bottom + vertices.clear(); + vertices.push_back(Point3d(17.5976, -11.7318, 0)); + vertices.push_back(Point3d(-17.5976, -11.7318, 0)); + vertices.push_back(Point3d(-13.0256, -7.1598, 0)); + vertices.push_back(Point3d(13.0256, -7.1598, 0)); + boost::optional bottomBottom = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(bottomBottom); + bottomBottom->setZOrigin(0); + + // bottom left + vertices.clear(); + vertices.push_back(Point3d(-17.5976, 11.7318, 0)); + vertices.push_back(Point3d(-13.0256, 7.1598, 0)); + vertices.push_back(Point3d(-13.0256, -7.1598, 0)); + vertices.push_back(Point3d(-17.5976, -11.7318, 0)); + boost::optional bottomLeft = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(bottomLeft); + bottomLeft->setZOrigin(0); + + // top floor + + // top core + vertices.clear(); + vertices.push_back(Point3d(-7.8714, 3.7236, 0)); + vertices.push_back(Point3d(7.8714, 3.7236, 0)); + vertices.push_back(Point3d(7.8714, -3.7236, 0)); + vertices.push_back(Point3d(-7.8714, -3.7236, 0)); + boost::optional topCore = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(topCore); + topCore->setZOrigin(3); + + // top top + vertices.clear(); + vertices.push_back(Point3d(-15.4434, 8.2956, 0)); + vertices.push_back(Point3d(15.4434, 8.2956, 0)); + vertices.push_back(Point3d(7.8714, 3.7236, 0)); + vertices.push_back(Point3d(-7.8714, 3.7236, 0)); + boost::optional topTop = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(topTop); + topTop->setZOrigin(3); + + // top right + vertices.clear(); + vertices.push_back(Point3d(15.4434, 8.2956, 0)); + vertices.push_back(Point3d(15.4434, -8.2956, 0)); + vertices.push_back(Point3d(7.8714, -3.7236, 0)); + vertices.push_back(Point3d(7.8714, 3.7236, 0)); + boost::optional topRight = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(topRight); + topRight->setZOrigin(3); + + // top bottom + vertices.clear(); + vertices.push_back(Point3d(15.4434, -8.2956, 0)); + vertices.push_back(Point3d(-15.4434, -8.2956, 0)); + vertices.push_back(Point3d(-7.8714, -3.7236, 0)); + vertices.push_back(Point3d(7.8714, -3.7236, 0)); + boost::optional topBottom = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(topBottom); + topBottom->setZOrigin(3); + + // top left + vertices.clear(); + vertices.push_back(Point3d(-15.4434, 8.2956, 0)); + vertices.push_back(Point3d(-7.8714, 3.7236, 0)); + vertices.push_back(Point3d(-7.8714, -3.7236, 0)); + vertices.push_back(Point3d(-15.4434, -8.2956, 0)); + boost::optional topLeft = Space::fromFloorPrint(vertices, 3, m); + ASSERT_TRUE(topLeft); + topLeft->setZOrigin(3); + + // create thermal zones + std::vector spaces = m.getConcreteModelObjects(); + for (auto& space : spaces) { + ThermalZone z(m); + space.setThermalZone(z); + } + + intersectSurfaces(spaces); + matchSurfaces(spaces); + + double exteriorFloorArea = 0; + double interiorFloorArea = 0; + double exteriorRoofArea = 0; + double interiorRoofArea = 0; + double exteriorWallArea = 0; + double interiorWallArea = 0; + + std::vector surfaces = m.getConcreteModelObjects(); + for (auto& surface : surfaces) { + if (istringEqual(surface.surfaceType(), "RoofCeiling")) { + if (istringEqual(surface.outsideBoundaryCondition(), "Outdoors")) { + exteriorRoofArea += surface.grossArea(); + } else { + interiorRoofArea += surface.grossArea(); + } + } else if (istringEqual(surface.surfaceType(), "Floor")) { + if (istringEqual(surface.outsideBoundaryCondition(), "Ground")) { + exteriorFloorArea += surface.grossArea(); + } else { + interiorFloorArea += surface.grossArea(); + } + } else if (istringEqual(surface.surfaceType(), "Wall")) { + if (istringEqual(surface.outsideBoundaryCondition(), "Outdoors")) { + exteriorWallArea += surface.grossArea(); + } else { + interiorWallArea += surface.grossArea(); + } + } + } + + EXPECT_NEAR(exteriorFloorArea, 825.8048, 0.01); + //EXPECT_NEAR(interiorFloorArea, 412.9019, 0.01); + EXPECT_NEAR(exteriorRoofArea, 825.8048, 0.01); + //EXPECT_NEAR(interiorRoofArea, 412.9019, 0.01); + + //m.save("intersect3.osm", true); +} \ No newline at end of file diff --git a/openstudiocore/src/model/test/ZoneHVACEquipmentList_GTest.cpp b/openstudiocore/src/model/test/ZoneHVACEquipmentList_GTest.cpp new file mode 100644 index 00000000000..85df5007855 --- /dev/null +++ b/openstudiocore/src/model/test/ZoneHVACEquipmentList_GTest.cpp @@ -0,0 +1,131 @@ +/*********************************************************************************************************************** +* OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. +* +* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the +* following conditions are met: +* +* (1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following +* disclaimer. +* +* (2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following +* disclaimer in the documentation and/or other materials provided with the distribution. +* +* (3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products +* derived from this software without specific prior written permission from the respective party. +* +* (4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other derivative works +* may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar designation without specific prior +* written permission from Alliance for Sustainable Energy, LLC. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED +* STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +***********************************************************************************************************************/ + +#include + +#include + +#include "ModelFixture.hpp" +#include "../ThermalZone.hpp" +#include "../ZoneHVACBaseboardConvectiveElectric.hpp" + +using namespace openstudio; +using namespace openstudio::model; + + +TEST_F(ModelFixture, ZoneHVACEquipmentList_Logic) +{ + Model m; + + ThermalZone z(m); + + EXPECT_TRUE(z.setLoadDistributionScheme("UniformPLR")); + EXPECT_EQ(z.loadDistributionScheme(), "UniformPLR"); + + ZoneHVACBaseboardConvectiveElectric b1(m); + EXPECT_TRUE(b1.addToThermalZone(z)); + EXPECT_TRUE(z.setHeatingPriority(b1, 0)); + ZoneHVACBaseboardConvectiveElectric b2(m); + EXPECT_TRUE(b2.addToThermalZone(z)); + + // One that isn't part of the ZoneHVACEquipmentList + ZoneHVACBaseboardConvectiveElectric bwrong(m); + + EXPECT_EQ(2u, z.equipment().size()); + ASSERT_EQ(2u, z.equipmentInCoolingOrder().size()); + EXPECT_EQ(b1, z.equipmentInCoolingOrder()[0]); + EXPECT_EQ(b2, z.equipmentInCoolingOrder()[1]); + + // TODO: expected to fail right now due to https://github.com/NREL/EnergyPlus/issues/7193 + // ASSERT_EQ(1u, z.equipmentInHeatingOrder().size()); + // EXPECT_EQ(b2, z.equipmentInHeatingOrder()[0]); + + // Shouldn't be able to get/set anything for an equipment that isn't part of the ZoneEqList + EXPECT_FALSE(z.setHeatingPriority(bwrong, 3)); + EXPECT_FALSE(z.setCoolingPriority(bwrong, 3)); + + + // Can't set/get the Sequential Fraction if: + + // 1. Equipment isn't part of the ZoneEqList + EXPECT_TRUE(z.setLoadDistributionScheme("SequentialLoad")); + EXPECT_FALSE(z.setSequentialCoolingFraction(bwrong, 0.5)); + EXPECT_FALSE(z.setSequentialHeatingFraction(bwrong, 0.5)); + EXPECT_FALSE(z.sequentialCoolingFraction(bwrong)); + EXPECT_FALSE(z.sequentialHeatingFraction(bwrong)); + + // 2. Load Distribution isn't 'SequentialLoad' + EXPECT_TRUE(z.setLoadDistributionScheme("UniformPLR")); + EXPECT_FALSE(z.setSequentialCoolingFraction(b1, 0.5)); + EXPECT_FALSE(z.setSequentialHeatingFraction(b1, 0.5)); + EXPECT_FALSE(z.sequentialCoolingFraction(b1)); + EXPECT_FALSE(z.sequentialHeatingFraction(b1)); + + EXPECT_TRUE(z.setLoadDistributionScheme("SequentialLoad")); + + // 3. Has a priority of zero + // TODO: expected to fail (that is, it'll work) right now due to https://github.com/NREL/EnergyPlus/issues/7193 + // EXPECT_FALSE(z.setSequentialHeatingFraction(b1, 0.5)); + // EXPECT_FALSE(z.sequentialHeatingFraction(b1)); + + // Rest should work fine + EXPECT_TRUE(z.setSequentialCoolingFraction(b1, 0.5)); + ASSERT_TRUE(z.sequentialCoolingFraction(b1)); + EXPECT_EQ(0.5, z.sequentialCoolingFraction(b1).get()); + + EXPECT_TRUE(z.setSequentialHeatingFraction(b2, 0.65)); + ASSERT_TRUE(z.sequentialHeatingFraction(b2)); + EXPECT_EQ(0.65, z.sequentialHeatingFraction(b2).get()); + + EXPECT_TRUE(z.setSequentialCoolingFraction(b2, 0.7)); + ASSERT_TRUE(z.sequentialCoolingFraction(b2)); + EXPECT_EQ(0.7, z.sequentialCoolingFraction(b2).get()); + + + // Setting a priority to zero should reset the corresponding Sequential Fraction + // TODO + // EXPECT_TRUE(z.setCoolingPriority(b2, 0)); + EXPECT_EQ(2u, z.equipment().size()); + // TODO + // ASSERT_EQ(1u, z.equipmentInCoolingOrder().size()); + // EXPECT_EQ(b1, z.equipmentInCoolingOrder()[0]); + + // TODO + // EXPECT_FALSE(z.sequentialCoolingFraction(b2)); // reset + EXPECT_TRUE(z.sequentialHeatingFraction(b2)); // untouched + + + // Setting the Load Distribution Scheme to something else should reset all sequential fractions + EXPECT_TRUE(z.setLoadDistributionScheme("UniformLoad")); + EXPECT_FALSE(z.sequentialCoolingFraction(b1)); + EXPECT_FALSE(z.sequentialCoolingFraction(b2)); + EXPECT_FALSE(z.sequentialHeatingFraction(b1)); + EXPECT_FALSE(z.sequentialHeatingFraction(b2)); + +} diff --git a/openstudiocore/src/openstudio_lib/DefaultConstructionSetInspectorView.cpp b/openstudiocore/src/openstudio_lib/DefaultConstructionSetInspectorView.cpp index 4f08b1ea31e..7979601d68a 100644 --- a/openstudiocore/src/openstudio_lib/DefaultConstructionSetInspectorView.cpp +++ b/openstudiocore/src/openstudio_lib/DefaultConstructionSetInspectorView.cpp @@ -949,6 +949,53 @@ void SiteShadingVC::onDrop(const OSItemId& itemId) } } + +// AdiabaticSurfaceVC + +void AdiabaticSurfaceVC::onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) +{ + if (index == OS_DefaultConstructionSetFields::AdiabaticSurfaceConstructionName){ + emit itemIds(makeVector()); + } +} + +std::vector AdiabaticSurfaceVC::makeVector() +{ + std::vector result; + if (m_modelObject){ + model::DefaultConstructionSet defaultConstructionSet = m_modelObject->cast(); + boost::optional constructionBase = defaultConstructionSet.adiabaticSurfaceConstruction(); + if (constructionBase){ + result.push_back(modelObjectToItemId(*constructionBase, false)); + } + } + return result; +} + +void AdiabaticSurfaceVC::onRemoveItem(OSItem* item) +{ + if (m_modelObject){ + model::DefaultConstructionSet defaultConstructionSet = m_modelObject->cast(); + defaultConstructionSet.resetAdiabaticSurfaceConstruction(); + } +} + +void AdiabaticSurfaceVC::onReplaceItem(OSItem * currentItem, const OSItemId& replacementItemId) +{ + onDrop(replacementItemId); +} + +void AdiabaticSurfaceVC::onDrop(const OSItemId& itemId) +{ + if (m_modelObject){ + model::DefaultConstructionSet defaultConstructionSet = m_modelObject->cast(); + boost::optional constructionBase = this->addToModel(itemId); + if (constructionBase){ + defaultConstructionSet.setAdiabaticSurfaceConstruction(*constructionBase); + } + } +} + DefaultConstructionSetInspectorView::DefaultConstructionSetInspectorView(const model::Model& model, QWidget * parent) : ModelObjectInspectorView(model, true, parent), @@ -978,6 +1025,7 @@ DefaultConstructionSetInspectorView::DefaultConstructionSetInspectorView(const m m_spaceShadingDZ(nullptr), m_buildingShadingDZ(nullptr), m_siteShadingDZ(nullptr), + m_adiabaticSurfaceDZ(nullptr), m_exteriorWallConstructionVC(nullptr), m_exteriorFloorConstructionVC(nullptr), @@ -1003,6 +1051,7 @@ DefaultConstructionSetInspectorView::DefaultConstructionSetInspectorView(const m m_spaceShadingVC(nullptr), m_buildingShadingVC(nullptr), m_siteShadingVC(nullptr), + m_adiabaticSurfaceVC(nullptr), m_vectorControllers(std::vector()), m_dropZones(std::vector()) @@ -1419,7 +1468,18 @@ DefaultConstructionSetInspectorView::DefaultConstructionSetInspectorView(const m gridLayout->addWidget(label,row,leftCol); gridLayout->addWidget(m_interiorPartitionsDZ,row+1,leftCol); - OS_ASSERT(m_vectorControllers.size() == 24); + label = new QLabel(); + label->setText("Adiabatic Surfaces"); + label->setObjectName("H2"); + //label->setContentsMargins(padding,0,padding,0); + m_adiabaticSurfaceVC = new AdiabaticSurfaceVC(); + m_vectorControllers.push_back(m_adiabaticSurfaceVC); + m_adiabaticSurfaceDZ = new OSDropZone(m_adiabaticSurfaceVC); + m_dropZones.push_back(m_adiabaticSurfaceDZ); + gridLayout->addWidget(label, row, middleCol); + gridLayout->addWidget(m_adiabaticSurfaceDZ, row+1, middleCol); + + OS_ASSERT(m_vectorControllers.size() == 25); configDropZones(); @@ -1615,6 +1675,9 @@ void DefaultConstructionSetInspectorView::attach(openstudio::model::DefaultConst m_siteShadingVC->attach(defaultConstructionSet); m_siteShadingVC->reportItems(); + m_adiabaticSurfaceVC->attach(defaultConstructionSet); + m_adiabaticSurfaceVC->reportItems(); + m_defaultConstructionSet = defaultConstructionSet; // m_nameEdit->bind(defaultConstructionSet, "name"); diff --git a/openstudiocore/src/openstudio_lib/DefaultConstructionSetInspectorView.hpp b/openstudiocore/src/openstudio_lib/DefaultConstructionSetInspectorView.hpp index 94f151a56c8..a99199bf999 100644 --- a/openstudiocore/src/openstudio_lib/DefaultConstructionSetInspectorView.hpp +++ b/openstudiocore/src/openstudio_lib/DefaultConstructionSetInspectorView.hpp @@ -266,6 +266,21 @@ class SiteShadingVC : public ModelObjectVectorController virtual void onDrop(const OSItemId& itemId) override; }; +class AdiabaticSurfaceVC : public ModelObjectVectorController +{ + Q_OBJECT + +public: + virtual ~AdiabaticSurfaceVC() {} + +protected: + virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; + virtual std::vector makeVector() override; + virtual void onRemoveItem(OSItem* item) override; + virtual void onReplaceItem(OSItem * currentItem, const OSItemId& replacementItemId) override; + virtual void onDrop(const OSItemId& itemId) override; +}; + class DefaultConstructionSetInspectorView : public ModelObjectInspectorView { Q_OBJECT @@ -311,6 +326,7 @@ class DefaultConstructionSetInspectorView : public ModelObjectInspectorView OSDropZone * m_spaceShadingDZ; OSDropZone * m_buildingShadingDZ; OSDropZone * m_siteShadingDZ; + OSDropZone * m_adiabaticSurfaceDZ; WallConstructionVC * m_exteriorWallConstructionVC; FloorConstructionVC * m_exteriorFloorConstructionVC; @@ -336,6 +352,7 @@ class DefaultConstructionSetInspectorView : public ModelObjectInspectorView SpaceShadingVC * m_spaceShadingVC; BuildingShadingVC * m_buildingShadingVC; SiteShadingVC * m_siteShadingVC; + AdiabaticSurfaceVC * m_adiabaticSurfaceVC; std::vector m_vectorControllers; std::vector m_dropZones; diff --git a/openstudiocore/src/osversion/VersionTranslator.cpp b/openstudiocore/src/osversion/VersionTranslator.cpp index dd4753db8d0..dc124d2b398 100644 --- a/openstudiocore/src/osversion/VersionTranslator.cpp +++ b/openstudiocore/src/osversion/VersionTranslator.cpp @@ -4442,6 +4442,29 @@ std::string VersionTranslator::update_2_7_1_to_2_7_2(const IdfFile& idf_2_7_1, c ss << object; } + } else if (iddname == "OS:ZoneHVAC:EquipmentList") { + + auto iddObject = idd_2_7_2.getObject("OS:ZoneHVAC:EquipmentList"); + IdfObject newObject(iddObject.get()); + + // Copy non extensible fields in place + for( size_t i = 0; i < object.numNonextensibleFields(); ++i ) { + if( (value = object.getString(i)) ) { + newObject.setString(i, value.get()); + } + } + + // Copy the existing eg values (the new fields were added at the end of the extensible groups, and have defaults) + for (const IdfExtensibleGroup& eg : object.extensibleGroups()) { + IdfExtensibleGroup new_eg = newObject.pushExtensibleGroup(); + for (size_t i = 0; i < 3; ++i) { + new_eg.setString(i, eg.getString(i).get()); + } + } + + m_refactored.push_back( std::pair(object, newObject) ); + ss << newObject; + // No-op } else { ss << object; diff --git a/openstudiocore/src/utilities/bcl/RemoteBCL.cpp b/openstudiocore/src/utilities/bcl/RemoteBCL.cpp index 17626dea382..5b6f9a16c84 100644 --- a/openstudiocore/src/utilities/bcl/RemoteBCL.cpp +++ b/openstudiocore/src/utilities/bcl/RemoteBCL.cpp @@ -629,6 +629,7 @@ namespace openstudio{ // can't start another download until last one is done if (!m_mutex.try_lock()){ + LOG(Debug, "Cannot get mutex lock"); return false; } @@ -641,7 +642,7 @@ namespace openstudio{ m_downloadUid = uid; QString url = toQString(remoteUrl() + "/api/component/download?uids=" + uid); - //LOG(Warn, toString(url)); + LOG(Debug, "Download URL '" << toString(url) << "'"); QNetworkRequest request = QNetworkRequest(QUrl(url)); request.setRawHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17"); @@ -658,10 +659,13 @@ namespace openstudio{ //#endif m_downloadReply = m_networkManager->get(request); - if (!m_downloadReply->isRunning()){ + if (m_downloadReply->isRunning()) { + LOG(Debug, "Download running"); + }else{ m_mutex.unlock(); m_downloadReply->deleteLater(); m_downloadReply = nullptr; + LOG(Debug, "Download failed to start"); return false; } diff --git a/openstudiocore/src/utilities/geometry/Intersection.cpp b/openstudiocore/src/utilities/geometry/Intersection.cpp index 9bc60a238d6..7c56a4bd838 100644 --- a/openstudiocore/src/utilities/geometry/Intersection.cpp +++ b/openstudiocore/src/utilities/geometry/Intersection.cpp @@ -103,6 +103,9 @@ namespace openstudio{ std::vector inners = boostPolygon.inners(); for (const BoostRing& inner : inners){ + if (inner.size() < 3) { + continue; + } TPPLPoly innerPoly; // must be clockwise innerPoly.Init(inner.size() - 1); innerPoly.SetHole(true); @@ -399,6 +402,52 @@ namespace openstudio{ return m_newPolygons2; } + double IntersectionResult::area1() const + { + double result = 0; + boost::optional d; + d = getArea(m_polygon1); + if (d) { + result += *d; + } else { + LOG_FREE(Warn, "utilities.geometry.IntersectionResult", "Cannot calculate area for polygon1"); + } + + for (const auto& polygon: m_newPolygons1) { + d = getArea(polygon); + if (d) { + result += *d; + } else { + LOG_FREE(Warn, "utilities.geometry.IntersectionResult", "Cannot calculate area for polygon in polygons1"); + } + } + + return result; + } + + double IntersectionResult::area2() const + { + double result = 0; + boost::optional d; + d = getArea(m_polygon2); + if (d) { + result += *d; + } else { + LOG_FREE(Warn, "utilities.geometry.IntersectionResult", "Cannot calculate area for polygon2"); + } + + for (const auto& polygon: m_newPolygons2) { + d = getArea(polygon); + if (d) { + result += *d; + } else { + LOG_FREE(Warn, "utilities.geometry.IntersectionResult", "Cannot calculate area for polygon in polygons2"); + } + } + + return result; + } + std::vector removeSpikes(const std::vector& polygon, double tol) { // convert vertices to boost rings @@ -560,6 +609,9 @@ namespace openstudio{ std::vector< std::vector > newPolygons1; std::vector< std::vector > newPolygons2; + //std::cout << "Initial polygon1 area " << getArea(polygon1).get() << std::endl; + //std::cout << "Initial polygon2 area " << getArea(polygon2).get() << std::endl; + // convert vertices to boost rings std::vector allPoints; @@ -708,7 +760,12 @@ namespace openstudio{ newPolygons2.push_back(newPolygon2); } - return IntersectionResult(resultPolygon1, resultPolygon2, newPolygons1, newPolygons2); + IntersectionResult result(resultPolygon1, resultPolygon2, newPolygons1, newPolygons2); + + //std::cout << "Result area1 " << result.area1() << std::endl; + //std::cout << "Result area2 " << result.area2() << std::endl; + + return result; } std::vector > subtract(const std::vector& polygon, const std::vector >& holes, double tol) diff --git a/openstudiocore/src/utilities/geometry/Intersection.hpp b/openstudiocore/src/utilities/geometry/Intersection.hpp index f1bbc96dbad..5c6821f3c53 100644 --- a/openstudiocore/src/utilities/geometry/Intersection.hpp +++ b/openstudiocore/src/utilities/geometry/Intersection.hpp @@ -59,6 +59,12 @@ namespace openstudio{ // new polygons generated from the second surface std::vector< std::vector > newPolygons2() const; + // total area from the first set of polygons + double area1() const; + + // total area from the second set of polygons + double area2() const; + private: std::vector m_polygon1; std::vector m_polygon2; diff --git a/openstudiocore/src/utilities/idd/Test/IddFile_GTest.cpp b/openstudiocore/src/utilities/idd/Test/IddFile_GTest.cpp index 638a45e0cd5..d4a98e3c150 100644 --- a/openstudiocore/src/utilities/idd/Test/IddFile_GTest.cpp +++ b/openstudiocore/src/utilities/idd/Test/IddFile_GTest.cpp @@ -74,7 +74,7 @@ TEST_F(IddFixture, EpIddFile) EXPECT_EQ("", logMessage.logMessage()); } - EXPECT_EQ("9.0.1",loadedIddFile->version()); + EXPECT_EQ("9.1.0",loadedIddFile->version()); EXPECT_EQ(epIddFile.objects().size(),loadedIddFile->objects().size()); if (epIddFile.objects().size() != loadedIddFile->objects().size()) { // get sets of IddObjectType diff --git a/openstudiocore/src/utilities/idf/Test/ExtensibleGroup_GTest.cpp b/openstudiocore/src/utilities/idf/Test/ExtensibleGroup_GTest.cpp index 99d8ddbf4fa..29cb21c0c3a 100644 --- a/openstudiocore/src/utilities/idf/Test/ExtensibleGroup_GTest.cpp +++ b/openstudiocore/src/utilities/idf/Test/ExtensibleGroup_GTest.cpp @@ -141,7 +141,7 @@ TEST_F(IdfFixture,IdfExtensibleGroup_Setters) { obj = objs[0]; eg = obj.getExtensibleGroup(0); ASSERT_FALSE(eg.empty()); - ASSERT_EQ(static_cast(4),eg.numFields()); + ASSERT_EQ(static_cast(6),eg.numFields()); // setUnsigned OptionalUnsigned ou = eg.getUnsigned(2,true);