Merge remote-tracking branch 'origin/develop' into 8376_FileSystem_Mo…

…ve_minimal
NREL · Jan 13, 2021 · 5f15aec · 5f15aec · nrel-bot-3 · Jan 13, 2021
2 parents 04c4ebe + ec58f46
commit 5f15aec
Show file tree

Hide file tree

Showing 716 changed files with 160,144 additions and 53,917 deletions.
diff --git a/.decent_ci-Linux.yaml b/.decent_ci-Linux.yaml
@@ -25,8 +25,8 @@ compilers:
     cmake_extra_flags: -DLINK_WITH_PYTHON=ON -DBUILD_FORTRAN=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=OFF -DCOMMIT_SHA=$COMMIT_SHA -DENABLE_COVERAGE:BOOL=ON -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF
     coverage_enabled: true
     coverage_base_dir: src/EnergyPlus
-    coverage_pass_limit: 68.0
-    coverage_warn_limit: 67.9
+    coverage_pass_limit: 67.8
+    coverage_warn_limit: 67.7
     coverage_s3_bucket: energyplus
     build_tag: IntegrationCoverage
     ctest_filter: -R "integration.*"

diff --git a/.github/workflows/pr_labels.yml b/.github/workflows/pr_labels.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   check_pr_labels:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.github/workflows/windows_release.yml b/.github/workflows/windows_release.yml
@@ -85,7 +85,7 @@ jobs:
       run: |
         set -x
         out_dir="C:/Qt"
-        aqt tool windows tools_ifw 4.0 qt.tools.ifw.4.0 --outputdir="$out_dir"
+        aqt tool windows tools_ifw 4.0 qt.tools.ifw.40 --outputdir="$out_dir"
         echo "$out_dir/Tools/QtInstallerFramework/4.0/bin" >> $GITHUB_PATH
 
     - name: Create Build Directory

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -200,7 +200,7 @@ set(RE2_BUILD_TESTING OFF CACHE BOOL "" FORCE)
 
 
 if( OPENGL_FOUND )
-  set(BUILD_PENUMBRA_TESTING ${BUILD_TESTING} CACHE BOOL "" FORCE)
+  set(BUILD_PENUMBRA_TESTING OFF CACHE BOOL "")
 endif()
 
 if( BUILD_TESTING )
@@ -313,7 +313,7 @@ if( BUILD_TESTING )
 
   set_target_properties(btwxt_tests PROPERTIES FOLDER ThirdParty/Btwxt)
   set_target_properties(kiva_tests PROPERTIES FOLDER ThirdParty/Kiva)
-  if( OPENGL_FOUND )
+  if( OPENGL_FOUND AND BUILD_PENUMBRA_TESTING)
     set_target_properties(penumbra_tests PROPERTIES FOLDER ThirdParty/Penumbra)
   endif()
 endif()

diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake
@@ -22,6 +22,7 @@ endif()
 IF ( MSVC AND NOT ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" ) ) # Visual C++ (VS 2013)
 
     # COMPILER FLAGS
+    ADD_COMPILE_OPTIONS("/bigobj")
     ADD_COMPILE_OPTIONS("/nologo")
     ADD_COMPILE_OPTIONS("/EHsc")
     ADD_COMPILE_OPTIONS("/MP") # Enables multi-processor compilation of source within a single project
@@ -104,7 +105,7 @@ ELSEIF ( CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"
     ADD_CXX_DEFINITIONS("-pipe") # Faster compiler processing
     ADD_CXX_DEFINITIONS("-pedantic") # Turn on warnings about constructs/situations that may be non-portable or outside of the standard
     ADD_CXX_DEFINITIONS("-Wall -Wextra") # Turn on warnings
-    ADD_CXX_DEFINITIONS("-Werror") # Treat warnings as errors
+#    ADD_CXX_DEFINITIONS("-Werror") # Treat warnings as errors
     ADD_CXX_DEFINITIONS("-Wno-unknown-pragmas")
     if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0)
       ADD_CXX_DEFINITIONS("-Wno-deprecated-copy")

diff --git a/...ngineering-reference/src/daylighting-and-window-calculations/daylighting-calculations.tex b/...ngineering-reference/src/daylighting-and-window-calculations/daylighting-calculations.tex
@@ -14,7 +14,7 @@ \section{Daylighting Calculations}\label{daylighting-calculations}
     and the contribution of light that reflects from the walls, floor and ceiling before reaching the reference points. 
 
     If a zone has surfaces with air boundaries (Construction:AirBoundary) 
-    using the \textit{GroupedZones} method for solar and daylighting then all of the surfaces within the grouped enclosure are included in the "zone". Each daylighting control and reference point 
+    then all of the surfaces within the grouped enclosure are included in the ``zone''. Each daylighting control and reference point 
     remains associated with a specific zone, but all windows (and other surfaces) within the grouped enclosure are seen by each reference point within the enclosure. For example if there is an air
     boundary between Zone A and Zone B, a daylighting reference point in Zone A will see all surfaces in both Zone A and Zone B directly.
 

diff --git a/...rence/src/surface-heat-balance-manager-processes/infrared-radiation-transfer-material.tex b/...rence/src/surface-heat-balance-manager-processes/infrared-radiation-transfer-material.tex
@@ -77,8 +77,6 @@ \subsubsection{Specifying an Infrared Transparent (IRT) surface}\label{specifyin
 
 The Infrared Transparent surface should not participate in a convective/conductive exchange between the zones it separates. In order to minimize this effect, the SurfaceProperty:ConvectionCoefficients object must be used. Outside and Inside values for the surface's convection coefficients should be on the order of .1.~ Further examples are given in the Input Output Reference document.
 
-Infrared transparent surfaces may also be specified using Construction:AirBoundary with the \textit{IRTSurface} option for radiant exchange. This method automatically generates an internal material layer with IRT properties and sets the inside convection coefficient to the Minimum Surface Convection Heat Transfer Coefficient Value specified in the HeatBalanceAlgorithm object which defaults to 0.1 [W/m2-K].
-
 \subsection{Behavior Checks}\label{behavior-checks}
 
 The behavior of multi zones separated with infrared transparent surfaces can be checked with a simple comparison. Begin with a single zone model as shown below. This model has a south-facing window, and four walls exposed to wind and sun, and a roof exposed to wind and sun.

diff --git a/doc/engineering-reference/src/surface-heat-balance-manager-processes/inside-heat-balance.tex b/doc/engineering-reference/src/surface-heat-balance-manager-processes/inside-heat-balance.tex
@@ -33,7 +33,7 @@ \section{Inside Heat Balance}\label{inside-heat-balance}
 
 \subsection{Internal Long-Wave Radiation Exchange}\label{internal-long-wave-radiation-exchange}
 
-Long-wave radiation exchange is balanced within an enclosure which may be a single zone or a group of zones connected by air boundaries (see Construction:AirBoundary) using the \textit{GroupedZone} radiant exchange method. Throughout this section, "Zone" refers to either type of enclosure.
+Long-wave radiation exchange is balanced within an enclosure which may be a single zone or a group of zones connected by air boundaries (see Construction:AirBoundary). Throughout this section, ``Zone'' refers to either type of enclosure.
 
 \subsubsection{LW Radiation Exchange Among Zone Surfaces}\label{lw-radiation-exchange-among-zone-surfaces}
 

diff --git a/doc/input-output-reference/src/overview/group-advanced-surface-concepts.tex b/doc/input-output-reference/src/overview/group-advanced-surface-concepts.tex
@@ -2703,7 +2703,7 @@ \subsubsection{Inputs}\label{inputs-17}
 
 \paragraph{Field: Zone or ZoneList Name}\label{zonepropertyuserviewfactorsbysurfacename-field-zone-name}
 
-An enclosure for radiant exchange may be a single zone, or a group of zones connected by one or more air boundaries (see ``\hyperref[constructionairboundary]{Construction:AirBoundary}''). If a ZoneList name is specified, the referenced ``\hyperref[zonelist]{ZoneList}'') must match a group of zones connected with Construction:AirBoundary using the \textit{GroupedZones} option for Radiant Exchange Method.
+An enclosure for radiant exchange may be a single zone, or a group of zones connected by one or more air boundaries (see ``\hyperref[constructionairboundary]{Construction:AirBoundary}''). If a ZoneList name is specified, the referenced ``\hyperref[zonelist]{ZoneList}'') must match a group of zones connected with Construction:AirBoundary.
 
 Enter the applicable surface pairs with non-zero view factors. Any omitted surface pair is assumed to have a zero view factor.
 

diff --git a/doc/input-output-reference/src/overview/group-electric-load-center-generator.tex b/doc/input-output-reference/src/overview/group-electric-load-center-generator.tex
@@ -1840,7 +1840,7 @@ \subsubsection{Inputs}\label{inputs-8-005}
 
 \paragraph{Field: Fuel Type}\label{field-fuel-type-1}
 
-This alpha field determines the type of fuel that the generator uses. Valid choices are: \textbf{NaturalGas, Propane, Diesel, Gasoline, FuelOilNo1, FuelOilNo2, OtherFuel1} and \textbf{OtherFuel2}. The default is \textbf{NaturalGas}.
+This choice field specifies the type of fuel used by the generator. The fuel type can be NaturalGas, Propane, FuelOilNo1, FuelOilNo2, Diesel, Gasoline, Coal, OtherFuel1, or OtherFuel2. If the field is left blank, the fuel type will be assumed to be \textbf{NaturalGas}.
 
 \paragraph{Field: Heat Recovery Maximum Temperature}\label{field-heat-recovery-maximum-temperature-1}
 
