From 7b21cfb1a0ddbdda35e58e21a0be696937db4bd9 Mon Sep 17 00:00:00 2001 From: "chunhua.zhou" Date: Fri, 17 Dec 2021 02:31:36 +0000 Subject: [PATCH 1/3] Fixing namelist for observer run and core usage --- fix/gsi/gsiparm.anl.sh | 3 ++- scripts/exregional_run_analysis.sh | 4 ++++ ush/config_defaults.sh | 1 + ush/generate_FV3LAM_wflow.sh | 1 + ush/templates/FV3LAM_wflow.xml | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fix/gsi/gsiparm.anl.sh b/fix/gsi/gsiparm.anl.sh index d1ec65338..e60be23f4 100755 --- a/fix/gsi/gsiparm.anl.sh +++ b/fix/gsi/gsiparm.anl.sh @@ -1,10 +1,11 @@ gsi_namelist=" &SETUP - miter=2,niter(1)=50,niter(2)=50, + miter=${miter},niter(1)=50,niter(2)=50, write_diag(1)=.true.,write_diag(2)=${write_diag_2},write_diag(3)=.true., qoption=2,print_obs_para=.true.,diag_radardbz=${diag_radardbz}, gencode=78,factqmin=0.0,factqmax=0.0, iguess=-1, + lread_obs_save=${lread_obs_save},lread_obs_skip=${lread_obs_skip}, oneobtest=.false.,retrieval=.false., nhr_assimilation=3,l_foto=.false., use_pbl=.false.,use_prepb_satwnd=$ifsatbufr, diff --git a/scripts/exregional_run_analysis.sh b/scripts/exregional_run_analysis.sh index c4dc25564..659a903ec 100755 --- a/scripts/exregional_run_analysis.sh +++ b/scripts/exregional_run_analysis.sh @@ -290,6 +290,9 @@ esac ifsatbufr=.false. ifsoilnudge=.false. ifhyb=.false. +miter=2 +lread_obs_save=.false. +lread_obs_skip=.false. # Determine if hybrid option is available memname='atmf009' @@ -545,6 +548,7 @@ done # if [ ${gsi_type} == "OBSERVER" ]; then miter=0 + ifhyb=.false. if [ ${ens_type} == "MEAN" ]; then lread_obs_save=.true. lread_obs_skip=.false. diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh index 710c3c922..197774221 100644 --- a/ush/config_defaults.sh +++ b/ush/config_defaults.sh @@ -1536,6 +1536,7 @@ NNODES_RUN_GRAPHICS="1" # Number of cores. # NCORES_RUN_ANAL="4" +NCORES_RUN_OBSERVER="4" NCORES_RUN_ENKF="4" NATIVE_RUN_FCST="--cpus-per-task 2 --exclusive" NATIVE_RUN_ANAL="--cpus-per-task 2 --exclusive" diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh index 03156e24e..52e9b0773 100755 --- a/ush/generate_FV3LAM_wflow.sh +++ b/ush/generate_FV3LAM_wflow.sh @@ -244,6 +244,7 @@ settings="\ 'ncores_run_fcst': ${PE_MEMBER01} 'native_run_fcst': ${NATIVE_RUN_FCST} 'ncores_run_anal': ${NCORES_RUN_ANAL} + 'ncores_run_observer': ${NCORES_RUN_OBSERVER} 'native_run_anal': ${NATIVE_RUN_ANAL} 'ncores_run_enkf': ${NCORES_RUN_ENKF} 'native_run_enkf': ${NATIVE_RUN_ENKF} diff --git a/ush/templates/FV3LAM_wflow.xml b/ush/templates/FV3LAM_wflow.xml index 4a124190c..6e3bc7feb 100644 --- a/ush/templates/FV3LAM_wflow.xml +++ b/ush/templates/FV3LAM_wflow.xml @@ -1395,7 +1395,7 @@ MODULES_RUN_TASK_FP script. &LOAD_MODULES_RUN_TASK_FP; "&RUN_ANAL_TN;" "&JOBSDIR;/JREGIONAL_RUN_ANAL" {% if machine in ["JET", "HERA"] -%} - {{ ncores_run_anal }} + {{ ncores_run_observer }} {{ native_run_anal }} &RRFS_RESERVE; {% else -%} {{ nnodes_run_anal }}:ppn={{ ppn_run_anal }} From a719676de6fb0b7a8e9a1d6ee42b64f249011b76 Mon Sep 17 00:00:00 2001 From: "chunhua.zhou" Date: Fri, 17 Dec 2021 18:31:20 +0000 Subject: [PATCH 2/3] Reduce core usage for observer runs --- ush/config.sh.RRFS_CONUS_3km | 1 + 1 file changed, 1 insertion(+) diff --git a/ush/config.sh.RRFS_CONUS_3km b/ush/config.sh.RRFS_CONUS_3km index 338bbe018..326f7f3a3 100644 --- a/ush/config.sh.RRFS_CONUS_3km +++ b/ush/config.sh.RRFS_CONUS_3km @@ -83,6 +83,7 @@ SST_update_hour=01 GVF_update_hour=04 NCORES_RUN_ANAL=240 +NCORES_RUN_OBSERVER=80 HYBENSMEM_NMIN=66 HALO_BLEND=20 From d5b0a60b5eff0547d745b0bb25a4e3bae707371e Mon Sep 17 00:00:00 2001 From: "chunhua.zhou" Date: Fri, 17 Dec 2021 21:27:16 +0000 Subject: [PATCH 3/3] changing ens_type to rrfsens_type because ens_type is already used in scripts/exregional_run_analysis.sh --- jobs/JREGIONAL_RUN_ANAL | 4 ++-- scripts/exregional_run_analysis.sh | 8 ++++---- ush/templates/FV3LAM_wflow.xml | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jobs/JREGIONAL_RUN_ANAL b/jobs/JREGIONAL_RUN_ANAL index d9391992f..bfd079e00 100755 --- a/jobs/JREGIONAL_RUN_ANAL +++ b/jobs/JREGIONAL_RUN_ANAL @@ -73,7 +73,7 @@ else fi if [ ${GSI_TYPE} == "OBSERVER" ]; then - if [ ${ENS_TYPE} == "MEAN" ]; then + if [ ${RRFSENS_TYPE} == "MEAN" ]; then analworkdir="${CYCLE_DIR}/ensmean/observer${analworkname}" SLASH_ENSMEM_SUBDIR="" observer_nwges_dir="${NWGES_DIR}/ensmean/observer${analworkname}" @@ -100,7 +100,7 @@ $SCRIPTSDIR/exregional_run_analysis.sh \ cycle_dir="${CYCLE_DIR}" \ cycle_type="${CYCLE_TYPE}" \ gsi_type="${GSI_TYPE}" \ - ens_type="${ENS_TYPE}" \ + rrfsens_type="${RRFSENS_TYPE}" \ analworkdir="${analworkdir}" \ observer_nwges_dir="${observer_nwges_dir}" \ slash_ensmem_subdir="${SLASH_ENSMEM_SUBDIR}" || \ diff --git a/scripts/exregional_run_analysis.sh b/scripts/exregional_run_analysis.sh index 659a903ec..7ce128f46 100755 --- a/scripts/exregional_run_analysis.sh +++ b/scripts/exregional_run_analysis.sh @@ -55,7 +55,7 @@ specified cycle. # #----------------------------------------------------------------------- # -valid_args=( "cycle_dir" "cycle_type" "gsi_type" "ens_type" "analworkdir" "observer_nwges_dir" "slash_ensmem_subdir" ) +valid_args=( "cycle_dir" "cycle_type" "gsi_type" "rrfsens_type" "analworkdir" "observer_nwges_dir" "slash_ensmem_subdir" ) process_args valid_args "$@" # #----------------------------------------------------------------------- @@ -172,13 +172,13 @@ cd_vrfy ${analworkdir} fixgriddir=$FIX_GSI/${PREDEF_GRID_NAME} if [ ${cycle_type} == "spinup" ]; then - if [ ${ens_type} == "MEAN" ]; then + if [ ${rrfsens_type} == "MEAN" ]; then bkpath=${cycle_dir}/ensmean/fcst_fv3lam_spinup/INPUT else bkpath=${cycle_dir}${slash_ensmem_subdir}/fcst_fv3lam_spinup/INPUT fi else - if [ ${ens_type} == "MEAN" ]; then + if [ ${rrfsens_type} == "MEAN" ]; then bkpath=${cycle_dir}/ensmean/fcst_fv3lam/INPUT else bkpath=${cycle_dir}${slash_ensmem_subdir}/fcst_fv3lam/INPUT @@ -549,7 +549,7 @@ done if [ ${gsi_type} == "OBSERVER" ]; then miter=0 ifhyb=.false. - if [ ${ens_type} == "MEAN" ]; then + if [ ${rrfsens_type} == "MEAN" ]; then lread_obs_save=.true. lread_obs_skip=.false. else diff --git a/ush/templates/FV3LAM_wflow.xml b/ush/templates/FV3LAM_wflow.xml index 6e3bc7feb..21f07b719 100644 --- a/ush/templates/FV3LAM_wflow.xml +++ b/ush/templates/FV3LAM_wflow.xml @@ -904,7 +904,7 @@ MODULES_RUN_TASK_FP script. CYCLE_ROOT&CYCLE_BASEDIR; CYCLE_TYPE#type# GSI_TYPEANALYSIS - ENS_TYPEMEMBER + RRFSENS_TYPEMEMBER SLASH_ENSMEM_SUBDIR{{ slash_ensmem_subdir }} @@ -940,7 +940,7 @@ MODULES_RUN_TASK_FP script. CDATE@Y@m@d@H CYCLE_DIR&CYCLE_BASEDIR;/@Y@m@d@H CYCLE_TYPE#type# - ENS_TYPEMEMBER + RRFSENS_TYPEMEMBER SLASH_ENSMEM_SUBDIR{{ slash_ensmem_subdir }} @@ -980,7 +980,7 @@ MODULES_RUN_TASK_FP script. CDATE@Y@m@d@H CYCLE_DIR&CYCLE_BASEDIR;/@Y@m@d@H CYCLE_TYPE#type# - ENS_TYPEMEMBER + RRFSENS_TYPEMEMBER SLASH_ENSMEM_SUBDIR{{ slash_ensmem_subdir }} @@ -1364,7 +1364,7 @@ MODULES_RUN_TASK_FP script. CYCLE_ROOT&CYCLE_BASEDIR; NWGES_DIR&NWGES_BASEDIR;/@Y@m@d@H GSI_TYPEOBSERVER - ENS_TYPEMEAN + RRFSENS_TYPEMEAN @@ -1412,7 +1412,7 @@ MODULES_RUN_TASK_FP script. CYCLE_ROOT&CYCLE_BASEDIR; NWGES_DIR&NWGES_BASEDIR;/@Y@m@d@H GSI_TYPEOBSERVER - ENS_TYPEMEMBER + RRFSENS_TYPEMEMBER SLASH_ENSMEM_SUBDIR{{ slash_ensmem_subdir }}