From aae286345ca7a67f673eaae1bc467b6c87915f45 Mon Sep 17 00:00:00 2001 From: ChrisZYJ Date: Tue, 28 Apr 2026 16:52:16 -0700 Subject: [PATCH 1/2] CMake fix --- toolchain/dependencies/CMakeLists.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/toolchain/dependencies/CMakeLists.txt b/toolchain/dependencies/CMakeLists.txt index 0ef1dcf604..9a41e1cafc 100644 --- a/toolchain/dependencies/CMakeLists.txt +++ b/toolchain/dependencies/CMakeLists.txt @@ -82,6 +82,17 @@ if (MFC_SILO) else() find_package(Git REQUIRED) + # When the system HDF5 is the MPI-enabled variant (e.g. libhdf5-openmpi-dev), + # its headers transitively include mpi.h. Propagate MPI include dirs into the + # silo sub-build so those headers can be found. + find_package(MPI COMPONENTS C QUIET) + set(_silo_c_flags "${CMAKE_C_FLAGS}") + if (MPI_C_FOUND) + foreach(_dir IN LISTS MPI_C_INCLUDE_DIRS) + string(APPEND _silo_c_flags " -I${_dir}") + endforeach() + endif() + ExternalProject_Add(silo GIT_REPOSITORY "https://github.com/LLNL/Silo" GIT_TAG 4.12.0 @@ -98,6 +109,7 @@ if (MFC_SILO) "-DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}" "-DCMAKE_FIND_PACKAGE_REDIRECTS_DIR=${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}" "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" + "-DCMAKE_C_FLAGS=${_silo_c_flags}" "$<$:-DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/../cmake/cce>" ) endif() From d9f39c8b9c2d6159be39b859c00c2dbb47a5080b Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Wed, 29 Apr 2026 13:13:11 -0400 Subject: [PATCH 2/2] Refine module description for m_bubbles --- src/simulation/m_bubbles.fpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/simulation/m_bubbles.fpp b/src/simulation/m_bubbles.fpp index 2ff5952827..1881b128b4 100644 --- a/src/simulation/m_bubbles.fpp +++ b/src/simulation/m_bubbles.fpp @@ -4,8 +4,7 @@ #:include 'macros.fpp' -!> @brief Shared bubble-dynamics procedures (radial acceleration, wall pressure, sound speed) for ensemble- and volume-averaged -!! models +!> @brief Bubble-dynamics procedures for ensemble- and volume-averaged models module m_bubbles use m_derived_types