@@ -2040,7 +2040,7 @@ \subsubsection{Inputs}\label{inputs-9-004}
 
 \paragraph{Field: Fuel Type}\label{field-fuel-type-2}
 
-This choice field specifies the type of fuel used by the generator. Valid field types are Propane and NaturalGas. If the field is left blank, the fuel type will be assumed to be NaturalGas.
+This choice field specifies the type of fuel used by the generator. The fuel type can be NaturalGas, Propane, FuelOilNo1, FuelOilNo2, Diesel, Gasoline, Coal, OtherFuel1, or OtherFuel2. If the field is left blank, the fuel type will be assumed to be \textbf{NaturalGas}.
 
 \paragraph{Field: Fuel Higher Heating Value}\label{field-fuel-higher-heating-value-2}
 

diff --git a/doc/input-output-reference/src/overview/group-surface-construction-elements.tex b/doc/input-output-reference/src/overview/group-surface-construction-elements.tex
@@ -4080,30 +4080,14 @@ \subsection{Construction:AirBoundary}\label{constructionairboundary}
 When this construction type is used, the Outside Boundary Condition of the surface (or the base surface of a fenestration surface)
 must be either \textit{Surface} or \textit{Zone}. A base surface with Construction:AirBoundary cannot hold any fenestration surfaces.
 
+The two zones separated by this air boundary will be grouped together into a combined enclosure for solar distribution, daylighting, and radiant exchange (including distribution of radiant internal gains). If a given zone has an air boundary with more than one zone, then all of the connected zones will be grouped together. For example, if there is an air boundary between zones A and B, and another air boundary between zones B and C, all three zones (A, B, and C) will be grouped into a single enclosure. Normal default simplified view factors will apply unless detailed view factors are specified using \hyperref[zonepropertyuserviewfactorsbysurfacename]{ZoneProperty:UserViewFactors:BySurfaceName}.
+
 \subsubsection{Inputs}\label{inputs-38-01}
 
 \paragraph{Field: Name}\label{field-name-31-0001}
 
 The name of the construction.
 
-\paragraph{Field: Solar and Daylighting Method}\label{field-solar and-daylighting-method}
-
-This field controls how the surface is modeled for solar distribution and daylighting calculations. There are two
-choices:
-\begin{description}
-  \item[GroupedZones] The two zones separated by this air boundary will be grouped together into a combined zone for solar distribution and daylighting. If a given zone has an air boundary with more than one zone, then all of the connected zones will be grouped together. For example, if there is an air  boundary between zones A and B, and another air boundary between zones B and C, all three zones (A, B, and C) will be grouped into a single zone.
-  \item[InteriorWindow] The air boundary will be modeled as a perfectly transmitting interior window. As with other interior windows, all direct solar passing through the interior window will be diffuse in the adjacent zone.
-\end{description}
-
-\paragraph{Field: Radiant Exchange Method}\label{field-radiant-exchange-method}
-
-This field controls how the surface is modeled for radiant exchange calculations. There are two choices:
-
-\begin{description}
-  \item[GroupedZones] The two zones separated by this air boundary will be grouped together into a combined zone for radiant exchange between surfaces and distribution of radiant internal gains. If a given zone has an air boundary with more than one zone, then all of the connected zones will be grouped together. For example, if there is an air boundary between zones A and B, and another air boundary between zones B and C, all three zones (A, B, and C) will be grouped into a single zone. Normal default simplified view factors will apply unless detailed view factors are specified using \hyperref[zonepropertyuserviewfactorsbysurfacename]{ZoneProperty:UserViewFactors:BySurfaceName}.
-  \item[IRTSurface] The air boundary will be modeled as blackbody surface between the adjacent zones (similar to, but not exactly the same as, \hyperref[materialinfraredtransparent]{Material:InfraredTransparent}. The surface participates in the radiant exchange within each zone and receives long-wave radiant energy from internal sources. The surface does not absorb any visible or solar radiation, has no thermal resistance, and has zero convective heat transfer coefficients on both sides.
-\end{description}
-
 \paragraph{Field: Air Exchange Method}\label{field-air-exchange-method}
 
 This field controls how the surface is modeled for radiant exchange calculations. There are two choices:
@@ -4126,8 +4110,6 @@ \subsubsection{Inputs}\label{inputs-38-01}
 \begin{lstlisting}
   Construction:AirBoundary,
     Air Wall,                !- Name
-    GroupedZones,            !- Solar and Daylighting Method
-    GroupedZones,            !- Radiant Exchange Method
     SimpleMixing,            !- Air Exchange Method
     0.5,                     !- Simple Mixing Air Changes per Hour {1/hr}
     ;                        !- Simple Mixing Schedule Name