From 1ebe9a50564eb27fc7318ed006a42bbfb8c10c68 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Wed, 15 Jan 2025 11:14:06 +0100 Subject: [PATCH 01/30] 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 555d5b4e..bd3c8be3 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 02/30] 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 dea776a0..2e505dd1 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 03/30] 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 2e505dd1..b2baf8b9 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 04/30] .gitmodules: update branches for `models/pdaf` --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 182b1ce9..61fd55e0 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 9db826c83df1f1367068bdd3e652bea970795f5f Mon Sep 17 00:00:00 2001 From: Yorck Ewerdwalbesloh Date: Fri, 24 Oct 2025 10:13:03 +0200 Subject: [PATCH 05/30] Add PDAF .mod files to PDAF_INCLUDES for calling OMI routines --- cmake/BuildPDAFMODEL.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/BuildPDAFMODEL.cmake b/cmake/BuildPDAFMODEL.cmake index 211d029f..32c123d5 100644 --- a/cmake/BuildPDAFMODEL.cmake +++ b/cmake/BuildPDAFMODEL.cmake @@ -39,6 +39,8 @@ if(DEFINED eCLM_SRC) list(APPEND PDAF_INCLUDES "-I${CMAKE_INSTALL_PREFIX}/include/eCLM") list(APPEND PDAF_INCLUDES "-I${CMAKE_INSTALL_PREFIX}/include/eCLM/externals/mct/include") list(APPEND PDAF_INCLUDES "-I${CMAKE_INSTALL_PREFIX}/include/eCLM/externals/gptl/include") + # include PDAF .mod files to be able to call pdaf routines in framework omi routines + list(APPEND PDAF_INCLUDES "-I${PDAF_SRC}/src") endif() # ParFlow include dirs From c2031ab8cd912a780eb29c2c7232d8ca29d15a05 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 24 Oct 2025 10:20:12 +0200 Subject: [PATCH 06/30] README: link to OMI observation scripts --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 3b3b5217..63fd7ab6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ +# OMI version + +Observation script: https://icg4geo.icg.kfa-juelich.de/ExternalRepos/tsmp-pdaf/tsmp-pdaf-observation-scripts/-/tree/main/omi_obs_data?ref_type=heads + + # Terrestrial Systems Modeling Platform v2 (TSMP2) [![docs](https://github.com/HPSCTerrSys/TSMP2/actions/workflows/docs.yml/badge.svg)](https://github.com/HPSCTerrSys/TSMP2/actions/workflows/docs.yml) From 67cc13a2e7bc1e3fb6024c3c8a7c8e3196777a61 Mon Sep 17 00:00:00 2001 From: Yorck Ewerdwalbesloh Date: Fri, 24 Oct 2025 10:21:38 +0200 Subject: [PATCH 07/30] README: information from internal repo --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 63fd7ab6..82331451 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,16 @@ # OMI version +PDAF-OMI for multivariate data assimiliaton. +It is design to handle different observation types (currently soil moisture and TWS) automatically. +Additional to current observation files, the observation type has to be included (SM, GRACE). See also create observation script for details. + +Both global and local filters can be used. To enable multi-scale data assimilation, different localization radii for different observation types can be passed. Note that the localization radius for SM is currently in km and for GRACE in #gridcells. + +The framework generates a state vector for each type individually before the assimilation, some things would need to be adapted when mutliple observation types are assimilated at the same timestep. Currently, one observation file only consists of one observation type. As SM observations are usually assimilated at noon and GRACE observations are assimilated at the end of the month at midnight, this should not provide any problems. + +If questions arise contact ewerdwalbesloh@geod.uni-bonn.de + + Observation script: https://icg4geo.icg.kfa-juelich.de/ExternalRepos/tsmp-pdaf/tsmp-pdaf-observation-scripts/-/tree/main/omi_obs_data?ref_type=heads From e5ca38495752a7808ffaa3f16c7ccb10ba73968c Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 24 Oct 2025 11:40:55 +0200 Subject: [PATCH 08/30] update "models/eCLM" to `dev-grace-da` --- .gitmodules | 2 +- models/eCLM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2a7a07c6..7341d899 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,7 +17,7 @@ [submodule "models/eCLM"] path = models/eCLM url = https://github.com/HPSCTerrSys/eCLM.git - branch = beta-0.4 + branch = dev-grace-da [submodule "models/oasis3-mct"] path = models/oasis3-mct url = https://icg4geo.icg.kfa-juelich.de/ExternalReposPublic/oasis3-mct diff --git a/models/eCLM b/models/eCLM index 4d567d2d..e666707e 160000 --- a/models/eCLM +++ b/models/eCLM @@ -1 +1 @@ -Subproject commit 4d567d2d68cac0fba977914b4a9c3ba199afd0ff +Subproject commit e666707e730b24c1268462616e8942d023cd4521 From 49ef9477a518a9fdf66b059eca74cf8397b97027 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 24 Oct 2025 11:41:32 +0200 Subject: [PATCH 09/30] update "models/pdaf" to `tsmp-pdaf-patched-omi` --- .gitmodules | 2 +- models/pdaf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7341d899..942cf77e 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-omi [submodule "models/eCLM"] path = models/eCLM url = https://github.com/HPSCTerrSys/eCLM.git diff --git a/models/pdaf b/models/pdaf index caf5a559..e6a7e305 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit caf5a55982de7ab78594e75be9c567b4f6b5a529 +Subproject commit e6a7e305aaa5e78de078f2211e93e3cf7a38015b From 706289c7125c03be55b72a8a5725d3a3ff192682 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Mon, 27 Oct 2025 10:50:23 +0100 Subject: [PATCH 10/30] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index e6a7e305..27c22a3d 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit e6a7e305aaa5e78de078f2211e93e3cf7a38015b +Subproject commit 27c22a3dac3b1191988634f16177fdbd4db943b9 From e5a801e1208161c6687bd70107d4f27c0cfbc0e8 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Mon, 27 Oct 2025 13:07:01 +0100 Subject: [PATCH 11/30] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index 27c22a3d..85a3b04a 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit 27c22a3dac3b1191988634f16177fdbd4db943b9 +Subproject commit 85a3b04acbcbace80b46cb9deb1411875fc60f0f From cd11e6956bc8c4924f3edf235b23b2146e8e8293 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Mon, 27 Oct 2025 19:39:44 +0100 Subject: [PATCH 12/30] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index 85a3b04a..b84fdc39 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit 85a3b04acbcbace80b46cb9deb1411875fc60f0f +Subproject commit b84fdc39d0f3ba65299b99db755ac69f4a0a5763 From 59fa9056bc99fdba0c65fc8de1db81282f1fad6b Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Mon, 27 Oct 2025 23:09:34 +0100 Subject: [PATCH 13/30] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index b84fdc39..ad94003b 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit b84fdc39d0f3ba65299b99db755ac69f4a0a5763 +Subproject commit ad94003b3ecdb60b48c9dbd4cd73cdc64af17449 From 0a64d44d04da4fa137e7686541f157d909e3edda Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Wed, 29 Oct 2025 11:17:38 +0100 Subject: [PATCH 14/30] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index 81710946..ad2c1919 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 15/30] 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 5b69d404..5db30cd0 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 8b530b44..81652f8a 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 211d029f..f812265c 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 ad2c1919..c1a48082 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit ad2c191954b503fe9ac4c31651f81c10dc9d1709 +Subproject commit c1a480825437f2eecd76feef0f9a1dda4f1f14e4 From 3f70576ee265b1fc8947b8d2a8e75d18435e5756 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Wed, 29 Oct 2025 12:20:04 +0100 Subject: [PATCH 16/30] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index e87944ca..a1ed2e32 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit e87944ca2b298122ceca2ec21e9004e98059e358 +Subproject commit a1ed2e324f02ab8ca9d580c589aefc13da580835 From f21f46d3d7b74f5293c3ed25aba546794fe2250d Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 31 Oct 2025 16:16:15 +0100 Subject: [PATCH 17/30] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index a1ed2e32..a1a11fce 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit a1ed2e324f02ab8ca9d580c589aefc13da580835 +Subproject commit a1a11fceb97522e082141ee70ed6bd420f1151e0 From 494761b2e9554f35d4ba8f9a35ba14717607509e Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Tue, 4 Nov 2025 11:05:05 +0100 Subject: [PATCH 18/30] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index a1a11fce..92296689 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit a1a11fceb97522e082141ee70ed6bd420f1151e0 +Subproject commit 92296689700b4a8ade0d6a8d93969a0d516c8de5 From cb570340817e456ef8268bed66b68e2e2155ff2c Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Tue, 4 Nov 2025 11:21:41 +0100 Subject: [PATCH 19/30] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index 92296689..1b2ee211 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit 92296689700b4a8ade0d6a8d93969a0d516c8de5 +Subproject commit 1b2ee2115830f1bb635201f7bf79464e6ebd9eb9 From 5fe1909c621d55726d2e7fb1dbcfb10c4c75a929 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Wed, 17 Dec 2025 15:21:05 +0100 Subject: [PATCH 20/30] update "models/eCLM" to dev-grace-da --- models/eCLM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/eCLM b/models/eCLM index 4d567d2d..fbbc8b8c 160000 --- a/models/eCLM +++ b/models/eCLM @@ -1 +1 @@ -Subproject commit 4d567d2d68cac0fba977914b4a9c3ba199afd0ff +Subproject commit fbbc8b8cdd9f09f8b289bdeab366805b3cea06ea From 51494f2eae1e5e7d1054f352b50df47063dd7df8 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Wed, 17 Dec 2025 22:45:52 +0100 Subject: [PATCH 21/30] PDAF include dir to DA section and change to `include/` See `models/pdaf/src/Makefile`, where all *.mod files are moved to `include/`. --- cmake/BuildPDAFMODEL.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/BuildPDAFMODEL.cmake b/cmake/BuildPDAFMODEL.cmake index a095da51..777bc176 100644 --- a/cmake/BuildPDAFMODEL.cmake +++ b/cmake/BuildPDAFMODEL.cmake @@ -20,6 +20,7 @@ set(TSMPPDAFLIBDIR "${CMAKE_INSTALL_PREFIX}/lib") list(APPEND PDAF_INCLUDES "-I${NetCDF_F90_ROOT}/include") # DA include dirs +list(APPEND PDAF_INCLUDES "-I${PDAF_SRC}/include") list(APPEND PDAF_INCLUDES "-I${PDAF_SRC}/interface/model") list(APPEND PDAF_INCLUDES "-I${PDAF_SRC}/interface/model/common") list(APPEND PDAF_INCLUDES "-I${PDAF_SRC}/interface/model/parflow") @@ -39,8 +40,6 @@ if(DEFINED eCLM_SRC) list(APPEND PDAF_INCLUDES "-I${CMAKE_INSTALL_PREFIX}/include/eCLM") list(APPEND PDAF_INCLUDES "-I${CMAKE_INSTALL_PREFIX}/include/eCLM/externals/mct/include") list(APPEND PDAF_INCLUDES "-I${CMAKE_INSTALL_PREFIX}/include/eCLM/externals/gptl/include") - # include PDAF .mod files to be able to call pdaf routines in framework omi routines - list(APPEND PDAF_INCLUDES "-I${PDAF_SRC}/src") endif() # ParFlow include dirs From 84bffff54f5b52e17eedb42ecd1a2501b34c1271 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 19 Dec 2025 14:42:03 +0100 Subject: [PATCH 22/30] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index 2408708f..641fd5f2 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit 2408708f7e3fd5c8e4c205bf2da4edb0ed38f98d +Subproject commit 641fd5f2682088646f6350d1089572c2590be250 From 59b256822320234c4a42d05a0ace3f82c3a98f4d Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 19 Dec 2025 16:45:36 +0100 Subject: [PATCH 23/30] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index 641fd5f2..baf3f22d 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit 641fd5f2682088646f6350d1089572c2590be250 +Subproject commit baf3f22de29e8c698f3cbbc686d0c08ba86d5871 From 4e41bfae44b508c6fe638a9328c894e8917d5fed Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Thu, 26 Mar 2026 13:20:00 +0100 Subject: [PATCH 24/30] update "models/eCLM" to `beta-0.5` --- .gitmodules | 2 +- models/eCLM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 942cf77e..e7b6acaf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,7 +17,7 @@ [submodule "models/eCLM"] path = models/eCLM url = https://github.com/HPSCTerrSys/eCLM.git - branch = dev-grace-da + branch = beta-0.5 [submodule "models/oasis3-mct"] path = models/oasis3-mct url = https://icg4geo.icg.kfa-juelich.de/ExternalReposPublic/oasis3-mct diff --git a/models/eCLM b/models/eCLM index fbbc8b8c..94236422 160000 --- a/models/eCLM +++ b/models/eCLM @@ -1 +1 @@ -Subproject commit fbbc8b8cdd9f09f8b289bdeab366805b3cea06ea +Subproject commit 94236422b8900a612abb4d78d24864009cf8d775 From 77330eaa2d12f45f2718c7e00bab98af03e2eb42 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Thu, 26 Mar 2026 13:20:43 +0100 Subject: [PATCH 25/30] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index baf3f22d..15da8447 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit baf3f22de29e8c698f3cbbc686d0c08ba86d5871 +Subproject commit 15da8447ab7a8c9049710997c1210801c0677bc4 From 7a71ece2e1acdf545c53d3f4579148d1fec8b66b Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 27 Mar 2026 15:14:23 +0100 Subject: [PATCH 26/30] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index 15da8447..321b1a07 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit 15da8447ab7a8c9049710997c1210801c0677bc4 +Subproject commit 321b1a072465c73691c66bfe03f741ee7a0c16dd From 1c3b296f69282937c498f32e96b67cffdcfe9d96 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 27 Mar 2026 15:16:49 +0100 Subject: [PATCH 27/30] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index 321b1a07..d5b2f58f 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit 321b1a072465c73691c66bfe03f741ee7a0c16dd +Subproject commit d5b2f58f335817d2b8c67c79babd098e2a5f3ab4 From 13cfd54d1cd8af3b262d5f9bc3af1393b78a0f8c Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Mon, 27 Apr 2026 20:02:17 +0200 Subject: [PATCH 28/30] update "models/pdaf" --- models/pdaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pdaf b/models/pdaf index d5b2f58f..7e1c60f6 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit d5b2f58f335817d2b8c67c79babd098e2a5f3ab4 +Subproject commit 7e1c60f6b88667b9c9d51c7dd15ed5b555d42cc5 From 9e00f2c0c032eb9993b92cc95357191e4323a2ec Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Tue, 28 Apr 2026 00:34:33 +0200 Subject: [PATCH 29/30] remove OMI doc from README See https://hpscterrsys.github.io/pdaf/users_guide/running_tsmp_pdaf/tsmp_pdaf_omi.html --- README.md | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/README.md b/README.md index 82331451..3b3b5217 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,3 @@ -# OMI version - -PDAF-OMI for multivariate data assimiliaton. -It is design to handle different observation types (currently soil moisture and TWS) automatically. -Additional to current observation files, the observation type has to be included (SM, GRACE). See also create observation script for details. - -Both global and local filters can be used. To enable multi-scale data assimilation, different localization radii for different observation types can be passed. Note that the localization radius for SM is currently in km and for GRACE in #gridcells. - -The framework generates a state vector for each type individually before the assimilation, some things would need to be adapted when mutliple observation types are assimilated at the same timestep. Currently, one observation file only consists of one observation type. As SM observations are usually assimilated at noon and GRACE observations are assimilated at the end of the month at midnight, this should not provide any problems. - -If questions arise contact ewerdwalbesloh@geod.uni-bonn.de - - -Observation script: https://icg4geo.icg.kfa-juelich.de/ExternalRepos/tsmp-pdaf/tsmp-pdaf-observation-scripts/-/tree/main/omi_obs_data?ref_type=heads - - # Terrestrial Systems Modeling Platform v2 (TSMP2) [![docs](https://github.com/HPSCTerrSys/TSMP2/actions/workflows/docs.yml/badge.svg)](https://github.com/HPSCTerrSys/TSMP2/actions/workflows/docs.yml) From c7c248a2bc288b37076dc5f4e7b53eeff57a840c Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Tue, 28 Apr 2026 00:35:41 +0200 Subject: [PATCH 30/30] 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 820e6e79..05196ade 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-omi + 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 7e1c60f6..e4aa3362 160000 --- a/models/pdaf +++ b/models/pdaf @@ -1 +1 @@ -Subproject commit 7e1c60f6b88667b9c9d51c7dd15ed5b555d42cc5 +Subproject commit e4aa3362d931402cb3d66726c13de4f56265d1ff