From 1ebe9a50564eb27fc7318ed006a42bbfb8c10c68 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Wed, 15 Jan 2025 11:14:06 +0100 Subject: [PATCH 1/7] update submodule `models/pdaf` to PDAF-V2.3 --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index 555d5b4..bd3c8be 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit 555d5b4ed561e30043b30bcf7fe9817b40da601f +Subproject commit bd3c8be31a27949215ecf817f6c222abc92cf1fe From cdc6e4abd58f3164bf7c9ffce55730f0945b0a2d Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Wed, 15 Jan 2025 11:48:50 +0100 Subject: [PATCH 2/7] BuildPDAF: adapt make process to PDAF-V2.3 use `Makefile` in `$PDAF_SRC`, instead of `src` subdirectory add `make` targets `veryclean` and `directories` for adding include, library and external directories --- cmake/BuildPDAF.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/BuildPDAF.cmake b/cmake/BuildPDAF.cmake index dea776a..2e505dd 100644 --- a/cmake/BuildPDAF.cmake +++ b/cmake/BuildPDAF.cmake @@ -238,10 +238,10 @@ list(JOIN PDAF_ENV_VARS " " PDAF_ENV_VARS_STR) # make pdaf ExternalProject_Add(PDAF PREFIX PDAF - SOURCE_DIR ${PDAF_SRC}/src + SOURCE_DIR ${PDAF_SRC} BUILD_IN_SOURCE TRUE CONFIGURE_COMMAND "" - BUILD_COMMAND make ${PDAF_ENV_VARS} clean ../lib/libpdaf-d.a + BUILD_COMMAND make ${PDAF_ENV_VARS} veryclean directories libpdaf INSTALL_COMMAND "" DEPENDS ${PDAF_DEPENDENCIES} ) From 314c81263333868bce80ebcf3b5dbf8fb461a501 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Wed, 22 Jan 2025 11:04:31 +0100 Subject: [PATCH 3/7] cmake/BuildPDAF: use `make clean` instead of `make veryclean` `make veryclean` removes directories that will later give an error if non-existing. --- cmake/BuildPDAF.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/BuildPDAF.cmake b/cmake/BuildPDAF.cmake index 2e505dd..b2baf8b 100644 --- a/cmake/BuildPDAF.cmake +++ b/cmake/BuildPDAF.cmake @@ -241,7 +241,7 @@ ExternalProject_Add(PDAF SOURCE_DIR ${PDAF_SRC} BUILD_IN_SOURCE TRUE CONFIGURE_COMMAND "" - BUILD_COMMAND make ${PDAF_ENV_VARS} veryclean directories libpdaf + BUILD_COMMAND make ${PDAF_ENV_VARS} clean directories libpdaf INSTALL_COMMAND "" DEPENDS ${PDAF_DEPENDENCIES} ) From 8f2f5f6f49f8f78e0587475986e09dc937500ec5 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Thu, 6 Mar 2025 17:09:17 +0100 Subject: [PATCH 4/7] .gitmodules: update branches for `models/pdaf` --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 182b1ce..61fd55e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,7 +13,7 @@ [submodule "models/pdaf"] path = models/pdaf url = https://github.com/HPSCTerrSys/pdaf.git - branch = tsmp-pdaf-patched + branch = tsmp-pdaf-patched-v2.3 [submodule "models/eCLM"] path = models/eCLM url = https://github.com/HPSCTerrSys/eCLM.git From 0a64d44d04da4fa137e7686541f157d909e3edda Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Wed, 29 Oct 2025 11:17:38 +0100 Subject: [PATCH 5/7] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index 8171094..ad2c191 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit 81710946b7fc9618af79e228ff5a8b2815a2fa18 +Subproject commit ad2c191954b503fe9ac4c31651f81c10dc9d1709 From 5320f59958c9d717fa5006ffc9152cb45057cf60 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Wed, 29 Oct 2025 12:09:50 +0100 Subject: [PATCH 6/7] PDAF: Set `MODULEOPT` input dependent on Gnu/Intel compiler --- cmake/BuildPDAF.cmake | 20 ++++++++++++++++++++ cmake/BuildPDAFFRAMEWORK.cmake | 1 + cmake/BuildPDAFMODEL.cmake | 1 + models/pdaf | 2 +- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/cmake/BuildPDAF.cmake b/cmake/BuildPDAF.cmake index 5b69d40..5db30cd 100644 --- a/cmake/BuildPDAF.cmake +++ b/cmake/BuildPDAF.cmake @@ -241,6 +241,25 @@ endif() # Join list list(JOIN PDAF_CPP_DEFS " " PDAF_CPP_DEFS) +# Set PDAF_MODULEOPT for Makefile header +# ---------------------------------- +# Modules flag dependent on compiler +if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" + OR CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM") + + list(APPEND PDAF_MODULEOPT "-module") + +elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + + list(APPEND PDAF_MODULEOPT "-J") + +else() + message(FATAL_ERROR "Unsupported CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}") +endif() + +# Join list +list(JOIN PDAF_MODULEOPT " " PDAF_MODULEOPT) + # Set env vars required by PDAF Makefiles # --------------------------------------- list(APPEND PDAF_ENV_VARS PDAF_ARCH=${PDAF_ARCH}) @@ -252,6 +271,7 @@ list(APPEND PDAF_ENV_VARS TSMPPDAFCOPT=${PDAF_COPT}) list(APPEND PDAF_ENV_VARS TSMPPDAFDOUBLEPRECISION=${PDAF_DOUBLEPRECISION}) list(APPEND PDAF_ENV_VARS TSMPPDAFMPI_INC=${PDAF_MPI_INC}) list(APPEND PDAF_ENV_VARS TSMPPDAFCPP_DEFS=${PDAF_CPP_DEFS}) +list(APPEND PDAF_ENV_VARS TSMPPDAFMODULEOPT=${PDAF_MODULEOPT}) list(JOIN PDAF_ENV_VARS " " PDAF_ENV_VARS_STR) # message(STATUS "${PDAF_ENV_VARS_STR}") diff --git a/cmake/BuildPDAFFRAMEWORK.cmake b/cmake/BuildPDAFFRAMEWORK.cmake index 8b530b4..81652f8 100644 --- a/cmake/BuildPDAFFRAMEWORK.cmake +++ b/cmake/BuildPDAFFRAMEWORK.cmake @@ -19,6 +19,7 @@ list(APPEND PDAFFRAMEWORK_ENV_VARS TSMPPDAFCOPT=${PDAF_COPT}) list(APPEND PDAFFRAMEWORK_ENV_VARS TSMPPDAFDOUBLEPRECISION=${PDAF_DOUBLEPRECISION}) list(APPEND PDAFFRAMEWORK_ENV_VARS TSMPPDAFMPI_INC=${PDAF_MPI_INC}) list(APPEND PDAFFRAMEWORK_ENV_VARS TSMPPDAFCPP_DEFS=${PDAF_CPP_DEFS}) +list(APPEND PDAFFRAMEWORK_ENV_VARS TSMPPDAFMODULEOPT=${PDAF_MODULEOPT}) list(APPEND PDAFFRAMEWORK_ENV_VARS TSMPPDAFIMPORTFLAGS=${PDAF_INCLUDES}) list(APPEND PDAFFRAMEWORK_ENV_VARS TSMPPDAFCPPDEFS=${PDAF_DEFS}) list(APPEND PDAFFRAMEWORK_ENV_VARS TSMPPDAFLIBS=${PDAF_LIBS}) diff --git a/cmake/BuildPDAFMODEL.cmake b/cmake/BuildPDAFMODEL.cmake index 211d029..f812265 100644 --- a/cmake/BuildPDAFMODEL.cmake +++ b/cmake/BuildPDAFMODEL.cmake @@ -164,6 +164,7 @@ list(APPEND PDAFMODEL_ENV_VARS TSMPPDAFCOPT=${PDAF_COPT}) list(APPEND PDAFMODEL_ENV_VARS TSMPPDAFDOUBLEPRECISION=${PDAF_DOUBLEPRECISION}) list(APPEND PDAFMODEL_ENV_VARS TSMPPDAFMPI_INC=${PDAF_MPI_INC}) list(APPEND PDAFMODEL_ENV_VARS TSMPPDAFCPP_DEFS=${PDAF_CPP_DEFS}) +list(APPEND PDAFMODEL_ENV_VARS TSMPPDAFMODULEOPT=${PDAF_MODULEOPT}) list(APPEND PDAFMODEL_ENV_VARS TSMPPDAFIMPORTFLAGS=${PDAF_INCLUDES}) list(APPEND PDAFMODEL_ENV_VARS TSMPPDAFCPPDEFS=${PDAF_DEFS}) list(APPEND PDAFMODEL_ENV_VARS TSMPPDAFLIBS=${PDAF_LIBS}) diff --git a/models/pdaf b/models/pdaf index ad2c191..c1a4808 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit ad2c191954b503fe9ac4c31651f81c10dc9d1709 +Subproject commit c1a480825437f2eecd76feef0f9a1dda4f1f14e4 From 20c0accfedc0e9ef83b0cd2a5576397fdb9fffb3 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 19 Dec 2025 14:42:44 +0100 Subject: [PATCH 7/7] update "models/pdaf" to tsmp-pdaf-patched --- .gitmodules | 2 +- models/pdaf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 48479cb..2a7a07c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,7 +13,7 @@ [submodule "models/pdaf"] path = models/pdaf url = https://github.com/HPSCTerrSys/pdaf.git - branch = tsmp-pdaf-patched-v2.3 + branch = tsmp-pdaf-patched [submodule "models/eCLM"] path = models/eCLM url = https://github.com/HPSCTerrSys/eCLM.git diff --git a/models/pdaf b/models/pdaf index 2471de7..a9fdb46 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit 2471de7a0bc418d31fab895df688b5ba3986b274 +Subproject commit a9fdb46b422f7c8989af05943d997985fa581e91