From f91938b8714c9274c18f91e4d2a712473176a224 Mon Sep 17 00:00:00 2001 From: Cory Martin Date: Fri, 21 Feb 2025 21:22:13 +0000 Subject: [PATCH] Update jcb and da-utils hashes to support land DA. (#1509) # Description This PR updates jcb to handle station reject list chronicles for snow DA and the da-utils (and a CMake change) to support soil DA (which is not JEDI based but uses code in da-utils) # Companion PRs None # Issues None (whoops) # Automated CI tests to run in Global Workflow - [ ] atm_jjob - [ ] C96C48_ufs_hybatmDA - [x] C96C48_hybatmaerosnowDA - [ ] C48mx500_3DVarAOWCDA - [ ] C48mx500_hybAOWCDA - [ ] C96C48_hybatmDA --- bundle/CMakeLists.txt | 1 + sorc/da-utils | 2 +- sorc/jcb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bundle/CMakeLists.txt b/bundle/CMakeLists.txt index aeed6cff5..3ffb76942 100644 --- a/bundle/CMakeLists.txt +++ b/bundle/CMakeLists.txt @@ -35,6 +35,7 @@ set( ENABLE_MPI ON CACHE BOOL "Compile with MPI" ) option(BUILD_GDASBUNDLE "Build GDAS Bundle" ON) option(CLONE_JCSDADATA "Clone JCSDA test data repositories" OFF) option(WORKFLOW_TESTS "Include global-workflow dependent tests" OFF) +option(BUILD_REGRID_STATES "Build regrid states land DA utility" ON) # Depend path for non-ecbuild packages set(DEPEND_LIB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/Depends) diff --git a/sorc/da-utils b/sorc/da-utils index 32b6d9ab4..6ea450275 160000 --- a/sorc/da-utils +++ b/sorc/da-utils @@ -1 +1 @@ -Subproject commit 32b6d9ab4c68d6bf1332cdaefe4fbfbe5416ac43 +Subproject commit 6ea450275d95fcbc84821556e6460a4131998d97 diff --git a/sorc/jcb b/sorc/jcb index 8269ce474..b114fe432 160000 --- a/sorc/jcb +++ b/sorc/jcb @@ -1 +1 @@ -Subproject commit 8269ce474fe864fdd6dc51913ccce9daca630ac2 +Subproject commit b114fe432a10b70e7dfcae1694e0f09c0ef05f5b