Skip to content

fix: bump Silo to 4.12.1-pre1, drop patch, fix FFTW CMake 4.x compat #1442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbryngelson merged 3 commits into from
May 16, 2026
+3 −29
Merged

fix: bump Silo to 4.12.1-pre1, drop patch, fix FFTW CMake 4.x compat #1442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e61c2ad
fix: bump Silo to 4.12.1-pre1, drop patch, fix FFTW CMake 4.x compat
sbryngelson May 15, 2026
ef46ac6
Update module documentation for body forces
sbryngelson May 15, 2026
e1396b5
fix: restore Cray CMAKE_MODULE_PATH arg for Silo HDF5 discovery
sbryngelson May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/simulation/m_body_forces.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#:include 'macros.fpp'

!> @brief Computes gravitational and user-defined body force source terms for the momentum equations
!> @brief Computes gravitational and body force source terms for the momentum equations
module m_body_forces

use m_derived_types
Expand Down
5 changes: 2 additions & 3 deletions toolchain/dependencies/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ if (MFC_FFTW)
CMAKE_ARGS -DBUILD_TESTS=OFF
-DBUILD_SHARED_LIBS=OFF
"-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
)
else()
message(WARNING "The Fortran compiler vendor is Cray so FFTW3 will not be built. We will use cray-fftw instead.")
Expand Down Expand Up @@ -95,11 +96,9 @@ if (MFC_SILO)

ExternalProject_Add(silo
GIT_REPOSITORY "https://github.com/LLNL/Silo"
GIT_TAG 4.12.0
GIT_TAG 4.12.1-pre1
GIT_SHALLOW ON
GIT_PROGRESS ON
PATCH_COMMAND "${GIT_EXECUTABLE}" stash
&& "${GIT_EXECUTABLE}" apply "${CMAKE_SOURCE_DIR}/Silo.patch"
CMAKE_ARGS -DSILO_ENABLE_SHARED=OFF
-DSILO_ENABLE_SILOCK=OFF
-DSILO_ENABLE_BROWSER=OFF
Expand Down
25 changes: 0 additions & 25 deletions toolchain/dependencies/Silo.patch
View file
Open in desktop

This file was deleted.

Loading