diff --git a/.gitmodules b/.gitmodules index faac9f2..2725566 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,11 +13,11 @@ [submodule "models/pdaf"] path = models/pdaf url = https://github.com/HPSCTerrSys/pdaf.git - branch = tsmp-pdaf-patched + branch = tsmp-pdaf-patched-parallel-build [submodule "models/eCLM"] path = models/eCLM url = https://github.com/HPSCTerrSys/eCLM.git - branch = beta-0.7 + branch = master-parallel-build [submodule "models/oasis3-mct"] path = models/oasis3-mct url = https://icg4geo.icg.kfa-juelich.de/ExternalReposPublic/oasis3-mct diff --git a/CMakeLists.txt b/CMakeLists.txt index d077b8f..c6ec4ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.28) +cmake_minimum_required (VERSION 3.26) project(TSMP2 LANGUAGES C CXX Fortran) include(ExternalProject) diff --git a/cmake/BuildPDAF.cmake b/cmake/BuildPDAF.cmake index a653e44..b89685c 100644 --- a/cmake/BuildPDAF.cmake +++ b/cmake/BuildPDAF.cmake @@ -278,8 +278,8 @@ ExternalProject_Add(PDAF PREFIX PDAF SOURCE_DIR ${PDAF_SRC} BUILD_IN_SOURCE TRUE - CONFIGURE_COMMAND "" - BUILD_COMMAND make ${PDAF_ENV_VARS} clean directories libpdaf + CONFIGURE_COMMAND $(MAKE) ${PDAF_ENV_VARS} clean directories + BUILD_COMMAND $(MAKE) ${PDAF_ENV_VARS} -j ${PARALLEL_JOBS} libpdaf INSTALL_COMMAND "" DEPENDS ${PDAF_DEPENDENCIES} ) diff --git a/cmake/BuildPDAFFRAMEWORK.cmake b/cmake/BuildPDAFFRAMEWORK.cmake index 81652f8..b1cf1fb 100644 --- a/cmake/BuildPDAFFRAMEWORK.cmake +++ b/cmake/BuildPDAFFRAMEWORK.cmake @@ -33,8 +33,8 @@ ExternalProject_Add(PDAF-Framework PREFIX PDAF-Framework SOURCE_DIR ${PDAF_SRC}/interface/framework BUILD_IN_SOURCE TRUE - CONFIGURE_COMMAND "" - BUILD_COMMAND make ${PDAFFRAMEWORK_ENV_VARS} clean all + CONFIGURE_COMMAND $(MAKE) ${PDAFFRAMEWORK_ENV_VARS} clean + BUILD_COMMAND $(MAKE) ${PDAFFRAMEWORK_ENV_VARS} -j ${PARALLEL_JOBS} all INSTALL_COMMAND "" DEPENDS PDAF-Model ) diff --git a/cmake/BuildPDAFMODEL.cmake b/cmake/BuildPDAFMODEL.cmake index 49345e6..3e7608a 100644 --- a/cmake/BuildPDAFMODEL.cmake +++ b/cmake/BuildPDAFMODEL.cmake @@ -213,8 +213,8 @@ ExternalProject_Add(PDAF-Model PREFIX PDAF-Model SOURCE_DIR ${PDAF_SRC}/interface/model BUILD_IN_SOURCE TRUE - CONFIGURE_COMMAND "" - BUILD_COMMAND make ${PDAFMODEL_ENV_VARS} clean all + CONFIGURE_COMMAND $(MAKE) ${PDAFMODEL_ENV_VARS} clean + BUILD_COMMAND $(MAKE) ${PDAFMODEL_ENV_VARS} -j ${PARALLEL_JOBS} all INSTALL_COMMAND "" DEPENDS PDAF ) diff --git a/models/eCLM b/models/eCLM index 81bc52f..8d9ca1e 160000 --- a/models/eCLM +++ b/models/eCLM @@ -1 +1 @@ -Subproject commit 81bc52f4d0e9275f8b87d186978e8198093b4927 +Subproject commit 8d9ca1ea7a3418335527568417a889ef3f259634 diff --git a/models/pdaf b/models/pdaf index 43eb07e..e6ffbba 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit 43eb07e9f31ec49765f1c9e6a563b20eaba63395 +Subproject commit e6ffbba7d7d0f21b173571a1a9efbf1a93d9d98e