From d300ebe96e8574e9cbd96d6e3444b5fbafb2f628 Mon Sep 17 00:00:00 2001 From: Anna Shlyaeva Date: Wed, 5 Feb 2025 07:12:32 -0700 Subject: [PATCH] Bugfix for ensemble recenter + add a test (#1477) # Description Bugfix for ensemble recenter; adds a gw-ci test for recenter as well. # Companion PRs Required for https://github.com/NOAA-EMC/global-workflow/pull/3238 # Automated CI tests to run in Global Workflow - [ ] atm_jjob - [ ] C96C48_ufs_hybatmDA - [ ] C96C48_hybatmaerosnowDA - [ ] C48mx500_3DVarAOWCDA - [x] C48mx500_hybAOWCDA - [ ] C96C48_hybatmDA Co-authored-by: Anna Shlyaeva --- parm/soca/berror/soca_ensrecenter.yaml | 2 +- test/gw-ci/CMakeLists.txt | 4 ++++ utils/soca/gdas_ens_handler.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/parm/soca/berror/soca_ensrecenter.yaml b/parm/soca/berror/soca_ensrecenter.yaml index b70060140..b7d8e2032 100644 --- a/parm/soca/berror/soca_ensrecenter.yaml +++ b/parm/soca/berror/soca_ensrecenter.yaml @@ -60,5 +60,5 @@ output increment: date: '{{ MARINE_WINDOW_END_ISO }}' exp: trash type: incr - output file: 'ocn.recenter.incr.%mem%.nc' + output file: 'recenter.incr.%mem%.nc' pattern: '%mem%' diff --git a/test/gw-ci/CMakeLists.txt b/test/gw-ci/CMakeLists.txt index 4c08c8a83..99dcfa865 100644 --- a/test/gw-ci/CMakeLists.txt +++ b/test/gw-ci/CMakeLists.txt @@ -180,6 +180,9 @@ function(add_task task_name test_prefix is_full_cycle HALF_CYCLE FULL_CYCLE pslo elseif("${task_name}" STREQUAL "gdas_marineanlletkf") list(APPEND TEST_DEPENDS "${test_prefix}_enkfgdas_fcst_${HALF_CYCLE}") list(APPEND TEST_DEPENDS "${test_prefix}_gdas_prepoceanobs_${FULL_CYCLE}") + elseif("${task_name}" STREQUAL "gdas_ocnanalecen") + list(APPEND TEST_DEPENDS "${test_prefix}_gdas_marineanlvar_${FULL_CYCLE}") + list(APPEND TEST_DEPENDS "${test_prefix}_gdas_marineanlletkf_${FULL_CYCLE}") else() list(APPEND TEST_DEPENDS "${test_prefix}") endif() @@ -394,6 +397,7 @@ if (WORKFLOW_TESTS) "gdas_marinebmat" "gdas_marineanlinit" "gdas_marineanlvar" + "gdas_ocnanalecen" "gdas_marineanlchkpt" "gdas_marineanlfinal" ) diff --git a/utils/soca/gdas_ens_handler.h b/utils/soca/gdas_ens_handler.h index 741055ca1..c60723db5 100644 --- a/utils/soca/gdas_ens_handler.h +++ b/utils/soca/gdas_ens_handler.h @@ -169,7 +169,7 @@ namespace gdasapp { postProcIncr.setToZero(incr); // Save the increments used to initialize the ensemble forecast - result = postProcIncr.save(mom6_incr, i+1); + result = postProcIncr.save(mom6_incr, i+1, {"ocn"}); } return result; }