From 21163e75997e932061c2feb8fd6a755d21fb16fb Mon Sep 17 00:00:00 2001 From: Guillaume Vernieres Date: Fri, 21 Jul 2023 09:35:00 -0400 Subject: [PATCH] update for oops 2258, point ufo to dev --- CMakeLists.txt | 2 +- parm/soca/variational/3dvarfgat.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f432d428..623483797 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" BRANCH develop ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" BRANCH develop ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" BRANCH develop ) - ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" BRANCH feature/gdasapp_ufo ) + ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" BRANCH develop ) # FMS and FV3 dynamical core ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" BRANCH release-stable ) diff --git a/parm/soca/variational/3dvarfgat.yaml b/parm/soca/variational/3dvarfgat.yaml index 8b6ff5652..de59a03d8 100644 --- a/parm/soca/variational/3dvarfgat.yaml +++ b/parm/soca/variational/3dvarfgat.yaml @@ -11,7 +11,6 @@ cost function: model: name: PseudoModel tstep: PT3H - state variables: &soca_model_vars [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh, hocn, mld, layer_depth] states: !INC ${BKG_LIST} background: @@ -20,7 +19,8 @@ cost function: ocn_filename: MOM.res.nc ice_filename: cice.res.nc date: '{{ATM_WINDOW_BEGIN}}' - state variables: *soca_model_vars + state variables: &soca_model_vars [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh, hocn, mld, layer_depth] + background error: !INC ${SABER_BLOCKS_YAML} observations: !INC ${OBS_LIST}