From 90253769cb45dbd80be4eff35735f29ff9e0ddc9 Mon Sep 17 00:00:00 2001 From: Edwin Lee Date: Thu, 18 Feb 2021 15:05:13 -0600 Subject: [PATCH 1/3] Fix installed IDDs --- cmake/Install.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index e699540ee56..1393e0ea4e9 100644 --- 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) From e2682a7da37928073c3e887014b67b0a8eafee4e Mon Sep 17 00:00:00 2001 From: Edwin Lee Date: Thu, 18 Feb 2021 18:45:46 -0600 Subject: [PATCH 2/3] Approve-List some byref booleans --- scripts/dev/find_byref_bool_override.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/dev/find_byref_bool_override.py b/scripts/dev/find_byref_bool_override.py index b3b4b2e18ca..9d087e93713 100755 --- 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": { From 2e338253d166f769576830064c7761862c948785 Mon Sep 17 00:00:00 2001 From: Edwin Lee Date: Thu, 18 Feb 2021 20:28:09 -0600 Subject: [PATCH 3/3] Fix some doc warnings --- .../inside-heat-balance.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index c626fff7c28..8003bbc846e 100644 --- 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