Merge branch 'develop' of github.com:NREL/EnergyPlus into develop

CMakeLists.txt

@@ -133,6 +133,7 @@ include(cmake/CompilerFlags.cmake)
 
 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src )
 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/third_party )
+INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/third_party/btwxt/src )
 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/third_party/re2 )
 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/third_party/doj )
 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/third_party/nlohmann )
@@ -161,14 +162,16 @@ set(RE2_BUILD_TESTING OFF CACHE BOOL "" FORCE)
 if( BUILD_TESTING )
   set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
   set(BUILD_GTEST ON CACHE BOOL "" FORCE)
-  set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
+  set(BUILD_GMOCK ON CACHE BOOL "" FORCE)
   option( TEST_ANNUAL_SIMULATION "Use annual simulations for tests instead of only design days" OFF )
   enable_testing()
   include(CTest)
+  ADD_SUBDIRECTORY(third_party/gtest)
 endif()
 
 # E+ required libraries
 ADD_SUBDIRECTORY(idd)
+
 ADD_SUBDIRECTORY(third_party/SQLite)
 ADD_SUBDIRECTORY(third_party/ObjexxFCL)
 ADD_SUBDIRECTORY(third_party/BCVTB)
@@ -177,14 +180,17 @@ ADD_SUBDIRECTORY(third_party/FMI)
 ADD_SUBDIRECTORY(third_party/zlib)
 ADD_SUBDIRECTORY(third_party/DElight)
 ADD_SUBDIRECTORY(third_party/re2)
+
 ADD_SUBDIRECTORY(scripts/dev/generate_embeddable_epJSON_schema)
 IF( NOT APPLE )
   ADD_SUBDIRECTORY(third_party/FMUParser)
 ENDIF()
 ADD_SUBDIRECTORY(third_party/Windows-CalcEngine)
-if( BUILD_TESTING )
-  ADD_SUBDIRECTORY(third_party/gtest)
-endif()
+
+# Btwxt
+INCLUDE_DIRECTORIES( ${gtest_SOURCE_DIR}/include/ SYSTEM )
+set(BUILD_BTWXT_TESTING ${BUILD_TESTING} CACHE BOOL "" FORCE)
+ADD_SUBDIRECTORY(third_party/btwxt)
 
 # Kiva
 INCLUDE(third_party/cmake/kiva.cmake)

doc/input-output-reference/src/overview/group-air-distribution-equipment.tex

@@ -1495,73 +1495,6 @@ \subsubsection{Inputs}\label{inputs-10-000}
     CapModFuncOfWaterFlow; !- Beam Heating Capacity Hot Water Flow Modification Factor Curve or Table Name
 \end{lstlisting}
 
-\begin{lstlisting}
-  Curve:Linear,  ! y = x
-    CapModFuncOfTempDiff, !-Name
-    0, !_ Coef Const
-    1, !- Coef x
-    0,  !- min x
-    1.5, !- max x
-    0.0 , !- min y
-    1.5; ! max y
-\end{lstlisting}
-
-\begin{lstlisting}
-  Table:OneIndependentVariable,
-    CoolCapModFuncOfSAFlow, !- Name
-    quadratic,!- Curve Type
-    EvaluateCurveToLimits,!- Interpolation Method
-    0.714,!- min x
-    1.2857,!- max x
-    0.8234,!- min y
-    1.1256,!- max y
-    dimensionless, !-
-    dimensionless, !-
-    , !- normalization ref
-    0.714286, 0.823403,
-    1.0,      1.0,
-    1.2857,   1.1256;
-\end{lstlisting}
-
-\begin{lstlisting}
-  Table:OneIndependentVariable,
-    CapModFuncOfWaterFlow, !- Name
-    quadratic,!- Curve Type
-    EvaluateCurveToLimits,!- Interpolation Method
-    0.0,!- min x
-    1.333333,!- max x
-    0.0,!- min y
-    1.04,!- max y
-    dimensionless, !-
-    dimensionless, !-
-     , !- normalization ref
-    0.0,      0.0,
-    0.05,     0.001,
-    0.33333,  0.71,
-    0.5,      0.85,
-    0.666667, 0.92,
-    0.833333, 0.97,
-    1.0,      1.0,
-    1.333333, 1.04;
-\end{lstlisting}
-
-\begin{lstlisting}
-  Table:OneIndependentVariable,
-    HeatCapModFuncOfSAFlow, !- Name
-    quadratic,!- Curve Type
-    EvaluateCurveToLimits,!- Interpolation Method
-    0.714,!- min x
-    1.2857,!- max x
-    0.8554,!- min y
-    1.0778,!- max y
-    dimensionless, !-
-    dimensionless, !-
-    , !- normalization ref
-    0.714286, 0.8554,
-    1.0,      1.0,
-    1.2857,   1.0778;
-\end{lstlisting}
-
 \subsubsection{Outputs}\label{outputs-10}
 
 \paragraph{Zone Air Terminal Beam Sensible Cooling Rate {[}W{]}}\label{zone-air-terminal-beam-sensible-cooling-rate-w}

doc/input-output-reference/src/overview/group-energy-management-system-ems.tex

@@ -574,7 +574,7 @@ \subsubsection{Inputs}\label{inputs-8-006}
 
 \subsection{EnergyManagementSystem:CurveOrTableIndexVariable}\label{energymanagementsystemcurveortableindexvariable}
 
-The EMS provides a method for reusing curve and table input objects from elsewhere in the model. Input objects, such as \hyperref[curvecubic]{Curve:Cubic}, \hyperref[curvebiquadratic]{Curve:Biquadratic}, or Table:TwoIndependetVariables, are used by various component models to describe performance relationships in a generic way. By using an EnergyManagementSystem:CurveOrTableIndexVariable input object, these curves and tables can be used in your own Erl programs. This object sets up an Erl variable that contains an index that points to specific curve or table. This index variable is then used as the first argument in a call to the built-in function called @CurveValue so that the correct curve or table is evaluated.
+The EMS provides a method for reusing curve and table input objects from elsewhere in the model. Input objects, such as \hyperref[curvecubic]{Curve:Cubic}, \hyperref[curvebiquadratic]{Curve:Biquadratic}, or \hyperref[tablelookup]{Table:Lookup}, are used by various component models to describe performance relationships in a generic way. By using an EnergyManagementSystem:CurveOrTableIndexVariable input object, these curves and tables can be used in your own Erl programs. This object sets up an Erl variable that contains an index that points to specific curve or table. This index variable is then used as the first argument in a call to the built-in function called @CurveValue so that the correct curve or table is evaluated.
 
 \subsubsection{Inputs}\label{inputs-9-005}