Skip to content

PDAF-related change towards parallel build #145

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

Open
jjokella wants to merge 8 commits into
base: parallel-build-mvh
Choose a base branch
from
Open

PDAF-related change towards parallel build #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c1a71c3
PDAF: split external project make commands for parallel build
jjokella Oct 8, 2026
abd24a0
update "models/pdaf" to tsmp-pdaf-patched-parallel-build
jjokella Oct 8, 2026
0885a19
update "models/pdaf"
jjokella Oct 8, 2026
f186a0a
update "models/pdaf"
jjokella Oct 8, 2026
10fca91
PDAF: for Stages/2024
jjokella Oct 8, 2026
48850ab
update "models/eCLM" to master-parallel-build
jjokella Oct 8, 2026
b46b1f4
use $(MAKE) instead of explicit -j option
jjokella Oct 8, 2026
7784f3f
re-introduce the parallel jobs
jjokella Oct 8, 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
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.28)
cmake_minimum_required (VERSION 3.26)
project(TSMP2 LANGUAGES C CXX Fortran)
include(ExternalProject)

Expand Down
4 changes: 2 additions & 2 deletions cmake/BuildPDAF.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)
Expand Down
4 changes: 2 additions & 2 deletions cmake/BuildPDAFFRAMEWORK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
4 changes: 2 additions & 2 deletions cmake/BuildPDAFMODEL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
2 changes: 1 addition & 1 deletion models/eCLM
Open in desktop
Submodule eCLM updated 14 files
+20 −6 .github/workflows/build_and_run_eCLM.yml
+56 −0 CITATION.cff
+29 −0 CONTRIBUTING.md
+1 −1 LICENSE
+12 −6 README.md
+44 −3 docs/users_guide/introduction/quick_start.md
+4 −15 src/clm5/biogeophys/BalanceCheckMod.F90
+1 −3 src/clm5/biogeophys/CanopyTemperatureMod.F90
+4 −1 src/clm5/biogeophys/SoilHydrologyMod.F90
+4 −0 src/clm5/biogeophys/SoilStateInitTimeConstMod.F90
+49 −6 src/clm5/biogeophys/SoilWaterMovementMod.F90
+8 −7 src/clm5/main/clm_driver.F90
+0 −10 src/clm5/main/lnd2atmMod.F90
+2 −2 src/externals/CMakeLists.txt
2 changes: 1 addition & 1 deletion models/pdaf
Open in desktop
Submodule pdaf updated 4 files
+2 −28 docs/users_guide/running_tsmp_pdaf/input_enkfpf.md
+19 −1 interface/framework/Makefile
+20 −0 interface/framework/init_pdaf.F90
+8 −1 interface/model/Makefile