From 9437b30525f079d1f3c7fe9fb506ebc10369a06d Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Tue, 26 Nov 2024 13:35:02 +0100 Subject: [PATCH 01/13] update CLM3.5 with Stages/2024 fixes --- models/CLM3.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/CLM3.5 b/models/CLM3.5 index 6301079..15dba17 160000 --- a/models/CLM3.5 +++ b/models/CLM3.5 @@ -1 +1 @@ -Subproject commit 6301079b68e08297a5eb7814bc90ad4f39e770c6 +Subproject commit 15dba177f27142c781fbd845770598c8db9c8be7 From 4640afc433ac7cc7883d4f752a585481529ecad1 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Thu, 28 Nov 2024 10:19:15 +0100 Subject: [PATCH 02/13] update `parflow_pdaf` to `v3.13.0-pdaf` --- .gitmodules | 2 +- README.md | 2 +- models/parflow_pdaf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4d8c3de..182b1ce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ [submodule "models/parflow_pdaf"] path = models/parflow_pdaf url = https://github.com/HPSCTerrSys/parflow - branch = tsmp-pdaf + branch = tsmp-pdaf-patched [submodule "models/pdaf"] path = models/pdaf url = https://github.com/HPSCTerrSys/pdaf.git diff --git a/README.md b/README.md index a0c02ea..e966e26 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ git clone -b v3.12.0 https://github.com/parflow/parflow.git models/parflow PARFLOW_SRC=`realpath models/parflow` # ParFlow (PDAF-patched) -git clone -b v3.12.0-tsmp https://github.com/HPSCTerrSys/parflow models/parflow_pdaf +git clone -b v3.13.0-pdaf https://github.com/HPSCTerrSys/parflow models/parflow_pdaf PARFLOW_SRC=`realpath models/parflow_pdaf` # CLM3.5 diff --git a/models/parflow_pdaf b/models/parflow_pdaf index d67aa13..094f414 160000 --- a/models/parflow_pdaf +++ b/models/parflow_pdaf @@ -1 +1 @@ -Subproject commit d67aa13c831087d6f74ea07a1c5b6504d59b3d82 +Subproject commit 094f414ecf703bef78c25299ac691e51b695a822 From 3b95657c7433abc9ca3652fdb3684e3fe53cf3ae Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Thu, 28 Nov 2024 10:19:15 +0100 Subject: [PATCH 03/13] update `parflow_pdaf` with bugfixes --- models/parflow_pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/parflow_pdaf b/models/parflow_pdaf index 094f414..338a270 160000 --- a/models/parflow_pdaf +++ b/models/parflow_pdaf @@ -1 +1 @@ -Subproject commit 094f414ecf703bef78c25299ac691e51b695a822 +Subproject commit 338a27003ff1d97cb84102c23381dc6d335b24b4 From 8bdb07304b667ce1c3e6dff01c2e3498774d410e Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Thu, 28 Nov 2024 16:11:55 +0100 Subject: [PATCH 04/13] update `parflow_pdaf` with bugfix --- models/parflow_pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/parflow_pdaf b/models/parflow_pdaf index 338a270..24fd719 160000 --- a/models/parflow_pdaf +++ b/models/parflow_pdaf @@ -1 +1 @@ -Subproject commit 338a27003ff1d97cb84102c23381dc6d335b24b4 +Subproject commit 24fd719aa5c20356b44ef902db8a6d0b7b945847 From 106dc728780dd2441838f85692c90c5628b70bd5 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Thu, 28 Nov 2024 18:55:38 +0100 Subject: [PATCH 05/13] update `pdaf` with `origin_local` definition fix --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index b975d61..555d5b4 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit b975d61e11af05a9c60af028b1d8e5bc9acfda44 +Subproject commit 555d5b4ed561e30043b30bcf7fe9817b40da601f From 0168c452bd0d51282da76d45233817800d80388d Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Thu, 28 Nov 2024 21:41:53 +0100 Subject: [PATCH 06/13] ParFlow-PDAF: Set `-DUSE_PDAF=True` for PDAF-ParFlow-builds `-DUSE_PDAF=True` is handed to ParFlow-build, whenever PDAF is used. --- cmake/BuildParFlow.cmake | 5 +++++ models/parflow_pdaf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/BuildParFlow.cmake b/cmake/BuildParFlow.cmake index 17be4e2..384c2fa 100644 --- a/cmake/BuildParFlow.cmake +++ b/cmake/BuildParFlow.cmake @@ -19,6 +19,10 @@ else() -DPARFLOW_HAVE_CLM=ON) endif() +if(${PDAF}) + list(APPEND PF_PDAF_FLAGS -DUSE_PDAF=True) +endif() + # # TODO: Add compile switches for ParFlow GPU # @@ -60,6 +64,7 @@ ExternalProject_Add(ParFlow -DPARFLOW_ENABLE_SLURM=${ENABLE_SLURM} -DCMAKE_EXE_LINKER_FLAGS=${PF_LDFLAGS} ${PF_CLM_FLAGS} + ${PF_PDAF_FLAGS} ${JSC_FLAGS} DEPENDS ${MODEL_DEPENDENCIES} ) diff --git a/models/parflow_pdaf b/models/parflow_pdaf index 24fd719..0e8e758 160000 --- a/models/parflow_pdaf +++ b/models/parflow_pdaf @@ -1 +1 @@ -Subproject commit 24fd719aa5c20356b44ef902db8a6d0b7b945847 +Subproject commit 0e8e758646bd9faccfc2539cf8d42129e89a0a4c From 7f390c3f4bbf4fb672405d494369fc026e3eb9f7 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 29 Nov 2024 06:48:57 +0100 Subject: [PATCH 07/13] update `parflow_pdaf` with `USE_PDAF` fix --- models/parflow_pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/parflow_pdaf b/models/parflow_pdaf index 0e8e758..a5d0c88 160000 --- a/models/parflow_pdaf +++ b/models/parflow_pdaf @@ -1 +1 @@ -Subproject commit 0e8e758646bd9faccfc2539cf8d42129e89a0a4c +Subproject commit a5d0c88d6a17ea8e45bfc09fa62c18a4f0dade39 From 2935952a48e02cb4c15cbe5e424667c3a2b4c14b Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 29 Nov 2024 08:12:01 +0100 Subject: [PATCH 08/13] update `parflow_pdaf` with `USE_PDAF` fix II --- models/parflow_pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/parflow_pdaf b/models/parflow_pdaf index a5d0c88..31aac49 160000 --- a/models/parflow_pdaf +++ b/models/parflow_pdaf @@ -1 +1 @@ -Subproject commit a5d0c88d6a17ea8e45bfc09fa62c18a4f0dade39 +Subproject commit 31aac49242556d528fe2877e8edf3ede3452b1bd From 9583b43ff43e2a6021260c01f3f06a2dec46a185 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 29 Nov 2024 09:06:58 +0100 Subject: [PATCH 09/13] update `parflow_pdaf` with `USE_PDAF` fix III --- models/parflow_pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/parflow_pdaf b/models/parflow_pdaf index 31aac49..4b7bc96 160000 --- a/models/parflow_pdaf +++ b/models/parflow_pdaf @@ -1 +1 @@ -Subproject commit 31aac49242556d528fe2877e8edf3ede3452b1bd +Subproject commit 4b7bc967f72be4077e18a211f3b21918d3dd51e4 From be0057aeffd296cce767c85cf027c34b59c5a19c Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 29 Nov 2024 10:37:19 +0100 Subject: [PATCH 10/13] BuildPDAFMODEL: Add `-DUSE_PDAF` --- cmake/BuildPDAFMODEL.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/BuildPDAFMODEL.cmake b/cmake/BuildPDAFMODEL.cmake index 54e9f0d..2f64220 100644 --- a/cmake/BuildPDAFMODEL.cmake +++ b/cmake/BuildPDAFMODEL.cmake @@ -142,6 +142,7 @@ else() endif() endif() +list(APPEND PDAF_DEFS "-DUSE_PDAF") if (CMAKE_BUILD_TYPE STREQUAL "DEBUG") # Debug run: Define `PDAF_DEBUG` list(APPEND PDAF_DEFS "-DPDAF_DEBUG") From e2b03ab749d325e94316f3d5a6014d09a1aff88e Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 29 Nov 2024 14:59:12 +0100 Subject: [PATCH 11/13] udpate `parflow` revert back to before `USE_PDAF` --- models/parflow_pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/parflow_pdaf b/models/parflow_pdaf index 4b7bc96..24fd719 160000 --- a/models/parflow_pdaf +++ b/models/parflow_pdaf @@ -1 +1 @@ -Subproject commit 4b7bc967f72be4077e18a211f3b21918d3dd51e4 +Subproject commit 24fd719aa5c20356b44ef902db8a6d0b7b945847 From 8e2f393546562650b81cc7feb1fe14312bbe7778 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Mon, 2 Dec 2024 10:23:40 +0100 Subject: [PATCH 12/13] Comment out `USE_PDAF` flag for PDAFMODEL --- cmake/BuildPDAFMODEL.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/BuildPDAFMODEL.cmake b/cmake/BuildPDAFMODEL.cmake index 2f64220..043c573 100644 --- a/cmake/BuildPDAFMODEL.cmake +++ b/cmake/BuildPDAFMODEL.cmake @@ -142,7 +142,7 @@ else() endif() endif() -list(APPEND PDAF_DEFS "-DUSE_PDAF") +# list(APPEND PDAF_DEFS "-DUSE_PDAF") if (CMAKE_BUILD_TYPE STREQUAL "DEBUG") # Debug run: Define `PDAF_DEBUG` list(APPEND PDAF_DEFS "-DPDAF_DEBUG") From 637739e9aa74efd71f4c146cc30910d3acb691cd Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Mon, 2 Dec 2024 14:14:38 +0100 Subject: [PATCH 13/13] remove any mention to `USE_PDAF` --- cmake/BuildPDAFMODEL.cmake | 1 - cmake/BuildParFlow.cmake | 5 ----- 2 files changed, 6 deletions(-) diff --git a/cmake/BuildPDAFMODEL.cmake b/cmake/BuildPDAFMODEL.cmake index 043c573..54e9f0d 100644 --- a/cmake/BuildPDAFMODEL.cmake +++ b/cmake/BuildPDAFMODEL.cmake @@ -142,7 +142,6 @@ else() endif() endif() -# list(APPEND PDAF_DEFS "-DUSE_PDAF") if (CMAKE_BUILD_TYPE STREQUAL "DEBUG") # Debug run: Define `PDAF_DEBUG` list(APPEND PDAF_DEFS "-DPDAF_DEBUG") diff --git a/cmake/BuildParFlow.cmake b/cmake/BuildParFlow.cmake index 384c2fa..17be4e2 100644 --- a/cmake/BuildParFlow.cmake +++ b/cmake/BuildParFlow.cmake @@ -19,10 +19,6 @@ else() -DPARFLOW_HAVE_CLM=ON) endif() -if(${PDAF}) - list(APPEND PF_PDAF_FLAGS -DUSE_PDAF=True) -endif() - # # TODO: Add compile switches for ParFlow GPU # @@ -64,7 +60,6 @@ ExternalProject_Add(ParFlow -DPARFLOW_ENABLE_SLURM=${ENABLE_SLURM} -DCMAKE_EXE_LINKER_FLAGS=${PF_LDFLAGS} ${PF_CLM_FLAGS} - ${PF_PDAF_FLAGS} ${JSC_FLAGS} DEPENDS ${MODEL_DEPENDENCIES} )