diff --git a/jobs/JRRFS_RUN_ENKF b/jobs/JRRFS_ANALYSIS_ENKF similarity index 98% rename from jobs/JRRFS_RUN_ENKF rename to jobs/JRRFS_ANALYSIS_ENKF index 4761bd0fe..024e96fbf 100755 --- a/jobs/JRRFS_RUN_ENKF +++ b/jobs/JRRFS_ANALYSIS_ENKF @@ -73,7 +73,7 @@ cd ${DATA} export pgmout="${DATA}/OUTPUT.$$" env -$SCRIPTSdir/exrrfs_run_enkf.sh +$SCRIPTSdir/exrrfs_analysis_enkf.sh export err=$?; err_chk if [ -e "$pgmout" ]; then diff --git a/jobs/JRRFS_RUN_ANALYSIS b/jobs/JRRFS_ANALYSIS_GSI similarity index 99% rename from jobs/JRRFS_RUN_ANALYSIS rename to jobs/JRRFS_ANALYSIS_GSI index baefede33..c36adf73d 100755 --- a/jobs/JRRFS_RUN_ANALYSIS +++ b/jobs/JRRFS_ANALYSIS_GSI @@ -134,7 +134,7 @@ mkdir -p "${COMOUT}" export pgmout="${DATA}/OUTPUT.$$" env -$SCRIPTSdir/exrrfs_run_analysis.sh +$SCRIPTSdir/exrrfs_analysis_gsi.sh export err=$?; err_chk if [ -e "$pgmout" ]; then diff --git a/jobs/JRRFS_RUN_GSIDIAG b/jobs/JRRFS_ANALYSIS_GSIDIAG similarity index 99% rename from jobs/JRRFS_RUN_GSIDIAG rename to jobs/JRRFS_ANALYSIS_GSIDIAG index 51efc6829..5cc38c234 100755 --- a/jobs/JRRFS_RUN_GSIDIAG +++ b/jobs/JRRFS_ANALYSIS_GSIDIAG @@ -88,7 +88,7 @@ mkdir -p "${COMOUT}" export pgmout="${DATA}/OUTPUT.$$" env -$SCRIPTSdir/exrrfs_run_gsidiag.sh +$SCRIPTSdir/exrrfs_analysis_gsidiag.sh export err=$?; err_chk if [ -e "$pgmout" ]; then diff --git a/jobs/JRRFS_NONVARCLDANL b/jobs/JRRFS_ANALYSIS_NONVARCLD similarity index 99% rename from jobs/JRRFS_NONVARCLDANL rename to jobs/JRRFS_ANALYSIS_NONVARCLD index 88bd2518d..6d9c7b4a9 100755 --- a/jobs/JRRFS_NONVARCLDANL +++ b/jobs/JRRFS_ANALYSIS_NONVARCLD @@ -105,7 +105,7 @@ mkdir -p "${COMOUT}" export pgmout="${DATA}/OUTPUT.$$" env -$SCRIPTSdir/exrrfs_nonvarcldanl.sh +$SCRIPTSdir/exrrfs_analysis_nonvarcld.sh export err=$?; err_chk if [ -e "$pgmout" ]; then diff --git a/jobs/JRRFS_RUN_PREPSTART b/jobs/JRRFS_PREP_CYC similarity index 97% rename from jobs/JRRFS_RUN_PREPSTART rename to jobs/JRRFS_PREP_CYC index a3ef35db3..3141a2e2f 100755 --- a/jobs/JRRFS_RUN_PREPSTART +++ b/jobs/JRRFS_PREP_CYC @@ -1,7 +1,7 @@ #!/bin/bash #----------------------------------------------------------------------- -# RRFS Run Prepstart +# RRFS Prep Cyc #----------------------------------------------------------------------- #----------------------------------------------------------------------- @@ -40,7 +40,7 @@ print_info_msg " Entering script: \"${scrfunc_fn}\" In directory: \"${scrfunc_dir}\" -This is the J-job script for the prepstart tasks for the specified cycle. +This is the J-job script for the prep_cyc tasks for the specified cycle. ========================================================================" #----------------------------------------------------------------------- @@ -99,7 +99,7 @@ mkdir -p "${COMOUT}" export pgmout="${INPUT_DATA}/OUTPUT.$$" env -$SCRIPTSdir/exrrfs_run_prepstart.sh +$SCRIPTSdir/exrrfs_prep_cyc.sh export err=$?; err_chk if [ -e "$pgmout" ]; then diff --git a/jobs/JRRFS_PROCESS_GLMFED b/jobs/JRRFS_PROCESS_LIGHTNING similarity index 90% rename from jobs/JRRFS_PROCESS_GLMFED rename to jobs/JRRFS_PROCESS_LIGHTNING index f56c607ea..88cabdda7 100755 --- a/jobs/JRRFS_PROCESS_GLMFED +++ b/jobs/JRRFS_PROCESS_LIGHTNING @@ -37,7 +37,7 @@ print_info_msg " Entering script: \"${scrfunc_fn}\" In directory: \"${scrfunc_dir}\" -This is the J-job script for the task that runs a GLM FED +This is the J-job script for the task that runs a GLM FED lightning preprocess with RRFS for the specified cycle. ========================================================================" @@ -51,15 +51,15 @@ export RUN=${RUN:-rrfs} if [ ${CYCLE_TYPE} == "spinup" ]; then if [ ${DO_ENSEMBLE} = TRUE ]; then - export jobid=${RUN}_process_glmfed_enkf_spinup_${envir}_${cyc} + export jobid=${RUN}_process_lightning_enkf_spinup_${envir}_${cyc} else - export jobid=${RUN}_process_glmfed_spinup_${envir}_${cyc} + export jobid=${RUN}_process_lightning_spinup_${envir}_${cyc} fi else if [ ${DO_ENSEMBLE} = TRUE ]; then - export jobid=${RUN}_process_glmfed_enkf_${envir}_${cyc} + export jobid=${RUN}_process_lightning_enkf_${envir}_${cyc} else - export jobid=${RUN}_process_glmfed_${envir}_${cyc} + export jobid=${RUN}_process_lightning_${envir}_${cyc} fi fi @@ -82,7 +82,7 @@ export MODE=$GLMFED_DATA_MODE export pgmout="${DATA}/OUTPUT.$$" env -python -u ${SCRIPTSdir}/exrrfs_process_glmfed.py +python -u ${SCRIPTSdir}/exrrfs_process_lightning.py export err=$?; err_chk if [ -e "$pgmout" ]; then diff --git a/jobs/JRRFS_PROCESS_RADARREF b/jobs/JRRFS_PROCESS_RADAR similarity index 92% rename from jobs/JRRFS_PROCESS_RADARREF rename to jobs/JRRFS_PROCESS_RADAR index a726c1c07..4ecf2f51a 100755 --- a/jobs/JRRFS_PROCESS_RADARREF +++ b/jobs/JRRFS_PROCESS_RADAR @@ -53,14 +53,14 @@ export envir=${envir:-prod} export RUN=${RUN:-rrfs} if [ "${CYCLE_TYPE}" = "spinup" ]; then - export jobid=${RUN}_process_radarref_spinup_${envir}_${cyc} + export jobid=${RUN}_process_radar_spinup_${envir}_${cyc} if [ "${DO_ENSEMBLE}" = "TRUE" ]; then - export jobid=${RUN}_process_radarref_spinup_enkf_${envir}_${cyc} + export jobid=${RUN}_process_radar_spinup_enkf_${envir}_${cyc} fi else - export jobid=${RUN}_process_radarref_${envir}_${cyc} + export jobid=${RUN}_process_radar_${envir}_${cyc} if [ "${DO_ENSEMBLE}" = "TRUE" ]; then - export jobid=${RUN}_process_radarref_enkf_${envir}_${cyc} + export jobid=${RUN}_process_radar_enkf_${envir}_${cyc} fi fi @@ -88,7 +88,7 @@ mkdir -p "${COMOUT}" export pgmout="${DATA}/OUTPUT.$$" env -$SCRIPTSdir/exrrfs_process_radarref.sh +$SCRIPTSdir/exrrfs_process_radar.sh export err=$?; err_chk if [ -e "$pgmout" ]; then diff --git a/jobs/JRRFS_RUN_RECENTER b/jobs/JRRFS_RECENTER similarity index 99% rename from jobs/JRRFS_RUN_RECENTER rename to jobs/JRRFS_RECENTER index 950b96d96..5f9638302 100755 --- a/jobs/JRRFS_RUN_RECENTER +++ b/jobs/JRRFS_RECENTER @@ -94,7 +94,7 @@ fi export pgmout="${DATA}/OUTPUT.$$" env -$SCRIPTSdir/exrrfs_run_recenter.sh +$SCRIPTSdir/exrrfs_recenter.sh export err=$?; err_chk if [ -e "$pgmout" ]; then diff --git a/jobs/JRRFS_RUN_POSTANAL b/jobs/JRRFS_UPDATE_LBC_SOIL similarity index 98% rename from jobs/JRRFS_RUN_POSTANAL rename to jobs/JRRFS_UPDATE_LBC_SOIL index 8d9d31881..eb9729a37 100755 --- a/jobs/JRRFS_RUN_POSTANAL +++ b/jobs/JRRFS_UPDATE_LBC_SOIL @@ -1,7 +1,7 @@ #!/bin/bash #----------------------------------------------------------------------- -# RRFS Post Analysis +# RRFS Update LBC & Soil #----------------------------------------------------------------------- #----------------------------------------------------------------------- @@ -118,7 +118,7 @@ mkdir -p "${COMOUT}" export pgmout="${DATA}/OUTPUT.$$" env -$SCRIPTSdir/exrrfs_run_postanal.sh +$SCRIPTSdir/exrrfs_update_lbc_soil.sh export err=$?; err_chk if [ -e "$pgmout" ]; then diff --git a/modulefiles/tasks/hera/run_bufrsnd.local.lua b/modulefiles/tasks/hera/bufrsnd.local.lua similarity index 100% rename from modulefiles/tasks/hera/run_bufrsnd.local.lua rename to modulefiles/tasks/hera/bufrsnd.local.lua diff --git a/modulefiles/tasks/hera/get_extrn_ics.local.lua b/modulefiles/tasks/hera/get_extrn_ics.local.lua deleted file mode 100644 index acf81facb..000000000 --- a/modulefiles/tasks/hera/get_extrn_ics.local.lua +++ /dev/null @@ -1,2 +0,0 @@ -load("hpss") -load("python_srw") diff --git a/modulefiles/tasks/hera/get_extrn_lbcs.local.lua b/modulefiles/tasks/hera/get_extrn_lbcs.local.lua deleted file mode 100644 index acf81facb..000000000 --- a/modulefiles/tasks/hera/get_extrn_lbcs.local.lua +++ /dev/null @@ -1,2 +0,0 @@ -load("hpss") -load("python_srw") diff --git a/modulefiles/tasks/hera/run_proc_smoke.local.lua b/modulefiles/tasks/hera/process_smoke.local.lua similarity index 100% rename from modulefiles/tasks/hera/run_proc_smoke.local.lua rename to modulefiles/tasks/hera/process_smoke.local.lua diff --git a/modulefiles/tasks/hera/run_graphics.local.lua b/modulefiles/tasks/hera/run_graphics.local.lua deleted file mode 100644 index 792df2e2e..000000000 --- a/modulefiles/tasks/hera/run_graphics.local.lua +++ /dev/null @@ -1,4 +0,0 @@ -prepend_path("MODULEPATH","/contrib/miniconda3/modulefiles") -load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) - -setenv("SRW_ENV", "pygraf") diff --git a/modulefiles/tasks/hera/run_vx.local.lua b/modulefiles/tasks/hera/run_vx.local.lua deleted file mode 100644 index f2a338e63..000000000 --- a/modulefiles/tasks/hera/run_vx.local.lua +++ /dev/null @@ -1,9 +0,0 @@ ---[[ -Loading intel is really only necessary when running verification tasks -with the COMPILER experiment parameter set to "gnu" because in that case, -the intel libraries aren't loaded, but the MET/METplus vx software still -needs them because it's built using the intel compiler. This line can -be removed if/when there is a version of MET/METplus built using GNU. ---]] -load(pathJoin("intel", os.getenv("intel_ver") or "18.0.5.274")) -load("python_srw") diff --git a/modulefiles/tasks/jet/run_bufrsnd.local.lua b/modulefiles/tasks/jet/bufrsnd.local.lua similarity index 100% rename from modulefiles/tasks/jet/run_bufrsnd.local.lua rename to modulefiles/tasks/jet/bufrsnd.local.lua diff --git a/modulefiles/tasks/jet/get_extrn_ics.local.lua b/modulefiles/tasks/jet/get_extrn_ics.local.lua deleted file mode 100644 index acf81facb..000000000 --- a/modulefiles/tasks/jet/get_extrn_ics.local.lua +++ /dev/null @@ -1,2 +0,0 @@ -load("hpss") -load("python_srw") diff --git a/modulefiles/tasks/jet/get_extrn_lbcs.local.lua b/modulefiles/tasks/jet/get_extrn_lbcs.local.lua deleted file mode 100644 index acf81facb..000000000 --- a/modulefiles/tasks/jet/get_extrn_lbcs.local.lua +++ /dev/null @@ -1,2 +0,0 @@ -load("hpss") -load("python_srw") diff --git a/modulefiles/tasks/jet/run_prepstart.local b/modulefiles/tasks/jet/prep_cyc.local.lua similarity index 100% rename from modulefiles/tasks/jet/run_prepstart.local rename to modulefiles/tasks/jet/prep_cyc.local.lua diff --git a/modulefiles/tasks/jet/run_proc_smoke.local.lua b/modulefiles/tasks/jet/process_smoke.local.lua similarity index 100% rename from modulefiles/tasks/jet/run_proc_smoke.local.lua rename to modulefiles/tasks/jet/process_smoke.local.lua diff --git a/modulefiles/tasks/jet/run_enspost.local.lua b/modulefiles/tasks/jet/run_enspost.local.lua deleted file mode 100644 index 45faad169..000000000 --- a/modulefiles/tasks/jet/run_enspost.local.lua +++ /dev/null @@ -1,4 +0,0 @@ -prepend_path("MODULEPATH","/contrib/miniconda3/modulefiles") -load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.5.12")) - -setenv("SRW_ENV", "pygraf") diff --git a/modulefiles/tasks/jet/run_graphics.local.lua b/modulefiles/tasks/jet/run_graphics.local.lua deleted file mode 100644 index 792df2e2e..000000000 --- a/modulefiles/tasks/jet/run_graphics.local.lua +++ /dev/null @@ -1,4 +0,0 @@ -prepend_path("MODULEPATH","/contrib/miniconda3/modulefiles") -load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) - -setenv("SRW_ENV", "pygraf") diff --git a/modulefiles/tasks/jet/run_vx.local.lua b/modulefiles/tasks/jet/run_vx.local.lua deleted file mode 100644 index 750fd7603..000000000 --- a/modulefiles/tasks/jet/run_vx.local.lua +++ /dev/null @@ -1 +0,0 @@ -load("python_srw") diff --git a/modulefiles/tasks/wcoss2/add_aerosol.local.lua b/modulefiles/tasks/wcoss2/add_aerosol.local.lua deleted file mode 100644 index d97797709..000000000 --- a/modulefiles/tasks/wcoss2/add_aerosol.local.lua +++ /dev/null @@ -1,19 +0,0 @@ -load("python_srw") - -load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver"))) -load(pathJoin("intel", os.getenv("intel_ver"))) -load(pathJoin("craype", os.getenv("craype_ver"))) -load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) -load(pathJoin("cray-pals", os.getenv("cray_pals_ver"))) - -prepend_path("MODULEPATH", os.getenv("modulepath_compiler")) -prepend_path("MODULEPATH", os.getenv("modulepath_mpi")) - -load(pathJoin("libjpeg", os.getenv("libjpeg_ver"))) -load(pathJoin("netcdf", os.getenv("netcdf_ver"))) -load(pathJoin("bacio", os.getenv("bacio_ver"))) -load(pathJoin("w3emc", os.getenv("w3emc_ver"))) -load(pathJoin("nemsio", os.getenv("nemsio_ver"))) -load(pathJoin("udunits", os.getenv("udunits_ver"))) -load(pathJoin("gsl", os.getenv("gsl_ver"))) -load(pathJoin("nco", os.getenv("nco_ver"))) diff --git a/modulefiles/tasks/wcoss2/run_analysis_gsi.local.lua b/modulefiles/tasks/wcoss2/analysis_gsi.local.lua similarity index 100% rename from modulefiles/tasks/wcoss2/run_analysis_gsi.local.lua rename to modulefiles/tasks/wcoss2/analysis_gsi.local.lua diff --git a/modulefiles/tasks/wcoss2/run_bufrsnd.local.lua b/modulefiles/tasks/wcoss2/bufrsnd.local.lua similarity index 100% rename from modulefiles/tasks/wcoss2/run_bufrsnd.local.lua rename to modulefiles/tasks/wcoss2/bufrsnd.local.lua diff --git a/modulefiles/tasks/wcoss2/run_enkfupdt.local.lua b/modulefiles/tasks/wcoss2/enkfupdt.local.lua similarity index 100% rename from modulefiles/tasks/wcoss2/run_enkfupdt.local.lua rename to modulefiles/tasks/wcoss2/enkfupdt.local.lua diff --git a/modulefiles/tasks/wcoss2/run_prepstart.local.lua b/modulefiles/tasks/wcoss2/prep_cyc.local.lua similarity index 100% rename from modulefiles/tasks/wcoss2/run_prepstart.local.lua rename to modulefiles/tasks/wcoss2/prep_cyc.local.lua diff --git a/modulefiles/tasks/wcoss2/run_proc_smoke.local.lua b/modulefiles/tasks/wcoss2/process_smoke.local.lua similarity index 100% rename from modulefiles/tasks/wcoss2/run_proc_smoke.local.lua rename to modulefiles/tasks/wcoss2/process_smoke.local.lua diff --git a/modulefiles/tasks/wcoss2/run_recenter.local.lua b/modulefiles/tasks/wcoss2/recenter.local.lua similarity index 100% rename from modulefiles/tasks/wcoss2/run_recenter.local.lua rename to modulefiles/tasks/wcoss2/recenter.local.lua diff --git a/modulefiles/tasks/wcoss2/run_vx.local.lua b/modulefiles/tasks/wcoss2/run_vx.local.lua deleted file mode 100644 index 3f9f628e3..000000000 --- a/modulefiles/tasks/wcoss2/run_vx.local.lua +++ /dev/null @@ -1,6 +0,0 @@ -load("python_srw") - -prepend_path("MODULEPATH", os.getenv("modulepath_compiler")) -prepend_path("MODULEPATH", os.getenv("modulepath_mpi")) - -load(pathJoin("netcdf", os.getenv("netcdf_ver"))) diff --git a/parm/FV3LAM_wflow.xml b/parm/FV3LAM_wflow.xml index f62077842..3c294dd68 100644 --- a/parm/FV3LAM_wflow.xml +++ b/parm/FV3LAM_wflow.xml @@ -38,34 +38,30 @@ Workflow task names. - + - + - - + + - + - - + - + - - + - - @@ -146,26 +142,26 @@ tasks. -{{ nnodes_proc_smoke }}:ppn={{ ppn_proc_smoke }}"> -{{ nnodes_proc_radar }}:ppn={{ ppn_proc_radar }}"> -{{ nnodes_proc_glmfed }}:ppn={{ ppn_proc_glmfed }}"> -{{ nnodes_proc_bufr }}:ppn={{ ppn_proc_bufr }}"> -{{ nnodes_run_prepstart }}:ppn={{ ppn_run_prepstart }}"> -{{ nnodes_save_restart }}:ppn={{ ppn_save_restart }}"> -{{ nnodes_run_recenter }}:ppn={{ ppn_run_recenter }}"> -{{ nnodes_run_postanal }}:ppn={{ ppn_run_postanal }}"> -{{ nnodes_run_gsidiag }}:ppn={{ ppn_run_gsidiag }}"> -{{ nnodes_prdgen }}:ppn={{ ppn_prdgen }}"> -{{ nnodes_run_nonvarcldanl }}:ppn={{ ppn_run_nonvarcldanl }}"> +{{ nnodes_process_smoke }}:ppn={{ ppn_process_smoke }}"> +{{ nnodes_process_radar }}:ppn={{ ppn_process_radar }}"> +{{ nnodes_process_lightning }}:ppn={{ ppn_process_lightning }}"> +{{ nnodes_process_bufr }}:ppn={{ ppn_process_bufr }}"> +{{ nnodes_prep_cyc }}:ppn={{ ppn_prep_cyc }}"> +{{ nnodes_save_restart }}:ppn={{ ppn_save_restart }}"> +{{ nnodes_recenter }}:ppn={{ ppn_recenter }}"> +{{ nnodes_update_lbc_soil }}:ppn={{ ppn_update_lbc_soil }}"> +{{ nnodes_analysis_gsidiag }}:ppn={{ ppn_analysis_gsidiag }}"> +{{ nnodes_prdgen }}:ppn={{ ppn_prdgen }}"> +{{ nnodes_analysis_nonvarcld }}:ppn={{ ppn_analysis_nonvarcld }}"> {%- if machine in ["WCOSS2"] %} -{{ nnodes_run_bufrsnd }}:ppn={{ ppn_run_bufrsnd }}:tpp={{ tpp_run_bufrsnd }}"> +{{ nnodes_bufrsnd }}:ppn={{ ppn_bufrsnd }}:tpp={{ tpp_bufrsnd }}"> {{ nnodes_post }}:ppn={{ ppn_post }}:tpp={{ tpp_post }}"> -{{ nnodes_run_enkf }}:ppn={{ ppn_run_enkf }}:tpp={{ tpp_run_enkf }}"> +{{ nnodes_analysis_enkf }}:ppn={{ ppn_analysis_enkf }}:tpp={{ tpp_analysis_enkf }}"> {{ nnodes_make_ics }}:ppn={{ ppn_make_ics }}:tpp={{ tpp_make_ics }}"> {{ nnodes_blend_ics }}:ppn={{ ppn_blend_ics }}"> {{ nnodes_make_lbcs }}:ppn={{ ppn_make_lbcs }}:tpp={{ tpp_make_lbcs }}"> -{{ nnodes_run_analysis }}:ppn={{ ppn_run_analysis }}:tpp={{ tpp_run_analysis }}"> +{{ nnodes_analysis_gsi }}:ppn={{ ppn_analysis_gsi }}:tpp={{ tpp_analysis_gsi }}"> {{ nnodes_forecast }}:ppn={{ ppn_forecast }}:tpp={{ tpp_forecast }}"> {{ nnodes_forecast }}:ppn={{ ppn_forecast }}:tpp={{ tpp_forecast }}"> @@ -177,43 +173,43 @@ define resources used for each tasks -l place=excl:scatter"> {%- endif %} {%- elif machine in ["JET"] %} -{{ nnodes_run_bufrsnd }}:ppn={{ ppn_run_bufrsnd }}"> +{{ nnodes_bufrsnd }}:ppn={{ ppn_bufrsnd }}"> {{ nnodes_post }}:ppn={{ ppn_post }}"> -{{ nnodes_run_enkf }}:ppn={{ ppn_run_enkf }}"> +{{ nnodes_analysis_enkf }}:ppn={{ ppn_analysis_enkf }}"> {{ nnodes_make_ics }}:ppn={{ ppn_make_ics }}"> {{ nnodes_blend_ics }}:ppn={{ ppn_blend_ics }}"> {{ nnodes_make_lbcs }}:ppn={{ ppn_make_lbcs }}"> -{{ ncores_run_analysis }}"> +{{ ncores_analysis_gsi }}"> {{ ncores_forecast }}"> {{ ncores_forecast }}"> {{ ncores_per_node }}"> --export=NONE"> -{{ native_run_analysis }} &RRFS_RESERVE;"> +{{ native_analysis_gsi }} &RRFS_RESERVE;"> {{ native_forecast }} &RRFS_RESERVE;"> {{ native_forecast }} &RRFS_RESERVE;"> {%- elif machine in ["HERA"] %} -{{ nnodes_run_bufrsnd }}:ppn={{ ppn_run_bufrsnd }}"> +{{ nnodes_bufrsnd }}:ppn={{ ppn_bufrsnd }}"> {{ nnodes_post }}:ppn={{ ppn_post }}"> -{{ nnodes_run_enkf }}:ppn={{ ppn_run_enkf }}"> +{{ nnodes_analysis_enkf }}:ppn={{ ppn_analysis_enkf }}"> {{ nnodes_make_ics }}:ppn={{ ppn_make_ics }}"> {{ nnodes_blend_ics }}:ppn={{ ppn_blend_ics }}"> {{ nnodes_make_lbcs }}:ppn={{ ppn_make_lbcs }}"> -{{ ncores_run_analysis }}"> +{{ ncores_analysis_gsi }}"> {{ nnodes_forecast }}:ppn={{ ppn_forecast }}"> {{ nnodes_forecast }}:ppn={{ ppn_forecast }}"> {{ ncores_per_node }}"> --export=NONE"> -{{ native_run_analysis }} &RRFS_RESERVE;"> +{{ native_analysis_gsi }} &RRFS_RESERVE;"> {%- else %} -{{ nnodes_run_bufrsnd }}:ppn={{ ppn_run_bufrsnd }}"> +{{ nnodes_bufrsnd }}:ppn={{ ppn_bufrsnd }}"> {{ nnodes_post }}:ppn={{ ppn_post }}"> -{{ nnodes_run_enkf }}:ppn={{ ppn_run_enkf }}"> +{{ nnodes_analysis_enkf }}:ppn={{ ppn_analysis_enkf }}"> {{ nnodes_make_ics }}:ppn={{ ppn_make_ics }}"> {{ nnodes_blend_ics }}:ppn={{ ppn_blend_ics }}"> {{ nnodes_make_lbcs }}:ppn={{ ppn_make_lbcs }}"> -{{ nnodes_run_analysis }}:ppn={{ ppn_run_analysis }}"> +{{ nnodes_analysis_gsi }}:ppn={{ ppn_analysis_gsi }}"> {{ nnodes_forecast }}:ppn={{ ppn_forecast }}"> {{ nnodes_forecast }}:ppn={{ ppn_forecast }}"> {{ ncores_per_node }}"> @@ -223,34 +219,33 @@ define resources used for each tasks {%- endif %} - - - - + + + + - - + + - + - + - + - - - + + - - -{{ memo_prep_cyc}}"> - - - + + +{{ memo_prep_cyc}}"> + + + {%- if do_retro %} @@ -291,8 +286,8 @@ define resources used for each tasks - - + + @@ -465,12 +460,12 @@ MODULES_RUN_TASK_FP script. &RSRV_DEFAULT; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_SMOKE_TN;" "&JOBSdir;/JRRFS_PROCESS_SMOKE" + &LOAD_MODULES_RUN_TASK_FP; "&PROCESS_SMOKE_TN;" "&JOBSdir;/JRRFS_PROCESS_SMOKE" - &RESOURCES_PROC_SMOKE; + &RESOURCES_PROCESS_SMOKE; &NATIVE_ALL; - &WALLTIME_PROC_SMOKE; - &MEMO_PROC_SMOKE; + &WALLTIME_PROCESS_SMOKE; + &MEMO_PROCESS_SMOKE; &NODESIZE_ALL; &TAG;_&PROCESS_SMOKE_TN;_#type# &LOGDIR;/&PROCESS_SMOKE_TN;_#type#_&TAG;_@Y@m@d@H.log @@ -486,7 +481,7 @@ MODULES_RUN_TASK_FP script. - @Y@m@d@H@M00 + @Y@m@d@H@M00 {%- if do_retro %} &FG_ROOT;/&RUN;.@Y@m@d/@H/forecast/RESTART/@Y@m@d.@H0000.coupler.res {%- endif %} @@ -496,24 +491,24 @@ MODULES_RUN_TASK_FP script. {%- endif %} -{%- if do_nonvar_cldanal or do_enkf_radar_ref or do_envar_radar_ref %} +{%- if do_analysis_nonvarcld or do_enkf_radar_ref or do_envar_radar_ref %} - + &RSRV_DEFAULT; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_ANALYSIS_TN;" "&JOBSdir;/JRRFS_PROCESS_RADARREF" + &LOAD_MODULES_RUN_TASK_FP; "&ANALYSIS_GSI_TN;" "&JOBSdir;/JRRFS_PROCESS_RADAR" - &RESOURCES_PROC_RADAR; + &RESOURCES_PROCESS_RADAR; &NATIVE_ALL; - &WALLTIME_PROC_RADAR; + &WALLTIME_PROCESS_RADAR; &NODESIZE_ALL; - &TAG;_&PROCESS_RADAR_REF_TN;_#type# - &LOGDIR;/&PROCESS_RADAR_REF_TN;_#type#_&TAG;_@Y@m@d@H.log + &TAG;_&PROCESS_RADAR_TN;_#type# + &LOGDIR;/&PROCESS_RADAR_TN;_#type#_&TAG;_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; PDY@Y@m@d @@ -539,19 +534,19 @@ MODULES_RUN_TASK_FP script. ************************************************************************ ************************************************************************ --> - + &RSRV_DEFAULT; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_SMOKE_TN;" "&JOBSdir;/JRRFS_PROCESS_GLMFED" + &LOAD_MODULES_RUN_TASK_FP; "&PROCESS_SMOKE_TN;" "&JOBSdir;/JRRFS_PROCESS_LIGHTNING" - &RESOURCES_PROC_GLMFED; + &RESOURCES_PROCESS_LIGHTNING; &NATIVE_ALL; - &WALLTIME_PROC_GLMFED; + &WALLTIME_PROCESS_LIGHTNING; &NODESIZE_ALL; - &TAG;_&PROCESS_GLMFED_TN;_#type# - &LOGDIR;/&PROCESS_GLMFED_TN;_#type#_&TAG;_@Y@m@d@H.log + &TAG;_&PROCESS_LIGHTNING_TN;_#type# + &LOGDIR;/&PROCESS_LIGHTNING_TN;_#type#_&TAG;_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; PDY@Y@m@d @@ -563,7 +558,7 @@ MODULES_RUN_TASK_FP script. KEEPDATAYES - @Y@m@d@H@M00 + @Y@m@d@H@M00 @@ -578,12 +573,12 @@ MODULES_RUN_TASK_FP script. &RSRV_DEFAULT; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_ANALYSIS_TN;" "&JOBSdir;/JRRFS_PROCESS_BUFR" + &LOAD_MODULES_RUN_TASK_FP; "&ANALYSIS_GSI_TN;" "&JOBSdir;/JRRFS_PROCESS_BUFR" - &RESOURCES_PROC_BUFR; + &RESOURCES_PROCESS_BUFR; &NATIVE_ALL; - &WALLTIME_PROC_BUFR; - &MEMO_PROC_BUFR; + &WALLTIME_PROCESS_BUFR; + &MEMO_PROCESS_BUFR; &NODESIZE_ALL; &TAG;_&PROCESS_BUFR_TN;_#type# &LOGDIR;/&PROCESS_BUFR_TN;_#type#_&TAG;_@Y@m@d@H.log @@ -935,16 +930,107 @@ MODULES_RUN_TASK_FP script. {%- if do_spinup %} +{%- if not do_ensinit %} - + &RSRV_DEFAULT; &WALL_LIMIT_PRE; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_PREPSTART_TN;" "&JOBSdir;/JRRFS_RUN_PREPSTART" + &LOAD_MODULES_RUN_TASK_FP; "&PREP_CYC_TN;" "&JOBSdir;/JRRFS_PREP_CYC" + + &RESOURCES_PREP_CYC; + &NATIVE_ALL; + &WALLTIME_PREP_CYC; + &NODESIZE_ALL; + &MEMO_PREP_CYC; + &TAG;_&PREP_CYC_SPINUP_TN;{{ uscore_ensmem_name }} + &LOGDIR;/&PREP_CYC_SPINUP_TN;_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log + + GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + PDY@Y@m@d + HH@H + cyc@H + CDATE@Y@m@d@H + DATAROOT&DATAROOT; + FG_ROOT&FG_ROOT; + LBCS_ROOT&FG_ROOT; + CYCLE_TYPEspinup + {%- if do_ensinit %} + CYCLE_SUBTYPEensinit + {%- endif %} + ENSMEM_INDX{{ ensmem_indx_name }} + GESROOT&GESROOT; + COMROOT&COMROOT; + KEEPDATAYES + + + + + + + {%- for h in cycl_hrs_spinstart %} + {{ h }}@H + {%- endfor %} + + {% if do_ens_blending %} + + {% else %} + + {% endif %} + + {%- for h in range(0,lbcs_search_hrs) %} + + {%- endfor %} + +{%- if do_retro %} + {%- if not do_ensemble %} + &FG_ROOT;/&RUN;.@Y@m@d/@H/forecast_spinup/INPUT/gfs_ctrl.nc + {%- endif %} +{%- else %} + @Y@m@d@H@M00 +{%- endif %} + + + + {%- for h in cycl_hrs_spinstart %} + {{ h }}@H + {%- endfor %} +{%- if do_retro %} + {%- if do_ensemble %} + &FG_ROOT;/&RUN;.@Y@m@d/@H/m#mem#/forecast_spinup/RESTART/@Y@m@d.@H0000.coupler.res + {%- else %} + &FG_ROOT;/&RUN;.@Y@m@d/@H/forecast_spinup/RESTART/@Y@m@d.@H0000.coupler.res + {%- endif %} +{%- else %} + @Y@m@d@H@M00 + {%- if do_ensemble %} + &FG_ROOT;/&RUN;.@Y@m@d/@H/m#mem#/forecast_spinup/RESTART/@Y@m@d.@H0000.coupler.res + {%- else %} + &FG_ROOT;/&RUN;.@Y@m@d/@H/forecast_spinup/RESTART/@Y@m@d.@H0000.coupler.res + {%- endif %} +{%- endif %} + + + + + + +{%- endif %} +{% if do_ensinit -%} + + + + &RSRV_DEFAULT; + &WALL_LIMIT_PRE; + + &LOAD_MODULES_RUN_TASK_FP; "&PREP_CYC_TN;" "&JOBSdir;/JRRFS_PREP_CYC" &RESOURCES_PREP_CYC; &NATIVE_ALL; @@ -1023,7 +1109,6 @@ MODULES_RUN_TASK_FP script. -{% if do_ensinit -%} - + &RSRV_DEFAULT; &WALL_LIMIT_PRE; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_PREPSTART_TN;" "&JOBSdir;/JRRFS_RUN_PREPSTART" + &LOAD_MODULES_RUN_TASK_FP; "&PREP_CYC_TN;" "&JOBSdir;/JRRFS_PREP_CYC" &RESOURCES_PREP_CYC; &NATIVE_ALL; &WALLTIME_PREP_CYC; @@ -1149,7 +1234,7 @@ MODULES_RUN_TASK_FP script. {% endif %} - &ENSCTRL_COMOUT;/@H_spinup/nonvarcldanl_complete.txt + &ENSCTRL_COMOUT;/@H_spinup/analysis_nonvarcld_complete.txt @@ -1160,16 +1245,16 @@ MODULES_RUN_TASK_FP script. ************************************************************************ ************************************************************************ --> - + &RSRV_ENKF; &WALL_LIMIT_RECENTER; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_RECENTER_TN;" &JOBSdir;/JRRFS_RUN_RECENTER - &RESOURCES_RUN_RECENTER; + &LOAD_MODULES_RUN_TASK_FP; "&RECENTER_TN;" &JOBSdir;/JRRFS_RECENTER + &RESOURCES_RECENTER; &NATIVE_ALL; - &WALLTIME_RUN_RECENTER; + &WALLTIME_RECENTER; &NODESIZE_ALL; - &TAG;_&RUN_RECENTER_TN;_spinup - &LOGDIR;/&RUN_RECENTER_TN;_spinup_&TAG;@Y@m@d@H.log + &TAG;_&RECENTER_TN;_spinup + &LOGDIR;/&RECENTER_TN;_spinup_&TAG;@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; nens{{ num_ens_members }} @@ -1191,7 +1276,7 @@ MODULES_RUN_TASK_FP script. {%- endif %} {%- endfor %} - &ENSCTRL_COMOUT;/@H_spinup/nonvarcldanl_complete.txt + &ENSCTRL_COMOUT;/@H_spinup/analysis_nonvarcld_complete.txt @@ -1199,15 +1284,15 @@ MODULES_RUN_TASK_FP script. ************************************************************************ ************************************************************************ --> - + &RSRV_ENKF; &WALL_LIMIT_RECENTER; &LOAD_MODULES_RUN_TASK_FP; "&RUN_RECENTER_TN;" "&JOBSdir;/JRRFS_CALC_ENSMEAN" - &RESOURCES_RUN_RECENTER; + &RESOURCES_RECENTER; &NATIVE_ALL; - &WALLTIME_RUN_RECENTER; + &WALLTIME_RECENTER; &NODESIZE_ALL; &TAG;_&CALC_ENSMEAN_TN;_spinup &LOGDIR;/&CALC_ENSMEAN_TN;_spinup_&TAG;_@Y@m@d@H.log @@ -1225,7 +1310,7 @@ MODULES_RUN_TASK_FP script. - + &FG_ROOT;/&RUN;.@Y@m@d/@H/m#mem#/run_blending @@ -1240,7 +1325,7 @@ MODULES_RUN_TASK_FP script. &RSRV_ANALYSIS; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_ANALYSIS_TN;" "&JOBSdir;/JRRFS_RUN_ANALYSIS" + &LOAD_MODULES_RUN_TASK_FP; "&ANALYSIS_GSI_TN;" "&JOBSdir;/JRRFS_ANALYSIS_GSI" &RESOURCES_ANALYSIS_GSI; &NATIVE_ANALYSIS_GSI; &WALLTIME_ANALYSIS_GSI; @@ -1265,7 +1350,7 @@ MODULES_RUN_TASK_FP script. {%- if do_enkf_radar_ref %} - + {%- endif %} &OBSPATH;/@Y@m@d@H.rap.t@Hz.prepbufr.tm00 @@ -1291,7 +1376,7 @@ MODULES_RUN_TASK_FP script. &RSRV_ANALYSIS; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_ANALYSIS_TN;" "&JOBSdir;/JRRFS_RUN_ANALYSIS" + &LOAD_MODULES_RUN_TASK_FP; "&ANALYSIS_GSI_TN;" "&JOBSdir;/JRRFS_ANALYSIS_GSI" &RESOURCES_ANALYSIS_GSI; &NATIVE_ANALYSIS_GSI; &WALLTIME_ANALYSIS_GSI; @@ -1328,16 +1413,16 @@ MODULES_RUN_TASK_FP script. ************************************************************************ ************************************************************************ --> - + &RSRV_ENKF; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_ENKFUPDT_TN;" &JOBSdir;/JRRFS_RUN_ENKF + &LOAD_MODULES_RUN_TASK_FP; "&ENKFUPDT_TN;" &JOBSdir;/JRRFS_ANALYSIS_ENKF - &RESOURCES_RUN_ENKF; - &WALLTIME_RUN_ENKF; + &RESOURCES_ANALYSIS_ENKF; + &WALLTIME_ANALYSIS_ENKF; &NODESIZE_ALL; - &TAG;_&RUN_ENKFUPDT_TN;_spinup - &LOGDIR;/&RUN_ENKFUPDT_TN;_spinup_&TAG;_@Y@m@d@H.log + &TAG;_&ENKFUPDT_TN;_spinup + &LOGDIR;/&ENKFUPDT_TN;_spinup_&TAG;_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; nens{{ num_ens_members }} @@ -1366,10 +1451,10 @@ MODULES_RUN_TASK_FP script. &RSRV_ENKF; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&ENKF_RADAR_REF_TN;" &JOBSdir;/JRRFS_RUN_ENKF + &LOAD_MODULES_RUN_TASK_FP; "&ENKF_RADAR_REF_TN;" &JOBSdir;/JRRFS_ANALYSIS_ENKF - &RESOURCES_RUN_ENKF; - &WALLTIME_RUN_ENKF; + &RESOURCES_ANALYSIS_ENKF; + &WALLTIME_ANALYSIS_ENKF; &NODESIZE_ALL; &TAG;_&ENKF_RADAR_REF_TN;_spinup &LOGDIR;/&ENKF_RADAR_REF_TN;_spinup_&TAG;_@Y@m@d@H.log @@ -1388,7 +1473,7 @@ MODULES_RUN_TASK_FP script. - + {%- if do_retro %} {%- for m in range(1, num_ens_members+1) %} @@ -1403,7 +1488,7 @@ MODULES_RUN_TASK_FP script. {%- endif %} -{% if do_ensemble and do_nonvar_cldanal %} +{% if do_ensemble and do_analysis_nonvarcld %} {%- for m in range(1, num_ens_members+1) -%}{%- set fmtstr=" %0"~ndigits_ensmem_names~"d" -%}{{- fmtstr%m -}}{%- endfor %} @@ -1412,20 +1497,20 @@ MODULES_RUN_TASK_FP script. ************************************************************************ ************************************************************************ --> - + &RSRV_DEFAULT; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_ANALYSIS_TN;" "&JOBSdir;/JRRFS_NONVARCLDANL" + &LOAD_MODULES_RUN_TASK_FP; "&ANALYSIS_GSI_TN;" "&JOBSdir;/JRRFS_ANALYSIS_NONVARCLD" - &RESOURCES_NONVAR_CLD; - &WALLTIME_NONVAR_CLD; + &RESOURCES_ANALYSIS_NONVARCLD; + &WALLTIME_ANALYSIS_NONVARCLD; &NATIVE_ALL; &NODESIZE_ALL; - &TAG;_&CLDANL_NONVAR_TN;_spinup{{ uscore_ensmem_name }} - &LOGDIR;/&CLDANL_NONVAR_TN;_spinup_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log + &TAG;_&ANALYSIS_NONVARCLD_TN;_spinup{{ uscore_ensmem_name }} + &LOGDIR;/&ANALYSIS_NONVARCLD_TN;_spinup_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; PDY@Y@m@d @@ -1447,13 +1532,13 @@ MODULES_RUN_TASK_FP script. {%- if do_enkf_radar_ref %} {%- else %} - + {%- endif %} {%- elif do_envar_radar_ref and not do_envar_radar_ref_once %} - + {%- for h in cycl_hrs_hyb_fv3lam_ens %} {{ h }}@H {%- endfor %} @@ -1468,7 +1553,7 @@ MODULES_RUN_TASK_FP script. {%- else %} - + {%- endif %} @@ -1488,7 +1573,7 @@ MODULES_RUN_TASK_FP script. &RSRV_ANALYSIS; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_ANALYSIS_TN;" "&JOBSdir;/JRRFS_RUN_ANALYSIS" + &LOAD_MODULES_RUN_TASK_FP; "&ANALYSIS_GSI_TN;" "&JOBSdir;/JRRFS_ANALYSIS_GSI" &RESOURCES_ANALYSIS_GSI; &NATIVE_ANALYSIS_GSI; &WALLTIME_ANALYSIS_GSI; @@ -1523,7 +1608,7 @@ MODULES_RUN_TASK_FP script. {%- if do_retro %} {%- if do_envar_radar_ref and do_envar_radar_ref_once %} - + {%- endif %} @@ -1556,18 +1641,18 @@ MODULES_RUN_TASK_FP script. ************************************************************************ ************************************************************************ --> - + &RSRV_DEFAULT; &WALL_LIMIT_POST; - &LOAD_MODULES_RUN_TASK_FP; "&POST_TN;" "&JOBSdir;/JRRFS_RUN_POSTANAL" - &RESOURCES_POSTANAL; + &LOAD_MODULES_RUN_TASK_FP; "&POST_TN;" "&JOBSdir;/JRRFS_UPDATE_LBC_SOIL" + &RESOURCES_UPDATE_LBC_SOIL; &NATIVE_ALL; - &WALLTIME_POSTANAL; + &WALLTIME_UPDATE_LBC_SOIL; &NODESIZE_ALL; - &TAG;_&POSTANAL_TN;_spinup{{ uscore_ensmem_name }} - &LOGDIR;/&POSTANAL_TN;{{ uscore_ensmem_name }}_spinup_&TAG;_@Y@m@d@H.log + &TAG;_&UPDATE_LBC_SOIL_TN;_spinup{{ uscore_ensmem_name }} + &LOGDIR;/&UPDATE_LBC_SOIL_TN;{{ uscore_ensmem_name }}_spinup_&TAG;_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; PDY@Y@m@d @@ -1604,7 +1689,7 @@ MODULES_RUN_TASK_FP script. &RSRV_ANALYSIS; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&HYBRID_RADAR_REF_TN;" "&JOBSdir;/JRRFS_RUN_ANALYSIS" + &LOAD_MODULES_RUN_TASK_FP; "&HYBRID_RADAR_REF_TN;" "&JOBSdir;/JRRFS_ANALYSIS_GSI" &RESOURCES_ANALYSIS_GSI; &NATIVE_ANALYSIS_GSI; &WALLTIME_ANALYSIS_GSI; @@ -1631,7 +1716,7 @@ MODULES_RUN_TASK_FP script. - + {%- for h in cycl_hrs_hyb_fv3lam_ens %} @@ -1655,13 +1740,13 @@ MODULES_RUN_TASK_FP script. &RSRV_DEFAULT; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_ANALYSIS_TN;" "&JOBSdir;/JRRFS_RUN_GSIDIAG" - &RESOURCES_GSIDIAG; + &LOAD_MODULES_RUN_TASK_FP; "&ANALYSIS_GSI_TN;" "&JOBSdir;/JRRFS_ANALYSIS_GSIDIAG" + &RESOURCES_ANALYSIS_GSIDIAG; &NATIVE_ALL; - &WALLTIME_GSIDIAG; + &WALLTIME_ANALYSIS_GSIDIAG; &NODESIZE_ALL; &TAG;_&ANALYSIS_GSIDIAG_TN;_spinup - &LOGDIR;/&ANALYSIS_GSIDIAG_TN;spinup_&TAG;@Y@m@d@H.log + &LOGDIR;/&ANALYSIS_GSIDIAG_TN;_spinup_&TAG;@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; PDY@Y@m@d @@ -1690,25 +1775,25 @@ MODULES_RUN_TASK_FP script. {%- endif %} -{%- if do_nonvar_cldanal %} +{%- if do_analysis_nonvarcld %} - + &RSRV_DEFAULT; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_ANALYSIS_TN;" "&JOBSdir;/JRRFS_NONVARCLDANL" + &LOAD_MODULES_RUN_TASK_FP; "&ANALYSIS_GSI_TN;" "&JOBSdir;/JRRFS_ANALYSIS_NONVARCLD" - &RESOURCES_NONVAR_CLD; - &WALLTIME_NONVAR_CLD; + &RESOURCES_ANALYSIS_NONVARCLD; + &WALLTIME_ANALYSIS_NONVARCLD; &NATIVE_ALL; &NODESIZE_ALL; - &TAG;_&CLDANL_NONVAR_TN;_spinup{{ uscore_ensmem_name }} - &LOGDIR;/&CLDANL_NONVAR_TN;_spinup_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log + &TAG;_&ANALYSIS_NONVARCLD_TN;_spinup{{ uscore_ensmem_name }} + &LOGDIR;/&ANALYSIS_NONVARCLD_TN;_spinup_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; PDY@Y@m@d @@ -1730,13 +1815,13 @@ MODULES_RUN_TASK_FP script. {%- if do_enkf_radar_ref %} {%- else %} - + {%- endif %} {%- elif do_envar_radar_ref and not do_envar_radar_ref_once %} - + {%- for h in cycl_hrs_hyb_fv3lam_ens %} {{ h }}@H {%- endfor %} @@ -1751,7 +1836,7 @@ MODULES_RUN_TASK_FP script. {%- else %} - + {%- endif %} @@ -1791,13 +1876,13 @@ MODULES_RUN_TASK_FP script. KEEPDATAYES - {%- if do_dacycle and do_nonvar_cldanal%} - + {%- if do_dacycle and do_analysis_nonvarcld%} + {%- elif do_dacycle %} {%- if do_envar_radar_ref and not do_envar_radar_ref_once %} {%- else %} - + {%- endif %} {%- elif do_enkfupdate or do_enkf_radar_ref %} @@ -1810,11 +1895,11 @@ MODULES_RUN_TASK_FP script. {%- if do_ensinit or do_ens_blending %} &FG_ROOT;/&RUN;.@Y@m@d/@H/m#mem#/run_ensinit - + &FG_ROOT;/&RUN;.@Y@m@d/@H/m#mem#/run_blending - + {%- else %} @@ -1976,12 +2061,12 @@ MODULES_RUN_TASK_FP script. ************************************************************************ ************************************************************************ --> - + &RSRV_DEFAULT; &WALL_LIMIT_PRE; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_PREPSTART_TN;" "&JOBSdir;/JRRFS_RUN_PREPSTART" + &LOAD_MODULES_RUN_TASK_FP; "&PREP_CYC_TN;" "&JOBSdir;/JRRFS_PREP_CYC" &RESOURCES_PREP_CYC; &NATIVE_ALL; &WALLTIME_PREP_CYC; @@ -2114,15 +2199,15 @@ MODULES_RUN_TASK_FP script. ************************************************************************ ************************************************************************ --> - + &RSRV_ENKF; &WALL_LIMIT_RECENTER; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_RECENTER_TN;" "&JOBSdir;/JRRFS_CALC_ENSMEAN" - &RESOURCES_RUN_RECENTER; + &LOAD_MODULES_RUN_TASK_FP; "&RECENTER_TN;" "&JOBSdir;/JRRFS_CALC_ENSMEAN" + &RESOURCES_RECENTER; &NATIVE_ALL; - &WALLTIME_RUN_RECENTER; + &WALLTIME_RECENTER; &NODESIZE_ALL; &TAG;_&CALC_ENSMEAN_TN; &LOGDIR;/&CALC_ENSMEAN_TN;_&TAG;_@Y@m@d@H.log @@ -2156,7 +2241,7 @@ MODULES_RUN_TASK_FP script. &RSRV_ANALYSIS; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_ANALYSIS_TN;" "&JOBSdir;/JRRFS_RUN_ANALYSIS" + &LOAD_MODULES_RUN_TASK_FP; "&ANALYSIS_GSI_TN;" "&JOBSdir;/JRRFS_ANALYSIS_GSI" &RESOURCES_ANALYSIS_GSI; &NATIVE_ANALYSIS_GSI; &WALLTIME_ANALYSIS_GSI; @@ -2181,7 +2266,7 @@ MODULES_RUN_TASK_FP script. {%- if do_enkf_radar_ref %} - + {%- endif %} &OBSPATH;/@Y@m@d@H.{{obstype_source}}.t@Hz.prepbufr.tm00 @@ -2209,7 +2294,7 @@ MODULES_RUN_TASK_FP script. &RSRV_ANALYSIS; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_ANALYSIS_TN;" "&JOBSdir;/JRRFS_RUN_ANALYSIS" + &LOAD_MODULES_RUN_TASK_FP; "&ANALYSIS_GSI_TN;" "&JOBSdir;/JRRFS_ANALYSIS_GSI" &RESOURCES_ANALYSIS_GSI; &NATIVE_ANALYSIS_GSI; &WALLTIME_ANALYSIS_GSI; @@ -2248,16 +2333,16 @@ MODULES_RUN_TASK_FP script. ************************************************************************ ************************************************************************ --> - + &RSRV_ENKF; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_ENKFUPDT_TN;" &JOBSdir;/JRRFS_RUN_ENKF + &LOAD_MODULES_RUN_TASK_FP; "&ENKFUPDT_TN;" &JOBSdir;/JRRFS_ANALYSIS_ENKF - &RESOURCES_RUN_ENKF; - &WALLTIME_RUN_ENKF; + &RESOURCES_ANALYSIS_ENKF; + &WALLTIME_ANALYSIS_ENKF; &NODESIZE_ALL; - &TAG;_&RUN_ENKFUPDT_TN; - &LOGDIR;/&RUN_ENKFUPDT_TN;_&TAG;_@Y@m@d@H.log + &TAG;_&ENKFUPDT_TN; + &LOGDIR;/&ENKFUPDT_TN;_&TAG;_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; nens{{ num_ens_members }} @@ -2285,10 +2370,10 @@ MODULES_RUN_TASK_FP script. &RSRV_ENKF; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&ENKF_RADAR_REF_TN;" &JOBSdir;/JRRFS_RUN_ENKF + &LOAD_MODULES_RUN_TASK_FP; "&ENKF_RADAR_REF_TN;" &JOBSdir;/JRRFS_ANALYSIS_ENKF - &RESOURCES_RUN_ENKF; - &WALLTIME_RUN_ENKF; + &RESOURCES_ANALYSIS_ENKF; + &WALLTIME_ANALYSIS_ENKF; &NODESIZE_ALL; &TAG;_&ENKF_RADAR_REF_TN; &LOGDIR;/&ENKF_RADAR_REF_TN;_&TAG;_@Y@m@d@H.log @@ -2306,7 +2391,7 @@ MODULES_RUN_TASK_FP script. - + {%- if do_retro %} {%- for m in range(1, num_ens_members+1) %} @@ -2336,7 +2421,7 @@ MODULES_RUN_TASK_FP script. &RSRV_ANALYSIS; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_ANALYSIS_TN;" "&JOBSdir;/JRRFS_RUN_ANALYSIS" + &LOAD_MODULES_RUN_TASK_FP; "&ANALYSIS_GSI_TN;" "&JOBSdir;/JRRFS_ANALYSIS_GSI" &RESOURCES_ANALYSIS_GSI; &NATIVE_ANALYSIS_GSI; @@ -2374,7 +2459,7 @@ MODULES_RUN_TASK_FP script. {%- if use_rrfse_ens %} {%- if do_envar_radar_ref and do_envar_radar_ref_once %} - + {%- endif %} {%- if do_spinup %} @@ -2413,18 +2498,18 @@ MODULES_RUN_TASK_FP script. ************************************************************************ ************************************************************************ --> - + &RSRV_DEFAULT; &WALL_LIMIT_POST; - &LOAD_MODULES_RUN_TASK_FP; "&POST_TN;" "&JOBSdir;/JRRFS_RUN_POSTANAL" - &RESOURCES_POSTANAL; + &LOAD_MODULES_RUN_TASK_FP; "&POST_TN;" "&JOBSdir;/JRRFS_UPDATE_LBC_SOIL" + &RESOURCES_UPDATE_LBC_SOIL; &NATIVE_ALL; - &WALLTIME_POSTANAL; + &WALLTIME_UPDATE_LBC_SOIL; &NODESIZE_ALL; - &TAG;_&POSTANAL_TN;_prod{{ uscore_ensmem_name }} - &LOGDIR;/&POSTANAL_TN;{{ uscore_ensmem_name }}_prod_&TAG;_@Y@m@d@H.log + &TAG;_&UPDATE_LBC_SOIL_TN;_prod{{ uscore_ensmem_name }} + &LOGDIR;/&UPDATE_LBC_SOIL_TN;{{ uscore_ensmem_name }}_prod_&TAG;_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; PDY@Y@m@d @@ -2461,7 +2546,7 @@ MODULES_RUN_TASK_FP script. &RSRV_ANALYSIS; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&HYBRID_RADAR_REF_TN;" "&JOBSdir;/JRRFS_RUN_ANALYSIS" + &LOAD_MODULES_RUN_TASK_FP; "&HYBRID_RADAR_REF_TN;" "&JOBSdir;/JRRFS_ANALYSIS_GSI" &RESOURCES_ANALYSIS_GSI; &NATIVE_ANALYSIS_GSI; &WALLTIME_ANALYSIS_GSI; @@ -2488,7 +2573,7 @@ MODULES_RUN_TASK_FP script. - + {%- for h in cycl_hrs_hyb_fv3lam_ens %} @@ -2512,10 +2597,10 @@ MODULES_RUN_TASK_FP script. &RSRV_DEFAULT; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_ANALYSIS_TN;" "&JOBSdir;/JRRFS_RUN_GSIDIAG" - &RESOURCES_GSIDIAG; + &LOAD_MODULES_RUN_TASK_FP; "&ANALYSIS_GSI_TN;" "&JOBSdir;/JRRFS_ANALYSIS_GSIDIAG" + &RESOURCES_ANALYSIS_GSIDIAG; &NATIVE_ALL; - &WALLTIME_GSIDIAG; + &WALLTIME_ANALYSIS_GSIDIAG; &NODESIZE_ALL; &TAG;_&ANALYSIS_GSIDIAG_TN;_prod &LOGDIR;/&ANALYSIS_GSIDIAG_TN;prod_&TAG;@Y@m@d@H.log @@ -2547,23 +2632,23 @@ MODULES_RUN_TASK_FP script. {% endif -%} -{%- if do_nonvar_cldanal %} +{%- if do_analysis_nonvarcld %} - + &RSRV_DEFAULT; &WALL_LIMIT_ANALYSIS; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_ANALYSIS_TN;" "&JOBSdir;/JRRFS_NONVARCLDANL" + &LOAD_MODULES_RUN_TASK_FP; "&ANALYSIS_GSI_TN;" "&JOBSdir;/JRRFS_ANALYSIS_NONVARCLD" - &RESOURCES_NONVAR_CLD; - &WALLTIME_NONVAR_CLD; + &RESOURCES_ANALYSIS_NONVARCLD; + &WALLTIME_ANALYSIS_NONVARCLD; {%- if is_rtma %} {%- if machine in ["WCOSS2"] %} - &NATIVE_NONVAR_CLD; + &NATIVE_ANALYSIS_NONVARCLD; {%- else %} &NATIVE_ALL; {%- endif %} @@ -2572,8 +2657,8 @@ MODULES_RUN_TASK_FP script. {%- endif %} &NODESIZE_ALL; - &TAG;_&CLDANL_NONVAR_TN;_prod{{ uscore_ensmem_name }} - &LOGDIR;/&CLDANL_NONVAR_TN;_prod_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log + &TAG;_&ANALYSIS_NONVARCLD_TN;_prod{{ uscore_ensmem_name }} + &LOGDIR;/&ANALYSIS_NONVARCLD_TN;_prod_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; PDY@Y@m@d @@ -2595,13 +2680,13 @@ MODULES_RUN_TASK_FP script. {%- if do_enkf_radar_ref %} {%- else %} - + {%- endif %} {%- elif do_envar_radar_ref and not do_envar_radar_ref_once %} - + {%- for h in cycl_hrs_hyb_fv3lam_ens %} {{ h }}@H {%- endfor %} @@ -2616,7 +2701,7 @@ MODULES_RUN_TASK_FP script. {%- else %} - + {%- endif %} @@ -2635,16 +2720,16 @@ MODULES_RUN_TASK_FP script. ************************************************************************ ************************************************************************ --> - + &RSRV_ENKF; &WALL_LIMIT_RECENTER; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_RECENTER_TN;" &JOBSdir;/JRRFS_RUN_RECENTER - &RESOURCES_RUN_RECENTER; + &LOAD_MODULES_RUN_TASK_FP; "&RECENTER_TN;" &JOBSdir;/JRRFS_RECENTER + &RESOURCES_RECENTER; &NATIVE_ALL; - &WALLTIME_RUN_RECENTER; + &WALLTIME_RECENTER; &NODESIZE_ALL; - &TAG;_&RUN_RECENTER_TN; - &LOGDIR;/&RUN_RECENTER_TN;_&TAG;_@Y@m@d@H.log + &TAG;_&RECENTER_TN; + &LOGDIR;/&RECENTER_TN;_&TAG;_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; nens{{ num_ens_members }} @@ -2669,20 +2754,20 @@ MODULES_RUN_TASK_FP script. {%- else %} - {%- if do_nonvar_cldanal %} + {%- if do_analysis_nonvarcld %} {%- for m in range(1, num_ens_members+1) %} - + {%- endfor %} {%- elif do_enkf_radar_ref %} {%- elif do_enkfupdate %} - + {%- endif %} - &ENSCTRL_COMOUT;/@H/nonvarcldanl_complete.txt - &ENSCTRL_COMOUT;/@H_spinup/nonvarcldanl_complete.txt + &ENSCTRL_COMOUT;/@H/analysis_nonvarcld_complete.txt + &ENSCTRL_COMOUT;/@H_spinup/analysis_nonvarcld_complete.txt {% endif %} @@ -2728,7 +2813,7 @@ MODULES_RUN_TASK_FP script. {%- if do_ensfcst %} - + {%- else %} {%- if do_recenter %} @@ -2738,21 +2823,21 @@ MODULES_RUN_TASK_FP script. {{ h }}@H {%- endfor %} - + {%- for h in cycl_hrs_recenter %} {{ h }}@H {%- endfor %} - + - {%- elif do_nonvar_cldanal%} - + {%- elif do_analysis_nonvarcld%} + {%- elif do_enkf_radar_ref %} {%- elif do_enkfupdate %} - + {%- endif %} {%- endif %} @@ -2799,18 +2884,18 @@ MODULES_RUN_TASK_FP script. {%- if do_ensfcst %} {%- if do_recenter %} - + {%- else %} {%- endif %} {%- else %} - {%- if do_dacycle and do_nonvar_cldanal%} - + {%- if do_dacycle and do_analysis_nonvarcld%} + {%- elif do_dacycle %} {%- if do_envar_radar_ref and not do_envar_radar_ref_once %} {%- else %} - + {%- endif %} {%- elif do_enkfupdate or do_enkf_radar_ref %} {%- if do_recenter %} @@ -2821,21 +2906,21 @@ MODULES_RUN_TASK_FP script. {{ h }}@H {%- endfor %} - + {%- for h in cycl_hrs_recenter %} {{ h }}@H {%- endfor %} - + - {%- elif do_nonvar_cldanal%} - + {%- elif do_analysis_nonvarcld%} + {%- elif do_enkf_radar_ref %} {%- else %} - + {%- endif %} {%- else %} @@ -2874,13 +2959,13 @@ MODULES_RUN_TASK_FP script. KEEPDATAYES - {%- if do_dacycle and do_nonvar_cldanal%} - + {%- if do_dacycle and do_analysis_nonvarcld%} + {%- elif do_dacycle %} {%- if do_envar_radar_ref and not do_envar_radar_ref_once %} {%- else %} - + {%- endif %} {%- elif do_enkfupdate or do_enkf_radar_ref %} {%- if do_recenter %} @@ -2891,21 +2976,21 @@ MODULES_RUN_TASK_FP script. {{ h }}@H {%- endfor %} - + {%- for h in cycl_hrs_recenter %} {{ h }}@H {%- endfor %} - + - {%- elif do_nonvar_cldanal%} - + {%- elif do_analysis_nonvarcld%} + {%- elif do_enkf_radar_ref %} {%- else %} - + {%- endif %} {%- else %} @@ -3225,16 +3310,16 @@ MODULES_RUN_TASK_FP script. ************************************************************************ ************************************************************************ --> - + &RSRV_POST; &WALL_LIMIT_BUFRSND; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_BUFRSND_TN;" "&JOBSdir;/JRRFS_BUFRSND" - &RESOURCES_RUN_BUFRSND; - {{ wtime_run_bufrsnd }} + &LOAD_MODULES_RUN_TASK_FP; "&BUFRSND_TN;" "&JOBSdir;/JRRFS_BUFRSND" + &RESOURCES_BUFRSND; + {{ wtime_bufrsnd }} &NODESIZE_ALL; - &TAG;_&RUN_BUFRSND_TN; - &LOGDIR;/&RUN_BUFRSND_TN;_&TAG;_@Y@m@d@H.log + &TAG;_&BUFRSND_TN; + &LOGDIR;/&BUFRSND_TN;_&TAG;_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; PDY@Y@m@d @@ -3259,16 +3344,16 @@ MODULES_RUN_TASK_FP script. {%- if do_ensfcst %} - + &RSRV_POST; &WALL_LIMIT_BUFRSND; - &LOAD_MODULES_RUN_TASK_FP; "&RUN_BUFRSND_TN;" "&JOBSdir;/JRRFS_BUFRSND" - &RESOURCES_RUN_BUFRSND; - {{ wtime_run_bufrsnd }} + &LOAD_MODULES_RUN_TASK_FP; "&BUFRSND_TN;" "&JOBSdir;/JRRFS_BUFRSND" + &RESOURCES_BUFRSND; + {{ wtime_bufrsnd }} &NODESIZE_ALL; - &TAG;_&RUN_BUFRSND_TN;{{ uscore_ensmem_name }} - &LOGDIR;/&RUN_BUFRSND_TN;_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log + &TAG;_&BUFRSND_TN;{{ uscore_ensmem_name }} + &LOGDIR;/&BUFRSND_TN;_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; PDY@Y@m@d diff --git a/scripts/exrrfs_run_enkf.sh b/scripts/exrrfs_analysis_enkf.sh similarity index 97% rename from scripts/exrrfs_run_enkf.sh rename to scripts/exrrfs_analysis_enkf.sh index 6f4796a07..990ef6a97 100755 --- a/scripts/exrrfs_run_enkf.sh +++ b/scripts/exrrfs_analysis_enkf.sh @@ -59,28 +59,28 @@ case $MACHINE in # export FI_OFI_RXM_SAR_LIMIT=3145728 export OMP_STACKSIZE=2G - export OMP_NUM_THREADS=${TPP_RUN_ENKF} + export OMP_NUM_THREADS=${TPP_ANALYSIS_ENKF} export OMP_PROC_BIND=close export OMP_PLACES=threads export MPICH_RANK_REORDER_METHOD=0 - ncores=$(( NNODES_RUN_ENKF*PPN_RUN_ENKF )) - APRUN="mpiexec -n ${ncores} -ppn ${PPN_RUN_ENKF} --label --line-buffer --cpu-bind core --depth ${OMP_NUM_THREADS}" + ncores=$(( NNODES_ANALYSIS_ENKF*PPN_ANALYSIS_ENKF )) + APRUN="mpiexec -n ${ncores} -ppn ${PPN_ANALYSIS_ENKF} --label --line-buffer --cpu-bind core --depth ${OMP_NUM_THREADS}" ;; # "HERA") - export OMP_NUM_THREADS=${TPP_RUN_ENKF} + export OMP_NUM_THREADS=${TPP_ANALYSIS_ENKF} # export OMP_STACKSIZE=300M APRUN="srun" ;; # "ORION") - export OMP_NUM_THREADS=${TPP_RUN_ENKF} + export OMP_NUM_THREADS=${TPP_ANALYSIS_ENKF} export OMP_STACKSIZE=1024M APRUN="srun" ;; # "HERCULES") - export OMP_NUM_THREADS=${TPP_RUN_ENKF} + export OMP_NUM_THREADS=${TPP_ANALYSIS_ENKF} export OMP_STACKSIZE=1024M APRUN="srun" ;; @@ -158,7 +158,7 @@ for imem in $(seq 1 $nens) ensmean; do #----------------------------------------------------------------------- # if [ "${netcdf_diag}" = ".true." ] ; then - # Note, listall_rad is copied from exrrfs_run_analysis.sh + # Note, listall_rad is copied from exrrfs_analysis_gsi.sh listall_rad="hirs2_n14 msu_n14 sndr_g08 sndr_g11 sndr_g11 sndr_g12 sndr_g13 sndr_g08_prep sndr_g11_prep sndr_g12_prep sndr_g13_prep sndrd1_g11 sndrd2_g11 sndrd3_g11 sndrd4_g11 sndrd1_g15 sndrd2_g15 sndrd3_g15 sndrd4_g15 sndrd1_g13 sndrd2_g13 sndrd3_g13 sndrd4_g13 hirs3_n15 hirs3_n16 hirs3_n17 amsua_n15 amsua_n16 amsua_n17 amsua_n18 amsua_n19 amsua_metop-a amsua_metop-b amsua_metop-c amsub_n15 amsub_n16 amsub_n17 hsb_aqua airs_aqua amsua_aqua imgr_g08 imgr_g11 imgr_g12 pcp_ssmi_dmsp pcp_tmi_trmm conv sbuv2_n16 sbuv2_n17 sbuv2_n18 omi_aura ssmi_f13 ssmi_f14 ssmi_f15 hirs4_n18 hirs4_metop-a mhs_n18 mhs_n19 mhs_metop-a mhs_metop-b mhs_metop-c amsre_low_aqua amsre_mid_aqua amsre_hig_aqua ssmis_las_f16 ssmis_uas_f16 ssmis_img_f16 ssmis_env_f16 iasi_metop-a iasi_metop-b iasi_metop-c seviri_m08 seviri_m09 seviri_m10 seviri_m11 cris_npp atms_npp ssmis_f17 cris-fsr_npp cris-fsr_n20 atms_n20 abi_g16" if [ "${OB_TYPE}" = "conv" ]; then @@ -232,7 +232,7 @@ cp $CONVINFO convinfo cp $OZINFO ozinfo if [ "${DO_ENS_RADDA}" = "TRUE" ]; then - # This follows the procedure of DO_RADDA=TRUE in exrrfs_run_analysis.sh, with differences below + # This follows the procedure of DO_RADDA=TRUE in exrrfs_analysis_gsi.sh, with differences below # - The check for "spinup" or "prod" is not performed, as there is only one spinup cycle. # - The file check is back in time for up to 72 hours only. EnVar checks up to 240 hours back. # - No $satbias_dir is defined in EnKF. Thus, it is defined as below. diff --git a/scripts/exrrfs_run_analysis.sh b/scripts/exrrfs_analysis_gsi.sh similarity index 97% rename from scripts/exrrfs_run_analysis.sh rename to scripts/exrrfs_analysis_gsi.sh index c169bf366..8324165cf 100755 --- a/scripts/exrrfs_run_analysis.sh +++ b/scripts/exrrfs_analysis_gsi.sh @@ -61,31 +61,31 @@ case $MACHINE in # export FI_OFI_RXM_SAR_LIMIT=3145728 export OMP_STACKSIZE=500M - export OMP_NUM_THREADS=${TPP_RUN_ANALYSIS} - ncores=$(( NNODES_RUN_ANALYSIS*PPN_RUN_ANALYSIS)) - APRUN="mpiexec -n ${ncores} -ppn ${PPN_RUN_ANALYSIS} --cpu-bind core --depth ${OMP_NUM_THREADS}" + export OMP_NUM_THREADS=${TPP_ANALYSIS_GSI} + ncores=$(( NNODES_ANALYSIS_GSI*PPN_ANALYSIS_GSI)) + APRUN="mpiexec -n ${ncores} -ppn ${PPN_ANALYSIS_GSI} --cpu-bind core --depth ${OMP_NUM_THREADS}" ;; # "HERA") - export OMP_NUM_THREADS=${TPP_RUN_ANALYSIS} + export OMP_NUM_THREADS=${TPP_ANALYSIS_GSI} export OMP_STACKSIZE=300M APRUN="srun" ;; # "ORION") - export OMP_NUM_THREADS=${TPP_RUN_ANALYSIS} + export OMP_NUM_THREADS=${TPP_ANALYSIS_GSI} export OMP_STACKSIZE=1024M APRUN="srun" ;; # "HERCULES") - export OMP_NUM_THREADS=${TPP_RUN_ANALYSIS} + export OMP_NUM_THREADS=${TPP_ANALYSIS_GSI} export OMP_STACKSIZE=1024M APRUN="srun" ;; # "JET") - export OMP_NUM_THREADS=${TPP_RUN_ANALYSIS} + export OMP_NUM_THREADS=${TPP_ANALYSIS_GSI} export OMP_STACKSIZE=1024M APRUN="srun" ;; @@ -476,17 +476,17 @@ if [[ ${GSI_TYPE} == "OBSERVER" || ${anav_type} == "conv" || ${anav_type} == "co if [ "${anav_type}" = "conv_dbz" ]; then obs_number=${#obs_files_source[@]} if [ "${CYCLE_TYPE}" = "spinup" ]; then - obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radarref_spinup_${envir}_${cyc}/Gridded_ref.nc + obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radar_spinup_${envir}_${cyc}/Gridded_ref.nc else - obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radarref_${envir}_${cyc}/Gridded_ref.nc + obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radar_${envir}_${cyc}/Gridded_ref.nc fi obs_files_target[${obs_number}]=dbzobs.nc if [ "${DO_GLM_FED_DA}" = "TRUE" ]; then obs_number=${#obs_files_source[@]} if [ "${CYCLE_TYPE}" = "spinup" ]; then - obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_glmfed_spinup_${envir}_${cyc}/fedobs.nc + obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_lightning_spinup_${envir}_${cyc}/fedobs.nc else - obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_glmfed_${envir}_${cyc}/fedobs.nc + obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_lightning_${envir}_${cyc}/fedobs.nc fi obs_files_target[${obs_number}]=fedobs.nc fi @@ -495,14 +495,14 @@ if [[ ${GSI_TYPE} == "OBSERVER" || ${anav_type} == "conv" || ${anav_type} == "co if [ "${DO_ENKF_RADAR_REF}" = "TRUE" ]; then obs_number=${#obs_files_source[@]} if [ "${CYCLE_TYPE}" = "spinup" ]; then - obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radarref_spinup_enkf_${envir}_${cyc}/Gridded_ref.nc + obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radar_spinup_enkf_${envir}_${cyc}/Gridded_ref.nc else - obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radarref_enkf_${envir}_${cyc}/Gridded_ref.nc + obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radar_enkf_${envir}_${cyc}/Gridded_ref.nc fi obs_files_target[${obs_number}]=dbzobs.nc if [ "${DO_GLM_FED_DA}" = "TRUE" ]; then obs_number=${#obs_files_source[@]} - obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_glmfed_enkf_${envir}_${cyc}/fedobs.nc + obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_lightning_enkf_${envir}_${cyc}/fedobs.nc obs_files_target[${obs_number}]=fedobs.nc fi fi @@ -511,16 +511,16 @@ else if [ "${anav_type}" = "radardbz" ]; then if [ "${CYCLE_TYPE}" = "spinup" ]; then - obs_files_source[0]=${DATAROOT}/${RUN}_process_radarref_spinup_${envir}_${cyc}/Gridded_ref.nc + obs_files_source[0]=${DATAROOT}/${RUN}_process_radar_spinup_${envir}_${cyc}/Gridded_ref.nc else - obs_files_source[0]=${DATAROOT}/${RUN}_process_radarref_${envir}_${cyc}/Gridded_ref.nc + obs_files_source[0]=${DATAROOT}/${RUN}_process_radar_${envir}_${cyc}/Gridded_ref.nc fi obs_files_target[0]=dbzobs.nc if [ "${DO_GLM_FED_DA}" = "TRUE" ]; then if [ "${CYCLE_TYPE}" = "spinup" ]; then - obs_files_source[1]=${DATAROOT}/${RUN}_process_glmfed_spinup_${envir}_${cyc}/fedobs.nc + obs_files_source[1]=${DATAROOT}/${RUN}_process_lightning_spinup_${envir}_${cyc}/fedobs.nc else - obs_files_source[1]=${DATAROOT}/${RUN}_process_glmfed_${envir}_${cyc}/fedobs.nc + obs_files_source[1]=${DATAROOT}/${RUN}_process_lightning_${envir}_${cyc}/fedobs.nc fi obs_files_target[1]=fedobs.nc fi diff --git a/scripts/exrrfs_run_gsidiag.sh b/scripts/exrrfs_analysis_gsidiag.sh similarity index 98% rename from scripts/exrrfs_run_gsidiag.sh rename to scripts/exrrfs_analysis_gsidiag.sh index d0971f41d..ef5b21869 100755 --- a/scripts/exrrfs_run_gsidiag.sh +++ b/scripts/exrrfs_analysis_gsidiag.sh @@ -62,8 +62,8 @@ case $MACHINE in export FI_OFI_RXM_SAR_LIMIT=3145728 export OMP_STACKSIZE=1G export OMP_NUM_THREADS=1 - ncores=$(( NNODES_RUN_GSIDIAG*PPN_RUN_GSIDIAG )) - APRUN="mpiexec -n ${ncores} -ppn ${PPN_RUN_GSIDIAG} --cpu-bind core --depth ${OMP_NUM_THREADS}" + ncores=$(( NNODES_ANALYSIS_GSIDIAG*PPN_ANALYSIS_GSIDIAG )) + APRUN="mpiexec -n ${ncores} -ppn ${PPN_ANALYSIS_GSIDIAG} --cpu-bind core --depth ${OMP_NUM_THREADS}" ;; # "HERA") diff --git a/scripts/exrrfs_nonvarcldanl.sh b/scripts/exrrfs_analysis_nonvarcld.sh similarity index 95% rename from scripts/exrrfs_nonvarcldanl.sh rename to scripts/exrrfs_analysis_nonvarcld.sh index e941d72c9..ad428d2cc 100755 --- a/scripts/exrrfs_nonvarcldanl.sh +++ b/scripts/exrrfs_analysis_nonvarcld.sh @@ -58,8 +58,8 @@ ulimit -a case $MACHINE in # "WCOSS2") - ncores=$(( NNODES_RUN_NONVARCLDANL*PPN_RUN_NONVARCLDANL )) - APRUN="mpiexec -n ${ncores} -ppn ${PPN_RUN_NONVARCLDANL}" + ncores=$(( NNODES_ANALYSIS_NONVARCLD*PPN_ANALYSIS_NONVARCLD )) + APRUN="mpiexec -n ${ncores} -ppn ${PPN_ANALYSIS_NONVARCLD}" ;; # "HERA") @@ -129,7 +129,7 @@ fi if [ ${l_cld_uncertainty} == ".true." ]; then # Copy analysis fields into uncertainties - data will be overwritten - echo "exrrfs_nonvarcldanl.sh: copy tracer file into uncertainty file " + echo "exrrfs_analysis_nonvarcld.sh: copy tracer file into uncertainty file " cp ${bkpath}/fv_tracer.res.tile1.nc ${bkpath}/fv_tracer.unc.tile1.nc fi @@ -202,7 +202,7 @@ do done # radar reflectivity on esg grid over each subdomain. -process_radarref_path=${DATAROOT}/${RUN}_process_radarref${cycle_tag}_${envir}_${cyc} +process_radarref_path=${DATAROOT}/${RUN}_process_radar${cycle_tag}_${envir}_${cyc} ss=0 for bigmin in 0; do bigmin=$( printf %2.2i $bigmin ) @@ -307,11 +307,11 @@ fi # #----------------------------------------------------------------------- # -# touch nonvarcldanl_complete.txt to indicate competion of this task +# touch analysis_nonvarcld_complete.txt to indicate competion of this task # #----------------------------------------------------------------------- # -touch ${COMOUT}/nonvarcldanl_complete.txt +touch ${COMOUT}/analysis_nonvarcld_complete.txt # #----------------------------------------------------------------------- # diff --git a/scripts/exrrfs_bufrsnd.sh b/scripts/exrrfs_bufrsnd.sh index 721596c55..364f3cdae 100755 --- a/scripts/exrrfs_bufrsnd.sh +++ b/scripts/exrrfs_bufrsnd.sh @@ -57,8 +57,8 @@ ulimit -a case $MACHINE in "WCOSS2") - ncores=$(( NNODES_RUN_BUFRSND*PPN_RUN_BUFRSND )) - APRUNC="mpiexec -n ${ncores} -ppn ${PPN_RUN_BUFRSND}" + ncores=$(( NNODES_BUFRSND*PPN_BUFRSND )) + APRUNC="mpiexec -n ${ncores} -ppn ${PPN_BUFRSND}" APRUNS="time" ;; diff --git a/scripts/exrrfs_run_prepstart.sh b/scripts/exrrfs_prep_cyc.sh similarity index 99% rename from scripts/exrrfs_run_prepstart.sh rename to scripts/exrrfs_prep_cyc.sh index fa410bfa6..83ab7a782 100755 --- a/scripts/exrrfs_run_prepstart.sh +++ b/scripts/exrrfs_prep_cyc.sh @@ -42,7 +42,7 @@ print_info_msg " Entering script: \"${scrfunc_fn}\" In directory: \"${scrfunc_dir}\" -This is the ex-script for the prepstart tasks for the specified cycle. +This is the ex-script for the prep_cyc tasks for the specified cycle. ========================================================================" # #----------------------------------------------------------------------- @@ -54,8 +54,8 @@ This is the ex-script for the prepstart tasks for the specified cycle. case $MACHINE in "WCOSS2") - ncores=$(( NNODES_RUN_PREPSTART*PPN_RUN_PREPSTART)) - APRUN="mpiexec -n ${ncores} -ppn ${PPN_RUN_PREPSTART}" + ncores=$(( NNODES_PREP_CYC*PPN_PREP_CYC)) + APRUN="mpiexec -n ${ncores} -ppn ${PPN_PREP_CYC}" ;; "HERA") @@ -318,8 +318,8 @@ else # # First decide the source of the first guess (fg_restart_dirname) depending on CYCLE_TYPE and BKTYPE: # 1. If cycle is spinup cycle (CYCLE_TYPE == spinup) or it is the product start cycle (BKTYPE==2), - # looking for the first guess from spinup forecast (fcst_fv3lam_spinup) - # 2. Others, looking for the first guess from product forecast (fcst_fv3lam) + # looking for the first guess from spinup forecast (forecast_spinup) + # 2. Others, looking for the first guess from product forecast (forecast) # if [ "${CYCLE_TYPE}" = "spinup" ] || [ ${BKTYPE} -eq 2 ]; then fg_restart_dirname=forecast_spinup @@ -631,7 +631,7 @@ if [ "${DO_SMOKE_DUST}" = "TRUE" ] && [ "${CYCLE_TYPE}" = "spinup" ]; then # cy fi if [ "${if_cycle_smoke_dust}" = "TRUE" ] ; then # figure out which surface is available - surface_file_dir_name=fcst_fv3lam + surface_file_dir_name=forecast bkpath_find="missing" restart_prefix_find="missing" restart_prefix=$( date +%Y%m%d.%H0000. -d "${START_DATE}" ) diff --git a/scripts/exrrfs_process_glmfed.py b/scripts/exrrfs_process_lightning.py similarity index 100% rename from scripts/exrrfs_process_glmfed.py rename to scripts/exrrfs_process_lightning.py diff --git a/scripts/exrrfs_process_radarref.sh b/scripts/exrrfs_process_radar.sh similarity index 98% rename from scripts/exrrfs_process_radarref.sh rename to scripts/exrrfs_process_radar.sh index 39ceca51f..867ed6dc3 100755 --- a/scripts/exrrfs_process_radarref.sh +++ b/scripts/exrrfs_process_radar.sh @@ -62,8 +62,8 @@ ulimit -a case $MACHINE in # "WCOSS2") - ncores=$(( NNODES_PROC_RADAR*PPN_PROC_RADAR)) - APRUN="mpiexec -n ${ncores} -ppn ${PPN_PROC_RADAR}" + ncores=$(( NNODES_PROCESS_RADAR*PPN_PROCESS_RADAR)) + APRUN="mpiexec -n ${ncores} -ppn ${PPN_PROCESS_RADAR}" ;; # "HERA") diff --git a/scripts/exrrfs_run_recenter.sh b/scripts/exrrfs_recenter.sh similarity index 98% rename from scripts/exrrfs_run_recenter.sh rename to scripts/exrrfs_recenter.sh index c8f2a6d9e..d9063c902 100755 --- a/scripts/exrrfs_run_recenter.sh +++ b/scripts/exrrfs_recenter.sh @@ -58,8 +58,8 @@ case $MACHINE in export FI_OFI_RXM_SAR_LIMIT=3145728 export OMP_STACKSIZE=500M export OMP_NUM_THREADS=1 - ncores=$(( NNODES_RUN_RECENTER*PPN_RUN_RECENTER )) - APRUN="mpiexec -n ${ncores} -ppn ${PPN_RUN_RECENTER} --cpu-bind core --depth ${OMP_NUM_THREADS}" + ncores=$(( NNODES_RECENTER*PPN_RECENTER )) + APRUN="mpiexec -n ${ncores} -ppn ${PPN_RECENTER} --cpu-bind core --depth ${OMP_NUM_THREADS}" ;; # "HERA") diff --git a/scripts/exrrfs_save_restart.sh b/scripts/exrrfs_save_restart.sh index 54a144b60..e8e3d8fcc 100755 --- a/scripts/exrrfs_save_restart.sh +++ b/scripts/exrrfs_save_restart.sh @@ -127,7 +127,7 @@ if [[ ${DO_GLM_FED_DA} = TRUE && ${DO_ENSEMBLE} != TRUE ]]; then export restart_prefix=${restart_prefix} export PREP_MODEL=2 ncap2 -O -v -s 'flash_extent_density=ref_f3d' ${NWGES_DIR}/RESTART/${restart_prefix}.phy_data.nc ${NWGES_DIR}/RESTART/${restart_prefix}.tmp.nc - python -u ${SCRIPTSdir}/exrrfs_process_glmfed.py + python -u ${SCRIPTSdir}/exrrfs_process_lightning.py ncks -A -C -v flash_extent_density ${NWGES_DIR}/RESTART/${restart_prefix}.tmp.nc ${NWGES_DIR}/RESTART/${restart_prefix}.phy_data.nc rm ${NWGES_DIR}/RESTART/${restart_prefix}.tmp.nc fi @@ -143,7 +143,7 @@ if [[ ${DO_ENSEMBLE} = TRUE && ${fhr} -eq 1 && ${PREP_MODEL_FOR_FED} = TRUE ]]; export PREP_MODEL=2 ncap2 -O -v -s 'flash_extent_density=ref_f3d' ${NWGES_DIR}/RESTART/${restart_prefix}.phy_data.nc ${NWGES_DIR}/RESTART/${restart_prefix}.tmp.nc - python -u ${SCRIPTSdir}/exrrfs_process_glmfed.py + python -u ${SCRIPTSdir}/exrrfs_process_lightning.py ncks -A -C -v flash_extent_density ${NWGES_DIR}/RESTART/${restart_prefix}.tmp.nc ${NWGES_DIR}/RESTART/${restart_prefix}.phy_data.nc rm ${NWGES_DIR}/RESTART/${restart_prefix}.tmp.nc fi @@ -199,7 +199,7 @@ if [[ ${DO_GLM_FED_DA} = TRUE && ${DO_ENSEMBLE} != TRUE ]]; then time_0=`date +%s` ncap2 -O -v -s 'flash_extent_density=ref_f3d' ${NWGES_DIR}/RESTART/${restart_prefix}.phy_data.nc ${NWGES_DIR}/RESTART/${restart_prefix}.tmp.nc time_1=`date +%s` - python -u ${SCRIPTSdir}/exrrfs_process_glmfed.py + python -u ${SCRIPTSdir}/exrrfs_process_lightning.py time_2=`date +%s` ncks -A -C -v flash_extent_density ${NWGES_DIR}/RESTART/${restart_prefix}.tmp.nc ${NWGES_DIR}/RESTART/${restart_prefix}.phy_data.nc time_3=`date +%s` @@ -224,7 +224,7 @@ if [[ ${DO_ENSEMBLE} = TRUE && ${fhr} -eq 1 && ${PREP_MODEL_FOR_FED} = TRUE ]]; time_0=`date +%s` ncap2 -O -v -s 'flash_extent_density=ref_f3d' ${NWGES_DIR}/RESTART/${restart_prefix}.phy_data.nc ${NWGES_DIR}/RESTART/${restart_prefix}.tmp.nc time_1=`date +%s` - python -u ${SCRIPTSdir}/exrrfs_process_glmfed.py + python -u ${SCRIPTSdir}/exrrfs_process_lightning.py time_2=`date +%s` ncks -A -C -v flash_extent_density ${NWGES_DIR}/RESTART/${restart_prefix}.tmp.nc ${NWGES_DIR}/RESTART/${restart_prefix}.phy_data.nc time_3=`date +%s` diff --git a/scripts/exrrfs_run_postanal.sh b/scripts/exrrfs_update_lbc_soil.sh similarity index 94% rename from scripts/exrrfs_run_postanal.sh rename to scripts/exrrfs_update_lbc_soil.sh index eb1aca22f..5e7c02e44 100755 --- a/scripts/exrrfs_run_postanal.sh +++ b/scripts/exrrfs_update_lbc_soil.sh @@ -42,8 +42,8 @@ print_info_msg " Entering script: \"${scrfunc_fn}\" In directory: \"${scrfunc_dir}\" -This is the ex-script for the task that runs a analysis with FV3 for the -specified cycle. +This is the ex-script for the task that runs the applications after +analysis with RRFS for the specified cycle. ========================================================================" # #----------------------------------------------------------------------- @@ -61,8 +61,8 @@ case $MACHINE in export FI_OFI_RXM_SAR_LIMIT=3145728 export OMP_STACKSIZE=500M export OMP_NUM_THREADS=1 - ncores=$(( NNODES_RUN_POSTANAL*PPN_RUN_POSTANAL)) - APRUN="mpiexec -n ${ncores} -ppn ${PPN_RUN_POSTANAL} --cpu-bind core --depth ${OMP_NUM_THREADS}" + ncores=$(( NNODES_UPDATE_LBC_SOIL*PPN_UPDATE_LBC_SOIL)) + APRUN="mpiexec -n ${ncores} -ppn ${PPN_UPDATE_LBC_SOIL} --cpu-bind core --depth ${OMP_NUM_THREADS}" ;; "HERA") @@ -211,7 +211,7 @@ fi # print_info_msg " ======================================================================== -post analysis completed successfully!!! +Update LBC soil completed successfully!!! Exiting script: \"${scrfunc_fn}\" In directory: \"${scrfunc_dir}\" diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh index 685befb41..a7e5879ff 100644 --- a/ush/config_defaults.sh +++ b/ush/config_defaults.sh @@ -1797,27 +1797,25 @@ MAKE_LBCS_TN="make_lbcs" FORECAST_TN="forecast" POST_TN="post" PRDGEN_TN="prdgen" -RUN_BUFRSND_TN="run_bufrsnd" +BUFRSND_TN="bufrsnd" -ANALYSIS_GSI_TN="analysis_gsi_input" +ANALYSIS_GSI_TN="analysis_gsi" ANALYSIS_GSIDIAG_TN="analysis_gsi_diag" -POSTANAL_TN="postanal_input" +UPDATE_LBC_SOIL_TN="update_lbc_soil" OBSERVER_GSI_ENSMEAN_TN="observer_gsi_ensmean" OBSERVER_GSI_TN="observer_gsi" -PREP_START_TN="prep_start" PREP_CYC_SPINUP_TN="prep_cyc_spinup" PREP_CYC_PROD_TN="prep_cyc_prod" -PREP_CYC_ENSMEAN_TN="prep_cyc_ensmean" PREP_CYC_TN="prep_cyc" CALC_ENSMEAN_TN="calc_ensmean" -PROCESS_RADAR_REF_TN="process_radarref" +PROCESS_RADAR_TN="process_radar" RADAR_REF_THINNING="1" PROCESS_BUFR_TN="process_bufr" PROCESS_SMOKE_TN="process_smoke" -CLDANL_NONVAR_TN="cldanl_nonvar" +ANALYSIS_NONVARCLD_TN="analysis_nonvarcld" SAVE_RESTART_TN="save_restart" SAVE_DA_OUTPUT_TN="save_da_output" -PROCESS_GLMFED_TN="process_glmfed" +PROCESS_LIGHTNING_TN="process_lightning" # # Number of nodes. # @@ -1829,33 +1827,31 @@ NNODES_GET_EXTRN_LBCS="1" NNODES_MAKE_ICS="4" NNODES_BLEND_ICS="1" NNODES_MAKE_LBCS="4" -NNODES_RUN_PREPSTART="1" +NNODES_PREP_CYC="1" NNODES_FORECAST="" # This is calculated in the workflow generation scripts, so no need to set here. NNODES_POST="2" NNODES_PRDGEN="1" -NNODES_RUN_ANALYSIS="16" -NNODES_RUN_GSIDIAG="1" -NNODES_RUN_POSTANAL="1" -NNODES_RUN_ENKF="90" -NNODES_RUN_RECENTER="6" -NNODES_PROC_RADAR="2" -NNODES_PROC_GLMFED="1" -NNODES_PROC_BUFR="1" -NNODES_PROC_SMOKE="1" -NNODES_RUN_REF2TTEN="1" -NNODES_RUN_NONVARCLDANL="1" -NNODES_RUN_ENSPOST="1" -NNODES_RUN_BUFRSND="1" +NNODES_ANALYSIS_GSI="16" +NNODES_ANALYSIS_GSIDIAG="1" +NNODES_UPDATE_LBC_SOIL="1" +NNODES_ANALYSIS_ENKF="90" +NNODES_RECENTER="6" +NNODES_PROCESS_RADAR="2" +NNODES_PROCESS_LIGHTNING="1" +NNODES_PROCESS_BUFR="1" +NNODES_PROCESS_SMOKE="1" +NNODES_ANALYSIS_NONVARCLD="1" +NNODES_BUFRSND="1" NNODES_SAVE_RESTART="1" # # Number of cores. # -NCORES_RUN_ANALYSIS="4" +NCORES_ANALYSIS_GSI="4" NCORES_RUN_OBSERVER="4" -NCORES_RUN_ENKF="4" +NCORES_ANALYSIS_ENKF="4" NATIVE_FORECAST="--cpus-per-task 2 --exclusive" -NATIVE_RUN_ANALYSIS="--cpus-per-task 2 --exclusive" -NATIVE_RUN_ENKF="--cpus-per-task 4 --exclusive" +NATIVE_ANALYSIS_GSI="--cpus-per-task 2 --exclusive" +NATIVE_ANALYSIS_ENKF="--cpus-per-task 4 --exclusive" # # Number of MPI processes per node. # @@ -1867,34 +1863,32 @@ PPN_GET_EXTRN_LBCS="1" PPN_MAKE_ICS="12" PPN_BLEND_ICS="8" PPN_MAKE_LBCS="12" -PPN_RUN_PREPSTART="1" +PPN_PREP_CYC="1" PPN_FORECAST="24" # This may have to be changed depending on the number of threads used. PPN_POST="24" PPN_PRDGEN="1" -PPN_RUN_ANALYSIS="24" -PPN_RUN_GSIDIAG="24" -PPN_RUN_POSTANAL="1" -PPN_RUN_ENKF="1" -PPN_RUN_RECENTER="20" -PPN_PROC_RADAR="24" -PPN_PROC_GLMFED="1" -PPN_PROC_BUFR="1" -PPN_PROC_SMOKE="1" -PPN_RUN_REF2TTEN="1" -PPN_RUN_NONVARCLDANL="1" -PPN_RUN_ENSPOST="1" -PPN_RUN_BUFRSND="28" +PPN_ANALYSIS_GSI="24" +PPN_ANALYSIS_GSIDIAG="24" +PPN_UPDATE_LBC_SOIL="1" +PPN_ANALYSIS_ENKF="1" +PPN_RECENTER="20" +PPN_PROCESS_RADAR="24" +PPN_PROCESS_LIGHTNING="1" +PPN_PROCESS_BUFR="1" +PPN_PROCESS_SMOKE="1" +PPN_ANALYSIS_NONVARCLD="1" +PPN_BUFRSND="28" PPN_SAVE_RESTART="1" # # Number of TPP for WCOSS2. # TPP_MAKE_ICS="1" TPP_MAKE_LBCS="2" -TPP_RUN_ANALYSIS="1" -TPP_RUN_ENKF="1" +TPP_ANALYSIS_GSI="1" +TPP_ANALYSIS_ENKF="1" TPP_FORECAST="1" TPP_POST="1" -TPP_RUN_BUFRSND="1" +TPP_BUFRSND="1" # # Walltimes. # @@ -1906,27 +1900,24 @@ WTIME_GET_EXTRN_LBCS="00:45:00" WTIME_MAKE_ICS="00:30:00" WTIME_BLEND_ICS="00:30:00" WTIME_MAKE_LBCS="01:30:00" -WTIME_RUN_PREPSTART="00:10:00" -WTIME_RUN_PREPSTART_ENSMEAN="00:10:00" +WTIME_PREP_CYC="00:10:00" WTIME_FORECAST="00:30:00" WTIME_FORECAST_LONG="04:30:00" WTIME_FORECAST_SPINUP="00:30:00" WTIME_POST="00:15:00" WTIME_PRDGEN="00:40:00" -WTIME_RUN_ANALYSIS="00:30:00" -WTIME_RUN_GSIDIAG="00:15:00" -WTIME_RUN_POSTANAL="00:30:00" -WTIME_RUN_ENKF="01:00:00" -WTIME_RUN_RECENTER="01:00:00" -WTIME_PROC_RADAR="00:25:00" -WTIME_PROC_GLMFED="00:25:00" -WTIME_PROC_BUFR="00:25:00" -WTIME_PROC_SMOKE="00:25:00" -WTIME_RUN_REF2TTEN="00:20:00" -WTIME_RUN_NONVARCLDANL="00:20:00" -WTIME_RUN_BUFRSND="00:45:00" +WTIME_ANALYSIS_GSI="00:30:00" +WTIME_ANALYSIS_GSIDIAG="00:15:00" +WTIME_UPDATE_LBC_SOIL="00:30:00" +WTIME_ANALYSIS_ENKF="01:00:00" +WTIME_RECENTER="01:00:00" +WTIME_PROCESS_RADAR="00:25:00" +WTIME_PROCESS_LIGHTNING="00:25:00" +WTIME_PROCESS_BUFR="00:25:00" +WTIME_PROCESS_SMOKE="00:25:00" +WTIME_ANALYSIS_NONVARCLD="00:20:00" +WTIME_BUFRSND="00:45:00" WTIME_SAVE_RESTART="00:15:00" -WTIME_RUN_ENSPOST="00:30:00" # # Start times. # @@ -1937,21 +1928,19 @@ START_TIME_BLENDING="01:00:00" START_TIME_LATE_ANALYSIS="01:40:00" START_TIME_CONVENTIONAL="00:40:00" START_TIME_NSSLMOSIAC="00:45:00" -START_TIME_GLMFED="00:45:00" -START_TIME_PROCSMOKE="00:45:00" +START_TIME_PROCESS_LIGHTNING="00:45:00" +START_TIME_PROCESS_SMOKE="00:45:00" # # Memory. # -MEMO_RUN_PROCESSBUFR="20G" -MEMO_RUN_REF2TTEN="20G" -MEMO_RUN_NONVARCLDANL="20G" -MEMO_RUN_PREPSTART="24G" +MEMO_PROCESS_BUFR="20G" +MEMO_ANALYSIS_NONVARCLD="20G" MEMO_PRDGEN="24G" MEMO_PREP_CYC="40G" MEMO_SAVE_RESTART="40G" MEMO_SAVE_INPUT="40G" -MEMO_PROC_SMOKE="40G" -MEMO_PROC_GLMFED="70G" +MEMO_PROCESS_SMOKE="40G" +MEMO_PROCESS_LIGHTNING="70G" MEMO_SAVE_DA_OUTPUT="40G" # # Maximum number of attempts. @@ -1964,22 +1953,21 @@ MAXTRIES_GET_EXTRN_LBCS="2" MAXTRIES_MAKE_ICS="2" MAXTRIES_BLEND_ICS="2" MAXTRIES_MAKE_LBCS="2" -MAXTRIES_RUN_PREPSTART="1" +MAXTRIES_PREP_CYC="1" MAXTRIES_FORECAST="1" MAXTRIES_ANALYSIS_GSI="1" -MAXTRIES_POSTANAL="1" +MAXTRIES_UPDATE_LBC_SOIL="1" MAXTRIES_ANALYSIS_ENKF="1" MAXTRIES_POST="2" MAXTRIES_PRDGEN="1" -MAXTRIES_RUN_ANALYSIS="1" -MAXTRIES_RUN_POSTANAL="1" +MAXTRIES_ANALYSIS_GSI="1" +MAXTRIES_UPDATE_LBC_SOIL="1" MAXTRIES_RECENTER="1" -MAXTRIES_PROCESS_RADARREF="1" -MAXTRIES_PROC_GLMFED="1" +MAXTRIES_PROCESS_RADAR="1" +MAXTRIES_PROCESS_LIGHTNING="1" MAXTRIES_PROCESS_BUFR="1" MAXTRIES_PROCESS_SMOKE="1" -MAXTRIES_RADAR_REF2TTEN="1" -MAXTRIES_CLDANL_NONVAR="1" +MAXTRIES_ANALYSIS_NONVARCLD="1" MAXTRIES_SAVE_RESTART="1" MAXTRIES_SAVE_DA_OUTPUT="1" # @@ -2128,9 +2116,6 @@ TILE_SETS="full" # DO_GSIDIAG_OFFLINE: # Decide whether or not to run GSI diag generation outside of the GSI task # -# DO_ENSPOST: -# Flag to turn on/off python ensemble postprocessing for WPC testbeds. -# # DO_ENSINIT: # Decide whether or not to do ensemble initialization by running 1 # timestep ensemble forecast and recentering on the deterministic @@ -2198,7 +2183,6 @@ DO_ENKF_RADAR_REF="FALSE" DO_ENVAR_RADAR_REF="FALSE" DO_ENVAR_RADAR_REF_ONCE="FALSE" DO_RECENTER="FALSE" -DO_ENSPOST="FALSE" DO_ENSINIT="FALSE" DO_SAVE_DA_OUTPUT="FALSE" DO_GSIDIAG_OFFLINE="FALSE" @@ -2511,7 +2495,7 @@ GWD_HRRRsuite_BASEDIR="" # # Parameters for analysis options # -# DO_NONVAR_CLDANAL: +# DO_ANALYSIS_NONVARCLD: # Flag turn on the non-var cloud analysis. # # DO_GLM_FED_DA @@ -2525,7 +2509,7 @@ GWD_HRRRsuite_BASEDIR="" # #----------------------------------------------------------------------- # -DO_NONVAR_CLDANAL="FALSE" +DO_ANALYSIS_NONVARCLD="FALSE" DO_GLM_FED_DA="FALSE" GLMFED_DATA_MODE="FULL" PREP_MODEL_FOR_FED="FALSE" diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh index db4c67c1f..acf0060de 100755 --- a/ush/generate_FV3LAM_wflow.sh +++ b/ush/generate_FV3LAM_wflow.sh @@ -188,10 +188,6 @@ settings="\ 'make_grid_tn': ${MAKE_GRID_TN} 'make_orog_tn': ${MAKE_OROG_TN} 'make_sfc_climo_tn': ${MAKE_SFC_CLIMO_TN} - 'get_extrn_ics_tn': ${GET_EXTRN_ICS_TN} - 'get_extrn_lbcs_tn': ${GET_EXTRN_LBCS_TN} - 'get_extrn_lbcs_long_tn': ${GET_EXTRN_LBCS_LONG_TN} - 'get_gefs_lbcs_tn': ${GET_GEFS_LBCS_TN} 'make_ics_tn': ${MAKE_ICS_TN} 'blend_ics_tn': ${BLEND_ICS_TN} 'make_lbcs_tn': ${MAKE_LBCS_TN} @@ -200,21 +196,19 @@ settings="\ 'prdgen_tn': ${PRDGEN_TN} 'analysis_gsi': ${ANALYSIS_GSI_TN} 'analysis_gsidiag': ${ANALYSIS_GSIDIAG_TN} - 'post_anal': ${POSTANAL_TN} + 'update_lbc_soil': ${UPDATE_LBC_SOIL_TN} 'observer_gsi_ensmean': ${OBSERVER_GSI_ENSMEAN_TN} 'observer_gsi': ${OBSERVER_GSI_TN} - 'prep_start': ${PREP_START_TN} 'prep_cyc_spinup': ${PREP_CYC_SPINUP_TN} 'prep_cyc_prod': ${PREP_CYC_PROD_TN} - 'prep_cyc_ensmean': ${PREP_CYC_ENSMEAN_TN} 'prep_cyc': ${PREP_CYC_TN} 'calc_ensmean': ${CALC_ENSMEAN_TN} - 'process_radarref': ${PROCESS_RADAR_REF_TN} - 'process_glmfed': ${PROCESS_GLMFED_TN} + 'process_radar': ${PROCESS_RADAR_TN} + 'process_lightning': ${PROCESS_LIGHTNING_TN} 'process_bufr': ${PROCESS_BUFR_TN} 'process_smoke': ${PROCESS_SMOKE_TN} - 'cldanl_nonvar': ${CLDANL_NONVAR_TN} - 'run_bufrsnd_tn': ${RUN_BUFRSND_TN} + 'analysis_nonvarcld': ${ANALYSIS_NONVARCLD_TN} + 'bufrsnd_tn': ${BUFRSND_TN} 'save_restart': ${SAVE_RESTART_TN} 'save_da_output': ${SAVE_DA_OUTPUT_TN} 'tag': ${TAG} @@ -227,39 +221,35 @@ settings="\ 'nnodes_make_grid': ${NNODES_MAKE_GRID} 'nnodes_make_orog': ${NNODES_MAKE_OROG} 'nnodes_make_sfc_climo': ${NNODES_MAKE_SFC_CLIMO} - 'nnodes_get_extrn_ics': ${NNODES_GET_EXTRN_ICS} - 'nnodes_get_extrn_lbcs': ${NNODES_GET_EXTRN_LBCS} 'nnodes_make_ics': ${NNODES_MAKE_ICS} 'nnodes_blend_ics': ${NNODES_BLEND_ICS} 'nnodes_make_lbcs': ${NNODES_MAKE_LBCS} - 'nnodes_run_prepstart': ${NNODES_RUN_PREPSTART} + 'nnodes_prep_cyc': ${NNODES_PREP_CYC} 'nnodes_forecast': ${NNODES_FORECAST} - 'nnodes_run_analysis': ${NNODES_RUN_ANALYSIS} - 'nnodes_run_gsidiag': ${NNODES_RUN_GSIDIAG} - 'nnodes_run_postanal': ${NNODES_RUN_POSTANAL} - 'nnodes_run_enkf': ${NNODES_RUN_ENKF} - 'nnodes_run_recenter': ${NNODES_RUN_RECENTER} + 'nnodes_analysis_gsi': ${NNODES_ANALYSIS_GSI} + 'nnodes_analysis_gsidiag': ${NNODES_ANALYSIS_GSIDIAG} + 'nnodes_update_lbc_soil': ${NNODES_UPDATE_LBC_SOIL} + 'nnodes_analysis_enkf': ${NNODES_ANALYSIS_ENKF} + 'nnodes_recenter': ${NNODES_RECENTER} 'nnodes_post': ${NNODES_POST} 'nnodes_prdgen': ${NNODES_PRDGEN} - 'nnodes_proc_radar': ${NNODES_PROC_RADAR} - 'nnodes_proc_glmfed': ${NNODES_PROC_GLMFED} - 'nnodes_proc_bufr': ${NNODES_PROC_BUFR} - 'nnodes_proc_smoke': ${NNODES_PROC_SMOKE} - 'nnodes_run_ref2tten': ${NNODES_RUN_REF2TTEN} - 'nnodes_run_nonvarcldanl': ${NNODES_RUN_NONVARCLDANL} - 'nnodes_run_enspost': ${NNODES_RUN_ENSPOST} - 'nnodes_run_bufrsnd': ${NNODES_RUN_BUFRSND} + 'nnodes_process_radar': ${NNODES_PROCESS_RADAR} + 'nnodes_process_lightning': ${NNODES_PROCESS_LIGHTNING} + 'nnodes_process_bufr': ${NNODES_PROCESS_BUFR} + 'nnodes_process_smoke': ${NNODES_PROCESS_SMOKE} + 'nnodes_analysis_nonvarcld': ${NNODES_ANALYSIS_NONVARCLD} + 'nnodes_bufrsnd': ${NNODES_BUFRSND} 'nnodes_save_restart': ${NNODES_SAVE_RESTART} # # Number of cores used for a task # 'ncores_forecast': ${PE_MEMBER01} 'native_forecast': ${NATIVE_FORECAST} - 'ncores_run_analysis': ${NCORES_RUN_ANALYSIS} + 'ncores_analysis_gsi': ${NCORES_ANALYSIS_GSI} 'ncores_run_observer': ${NCORES_RUN_OBSERVER} - 'native_run_analysis': ${NATIVE_RUN_ANALYSIS} - 'ncores_run_enkf': ${NCORES_RUN_ENKF} - 'native_run_enkf': ${NATIVE_RUN_ENKF} + 'native_analysis_gsi': ${NATIVE_ANALYSIS_GSI} + 'ncores_analysis_enkf': ${NCORES_ANALYSIS_ENKF} + 'native_analysis_enkf': ${NATIVE_ANALYSIS_ENKF} # # Number of logical processes per node for each task. If running without # threading, this is equal to the number of MPI processes per node. @@ -267,68 +257,59 @@ settings="\ 'ppn_make_grid': ${PPN_MAKE_GRID} 'ppn_make_orog': ${PPN_MAKE_OROG} 'ppn_make_sfc_climo': ${PPN_MAKE_SFC_CLIMO} - 'ppn_get_extrn_ics': ${PPN_GET_EXTRN_ICS} - 'ppn_get_extrn_lbcs': ${PPN_GET_EXTRN_LBCS} 'ppn_make_ics': ${PPN_MAKE_ICS} 'ppn_blend_ics': ${PPN_BLEND_ICS} 'ppn_make_lbcs': ${PPN_MAKE_LBCS} - 'ppn_run_prepstart': ${PPN_RUN_PREPSTART} + 'ppn_prep_cyc': ${PPN_PREP_CYC} 'ppn_forecast': ${PPN_FORECAST} - 'ppn_run_analysis': ${PPN_RUN_ANALYSIS} - 'ppn_run_gsidiag': ${PPN_RUN_GSIDIAG} - 'ppn_run_postanal': ${PPN_RUN_POSTANAL} - 'ppn_run_enkf': ${PPN_RUN_ENKF} - 'ppn_run_recenter': ${PPN_RUN_RECENTER} + 'ppn_analysis_gsi': ${PPN_ANALYSIS_GSI} + 'ppn_analysis_gsidiag': ${PPN_ANALYSIS_GSIDIAG} + 'ppn_update_lbc_soil': ${PPN_UPDATE_LBC_SOIL} + 'ppn_analysis_enkf': ${PPN_ANALYSIS_ENKF} + 'ppn_recenter': ${PPN_RECENTER} 'ppn_post': ${PPN_POST} 'ppn_prdgen': ${PPN_PRDGEN} - 'ppn_proc_radar': ${PPN_PROC_RADAR} - 'ppn_proc_glmfed': ${PPN_PROC_GLMFED} - 'ppn_proc_bufr': ${PPN_PROC_BUFR} - 'ppn_proc_smoke': ${PPN_PROC_SMOKE} - 'ppn_run_ref2tten': ${PPN_RUN_REF2TTEN} - 'ppn_run_nonvarcldanl': ${PPN_RUN_NONVARCLDANL} - 'ppn_run_enspost': ${PPN_RUN_ENSPOST} - 'ppn_run_bufrsnd': ${PPN_RUN_BUFRSND} + 'ppn_process_radar': ${PPN_PROCESS_RADAR} + 'ppn_process_lightning': ${PPN_PROCESS_LIGHTNING} + 'ppn_process_bufr': ${PPN_PROCESS_BUFR} + 'ppn_process_smoke': ${PPN_PROCESS_SMOKE} + 'ppn_analysis_nonvarcld': ${PPN_ANALYSIS_NONVARCLD} + 'ppn_bufrsnd': ${PPN_BUFRSND} 'ppn_save_restart': ${PPN_SAVE_RESTART} # 'tpp_make_ics': ${TPP_MAKE_ICS} 'tpp_make_lbcs': ${TPP_MAKE_LBCS} - 'tpp_run_analysis': ${TPP_RUN_ANALYSIS} - 'tpp_run_enkf': ${TPP_RUN_ENKF} + 'tpp_analysis_gsi': ${TPP_ANALYSIS_GSI} + 'tpp_analysis_enkf': ${TPP_ANALYSIS_ENKF} 'tpp_forecast': ${TPP_FORECAST} 'tpp_post': ${TPP_POST} - 'tpp_run_bufrsnd': ${TPP_RUN_BUFRSND} + 'tpp_bufrsnd': ${TPP_BUFRSND} # # Maximum wallclock time for each task. # 'wtime_make_grid': ${WTIME_MAKE_GRID} 'wtime_make_orog': ${WTIME_MAKE_OROG} 'wtime_make_sfc_climo': ${WTIME_MAKE_SFC_CLIMO} - 'wtime_get_extrn_ics': ${WTIME_GET_EXTRN_ICS} - 'wtime_get_extrn_lbcs': ${WTIME_GET_EXTRN_LBCS} 'wtime_make_ics': ${WTIME_MAKE_ICS} 'wtime_blend_ics': ${WTIME_BLEND_ICS} 'wtime_make_lbcs': ${WTIME_MAKE_LBCS} - 'wtime_run_prepstart': ${WTIME_RUN_PREPSTART} - 'wtime_run_prepstart_ensmean': ${WTIME_RUN_PREPSTART_ENSMEAN} + 'wtime_prep_cyc': ${WTIME_PREP_CYC} 'wtime_forecast': ${WTIME_FORECAST} 'wtime_forecast_long': ${WTIME_FORECAST_LONG} 'wtime_forecast_spinup': ${WTIME_FORECAST_SPINUP} - 'wtime_run_analysis': ${WTIME_RUN_ANALYSIS} - 'wtime_run_gsidiag': ${WTIME_RUN_GSIDIAG} - 'wtime_run_postanal': ${WTIME_RUN_POSTANAL} - 'wtime_run_enkf': ${WTIME_RUN_ENKF} - 'wtime_run_recenter': ${WTIME_RUN_RECENTER} + 'wtime_analysis_gsi': ${WTIME_ANALYSIS_GSI} + 'wtime_analysis_gsidiag': ${WTIME_ANALYSIS_GSIDIAG} + 'wtime_update_lbc_soil': ${WTIME_UPDATE_LBC_SOIL} + 'wtime_analysis_enkf': ${WTIME_ANALYSIS_ENKF} + 'wtime_recenter': ${WTIME_RECENTER} 'wtime_post': ${WTIME_POST} - 'wtime_run_enspost': ${WTIME_RUN_ENSPOST} 'wtime_prdgen': ${WTIME_PRDGEN} - 'wtime_proc_radar': ${WTIME_PROC_RADAR} - 'wtime_proc_glmfed': ${WTIME_PROC_GLMFED} - 'wtime_proc_bufr': ${WTIME_PROC_BUFR} - 'wtime_proc_smoke': ${WTIME_PROC_SMOKE} - 'wtime_run_ref2tten': ${WTIME_RUN_REF2TTEN} - 'wtime_run_nonvarcldanl': ${WTIME_RUN_NONVARCLDANL} - 'wtime_run_bufrsnd': ${WTIME_RUN_BUFRSND} + 'wtime_process_radar': ${WTIME_PROCESS_RADAR} + 'wtime_process_lightning': ${WTIME_PROCESS_LIGHTNING} + 'wtime_process_bufr': ${WTIME_PROCESS_BUFR} + 'wtime_process_smoke': ${WTIME_PROCESS_SMOKE} + 'wtime_analysis_nonvarcld': ${WTIME_ANALYSIS_NONVARCLD} + 'wtime_bufrsnd': ${WTIME_BUFRSND} 'wtime_save_restart': ${WTIME_SAVE_RESTART} # # start time for each task. @@ -340,21 +321,19 @@ settings="\ 'start_time_late_analysis': ${START_TIME_LATE_ANALYSIS} 'start_time_conventional': ${START_TIME_CONVENTIONAL} 'start_time_nsslmosiac': ${START_TIME_NSSLMOSIAC} - 'start_time_proc_glmfed': ${START_TIME_GLMFED} - 'start_time_procsmoke': ${START_TIME_PROCSMOKE} + 'start_time_process_lightning': ${START_TIME_PROCESS_LIGHTNING} + 'start_time_process_smoke': ${START_TIME_PROCESS_SMOKE} # # Maximum memory for each task. # - 'memo_run_processbufr': ${MEMO_RUN_PROCESSBUFR} - 'memo_run_ref2tten': ${MEMO_RUN_REF2TTEN} - 'memo_run_nonvarcldanl': ${MEMO_RUN_NONVARCLDANL} - 'memo_run_prepstart': ${MEMO_RUN_PREPSTART} + 'memo_process_bufr': ${MEMO_PROCESS_BUFR} + 'memo_analysis_nonvarcld': ${MEMO_ANALYSIS_NONVARCLD} 'memo_prdgen': ${MEMO_PRDGEN} 'memo_prep_cyc': ${MEMO_PREP_CYC} 'memo_save_restart': ${MEMO_SAVE_RESTART} 'memo_save_input': ${MEMO_SAVE_INPUT} - 'memo_proc_smoke': ${MEMO_PROC_SMOKE} - 'memo_proc_glmfed': ${MEMO_PROC_GLMFED} + 'memo_process_smoke': ${MEMO_PROCESS_SMOKE} + 'memo_process_lightning': ${MEMO_PROCESS_LIGHTNING} 'memo_save_da_output': ${MEMO_SAVE_DA_OUTPUT} # # Maximum number of tries for each task. @@ -362,25 +341,22 @@ settings="\ 'maxtries_make_grid': ${MAXTRIES_MAKE_GRID} 'maxtries_make_orog': ${MAXTRIES_MAKE_OROG} 'maxtries_make_sfc_climo': ${MAXTRIES_MAKE_SFC_CLIMO} - 'maxtries_get_extrn_ics': ${MAXTRIES_GET_EXTRN_ICS} - 'maxtries_get_extrn_lbcs': ${MAXTRIES_GET_EXTRN_LBCS} 'maxtries_make_ics': ${MAXTRIES_MAKE_ICS} 'maxtries_blend_ics': ${MAXTRIES_BLEND_ICS} 'maxtries_make_lbcs': ${MAXTRIES_MAKE_LBCS} - 'maxtries_run_prepstart': ${MAXTRIES_RUN_PREPSTART} + 'maxtries_prep_cyc': ${MAXTRIES_PREP_CYC} 'maxtries_forecast': ${MAXTRIES_FORECAST} 'maxtries_analysis_gsi': ${MAXTRIES_ANALYSIS_GSI} - 'maxtries_postanal': ${MAXTRIES_POSTANAL} + 'maxtries_update_lbc_soil': ${MAXTRIES_UPDATE_LBC_SOIL} 'maxtries_analysis_enkf': ${MAXTRIES_ANALYSIS_ENKF} 'maxtries_recenter': ${MAXTRIES_RECENTER} 'maxtries_post': ${MAXTRIES_POST} 'maxtries_prdgen': ${MAXTRIES_PRDGEN} - 'maxtries_process_radarref': ${MAXTRIES_PROCESS_RADARREF} - 'maxtries_proc_glmfed': ${MAXTRIES_PROC_GLMFED} + 'maxtries_process_radar': ${MAXTRIES_PROCESS_RADAR} + 'maxtries_process_lightning': ${MAXTRIES_PROCESS_LIGHTNING} 'maxtries_process_bufr': ${MAXTRIES_PROCESS_BUFR} 'maxtries_process_smoke': ${MAXTRIES_PROCESS_SMOKE} - 'maxtries_radar_ref2tten': ${MAXTRIES_RADAR_REF2TTEN} - 'maxtries_cldanl_nonvar': ${MAXTRIES_CLDANL_NONVAR} + 'maxtries_analysis_nonvarcld': ${MAXTRIES_ANALYSIS_NONVARCLD} 'maxtries_save_restart': ${MAXTRIES_SAVE_RESTART} 'maxtries_save_da_output': ${MAXTRIES_SAVE_DA_OUTPUT} # @@ -490,7 +466,6 @@ settings="\ 'do_envar_radar_ref_once': ${DO_ENVAR_RADAR_REF_ONCE} 'do_recenter': ${DO_RECENTER} 'do_bufrsnd': ${DO_BUFRSND} - 'do_enspost': ${DO_ENSPOST} 'do_ensinit': ${DO_ENSINIT} 'do_save_da_output': ${DO_SAVE_DA_OUTPUT} 'do_gsidiag_offline': ${DO_GSIDIAG_OFFLINE} @@ -501,7 +476,7 @@ settings="\ 'do_dacycle': ${DO_DACYCLE} 'do_surface_cycle': ${DO_SURFACE_CYCLE} 'da_cycle_interval_hrs': ${DA_CYCLE_INTERV} - 'do_nonvar_cldanal': ${DO_NONVAR_CLDANAL} + 'do_analysis_nonvarcld': ${DO_ANALYSIS_NONVARCLD} 'do_spinup': ${DO_SPINUP} 'do_post_spinup': ${DO_POST_SPINUP} 'do_post_prod': ${DO_POST_PROD} diff --git a/ush/sample_configs/DA_eng/config.DA.ens.hera.sh b/ush/sample_configs/DA_eng/config.DA.ens.hera.sh index 6abdf9753..44a773d42 100644 --- a/ush/sample_configs/DA_eng/config.DA.ens.hera.sh +++ b/ush/sample_configs/DA_eng/config.DA.ens.hera.sh @@ -37,7 +37,7 @@ DO_SAVE_DA_OUTPUT="TRUE" DO_POST_SPINUP="TRUE" DO_POST_PROD="TRUE" DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" #DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="FALSE" DO_GLM_FED_DA="TRUE" diff --git a/ush/sample_configs/DA_eng/config.DA.para.wcoss2.sh b/ush/sample_configs/DA_eng/config.DA.para.wcoss2.sh index cf3699179..1d9be3d0a 100644 --- a/ush/sample_configs/DA_eng/config.DA.para.wcoss2.sh +++ b/ush/sample_configs/DA_eng/config.DA.para.wcoss2.sh @@ -41,7 +41,7 @@ DO_SAVE_INPUT="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="TRUE" DO_RETRO="FALSE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="TRUE" RADARREFL_TIMELEVEL=(0) diff --git a/ush/sample_configs/DA_eng/config.DA.retro.hera.sh b/ush/sample_configs/DA_eng/config.DA.retro.hera.sh index 402f4185c..5477b018e 100644 --- a/ush/sample_configs/DA_eng/config.DA.retro.hera.sh +++ b/ush/sample_configs/DA_eng/config.DA.retro.hera.sh @@ -36,7 +36,7 @@ DO_SAVE_INPUT="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="TRUE" DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" DO_ENVAR_RADAR_REF="FALSE" DO_SMOKE_DUST="TRUE" DO_REFL2TTEN="FALSE" diff --git a/ush/sample_configs/RRFS_A/config.sh.rrfs_a_c13 b/ush/sample_configs/RRFS_A/config.sh.rrfs_a_c13 index d3c8db1c7..9da378742 100644 --- a/ush/sample_configs/RRFS_A/config.sh.rrfs_a_c13 +++ b/ush/sample_configs/RRFS_A/config.sh.rrfs_a_c13 @@ -17,7 +17,7 @@ DO_SPINUP="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="TRUE" DO_RETRO="FALSE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="FALSE" RADARREFL_TIMELEVEL=(0) diff --git a/ush/sample_configs/RRFS_A/config.sh.rrfs_a_c3 b/ush/sample_configs/RRFS_A/config.sh.rrfs_a_c3 index 8d1905ea1..fb65d0ff9 100644 --- a/ush/sample_configs/RRFS_A/config.sh.rrfs_a_c3 +++ b/ush/sample_configs/RRFS_A/config.sh.rrfs_a_c3 @@ -19,7 +19,7 @@ DO_SAVE_INPUT="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="TRUE" DO_RETRO="FALSE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="TRUE" RADARREFL_TIMELEVEL=(0) diff --git a/ush/sample_configs/RRFS_A/config.sh.rrfs_a_c3_retro b/ush/sample_configs/RRFS_A/config.sh.rrfs_a_c3_retro index 49f85e987..39874a304 100644 --- a/ush/sample_configs/RRFS_A/config.sh.rrfs_a_c3_retro +++ b/ush/sample_configs/RRFS_A/config.sh.rrfs_a_c3_retro @@ -27,7 +27,7 @@ DO_SAVE_INPUT="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="TRUE" DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="TRUE" RADARREFL_TIMELEVEL=(0) diff --git a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_c13 b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_c13 index b0787962e..27cd4238e 100644 --- a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_c13 +++ b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_c13 @@ -19,7 +19,7 @@ DO_SAVE_DA_OUTPUT="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="FALSE" #DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" DO_SMOKE_DUST="FALSE" #RADARREFL_TIMELEVEL=(0) #FH_DFI_RADAR="0.0,0.25,0.5" @@ -28,7 +28,7 @@ DO_SMOKE_DUST="FALSE" if [[ ${DO_ENSFCST} == "TRUE" ]] ; then DO_SPINUP="FALSE" DO_SAVE_DA_OUTPUT="FALSE" - DO_NONVAR_CLDANAL="FALSE" + DO_ANALYSIS_NONVARCLD="FALSE" DO_POST_PROD="TRUE" fi @@ -102,7 +102,7 @@ NFHMAX_HF="24" WTIME_FORECAST="00:30:00" WTIME_FORECAST_LONG="01:45:00" -NNODES_RUN_ANALYSIS="1" +NNODES_ANALYSIS_GSI="1" EXTRN_MDL_NAME_ICS="GEFS" EXTRN_MDL_NAME_LBCS="GEFS" @@ -127,7 +127,6 @@ if [[ ${DO_ENSEMBLE} == "TRUE" ]]; then DO_ENKFUPDATE="TRUE" # DO_RECENTER="TRUE" DO_ENKF_RADAR_REF="TRUE" - DO_ENSPOST="FALSE" DO_ENSINIT="TRUE" NUM_ENS_MEMBERS_FCST=9 SPPINT=36 @@ -141,8 +140,8 @@ if [[ ${DO_ENSEMBLE} == "TRUE" ]]; then WTIME_MAKE_LBCS="01:30:00" fi RADAR_REF_THINNING="2" - NNODES_RUN_RECENTER="1" - PPN_RUN_RECENTER="128" + NNODES_RECENTER="1" + PPN_RECENTER="128" CLEAN_OLDFCST_HRS="48" CLEAN_OLDSTMPPOST_HRS="48" cld_bld_hgt=0.0 diff --git a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_c3 b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_c3 index bf891e768..e3299ec8d 100644 --- a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_c3 +++ b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_c3 @@ -19,7 +19,7 @@ DO_SAVE_DA_OUTPUT="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="FALSE" #DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" #DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="FALSE" #RADARREFL_TIMELEVEL=(0) @@ -34,7 +34,7 @@ if [[ ${DO_ENSFCST} == "TRUE" ]] ; then EXPT_SUBDIR="rrfs_conus_enfcst" DO_SPINUP="FALSE" DO_SAVE_DA_OUTPUT="FALSE" - DO_NONVAR_CLDANAL="FALSE" + DO_ANALYSIS_NONVARCLD="FALSE" DO_POST_PROD="TRUE" fi @@ -116,7 +116,7 @@ binary_diag=.false. WTIME_FORECAST="00:30:00" WTIME_FORECAST_LONG="03:45:00" -NNODES_RUN_ANALYSIS="1" +NNODES_ANALYSIS_GSI="1" EXTRN_MDL_NAME_ICS="GEFS" EXTRN_MDL_NAME_LBCS="GEFS" @@ -139,7 +139,6 @@ if [[ ${DO_ENSEMBLE} == "TRUE" ]]; then DO_ENKFUPDATE="TRUE" # DO_RECENTER="TRUE" DO_ENKF_RADAR_REF="TRUE" - DO_ENSPOST="FALSE" DO_ENSINIT="TRUE" RADAR_REF_THINNING="2" @@ -172,8 +171,8 @@ if [[ ${DO_ENSEMBLE} == "TRUE" ]]; then DO_RECENTER="TRUE" fi - PPN_RUN_RECENTER="$(( ${NUM_ENS_MEMBERS} + 1 ))" - NNODES_RUN_RECENTER="3" + PPN_RECENTER="$(( ${NUM_ENS_MEMBERS} + 1 ))" + NNODES_RECENTER="3" fi RUN_ensctrl="rrfs" diff --git a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_c3_retro b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_c3_retro index 12eb53c9f..885adfe5a 100644 --- a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_c3_retro +++ b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_c3_retro @@ -29,7 +29,7 @@ DO_SAVE_DA_OUTPUT="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="FALSE" DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" #DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="FALSE" #RADARREFL_TIMELEVEL=(0) @@ -54,7 +54,7 @@ if [[ ${DO_ENSFCST} == "TRUE" ]] ; then EXPT_SUBDIR="rrfs_conus_enfcst" DO_SPINUP="FALSE" DO_SAVE_DA_OUTPUT="FALSE" - DO_NONVAR_CLDANAL="FALSE" + DO_ANALYSIS_NONVARCLD="FALSE" DO_POST_PROD="TRUE" DO_BUFRSND="TRUE" fi @@ -138,7 +138,7 @@ OUTPUT_FH="1 -1" WTIME_FORECAST="00:30:00" WTIME_FORECAST_LONG="03:45:00" -NNODES_RUN_ANALYSIS="1" +NNODES_ANALYSIS_GSI="1" EXTRN_MDL_NAME_ICS="GDASENKF" EXTRN_MDL_NAME_LBCS="GEFS" @@ -160,7 +160,6 @@ if [[ ${DO_ENSEMBLE} == "TRUE" ]]; then DO_ENKFUPDATE="TRUE" # DO_RECENTER="TRUE" DO_ENKF_RADAR_REF="TRUE" - DO_ENSPOST="FALSE" DO_ENSINIT="TRUE" RADAR_REF_THINNING="2" @@ -194,10 +193,10 @@ if [[ ${DO_ENSEMBLE} == "TRUE" ]]; then DO_RECENTER="TRUE" fi -# PPN_RUN_RECENTER="$(( ${NUM_ENS_MEMBERS} + 1 ))" -# NNODES_RUN_RECENTER="3" - PPN_RUN_RECENTER="128" - NNODES_RUN_RECENTER="10" +# PPN_RECENTER="$(( ${NUM_ENS_MEMBERS} + 1 ))" +# NNODES_RECENTER="3" + PPN_RECENTER="128" + NNODES_RECENTER="10" fi RUN_ensctrl="rrfs" diff --git a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3 b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3 index 32b4d2054..16563f2db 100644 --- a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3 +++ b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3 @@ -19,7 +19,7 @@ DO_SAVE_DA_OUTPUT="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="FALSE" #DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" #DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="FALSE" #RADARREFL_TIMELEVEL=(0) @@ -50,7 +50,7 @@ if [[ ${DO_ENSFCST} == "TRUE" ]] ; then EXPT_SUBDIR="rrfs_na_enfcst" DO_SPINUP="FALSE" DO_SAVE_DA_OUTPUT="TRUE" - DO_NONVAR_CLDANAL="FALSE" + DO_ANALYSIS_NONVARCLD="FALSE" DO_POST_PROD="TRUE" DO_BUFRSND="TRUE" fi @@ -134,9 +134,9 @@ OUTPUT_FH="1 -1" WTIME_FORECAST="00:30:00" WTIME_FORECAST_LONG="04:45:00" -PPN_RUN_ANALYSIS="16" -NNODES_RUN_ANALYSIS="1" -TPP_RUN_ANALYSIS="8" +PPN_ANALYSIS_GSI="16" +NNODES_ANALYSIS_GSI="1" +TPP_ANALYSIS_GSI="8" EXTRN_MDL_NAME_ICS="GDASENKF" EXTRN_MDL_NAME_LBCS="GEFS" @@ -154,7 +154,6 @@ if [[ ${DO_ENSEMBLE} == "TRUE" ]]; then DO_ENKFUPDATE="TRUE" # DO_RECENTER="TRUE" DO_ENKF_RADAR_REF="TRUE" - DO_ENSPOST="FALSE" DO_ENSINIT="TRUE" RADAR_REF_THINNING="2" @@ -192,8 +191,8 @@ if [[ ${DO_ENSEMBLE} == "TRUE" ]]; then DO_RECENTER="TRUE" fi - PPN_RUN_RECENTER="128" - NNODES_RUN_RECENTER="10" + PPN_RECENTER="128" + NNODES_RECENTER="10" fi SPPINT=36 diff --git a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3_retro b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3_retro index 856bd9b29..84df63d09 100644 --- a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3_retro +++ b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3_retro @@ -19,7 +19,7 @@ DO_SAVE_DA_OUTPUT="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="FALSE" DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" #DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="FALSE" #RADARREFL_TIMELEVEL=(0) @@ -50,7 +50,7 @@ if [[ ${DO_ENSFCST} == "TRUE" ]] ; then EXPT_SUBDIR="rrfs_na_enfcst" DO_SPINUP="FALSE" DO_SAVE_DA_OUTPUT="TRUE" - DO_NONVAR_CLDANAL="FALSE" + DO_ANALYSIS_NONVARCLD="FALSE" DO_POST_PROD="TRUE" DO_BUFRSND="TRUE" fi @@ -134,9 +134,9 @@ OUTPUT_FH="1 -1" WTIME_FORECAST="00:30:00" WTIME_FORECAST_LONG="04:45:00" -PPN_RUN_ANALYSIS="16" -NNODES_RUN_ANALYSIS="1" -TPP_RUN_ANALYSIS="8" +PPN_ANALYSIS_GSI="16" +NNODES_ANALYSIS_GSI="1" +TPP_ANALYSIS_GSI="8" EXTRN_MDL_NAME_ICS="GDASENKF" GFS_FILE_FMT_ICS="netcdf" @@ -155,7 +155,6 @@ if [[ ${DO_ENSEMBLE} == "TRUE" ]]; then DO_ENKFUPDATE="TRUE" # DO_RECENTER="TRUE" DO_ENKF_RADAR_REF="TRUE" - DO_ENSPOST="FALSE" DO_ENSINIT="TRUE" RADAR_REF_THINNING="2" @@ -192,8 +191,8 @@ if [[ ${DO_ENSEMBLE} == "TRUE" ]]; then DO_RECENTER="TRUE" fi - PPN_RUN_RECENTER="128" - NNODES_RUN_RECENTER="10" + PPN_RECENTER="128" + NNODES_RECENTER="10" fi SPPINT=36 diff --git a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3 b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3 index 5be5c8e58..5a327f1b2 100644 --- a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3 +++ b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3 @@ -20,7 +20,7 @@ DO_SAVE_INPUT="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="TRUE" DO_RETRO="FALSE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="TRUE" EBB_DCYCLE="2" diff --git a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3_retro b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3_retro index d11131f08..0108f51c9 100644 --- a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3_retro +++ b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3_retro @@ -20,7 +20,7 @@ DO_SAVE_INPUT="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="TRUE" DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="TRUE" EBB_DCYCLE="2" diff --git a/ush/sample_configs/RRFS_B/config.sh.rrfs_b_c3 b/ush/sample_configs/RRFS_B/config.sh.rrfs_b_c3 index fa8b47a25..11f058e9d 100644 --- a/ush/sample_configs/RRFS_B/config.sh.rrfs_b_c3 +++ b/ush/sample_configs/RRFS_B/config.sh.rrfs_b_c3 @@ -18,7 +18,7 @@ DO_SAVE_INPUT="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="TRUE" DO_RETRO="FALSE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="TRUE" DO_REFL2TTEN="FALSE" diff --git a/ush/sample_configs/others/config.sh.RRFS_CONUS_13km b/ush/sample_configs/others/config.sh.RRFS_CONUS_13km index dbceedfe3..26024acee 100644 --- a/ush/sample_configs/others/config.sh.RRFS_CONUS_13km +++ b/ush/sample_configs/others/config.sh.RRFS_CONUS_13km @@ -16,7 +16,7 @@ DO_SPINUP="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="TRUE" DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="FALSE" EBB_DCYCLE="2" diff --git a/ush/sample_configs/others/config.sh.RRFS_CONUS_13km_ens b/ush/sample_configs/others/config.sh.RRFS_CONUS_13km_ens index 8c7beb072..64400e5fa 100644 --- a/ush/sample_configs/others/config.sh.RRFS_CONUS_13km_ens +++ b/ush/sample_configs/others/config.sh.RRFS_CONUS_13km_ens @@ -18,7 +18,7 @@ DO_SAVE_DA_OUTPUT="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="FALSE" DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" #DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="FALSE" DO_PM_DA="FALSE" @@ -50,7 +50,7 @@ if [[ ${DO_ENSFCST} == "TRUE" ]] ; then EXPT_SUBDIR="rrfs_conus13_enfcst" DO_SPINUP="FALSE" DO_SAVE_DA_OUTPUT="FALSE" - DO_NONVAR_CLDANAL="FALSE" + DO_ANALYSIS_NONVARCLD="FALSE" DO_POST_PROD="TRUE" fi diff --git a/ush/sample_configs/others/config.sh.RRFS_CONUS_3km b/ush/sample_configs/others/config.sh.RRFS_CONUS_3km index 5dd2c30ae..4618fdfef 100644 --- a/ush/sample_configs/others/config.sh.RRFS_CONUS_3km +++ b/ush/sample_configs/others/config.sh.RRFS_CONUS_3km @@ -18,7 +18,7 @@ DO_SAVE_INPUT="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="TRUE" DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="TRUE" EBB_DCYCLE="2" diff --git a/ush/sample_configs/others/config.sh.RRFS_CONUS_3km_ens b/ush/sample_configs/others/config.sh.RRFS_CONUS_3km_ens index 1ba244ea1..073ad8f5b 100644 --- a/ush/sample_configs/others/config.sh.RRFS_CONUS_3km_ens +++ b/ush/sample_configs/others/config.sh.RRFS_CONUS_3km_ens @@ -18,7 +18,7 @@ DO_SAVE_DA_OUTPUT="TRUE" DO_POST_SPINUP="TRUE" DO_POST_PROD="TRUE" DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" #DO_ENVAR_RADAR_REF="TRUE" DO_SMOKE_DUST="FALSE" #RADARREFL_TIMELEVEL=(0) @@ -48,7 +48,7 @@ if [[ ${DO_ENSFCST} == "TRUE" ]] ; then EXPT_SUBDIR="rrfs_conus_enfcst" DO_SPINUP="FALSE" DO_SAVE_DA_OUTPUT="FALSE" - DO_NONVAR_CLDANAL="FALSE" + DO_ANALYSIS_NONVARCLD="FALSE" DO_POST_PROD="TRUE" fi diff --git a/ush/sample_configs/others/config.sh.RRFS_NA_13km b/ush/sample_configs/others/config.sh.RRFS_NA_13km index 28d6fd680..c0aec5323 100644 --- a/ush/sample_configs/others/config.sh.RRFS_NA_13km +++ b/ush/sample_configs/others/config.sh.RRFS_NA_13km @@ -17,7 +17,7 @@ DO_DACYCLE="TRUE" DO_SURFACE_CYCLE="TRUE" DO_SPINUP="TRUE" DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" RADARREFL_TIMELEVEL=(0) FH_DFI_RADAR="0.0,0.25,0.5" DO_SOIL_ADJUST="TRUE" diff --git a/ush/sample_configs/others/config.sh.RRFS_NA_3km b/ush/sample_configs/others/config.sh.RRFS_NA_3km index f1a3d12b0..23784a5e8 100644 --- a/ush/sample_configs/others/config.sh.RRFS_NA_3km +++ b/ush/sample_configs/others/config.sh.RRFS_NA_3km @@ -19,7 +19,7 @@ DO_SAVE_INPUT="TRUE" DO_POST_SPINUP="FALSE" DO_POST_PROD="TRUE" DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" +DO_ANALYSIS_NONVARCLD="TRUE" DO_ENVAR_RADAR_REF="FALSE" DO_SMOKE_DUST="FALSE" EBB_DCYCLE="2" diff --git a/ush/sample_configs/smoke_dust/config.sh.RRFS-SD_PM25DA_CONUS_3km b/ush/sample_configs/smoke_dust/config.sh.RRFS-SD_PM25DA_CONUS_3km index 40993f4a4..93789b3e1 100644 --- a/ush/sample_configs/smoke_dust/config.sh.RRFS-SD_PM25DA_CONUS_3km +++ b/ush/sample_configs/smoke_dust/config.sh.RRFS-SD_PM25DA_CONUS_3km @@ -64,7 +64,7 @@ DO_DACYCLE="TRUE" DO_SURFACE_CYCLE="TRUE" DO_SPINUP="TRUE" DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="FALSE" +DO_ANALYSIS_NONVARCLD="FALSE" DO_SMOKE_DUST="TRUE" DO_REFL2TTEN="FALSE" RADARREFL_TIMELEVEL=(0) @@ -124,13 +124,13 @@ SNOWICE_update_hour=00 SOIL_SURGERY_time=2022072404 DT_ATMOS=60 -NCORES_RUN_ANALYSIS=240 +NCORES_ANALYSIS_GSI=240 NCORES_RUN_OBSERVER=80 HYBENSMEM_NMIN=66 HALO_BLEND=20 IO_LAYOUT_Y=1 PPN_RUN_REF2TTEN=1 -PPN_RUN_NONVARCLDANL=${IO_LAYOUT_Y} +PPN_ANALYSIS_NONVARCLD=${IO_LAYOUT_Y} PRINT_DIFF_PGR="TRUE" @@ -184,8 +184,8 @@ if [[ $MACHINE == "wcoss2" ]] ; then PPN_MAKE_LBCS="64" NNODES_MAKE_ICS="2" NNODES_MAKE_LBCS="1" - PPN_RUN_ANALYSIS="32" - NNODES_RUN_ANALYSIS="10" + PPN_ANALYSIS_GSI="32" + NNODES_ANALYSIS_GSI="10" PPN_FORECAST="64" NNODES_FORECAST="31" PPN_POST="64" @@ -193,13 +193,12 @@ if [[ $MACHINE == "wcoss2" ]] ; then MAXTRIES_MAKE_ICS="2" MAXTRIES_MAKE_LBCS="2" - MAXTRIES_RUN_PREPSTART="2" + MAXTRIES_PREP_CYC="2" MAXTRIES_FORECAST="2" MAXTRIES_ANALYSIS_GSI="2" MAXTRIES_ANALYSIS_ENKF="2" MAXTRIES_POST="2" MAXTRIES_RUN_WGRIB2="2" - MAXTRIES_RUN_ANALYSIS="2" GFS_FILE_FMT_ICS="netcdf" GFS_FILE_FMT_LBCS="netcdf" diff --git a/ush/set_rrfs_config_general.sh b/ush/set_rrfs_config_general.sh index 0f1648f7a..92c44dac8 100644 --- a/ush/set_rrfs_config_general.sh +++ b/ush/set_rrfs_config_general.sh @@ -107,25 +107,24 @@ COMINgfs="" GFS_FILE_FMT_ICS="grib2" GFS_FILE_FMT_LBCS="grib2" -NCORES_RUN_ANALYSIS=360 +NCORES_ANALYSIS_GSI=360 NCORES_RUN_OBSERVER=80 HYBENSMEM_NMIN=66 IO_LAYOUT_Y=1 -PPN_RUN_REF2TTEN=1 -PPN_RUN_NONVARCLDANL="6" -NNODES_RUN_NONVARCLDANL="20" +PPN_ANALYSIS_NONVARCLD="6" +NNODES_ANALYSIS_NONVARCLD="20" MAXTRIES_GET_EXTRN_ICS="2" MAXTRIES_GET_EXTRN_LBCS="2" MAXTRIES_MAKE_ICS="2" MAXTRIES_BLEND_ICS="2" MAXTRIES_MAKE_LBCS="2" -MAXTRIES_RUN_PREPSTART="2" +MAXTRIES_PREP_CYC="2" MAXTRIES_FORECAST="2" MAXTRIES_ANALYSIS_GSI="2" -MAXTRIES_POSTANAL="2" +MAXTRIES_UPDATE_LBC_SOIL="2" MAXTRIES_ANALYSIS_ENKF="2" -MAXTRIES_RUN_ANALYSIS="2" -MAXTRIES_CLDANL_NONVAR="2" +MAXTRIES_ANALYSIS_GSI="2" +MAXTRIES_ANALYSIS_NONVARCLD="2" MAXTRIES_SAVE_DA_OUTPUT="2" MAXTRIES_SAVE_RESTART="2" MAXTRIES_POST="2" @@ -134,8 +133,8 @@ MAXTRIES_PRDGEN="2" WTIME_FORECAST="00:45:00" WTIME_FORECAST_LONG="03:45:00" WTIME_MAKE_LBCS="02:00:00" -WTIME_RUN_ANALYSIS="00:50:00" -WTIME_RUN_PREPSTART="00:20:00" +WTIME_ANALYSIS_GSI="00:50:00" +WTIME_PREP_CYC="00:20:00" START_TIME_SPINUP="01:30:00" START_TIME_PROD="01:40:00" @@ -144,7 +143,7 @@ START_TIME_CONVENTIONAL_SPINUP="00:40:00" START_TIME_BLENDING="04:00:00" START_TIME_CONVENTIONAL="00:50:00" START_TIME_NSSLMOSIAC="00:55:00" -START_TIME_PROCSMOKE="00:50:00" +START_TIME_PROCESS_SMOKE="00:50:00" if [[ ${PREDEF_GRID_NAME} == "RRFS_CONUS_3km" ]] ; then DT_ATMOS=36 @@ -152,7 +151,7 @@ if [[ ${PREDEF_GRID_NAME} == "RRFS_CONUS_3km" ]] ; then TILE_LABELS="CONUS REGIONS" TILE_SETS="full NE,NC,NW,SE,SC,SW" CCPP_PHYS_SUITE="FV3_HRRR_gf" - PPN_RUN_POSTANAL="5" + PPN_UPDATE_LBC_SOIL="5" if [[ $MACHINE == "jet" ]] ; then if [[ -n $RESERVATION ]] ; then @@ -165,19 +164,19 @@ if [[ ${PREDEF_GRID_NAME} == "RRFS_CONUS_3km" ]] ; then TPP_FORECAST="2" NNODES_POST="2" PPN_POST="40" - PPN_PROC_RADAR="20" + PPN_PROCESS_RADAR="20" LAYOUT_X=15 LAYOUT_Y=40 - NCORES_RUN_ANALYSIS=200 - PPN_RUN_NONVARCLDANL="10" - NNODES_RUN_NONVARCLDANL="12" - PPN_RUN_ENKF="2" - NNODES_RUN_RECENTER="5" - PPN_RUN_RECENTER="40" + NCORES_ANALYSIS_GSI=200 + PPN_ANALYSIS_NONVARCLD="10" + NNODES_ANALYSIS_NONVARCLD="12" + PPN_ANALYSIS_ENKF="2" + NNODES_RECENTER="5" + PPN_RECENTER="40" NCORES_PER_NODE=40 - PPN_RUN_GSIDIAG=20 - START_TIME_PROCSMOKE="00:55:00" + PPN_ANALYSIS_GSIDIAG=20 + START_TIME_PROCESS_SMOKE="00:55:00" CLEAN_OLDFCST_HRS="18" fi @@ -196,18 +195,18 @@ if [[ ${PREDEF_GRID_NAME} == "RRFS_CONUS_3km" ]] ; then TPP_FORECAST="2" PPN_POST="40" NNODES_POST="2" - PPN_RUN_NONVARCLDANL="10" - NNODES_RUN_NONVARCLDANL="10" - PPN_RUN_GSIDIAG=40 - PPN_RUN_ENKF="2" - NNODES_RUN_RECENTER="5" - PPN_RUN_RECENTER="40" + PPN_ANALYSIS_NONVARCLD="10" + NNODES_ANALYSIS_NONVARCLD="10" + PPN_ANALYSIS_GSIDIAG=40 + PPN_ANALYSIS_ENKF="2" + NNODES_RECENTER="5" + PPN_RECENTER="40" WTIME_MAKE_LBCS="00:30:00" - WTIME_RUN_PREPSTART="00:10:00" + WTIME_PREP_CYC="00:10:00" WTIME_FORECAST="00:45:00" WTIME_FORECAST_LONG="02:30:00" - WTIME_RUN_ANALYSIS="00:30:00" + WTIME_ANALYSIS_GSI="00:30:00" START_TIME_SPINUP="01:10:00" START_TIME_PROD="02:10:00" @@ -224,39 +223,39 @@ if [[ ${PREDEF_GRID_NAME} == "RRFS_CONUS_3km" ]] ; then NNODES_MAKE_ICS="2" NNODES_BLEND_ICS="1" NNODES_MAKE_LBCS="1" - PPN_RUN_ANALYSIS="32" - TPP_RUN_ANALYSIS="4" - NNODES_RUN_ANALYSIS="10" + PPN_ANALYSIS_GSI="32" + TPP_ANALYSIS_GSI="4" + NNODES_ANALYSIS_GSI="10" PPN_FORECAST="64" TPP_FORECAST="2" NNODES_FORECAST="16" PPN_POST="128" NNODES_POST="1" TPP_POST="1" - PPN_PROC_RADAR="128" - NNODES_PROC_RADAR="1" - PPN_RUN_ENKF="32" - TPP_RUN_ENKF="4" - NNODES_RUN_ENKF="24" + PPN_PROCESS_RADAR="128" + NNODES_PROCESS_RADAR="1" + PPN_ANALYSIS_ENKF="32" + TPP_ANALYSIS_ENKF="4" + NNODES_ANALYSIS_ENKF="24" MEMO_PRDGEN="80G" - MEMO_RUN_PROCESSBUFR="80G" - PPN_RUN_NONVARCLDANL="128" - NNODES_RUN_NONVARCLDANL="2" - PPN_RUN_GSIDIAG=128 - NNODES_RUN_RECENTER="10" - PPN_RUN_RECENTER="128" + MEMO_PROCESS_BUFR="80G" + PPN_ANALYSIS_NONVARCLD="128" + NNODES_ANALYSIS_NONVARCLD="2" + PPN_ANALYSIS_GSIDIAG=128 + NNODES_RECENTER="10" + PPN_RECENTER="128" MAXTRIES_GET_EXTRN_ICS="1" MAXTRIES_GET_EXTRN_LBCS="1" MAXTRIES_MAKE_ICS="1" MAXTRIES_BLEND_ICS="1" MAXTRIES_MAKE_LBCS="1" - MAXTRIES_RUN_PREPSTART="1" - MAXTRIES_CLDANL_NONVAR="1" + MAXTRIES_PREP_CYC="1" + MAXTRIES_ANALYSIS_NONVARCLD="1" MAXTRIES_RECENTER="1" MAXTRIES_SAVE_RESTART="1" MAXTRIES_PROCESS_BUFR="1" - MAXTRIES_PROCESS_RADARREF="1" + MAXTRIES_PROCESS_RADAR="1" MAXTRIES_FORECAST="1" MAXTRIES_ANALYSIS_GSI="1" MAXTRIES_ANALYSIS_ENKF="1" @@ -270,8 +269,8 @@ if [[ ${PREDEF_GRID_NAME} == "RRFS_CONUS_3km" ]] ; then WTIME_MAKE_ICS="00:20:00" WTIME_BLEND_ICS="00:20:00" WTIME_MAKE_LBCS="02:00:00" - WTIME_RUN_ANALYSIS="00:50:00" - WTIME_RUN_PREPSTART="00:20:00" + WTIME_ANALYSIS_GSI="00:50:00" + WTIME_PREP_CYC="00:20:00" START_TIME_SPINUP="01:10:00" START_TIME_PROD="02:20:00" @@ -306,7 +305,7 @@ elif [[ ${PREDEF_GRID_NAME} == "RRFS_CONUS_13km" ]] ; then TILE_LABELS="CONUS REGIONS" TILE_SETS="full NE,NC,NW,SE,SC,SW" CCPP_PHYS_SUITE="FV3_HRRR_gf" - PPN_RUN_POSTANAL="5" + PPN_UPDATE_LBC_SOIL="5" if [[ $MACHINE == "wcoss2" ]] ; then LAYOUT_X="7" @@ -319,47 +318,47 @@ elif [[ ${PREDEF_GRID_NAME} == "RRFS_CONUS_13km" ]] ; then NNODES_MAKE_ICS="1" NNODES_BLEND_ICS="1" NNODES_MAKE_LBCS="1" - PPN_RUN_ANALYSIS="64" - TPP_RUN_ANALYSIS="2" - NNODES_RUN_ANALYSIS="1" + PPN_ANALYSIS_GSI="64" + TPP_ANALYSIS_GSI="2" + NNODES_ANALYSIS_GSI="1" PPN_FORECAST="64" TPP_FORECAST="2" NNODES_FORECAST="1" PPN_POST="64" NNODES_POST="1" - PPN_PROC_RADAR="64" - NNODES_PROC_RADAR="1" - PPN_RUN_ENKF="32" - TPP_RUN_ENKF="4" - NNODES_RUN_ENKF="2" - PPN_RUN_NONVARCLDANL="128" - NNODES_RUN_NONVARCLDANL="1" - PPN_RUN_GSIDIAG=128 + PPN_PROCESS_RADAR="64" + NNODES_PROCESS_RADAR="1" + PPN_ANALYSIS_ENKF="32" + TPP_ANALYSIS_ENKF="4" + NNODES_ANALYSIS_ENKF="2" + PPN_ANALYSIS_NONVARCLD="128" + NNODES_ANALYSIS_NONVARCLD="1" + PPN_ANALYSIS_GSIDIAG=128 WTIME_GET_EXTRN_ICS="00:05:00" WTIME_GET_EXTRN_LBCS="00:05:00" WTIME_MAKE_ICS="00:10:00" WTIME_BLEND_ICS="00:10:00" WTIME_MAKE_LBCS="00:30:00" - WTIME_RUN_PREPSTART="00:05:00" + WTIME_PREP_CYC="00:05:00" WTIME_FORECAST="00:35:00" WTIME_FORECAST_LONG="01:15:00" WTIME_FORECAST_SPINUP="00:15:00" WTIME_POST="00:05:00" WTIME_PRDGEN="00:10:00" - WTIME_RUN_ANALYSIS="00:20:00" - WTIME_RUN_POSTANAL="00:10:00" - WTIME_RUN_ENKF="00:10:00" - WTIME_RUN_RECENTER="00:10:00" - WTIME_PROC_RADAR="00:05:00" - WTIME_PROC_BUFR="00:05:00" - WTIME_RUN_NONVARCLDANL="00:10:00" + WTIME_ANALYSIS_GSI="00:20:00" + WTIME_UPDATE_LBC_SOIL="00:10:00" + WTIME_ANALYSIS_ENKF="00:10:00" + WTIME_RECENTER="00:10:00" + WTIME_PROCESS_RADAR="00:05:00" + WTIME_PROCESS_BUFR="00:05:00" + WTIME_ANALYSIS_NONVARCLD="00:10:00" WTIME_SAVE_RESTART="00:05:00" MAXTRIES_MAKE_ICS="2" MAXTRIES_BLEND_ICS="2" MAXTRIES_MAKE_LBCS="2" - MAXTRIES_RUN_PREPSTART="2" + MAXTRIES_PREP_CYC="2" MAXTRIES_FORECAST="2" MAXTRIES_ANALYSIS_GSI="2" MAXTRIES_ANALYSIS_ENKF="2" @@ -387,8 +386,8 @@ elif [[ ${PREDEF_GRID_NAME} == "RRFS_CONUS_13km" ]] ; then NNODES_BLEND_ICS="1" NNODES_MAKE_LBCS="1" NNODES_POST="1" - NCORES_RUN_ANALYSIS=60 - NATIVE_RUN_ANALYSIS="--cpus-per-task 4 --exclusive" + NCORES_ANALYSIS_GSI=60 + NATIVE_ANALYSIS_GSI="--cpus-per-task 4 --exclusive" LAYOUT_X=12 LAYOUT_Y=6 @@ -399,19 +398,19 @@ elif [[ ${PREDEF_GRID_NAME} == "RRFS_CONUS_13km" ]] ; then NNODES_MAKE_ICS="1" NNODES_BLEND_ICS="1" NNODES_MAKE_LBCS="1" - PPN_RUN_ANALYSIS="20" - NNODES_RUN_ANALYSIS="3" + PPN_ANALYSIS_GSI="20" + NNODES_ANALYSIS_GSI="3" PPN_FORECAST="20" NNODES_FORECAST="3" TPP_FORECAST="2" PPN_POST="20" NNODES_POST="1" - PPN_PROC_RADAR="40" - NNODES_PROC_RADAR="1" + PPN_PROCESS_RADAR="40" + NNODES_PROCESS_RADAR="1" NCORES_RUN_OBSERVER="40" - PPN_RUN_NONVARCLDANL="20" - NNODES_RUN_NONVARCLDANL="5" - PPN_RUN_GSIDIAG=40 + PPN_ANALYSIS_NONVARCLD="20" + NNODES_ANALYSIS_NONVARCLD="5" + PPN_ANALYSIS_GSIDIAG=40 fi elif [[ ${PREDEF_GRID_NAME} == "RRFS_NA_3km" ]] ; then @@ -422,7 +421,7 @@ elif [[ ${PREDEF_GRID_NAME} == "RRFS_NA_3km" ]] ; then hrrr_tiles4 hrrrak_tiles" TILE_SETS="full SE,SC,SW NE,NC,NW ATL,CA-NV,CentralCA CHI-DET,DCArea,EastCO \ GreatLakes,NYC-BOS,SEA-POR SouthCA,SouthFL,VortexSE AKRange,Anchorage,Juneau" - PPN_RUN_POSTANAL="5" + PPN_UPDATE_LBC_SOIL="5" if [[ -n $RESERVATION ]] ; then NNODES_MAKE_ICS="10" @@ -432,20 +431,19 @@ elif [[ ${PREDEF_GRID_NAME} == "RRFS_NA_3km" ]] ; then PPN_BLEND_ICS="8" PPN_MAKE_LBCS="10" WTIME_MAKE_LBCS="02:45:00" - WTIME_RUN_PREPSTART="00:20:00" - PPN_RUN_PREPSTART="5" + WTIME_PREP_CYC="00:20:00" + PPN_PREP_CYC="5" WRTCMP_write_tasks_per_group="50" NCORES_PER_NODE="40" - MEMO_RUN_REF2TTEN="60G" TPP_FORECAST="4" WTIME_FORECAST="04:00:00" LAYOUT_X=50 LAYOUT_Y=20 IO_LAYOUT_Y=10 - PPN_RUN_NONVARCLDANL="10" - NNODES_RUN_NONVARCLDANL="20" + PPN_ANALYSIS_NONVARCLD="10" + NNODES_ANALYSIS_NONVARCLD="20" NATIVE_FORECAST="--cpus-per-task 4 --exclusive" - NATIVE_RUN_ANALYSIS="--cpus-per-task 4 --exclusive" + NATIVE_ANALYSIS_GSI="--cpus-per-task 4 --exclusive" PARTITION_POST="kjet" PPN_POST="20" @@ -466,35 +464,35 @@ elif [[ ${PREDEF_GRID_NAME} == "RRFS_NA_3km" ]] ; then NNODES_MAKE_ICS="2" NNODES_BLEND_ICS="1" NNODES_MAKE_LBCS="1" - PPN_RUN_ANALYSIS="8" - NNODES_RUN_ANALYSIS="60" - TPP_RUN_ANALYSIS="16" + PPN_ANALYSIS_GSI="8" + NNODES_ANALYSIS_GSI="60" + TPP_ANALYSIS_GSI="16" PPN_FORECAST="64" NNODES_FORECAST="52" TPP_FORECAST="2" PPN_POST="32" NNODES_POST="4" TPP_POST="4" - PPN_PROC_RADAR="64" - NNODES_PROC_RADAR="1" - PPN_RUN_ENKF="8" - NNODES_RUN_ENKF="10" - TPP_RUN_ENKF="16" - PPN_RUN_NONVARCLDANL="128" - NNODES_RUN_NONVARCLDANL="1" + PPN_PROCESS_RADAR="64" + NNODES_PROCESS_RADAR="1" + PPN_ANALYSIS_ENKF="8" + NNODES_ANALYSIS_ENKF="10" + TPP_ANALYSIS_ENKF="16" + PPN_ANALYSIS_NONVARCLD="128" + NNODES_ANALYSIS_NONVARCLD="1" PPN_PRDGEN="128" - PPN_RUN_POSTANAL="8" - PPN_RUN_GSIDIAG=128 - NNODES_RUN_BUFRSND="2" - PPN_RUN_BUFRSND="64" - TPP_RUN_BUFRSND="2" - NNODES_RUN_RECENTER="10" - PPN_RUN_RECENTER="128" + PPN_UPDATE_LBC_SOIL="8" + PPN_ANALYSIS_GSIDIAG=128 + NNODES_BUFRSND="2" + PPN_BUFRSND="64" + TPP_BUFRSND="2" + NNODES_RECENTER="10" + PPN_RECENTER="128" MAXTRIES_MAKE_ICS="1" MAXTRIES_BLEND_ICS="1" MAXTRIES_MAKE_LBCS="1" - MAXTRIES_RUN_PREPSTART="1" + MAXTRIES_PREP_CYC="1" MAXTRIES_FORECAST="1" MAXTRIES_ANALYSIS_GSI="1" MAXTRIES_ANALYSIS_ENKF="1" @@ -502,10 +500,9 @@ elif [[ ${PREDEF_GRID_NAME} == "RRFS_NA_3km" ]] ; then MAXTRIES_PRDGEN="1" MAXTRIES_ANALYSIS_GSI="1" - MEMO_RUN_NONVARCLDANL="256G" - MEMO_PROC_SMOKE="256G" - MEMO_RUN_PREPSTART="120G" - MEMO_PREP_CYC="40G" + MEMO_ANALYSIS_NONVARCLD="256G" + MEMO_PROCESS_SMOKE="256G" + MEMO_PREP_CYC="120G" MEMO_SAVE_RESTART="120G" MEMO_SAVE_INPUT="120G" MEMO_PRDGEN="256G" @@ -522,7 +519,7 @@ elif [[ ${PREDEF_GRID_NAME} == "RRFS_NA_3km" ]] ; then WTIME_FORECAST="02:30:00" WTIME_FORECAST_LONG="05:30:00" WTIME_MAKE_LBCS="02:30:00" - WTIME_RUN_BUFRSND="04:45:00" + WTIME_BUFRSND="04:45:00" CLEAN_OLDPROD_HRS="120" CLEAN_OLDLOG_HRS="120" @@ -540,10 +537,10 @@ elif [[ ${PREDEF_GRID_NAME} == "RRFS_NA_3km" ]] ; then PPN_FORECAST="10" NNODES_FORECAST="105" TPP_FORECAST="4" - PPN_RUN_NONVARCLDANL="10" - NNODES_RUN_NONVARCLDANL="20" - NATIVE_RUN_ANALYSIS="--cpus-per-task 4 --exclusive" - PPN_RUN_GSIDIAG=40 + PPN_ANALYSIS_NONVARCLD="10" + NNODES_ANALYSIS_NONVARCLD="20" + NATIVE_ANALYSIS_GSI="--cpus-per-task 4 --exclusive" + PPN_ANALYSIS_GSIDIAG=40 fi elif [[ ${PREDEF_GRID_NAME} == "GSD_RAP13km" ]] ; then @@ -554,7 +551,7 @@ elif [[ ${PREDEF_GRID_NAME} == "GSD_RAP13km" ]] ; then TILE_SETS="full" NNODES_POST="1" grid_ratio_fv3=1.0 - PPN_RUN_POSTANAL="5" + PPN_UPDATE_LBC_SOIL="5" LAYOUT_X="16" LAYOUT_Y="16" PPN_FORECAST="20" diff --git a/ush/setup.sh b/ush/setup.sh index 1ed8b56ee..3dd942bec 100755 --- a/ush/setup.sh +++ b/ush/setup.sh @@ -484,7 +484,7 @@ optionList[0]=DO_DACYCLE optionList[1]=DO_SURFACE_CYCLE optionList[2]=DO_RETRO optionList[3]=LBCS_ICS_ONLY -optionList[4]=DO_NONVAR_CLDANAL +optionList[4]=DO_ANALYSIS_NONVARCLD optionList[5]=SAVE_CYCLE_LOG optionList[6]=DO_SOIL_ADJUST optionList[7]=DO_UPDATE_BC diff --git a/ush/valid_param_vals.sh b/ush/valid_param_vals.sh index 62b893740..3da08d5c9 100644 --- a/ush/valid_param_vals.sh +++ b/ush/valid_param_vals.sh @@ -55,7 +55,6 @@ valid_vals_DOT_OR_USCORE=("." "_") valid_vals_NOMADS=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no") valid_vals_NOMADS_file_type=("GRIB2" "grib2" "NEMSIO" "nemsio") valid_vals_DO_ENSEMBLE=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no") -valid_vals_DO_ENSPOST=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no") valid_vals_DO_ENSINIT=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no") valid_vals_DO_SAVE_INPUT=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no") valid_vals_DO_SAVE_DA_OUTPUT=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no") @@ -74,7 +73,7 @@ valid_vals_DO_POST_SPINUP=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no") valid_vals_DO_POST_PROD=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no") valid_vals_DO_PARALLEL_PRDGEN=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no") valid_vals_LBCS_ICS_ONLY=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no") -valid_vals_DO_NONVAR_CLDANAL=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no") +valid_vals_DO_ANALYSIS_NONVARCLD=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no") valid_vals_DO_SMOKE_DUST=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no") valid_vals_EBB_DCYCLE=("1" "2") valid_vals_DO_GLM_FED_DA=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no")