From c2f20114307ec8cf3384f7e4eb722b3d6bd144cb Mon Sep 17 00:00:00 2001 From: kayeekayee Date: Mon, 30 Sep 2024 15:30:28 -0600 Subject: [PATCH] Fix init task for real time; Fix archive path; Fix missing submodule (FV3/ccpp/framework). (#67) --- FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.base | 5 ++++- FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.fcst | 2 +- FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.resources | 5 +++++ FV3GFSwfm/rt_v17p8_ugwpv1_mynn/rt_c768_icsonly.xml | 1 + .../rt_pygraf_global_ugwpv1_mynn.xml | 10 ++++++---- parm/archive/master_gfs.yaml.j2 | 1 - parm/config/gfs/config.base.hera | 3 +++ parm/config/gfs/config.resources | 5 +++++ sorc/ufs_model.fd | 2 +- 9 files changed, 26 insertions(+), 8 deletions(-) diff --git a/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.base b/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.base index 03c2803816..fce4998b56 100644 --- a/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.base +++ b/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.base @@ -127,8 +127,11 @@ export DUMP_SUFFIX="" if [[ "${PDY}${cyc}" -ge "2019092100" && "${PDY}${cyc}" -le "2019110700" ]]; then export DUMP_SUFFIX="p" # Use dumps from NCO GFS v15.3 parallel fi +#KYW for real time init task +export DATAROOT="${STMP}/RUNDIRS/${PSLOT}" # TODO: set via prod_envir in Ops + export ARCDIR="${NOSCRUB}/archive/${PSLOT}" -export ATARDIR="/BMC/${HPSS_PROJECT}/1year/${USER}/${machine}/scratch/${PSLOT}" +export ATARDIR="/BMC/${HPSS_PROJECT}/1year/${USER}/${machine}/scratch/${PSLOT}/${PDY:0:4}" # Commonly defined parameters in JJOBS export envir=${envir:-"prod"} diff --git a/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.fcst b/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.fcst index 44826db5d1..800e68e1e7 100644 --- a/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.fcst +++ b/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.fcst @@ -137,7 +137,7 @@ export d2_bg_k2=0.04 export dz_min=6 export n_sponge=42 -# PBL/turbulance schemes +# PBL/turbulence schemes export hybedmf=".false." if [[ "${CCPP_SUITE}" == "FV3_global_nest"* ]]; then export satmedmf=".false." diff --git a/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.resources b/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.resources index 7b737d05f0..9edfa06a46 100644 --- a/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.resources +++ b/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.resources @@ -907,6 +907,11 @@ case ${step} in threads_per_task=1 tasks_per_node=6 memory="70GB" + wtime_init="00:30:00" + npe_init=24 + nth_init=1 + npe_node_init=6 + memory_init="70G" ;; "init_chem") diff --git a/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/rt_c768_icsonly.xml b/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/rt_c768_icsonly.xml index 225a13a309..ad739a36bd 100644 --- a/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/rt_c768_icsonly.xml +++ b/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/rt_c768_icsonly.xml @@ -117,6 +117,7 @@ ROTDIR&ROTDIR; PSLOT&PSLOT; COMPONENT&COMPONENT; + DATAROOT&ROTDIR;/../RUNDIRS/&PSLOT; diff --git a/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/rt_pygraf_global_ugwpv1_mynn.xml b/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/rt_pygraf_global_ugwpv1_mynn.xml index d39a2790a0..a1595c73a0 100644 --- a/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/rt_pygraf_global_ugwpv1_mynn.xml +++ b/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/rt_pygraf_global_ugwpv1_mynn.xml @@ -10,8 +10,8 @@ - - + + @@ -24,7 +24,8 @@ - + + @@ -35,7 +36,7 @@ - + @@ -132,3 +133,4 @@ + diff --git a/parm/archive/master_gfs.yaml.j2 b/parm/archive/master_gfs.yaml.j2 index 39fef5012d..c6878dd33a 100644 --- a/parm/archive/master_gfs.yaml.j2 +++ b/parm/archive/master_gfs.yaml.j2 @@ -28,7 +28,6 @@ datasets: {% filter indent(width=4) %} {% include "gfs_flux.yaml.j2" %} {% include "gfs_netcdfb.yaml.j2" %} -#KYW{% include "gfs_pgrb2b.yaml.j2" %} {% endfilter %} {% if MODE == "cycled" %} # Archive Gaussian analysis data diff --git a/parm/config/gfs/config.base.hera b/parm/config/gfs/config.base.hera index f779b4ace1..cab84c93bd 100644 --- a/parm/config/gfs/config.base.hera +++ b/parm/config/gfs/config.base.hera @@ -127,6 +127,9 @@ export DUMP_SUFFIX="" if [[ "${PDY}${cyc}" -ge "2019092100" && "${PDY}${cyc}" -le "2019110700" ]]; then export DUMP_SUFFIX="p" # Use dumps from NCO GFS v15.3 parallel fi +#KYW for real time init task +export DATAROOT="${STMP}/RUNDIRS/${PSLOT}" # TODO: set via prod_envir in Ops + export ARCDIR="${NOSCRUB}/archive/${PSLOT}" export ATARDIR="@ATARDIR@" diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources index 7b737d05f0..9edfa06a46 100644 --- a/parm/config/gfs/config.resources +++ b/parm/config/gfs/config.resources @@ -907,6 +907,11 @@ case ${step} in threads_per_task=1 tasks_per_node=6 memory="70GB" + wtime_init="00:30:00" + npe_init=24 + nth_init=1 + npe_node_init=6 + memory_init="70G" ;; "init_chem") diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index 3b4f88528b..5c9a6b79a0 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 3b4f88528ba1a8c00265eae2a2339f4b82e26dc2 +Subproject commit 5c9a6b79a04cd052dfb2702a27405ab34e575b34