Merge pull request #8548 from NREL/PrepFor95IOFreeze

Prep for 95 IO freeze
NREL · Feb 19, 2021 · 3153b0f · 3153b0f · nrel-bot-2b · Feb 19, 2021
2 parents e3d0786 + 2e33825
commit 3153b0f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/cmake/Install.cmake b/cmake/Install.cmake
@@ -380,8 +380,8 @@ endif()
 set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/release/readme.html")
 
 install(FILES "${PROJECT_SOURCE_DIR}/bin/CurveFitTools/IceStorageCurveFitTool.xlsm" DESTINATION "PreProcess/HVACCurveFitTool/")
-install(FILES "${PROJECT_SOURCE_DIR}/idd/V9-3-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater/")
-install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater/" RENAME "V9-4-0-Energy+.idd")
+install(FILES "${PROJECT_SOURCE_DIR}/idd/V9-4-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater/")
+install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater/" RENAME "V9-5-0-Energy+.idd")
 
 # Workflow stuff, takes about 40KB, so not worth it proposing to not install it
 install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/workflows/app_g_postprocess.py" DESTINATION "workflows/") # COMPONENT Workflows)

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
@@ -1014,7 +1014,7 @@ \subsubsection{ASTM C1340 Algorithm}\label{ASTM-C1340-algorithm}
 h_c = {(h_n^3 + h_f^3)}^{1/3}
 \end{equation}
 
-More information regarding the implemented equations in the code is provided in detail in Appendix A, section 7.7 and 7.8 of the reference: Fontanini, A. D., Aguilar, J. L. C., Mitchell, M. S., Kosny, J., Merket, N., DeGraw, J. W., & Lee, E. (2018). Predicting the performance of radiant technologies in attics: Reducing the discrepancies between attic specific and whole-building energy models. Energy and Buildings, 169, 69-83.
+More information regarding the implemented equations in the code is provided in detail in Appendix A, section 7.7 and 7.8 of the reference: Fontanini, A. D., Aguilar, J. L. C., Mitchell, M. S., Kosny, J., Merket, N., DeGraw, J. W., and Lee, E. (2018). Predicting the performance of radiant technologies in attics: Reducing the discrepancies between attic specific and whole-building energy models. Energy and Buildings, 169, 69-83.
 
 \subsection{Additional Heat Balance Source}\label{additional-heat-balance-source}
 
@@ -1049,7 +1049,7 @@ \subsubsection{References}\label{references-032}
 
 Fohanno, S., and G. Polidori. 2006. Modelling of natural convective heat transfer at an internal surface. Energy and Buildings 38 (2006) 548 - 553
 
-Fontanini, A. D., Aguilar, J. L. C., Mitchell, M. S., Kosny, J., Merket, N., DeGraw, J. W., & Lee, E. (2018). Predicting the performance of radiant technologies in attics: Reducing the discrepancies between attic specific and whole-building energy models. Energy and Buildings, 169, 69-83.
+Fontanini, A. D., Aguilar, J. L. C., Mitchell, M. S., Kosny, J., Merket, N., DeGraw, J. W., and Lee, E. (2018). Predicting the performance of radiant technologies in attics: Reducing the discrepancies between attic specific and whole-building energy models. Energy and Buildings, 169, 69-83.
 
 Goldstein, K. and A. Novoselac. 2010. Convective Heat Transfer in Rooms With Ceiling Slot Diffusers (RP-1416). \emph{HVAC\&R Research Journal} TBD
 

diff --git a/scripts/dev/find_byref_bool_override.py b/scripts/dev/find_byref_bool_override.py
@@ -341,6 +341,10 @@
             "heatingDesignlinepassed",
             "coolingDesignlinepassed",
             "desConditionlinepassed"
+        ],
+        "produceDualUnitsFlags": [
+            "produce_Sql",
+            "produce_Tab"
         ]
     },
     "PackagedTerminalHeatPump.cc": {