From f16498759c2378761129237ba8033752196c68b9 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 11 Jul 2025 09:55:29 +0200 Subject: [PATCH 01/11] CI: Enable eCLM-PDAF build --- .github/workflows/CI.yml | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7217c9c..f5f179d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -28,17 +28,16 @@ jobs: parflow_dir: "parflow", model_opts: "--eCLM --ParFlowGPU" } -# TODO - Fix PDAF GNU errors # - { # name: "CLM3.5-PDAF", # use_oasis: "False", # model_opts: "--CLM35 --PDAF" # } -# - { -# name: "eCLM-PDAF", -# use_oasis: "False", -# model_opts: "--eCLM --PDAF" -# } + - { + name: "eCLM-PDAF", + use_oasis: "False", + model_opts: "--eCLM --PDAF" + } # - { # name: "CLM3.5-ParFlow-PDAF", # use_oasis: "True", @@ -328,12 +327,11 @@ jobs: echo "VER_ICON=${VER_ICON}" >> $GITHUB_OUTPUT fi - # TODO - Fix PDAF GNU errors - # if [[ "${{ matrix.config.name }}" == *"PDAF"* ]]; then - # VER_PDAF=$(cat model_versions | grep -w "pdaf" | cut -d' ' -f1) - # echo "${VER_PDAF} => VER_PDAF" - # echo "VER_PDAF=${VER_PDAF}" >> $GITHUB_OUTPUT - # fi + if [[ "${{ matrix.config.name }}" == *"PDAF"* ]]; then + VER_PDAF=$(cat model_versions | grep -w "pdaf" | cut -d' ' -f1) + echo "${VER_PDAF} => VER_PDAF" + echo "VER_PDAF=${VER_PDAF}" >> $GITHUB_OUTPUT + fi # # OASIS3-MCT @@ -396,13 +394,13 @@ jobs: pwd && git submodule update --init --force . # - # TODO - Fix PDAF GNU errors + # PDAF # - # - if: contains(matrix.config.name, 'PDAF') - # name: Update PDAF submodule ${{ steps.model-versions.outputs.VER_PDAF }} - # working-directory: ${{ env.TSMP2_ROOT }}/models/pdaf - # run: | - # pwd && git submodule update --init --force . + - if: contains(matrix.config.name, 'PDAF') + name: Update PDAF submodule ${{ steps.model-versions.outputs.VER_PDAF }} + working-directory: ${{ env.TSMP2_ROOT }}/models/pdaf + run: | + pwd && git submodule update --init --force . # # Pre-build checks From a5914083a655a77d795546bdd69eeb996c1f7799 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 11 Jul 2025 10:15:37 +0200 Subject: [PATCH 02/11] CI: Enable eCLM/CLM3.5-ParFlow-PDAF builds --- .github/workflows/CI.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f5f179d..314f661 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -38,18 +38,18 @@ jobs: use_oasis: "False", model_opts: "--eCLM --PDAF" } -# - { -# name: "CLM3.5-ParFlow-PDAF", -# use_oasis: "True", -# parflow_dir: "parflow_pdaf", -# model_opts: "--CLM35 --ParFlow --PDAF" -# } -# - { -# name: "eCLM-ParFlow-PDAF", -# use_oasis: "True", -# parflow_dir: "parflow_pdaf", -# model_opts: "--eCLM --ParFlow --PDAF" -# } + - { + name: "CLM3.5-ParFlow-PDAF", + use_oasis: "True", + parflow_dir: "parflow_pdaf", + model_opts: "--CLM35 --ParFlow --PDAF" + } + - { + name: "eCLM-ParFlow-PDAF", + use_oasis: "True", + parflow_dir: "parflow_pdaf", + model_opts: "--eCLM --ParFlow --PDAF" + } env: SYSTEMNAME: UBUNTU STAGE: 24.04 From 6b2ea400c117b34620ce23eb68c620a501ad483a Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 11 Jul 2025 11:16:11 +0200 Subject: [PATCH 03/11] udpate `models/parflow_pdaf` to `tsmp-pdaf-patched` includes: commenting out unused variables in PDAF code --- .gitmodules | 2 +- models/parflow_pdaf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index dcbf8cf..f091a1a 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-patched-openmp-flag-fix + branch = tsmp-pdaf-patched [submodule "models/pdaf"] path = models/pdaf url = https://github.com/HPSCTerrSys/pdaf.git diff --git a/models/parflow_pdaf b/models/parflow_pdaf index 8ed596d..71d9009 160000 --- a/models/parflow_pdaf +++ b/models/parflow_pdaf @@ -1 +1 @@ -Subproject commit 8ed596d02577af1648349e123b00e3dd81468707 +Subproject commit 71d90095e95ad1456ed0c43fbd7e12af7d85ba9e From b005f8dba64527ae829d58d506e43beb6ba0802e Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 11 Jul 2025 11:41:42 +0200 Subject: [PATCH 04/11] BuildParFlow: Turn "eCLM" on for CLM3.5 in order to get Oasis-files compiled correctly --- cmake/BuildParFlow.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/BuildParFlow.cmake b/cmake/BuildParFlow.cmake index 708e14a..24c891f 100644 --- a/cmake/BuildParFlow.cmake +++ b/cmake/BuildParFlow.cmake @@ -6,6 +6,7 @@ if(DEFINED eCLM_SRC) elseif(DEFINED CLM35_SRC) list(APPEND PF_CLM_FLAGS -DPARFLOW_AMPS_LAYER=oas3 -DOAS3_ROOT=${OASIS_ROOT} + -DPARFLOW_HAVE_ECLM=ON # Experimental: CLM35 should have own flag -DPARFLOW_HAVE_CLM=OFF) else() # use ParFlow's internal CLM From b3fd901d7ef0b65941f8701de67771c94f91a64b Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 11 Jul 2025 10:51:29 +0200 Subject: [PATCH 05/11] BuildParFlow: Compiler option `-Wno-unused-variable` for PDAF-builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Error ``` parflow_pdaf/pfsimulator/parflow_lib/solver_richards.c:1817:16: error: unused variable ‘pfl_start’ [-Werror=unused-variable] ``` Background: In `PseudoAdvanceRichards`, there are many unused variables. --- cmake/BuildParFlow.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/BuildParFlow.cmake b/cmake/BuildParFlow.cmake index 24c891f..44e947e 100644 --- a/cmake/BuildParFlow.cmake +++ b/cmake/BuildParFlow.cmake @@ -42,7 +42,12 @@ endif() # Set compiler flags if(CMAKE_C_COMPILER_ID STREQUAL "GNU") # Flags were based from https://github.com/parflow/parflow/blob/c8aa8d7140db19153194728b8fa9136b95177b6d/.github/workflows/linux.yml#L486 - set(PF_CFLAGS "-Wall -Werror -Wno-unused-result -Wno-unused-function -Wno-stringop-overread") + if(${PDAF}) + # PDAF: add `-Wno-unused-variable` + set(PF_CFLAGS "-Wall -Werror -Wno-unused-result -Wno-unused-function -Wno-unused-variable -Wno-stringop-overread") + else() + set(PF_CFLAGS "-Wall -Werror -Wno-unused-result -Wno-unused-function -Wno-stringop-overread") + endif() # Silence arch-specific compiler warnings if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64|aarch64") string(APPEND PF_CFLAGS " -Wno-maybe-uninitialized") From dfc7e73461e8d9e9f5b7d78c56951ae9b01638e8 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 11 Jul 2025 13:52:34 +0200 Subject: [PATCH 06/11] udpate `models/parflow_pdaf` to `tsmp-pdaf-patched-hypre-cuda-fixes` branch matching current generic ParFlow from TSMP2 --- .gitmodules | 2 +- models/parflow_pdaf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index f091a1a..289284b 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-patched + branch = tsmp-pdaf-patched-hypre-cuda-fixes [submodule "models/pdaf"] path = models/pdaf url = https://github.com/HPSCTerrSys/pdaf.git diff --git a/models/parflow_pdaf b/models/parflow_pdaf index 71d9009..380a016 160000 --- a/models/parflow_pdaf +++ b/models/parflow_pdaf @@ -1 +1 @@ -Subproject commit 71d90095e95ad1456ed0c43fbd7e12af7d85ba9e +Subproject commit 380a016bc5c83489e0aff59484aa5dcd567ce97c From a60194c67490bf3cb24efa320ee38220b17c871e Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 11 Jul 2025 15:19:21 +0200 Subject: [PATCH 07/11] update `model/pdaf` to `tsmp-pdaf-patched-outdir-fix-clm35` --- .gitmodules | 2 +- models/pdaf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 289284b..15f833c 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-outdir-fix-clm35 [submodule "models/eCLM"] path = models/eCLM url = https://github.com/HPSCTerrSys/eCLM.git diff --git a/models/pdaf b/models/pdaf index f1440b8..e6fa13e 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit f1440b82dad4f855f6eebf9c8ea02441ca2ca912 +Subproject commit e6fa13e3099cfc803f4601b1035b315774d5d42e From 676b73cd4e4315d515f99d48514590de1633373d Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 11 Jul 2025 16:11:16 +0200 Subject: [PATCH 08/11] update `model/pdaf` to `tsmp-pdaf-patched-pdaf-CI` --- .gitmodules | 2 +- models/pdaf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 15f833c..ef57f35 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-outdir-fix-clm35 + branch = tsmp-pdaf-patched-pdaf-CI [submodule "models/eCLM"] path = models/eCLM url = https://github.com/HPSCTerrSys/eCLM.git diff --git a/models/pdaf b/models/pdaf index e6fa13e..6c3f74d 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit e6fa13e3099cfc803f4601b1035b315774d5d42e +Subproject commit 6c3f74dfab44ebd29efe617219effd780ece7c55 From d757fbba858e497bd4cba3daecbc563039ac2042 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 11 Jul 2025 17:00:38 +0200 Subject: [PATCH 09/11] update `model/parflow_pdaf` to `tsmp-pdaf-patched-pdaf-CI` --- .gitmodules | 2 +- models/parflow_pdaf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index ef57f35..bc020a6 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-patched-hypre-cuda-fixes + branch = tsmp-pdaf-patched-pdaf-CI [submodule "models/pdaf"] path = models/pdaf url = https://github.com/HPSCTerrSys/pdaf.git diff --git a/models/parflow_pdaf b/models/parflow_pdaf index 380a016..18a26ab 160000 --- a/models/parflow_pdaf +++ b/models/parflow_pdaf @@ -1 +1 @@ -Subproject commit 380a016bc5c83489e0aff59484aa5dcd567ce97c +Subproject commit 18a26abce3d4d3317bd476594e36e6d97ca2656a From f45128ad7b3a102b8ba2549d4643fc3f194dfa28 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 11 Jul 2025 17:22:15 +0200 Subject: [PATCH 10/11] update `model/parflow_pdaf` --- models/parflow_pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/parflow_pdaf b/models/parflow_pdaf index 18a26ab..ea0c571 160000 --- a/models/parflow_pdaf +++ b/models/parflow_pdaf @@ -1 +1 @@ -Subproject commit 18a26abce3d4d3317bd476594e36e6d97ca2656a +Subproject commit ea0c57190190979f74fe0f22062be929d6c7e7a7 From b787996a4e5c0b18c21425162909a7a88f83e98a Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Wed, 29 Oct 2025 10:55:17 +0100 Subject: [PATCH 11/11] update "models/pdaf" to tsmp-pdaf-patched-eclm-pfl-fixes --- .gitmodules | 2 +- models/pdaf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index bc020a6..693654b 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-pdaf-CI + branch = tsmp-pdaf-patched-eclm-pfl-fixes [submodule "models/eCLM"] path = models/eCLM url = https://github.com/HPSCTerrSys/eCLM.git diff --git a/models/pdaf b/models/pdaf index 6c3f74d..8171094 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit 6c3f74dfab44ebd29efe617219effd780ece7c55 +Subproject commit 81710946b7fc9618af79e228ff5a8b2815a2fa18