From 2c76cb64648429f45c2412904c7da9473c868d09 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Fri, 24 May 2024 12:54:00 +0000 Subject: [PATCH 1/9] add C384mx025_3DVarAOWCDA yamls --- ci/cases/weekly/C384mx025_3DVarAOWCDA.yaml | 18 +++++++++++ ci/cases/yamls/obs_list.yaml | 17 ++++++++++ ci/cases/yamls/ocnanal.yaml | 36 ++++++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 ci/cases/weekly/C384mx025_3DVarAOWCDA.yaml create mode 100644 ci/cases/yamls/obs_list.yaml create mode 100644 ci/cases/yamls/ocnanal.yaml diff --git a/ci/cases/weekly/C384mx025_3DVarAOWCDA.yaml b/ci/cases/weekly/C384mx025_3DVarAOWCDA.yaml new file mode 100644 index 0000000000..1e59b958c8 --- /dev/null +++ b/ci/cases/weekly/C384mx025_3DVarAOWCDA.yaml @@ -0,0 +1,18 @@ +experiment: + system: gfs + mode: cycled + +arguments: + pslot: {{ 'pslot' | getenv }} + app: S2S + resdetatmos: 384 + resdetocean: 0.25 + nens: 0 + gfs_cyc: 4 + start: cold + comroot: {{ 'PWD' | getenv }}/{{ 'pslot' | getenv }}/COMROOT + expdir: {{ 'PWD' | getenv }}/{{ 'pslot' | getenv }}/EXPDIR + idate: 2021063000 + edate: 2021070306 + icsdir: /scratch1/NCEPDEV/climate/Jessica.Meixner/cycling/IC_2021063000_V2 + yaml: {{ HOMEgfs }}/ci/cases/yamls/ocnanal.yaml diff --git a/ci/cases/yamls/obs_list.yaml b/ci/cases/yamls/obs_list.yaml new file mode 100644 index 0000000000..1739c51116 --- /dev/null +++ b/ci/cases/yamls/obs_list.yaml @@ -0,0 +1,17 @@ +observers: +# ADT +- !INC ${OBS_YAML_DIR}/adt_rads_all.yaml + +# SST +- !INC ${OBS_YAML_DIR}/sst_avhrr_ma_l3u.yaml +- !INC ${OBS_YAML_DIR}/sst_avhrr_mb_l3u.yaml +- !INC ${OBS_YAML_DIR}/sst_avhrr_mc_l3u.yaml +- !INC ${OBS_YAML_DIR}/sst_viirs_npp_l3u.yaml +- !INC ${OBS_YAML_DIR}/sst_viirs_n20_l3u.yaml +- !INC ${OBS_YAML_DIR}/sst_abi_g16_l3c.yaml +- !INC ${OBS_YAML_DIR}/sst_abi_g17_l3c.yaml +- !INC ${OBS_YAML_DIR}/sst_ahi_h08_l3c.yaml + +# Ice concentration +- !INC ${OBS_YAML_DIR}/icec_amsr2_north.yaml +- !INC ${OBS_YAML_DIR}/icec_amsr2_south.yaml diff --git a/ci/cases/yamls/ocnanal.yaml b/ci/cases/yamls/ocnanal.yaml new file mode 100644 index 0000000000..a266cbb553 --- /dev/null +++ b/ci/cases/yamls/ocnanal.yaml @@ -0,0 +1,36 @@ +defaults: + !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml + +base: + DOIAU: "YES" + DO_JEDIATMVAR: "NO" + DO_JEDIATMENS: "NO" + DO_JEDIOCNVAR: "YES" + DO_JEDISNOWDA: "NO" + DO_MERGENSST: "NO" + DOHYBVAR: "NO" + DO_FIT2OBS: "NO" + DO_VERFOZN: "NO" + DO_VERFRAD: "NO" + DO_VRFY_OCEANDA: "NO" + ACCOUNT: "marine-cpu" + FHMAX_GFS: 240 + HPSS_PROJECT: emc-climate + HOMEDIR: {{ 'PWD' | getenv }}/HOMEDIR + STMP: {{ 'PWD' | getenv }}/TMP + PTMP: {{ 'PWD' | getenv }}/TMP + NOSCRUB: {{ 'PWD' | getenv }}/TMP + +ocnanal: + SOCA_INPUT_FIX_DIR: /scratch2/NCEPDEV/ocean/Guillaume.Vernieres/data/static/1440x1080x75/soca + CASE_ANL: 'C24' + SOCA_OBS_LIST: {{ 'PWD' | getenv }}/obs_list.yaml + SOCA_NINNER: 100 + SABER_BLOCKS_YAML: '' + NICAS_RESOL: 1 + NICAS_GRID_SIZE: 15000 + +prepoceanobs: + SOCA_OBS_LIST: {{ HOMEgfs }}/ci/cases/yamls/obs_list.yaml + OBSPREP_YAML: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obsprep/obsprep_config.yaml + DMPDIR: /scratch1/NCEPDEV/da/common/ From 42629e64c49ea3461a9a915738fa2622e2ae39d6 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Fri, 24 May 2024 13:01:51 +0000 Subject: [PATCH 2/9] make v17 folder --- ci/cases/{weekly => gfsv17}/C384mx025_3DVarAOWCDA.yaml | 2 +- ci/cases/{yamls => gfsv17}/obs_list.yaml | 0 ci/cases/{yamls => gfsv17}/ocnanal.yaml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename ci/cases/{weekly => gfsv17}/C384mx025_3DVarAOWCDA.yaml (89%) rename ci/cases/{yamls => gfsv17}/obs_list.yaml (100%) rename ci/cases/{yamls => gfsv17}/ocnanal.yaml (93%) diff --git a/ci/cases/weekly/C384mx025_3DVarAOWCDA.yaml b/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml similarity index 89% rename from ci/cases/weekly/C384mx025_3DVarAOWCDA.yaml rename to ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml index 1e59b958c8..f39fdb6b2d 100644 --- a/ci/cases/weekly/C384mx025_3DVarAOWCDA.yaml +++ b/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml @@ -15,4 +15,4 @@ arguments: idate: 2021063000 edate: 2021070306 icsdir: /scratch1/NCEPDEV/climate/Jessica.Meixner/cycling/IC_2021063000_V2 - yaml: {{ HOMEgfs }}/ci/cases/yamls/ocnanal.yaml + yaml: {{ HOMEgfs }}/ci/cases/gfsv17/ocnanal.yaml diff --git a/ci/cases/yamls/obs_list.yaml b/ci/cases/gfsv17/obs_list.yaml similarity index 100% rename from ci/cases/yamls/obs_list.yaml rename to ci/cases/gfsv17/obs_list.yaml diff --git a/ci/cases/yamls/ocnanal.yaml b/ci/cases/gfsv17/ocnanal.yaml similarity index 93% rename from ci/cases/yamls/ocnanal.yaml rename to ci/cases/gfsv17/ocnanal.yaml index a266cbb553..c72e79018b 100644 --- a/ci/cases/yamls/ocnanal.yaml +++ b/ci/cases/gfsv17/ocnanal.yaml @@ -31,6 +31,6 @@ ocnanal: NICAS_GRID_SIZE: 15000 prepoceanobs: - SOCA_OBS_LIST: {{ HOMEgfs }}/ci/cases/yamls/obs_list.yaml + SOCA_OBS_LIST: {{ HOMEgfs }}/ci/cases/gfsv17/obs_list.yaml OBSPREP_YAML: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obsprep/obsprep_config.yaml DMPDIR: /scratch1/NCEPDEV/da/common/ From db2390ceba7107770097e47453573055de1a3d92 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 29 May 2024 10:23:36 -0400 Subject: [PATCH 3/9] Update ocnanal.yaml --- ci/cases/gfsv17/ocnanal.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/cases/gfsv17/ocnanal.yaml b/ci/cases/gfsv17/ocnanal.yaml index c72e79018b..8643a51d47 100644 --- a/ci/cases/gfsv17/ocnanal.yaml +++ b/ci/cases/gfsv17/ocnanal.yaml @@ -9,9 +9,9 @@ base: DO_JEDISNOWDA: "NO" DO_MERGENSST: "NO" DOHYBVAR: "NO" - DO_FIT2OBS: "NO" - DO_VERFOZN: "NO" - DO_VERFRAD: "NO" + DO_FIT2OBS: "YES" + DO_VERFOZN: "YES" + DO_VERFRAD: "YES" DO_VRFY_OCEANDA: "NO" ACCOUNT: "marine-cpu" FHMAX_GFS: 240 From 2b451f8e8e5403644187db3ea653e6b7912a73d0 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 29 May 2024 15:36:33 +0000 Subject: [PATCH 4/9] make account and hpss more generic --- ci/cases/gfsv17/ocnanal.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/cases/gfsv17/ocnanal.yaml b/ci/cases/gfsv17/ocnanal.yaml index 8643a51d47..5ccb79b1e7 100644 --- a/ci/cases/gfsv17/ocnanal.yaml +++ b/ci/cases/gfsv17/ocnanal.yaml @@ -13,9 +13,8 @@ base: DO_VERFOZN: "YES" DO_VERFRAD: "YES" DO_VRFY_OCEANDA: "NO" - ACCOUNT: "marine-cpu" FHMAX_GFS: 240 - HPSS_PROJECT: emc-climate + HPSS_PROJECT: {{ 'HPSS_PROJECT' | getenv }} HOMEDIR: {{ 'PWD' | getenv }}/HOMEDIR STMP: {{ 'PWD' | getenv }}/TMP PTMP: {{ 'PWD' | getenv }}/TMP From 619ede3ee8f4c15d9602177c92fb3e8d68245618 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 29 May 2024 15:51:17 +0000 Subject: [PATCH 5/9] be consistent with PR yamls --- ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml b/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml index f39fdb6b2d..d97c9567e9 100644 --- a/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml +++ b/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml @@ -10,8 +10,8 @@ arguments: nens: 0 gfs_cyc: 4 start: cold - comroot: {{ 'PWD' | getenv }}/{{ 'pslot' | getenv }}/COMROOT - expdir: {{ 'PWD' | getenv }}/{{ 'pslot' | getenv }}/EXPDIR + comroot: {{ 'RUNTESTS' | getenv }}/COMROOT + expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR idate: 2021063000 edate: 2021070306 icsdir: /scratch1/NCEPDEV/climate/Jessica.Meixner/cycling/IC_2021063000_V2 From c3a455ef0154ae1d64c3a8b66304724ab78c5f18 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 29 May 2024 15:55:47 +0000 Subject: [PATCH 6/9] remove user-defined stmp/ptmp/tmp/etc to provide more consistency with other yamls --- ci/cases/gfsv17/ocnanal.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci/cases/gfsv17/ocnanal.yaml b/ci/cases/gfsv17/ocnanal.yaml index 5ccb79b1e7..4961b3cf4b 100644 --- a/ci/cases/gfsv17/ocnanal.yaml +++ b/ci/cases/gfsv17/ocnanal.yaml @@ -15,10 +15,6 @@ base: DO_VRFY_OCEANDA: "NO" FHMAX_GFS: 240 HPSS_PROJECT: {{ 'HPSS_PROJECT' | getenv }} - HOMEDIR: {{ 'PWD' | getenv }}/HOMEDIR - STMP: {{ 'PWD' | getenv }}/TMP - PTMP: {{ 'PWD' | getenv }}/TMP - NOSCRUB: {{ 'PWD' | getenv }}/TMP ocnanal: SOCA_INPUT_FIX_DIR: /scratch2/NCEPDEV/ocean/Guillaume.Vernieres/data/static/1440x1080x75/soca From 6ed1d3c70f6b695c54d496410ed76144294ab1f2 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 29 May 2024 16:48:09 +0000 Subject: [PATCH 7/9] remove hpss_project for consistency with ci tests --- ci/cases/gfsv17/ocnanal.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/cases/gfsv17/ocnanal.yaml b/ci/cases/gfsv17/ocnanal.yaml index 4961b3cf4b..57cd8dcc97 100644 --- a/ci/cases/gfsv17/ocnanal.yaml +++ b/ci/cases/gfsv17/ocnanal.yaml @@ -14,7 +14,6 @@ base: DO_VERFRAD: "YES" DO_VRFY_OCEANDA: "NO" FHMAX_GFS: 240 - HPSS_PROJECT: {{ 'HPSS_PROJECT' | getenv }} ocnanal: SOCA_INPUT_FIX_DIR: /scratch2/NCEPDEV/ocean/Guillaume.Vernieres/data/static/1440x1080x75/soca From 62f4616ee7e4addf562fd0c1ddfd8ef80417f362 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 29 May 2024 17:19:59 +0000 Subject: [PATCH 8/9] update obslist --- ci/cases/gfsv17/obs_list.yaml | 17 ----------------- ci/cases/gfsv17/ocnanal.yaml | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 ci/cases/gfsv17/obs_list.yaml diff --git a/ci/cases/gfsv17/obs_list.yaml b/ci/cases/gfsv17/obs_list.yaml deleted file mode 100644 index 1739c51116..0000000000 --- a/ci/cases/gfsv17/obs_list.yaml +++ /dev/null @@ -1,17 +0,0 @@ -observers: -# ADT -- !INC ${OBS_YAML_DIR}/adt_rads_all.yaml - -# SST -- !INC ${OBS_YAML_DIR}/sst_avhrr_ma_l3u.yaml -- !INC ${OBS_YAML_DIR}/sst_avhrr_mb_l3u.yaml -- !INC ${OBS_YAML_DIR}/sst_avhrr_mc_l3u.yaml -- !INC ${OBS_YAML_DIR}/sst_viirs_npp_l3u.yaml -- !INC ${OBS_YAML_DIR}/sst_viirs_n20_l3u.yaml -- !INC ${OBS_YAML_DIR}/sst_abi_g16_l3c.yaml -- !INC ${OBS_YAML_DIR}/sst_abi_g17_l3c.yaml -- !INC ${OBS_YAML_DIR}/sst_ahi_h08_l3c.yaml - -# Ice concentration -- !INC ${OBS_YAML_DIR}/icec_amsr2_north.yaml -- !INC ${OBS_YAML_DIR}/icec_amsr2_south.yaml diff --git a/ci/cases/gfsv17/ocnanal.yaml b/ci/cases/gfsv17/ocnanal.yaml index 57cd8dcc97..dd910b0504 100644 --- a/ci/cases/gfsv17/ocnanal.yaml +++ b/ci/cases/gfsv17/ocnanal.yaml @@ -25,6 +25,6 @@ ocnanal: NICAS_GRID_SIZE: 15000 prepoceanobs: - SOCA_OBS_LIST: {{ HOMEgfs }}/ci/cases/gfsv17/obs_list.yaml + SOCA_OBS_LIST: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml OBSPREP_YAML: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obsprep/obsprep_config.yaml DMPDIR: /scratch1/NCEPDEV/da/common/ From 39289428b56dae3c90ad6d75fbff2dece467d389 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 29 May 2024 16:14:00 -0400 Subject: [PATCH 9/9] Update ci/cases/gfsv17/ocnanal.yaml Co-authored-by: Rahul Mahajan --- ci/cases/gfsv17/ocnanal.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cases/gfsv17/ocnanal.yaml b/ci/cases/gfsv17/ocnanal.yaml index dd910b0504..9024afcb31 100644 --- a/ci/cases/gfsv17/ocnanal.yaml +++ b/ci/cases/gfsv17/ocnanal.yaml @@ -18,7 +18,7 @@ base: ocnanal: SOCA_INPUT_FIX_DIR: /scratch2/NCEPDEV/ocean/Guillaume.Vernieres/data/static/1440x1080x75/soca CASE_ANL: 'C24' - SOCA_OBS_LIST: {{ 'PWD' | getenv }}/obs_list.yaml + SOCA_OBS_LIST: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml SOCA_NINNER: 100 SABER_BLOCKS_YAML: '' NICAS_RESOL: 1