From a96a596a47ba97e2a9a3c44c3f09ffe6cc886a0e Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Thu, 16 Jan 2025 19:22:52 +0000 Subject: [PATCH 1/3] initial --- parm/soca/letkf/letkf_obs_list.yaml.j2 | 45 ++++++++++++++++++++++++ parm/soca/letkf/marine-jcb-lektf.yaml.j2 | 5 +++ 2 files changed, 50 insertions(+) create mode 100644 parm/soca/letkf/letkf_obs_list.yaml.j2 create mode 100644 parm/soca/letkf/marine-jcb-lektf.yaml.j2 diff --git a/parm/soca/letkf/letkf_obs_list.yaml.j2 b/parm/soca/letkf/letkf_obs_list.yaml.j2 new file mode 100644 index 000000000..fdc967c0f --- /dev/null +++ b/parm/soca/letkf/letkf_obs_list.yaml.j2 @@ -0,0 +1,45 @@ +# Observations used with marine LETKF + +observations: +# ADT + - adt_rads_all + +# SST + - sst_avhrr_ma_l3u + - sst_avhrr_mb_l3u + - sst_avhrr_mc_l3u + - sst_viirs_npp_l3u + - sst_viirs_n20_l3u + - sst_abi_g16_l3c + - sst_abi_g17_l3c + - sst_ahi_h08_l3c + +# Ice concentration + - icec_amsr2_north + - icec_amsr2_south +# - icec_viirs_n20_l2_north +# - icec_viirs_n20_l2_south +# - icec_amsu_mb_l2 +# - icec_atms_n20_l2 +# - icec_atms_n21_l2 +# - icec_atms_npp_l2 +# - icec_gmi_gpm_l2 +# - icec_ssmis_f17_l2 + +# in situ: monthly +# - insitu_profile_bathy + - insitu_profile_argo +# - insitu_profile_glider +# - insitu_profile_tesac +# - insitu_profile_tesac_salinity +# - insitu_profile_marinemammal +# - insitu_profile_xbtctd +# - insitu_surface_altkob +# - insitu_surface_trkob +# - insitu_surface_trkob_salinity + +# in situ: daily +# - insitu_profile_dbuoy +# - insitu_profile_dbuoyb +# - insitu_profile_mbuoy +# - insitu_profile_mbuoyb diff --git a/parm/soca/letkf/marine-jcb-lektf.yaml.j2 b/parm/soca/letkf/marine-jcb-lektf.yaml.j2 new file mode 100644 index 000000000..e138d3a6d --- /dev/null +++ b/parm/soca/letkf/marine-jcb-lektf.yaml.j2 @@ -0,0 +1,5 @@ +# JEDI algorithm being invoked +algorithm: letkf + +# Observations +observations: !INC ${OBS_LIST_SHORT} From c1d9a3ca114cc8ec0f33fb459dd317f569a893a6 Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Thu, 6 Feb 2025 15:56:39 +0000 Subject: [PATCH 2/3] clean and working --- parm/soca/letkf/marine-jcb-lektf.yaml.j2 | 2 -- test/gw-ci/CMakeLists.txt | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/parm/soca/letkf/marine-jcb-lektf.yaml.j2 b/parm/soca/letkf/marine-jcb-lektf.yaml.j2 index e138d3a6d..7689d6cca 100644 --- a/parm/soca/letkf/marine-jcb-lektf.yaml.j2 +++ b/parm/soca/letkf/marine-jcb-lektf.yaml.j2 @@ -1,5 +1,3 @@ # JEDI algorithm being invoked algorithm: letkf -# Observations -observations: !INC ${OBS_LIST_SHORT} diff --git a/test/gw-ci/CMakeLists.txt b/test/gw-ci/CMakeLists.txt index f9aece46b..a365af0aa 100644 --- a/test/gw-ci/CMakeLists.txt +++ b/test/gw-ci/CMakeLists.txt @@ -178,8 +178,8 @@ function(add_task task_name test_prefix is_full_cycle HALF_CYCLE FULL_CYCLE pslo elseif("${task_name}" STREQUAL "gdas_marineanlfinal") list(APPEND TEST_DEPENDS "${test_prefix}_gdas_marineanlchkpt_${FULL_CYCLE}") 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}") + list(APPEND TEST_DEPENDS "${test_prefix}_gdas_marinebmat_${FULL_CYCLE}") else() list(APPEND TEST_DEPENDS "${test_prefix}") endif() @@ -389,8 +389,8 @@ if (WORKFLOW_TESTS) "enkfgdas_fcst") set(FULL_CYCLE_TASKS "gdas_prepoceanobs" - "gdas_marineanlletkf" "gdas_marinebmat" + "gdas_marineanlletkf" "gdas_marineanlinit" "gdas_marineanlvar" "gdas_marineanlchkpt" From a917eb14accba6327861e2b14392bebb7cccdff0 Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Thu, 6 Feb 2025 19:01:47 +0000 Subject: [PATCH 3/3] minor mod --- parm/soca/letkf/letkf_obs_list.yaml.j2 | 45 ------------------------ parm/soca/letkf/marine-jcb-lektf.yaml.j2 | 2 +- 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 parm/soca/letkf/letkf_obs_list.yaml.j2 diff --git a/parm/soca/letkf/letkf_obs_list.yaml.j2 b/parm/soca/letkf/letkf_obs_list.yaml.j2 deleted file mode 100644 index fdc967c0f..000000000 --- a/parm/soca/letkf/letkf_obs_list.yaml.j2 +++ /dev/null @@ -1,45 +0,0 @@ -# Observations used with marine LETKF - -observations: -# ADT - - adt_rads_all - -# SST - - sst_avhrr_ma_l3u - - sst_avhrr_mb_l3u - - sst_avhrr_mc_l3u - - sst_viirs_npp_l3u - - sst_viirs_n20_l3u - - sst_abi_g16_l3c - - sst_abi_g17_l3c - - sst_ahi_h08_l3c - -# Ice concentration - - icec_amsr2_north - - icec_amsr2_south -# - icec_viirs_n20_l2_north -# - icec_viirs_n20_l2_south -# - icec_amsu_mb_l2 -# - icec_atms_n20_l2 -# - icec_atms_n21_l2 -# - icec_atms_npp_l2 -# - icec_gmi_gpm_l2 -# - icec_ssmis_f17_l2 - -# in situ: monthly -# - insitu_profile_bathy - - insitu_profile_argo -# - insitu_profile_glider -# - insitu_profile_tesac -# - insitu_profile_tesac_salinity -# - insitu_profile_marinemammal -# - insitu_profile_xbtctd -# - insitu_surface_altkob -# - insitu_surface_trkob -# - insitu_surface_trkob_salinity - -# in situ: daily -# - insitu_profile_dbuoy -# - insitu_profile_dbuoyb -# - insitu_profile_mbuoy -# - insitu_profile_mbuoyb diff --git a/parm/soca/letkf/marine-jcb-lektf.yaml.j2 b/parm/soca/letkf/marine-jcb-lektf.yaml.j2 index 7689d6cca..1eb0824c6 100644 --- a/parm/soca/letkf/marine-jcb-lektf.yaml.j2 +++ b/parm/soca/letkf/marine-jcb-lektf.yaml.j2 @@ -1,3 +1,3 @@ # JEDI algorithm being invoked -algorithm: letkf +algorithm: marine_letkf