diff --git a/src/simulation/m_body_forces.fpp b/src/simulation/m_body_forces.fpp index fb5320f09e..1f60d2cae3 100644 --- a/src/simulation/m_body_forces.fpp +++ b/src/simulation/m_body_forces.fpp @@ -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 diff --git a/toolchain/dependencies/CMakeLists.txt b/toolchain/dependencies/CMakeLists.txt index 9a41e1cafc..d1c9c8b037 100644 --- a/toolchain/dependencies/CMakeLists.txt +++ b/toolchain/dependencies/CMakeLists.txt @@ -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.") @@ -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 diff --git a/toolchain/dependencies/Silo.patch b/toolchain/dependencies/Silo.patch deleted file mode 100644 index f8e2198e1f..0000000000 --- a/toolchain/dependencies/Silo.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7405f0dc998ac104b4b5c0536bbf9b0644d85a11 Mon Sep 17 00:00:00 2001 -From: Henry LE BERRE -Date: Mon, 1 Apr 2024 17:06:21 -0400 -Subject: [PATCH] CMake MFC Fixes - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 111eb42..9e460f7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -68,7 +68,7 @@ project(Silo VERSION ${SILO_VERSION} LANGUAGES CXX C) - ###----------------------------------------------------------------------------- - # location for Silo CMake includes - ###----------------------------------------------------------------------------- --set(CMAKE_MODULE_PATH ${Silo_SOURCE_DIR}/CMake) -+list(APPEND CMAKE_MODULE_PATH "${Silo_SOURCE_DIR}/CMake") - - ###----------------------------------------------------------------------------- - # If not already set, use a default build type of Release --- -2.45.1 -