Fix init task for real time; Fix archive path; Fix missing submodule …

…(FV3/ccpp/framework). (NOAA-GSL#67)
kayeekayee · Sep 30, 2024 · c2f2011 · c2f2011
1 parent b997e7d
commit c2f2011
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -117,6 +117,7 @@
 	<envar><name>ROTDIR</name><value>&ROTDIR;</value></envar>
 	<envar><name>PSLOT</name><value>&PSLOT;</value></envar>
 	<envar><name>COMPONENT</name><value>&COMPONENT;</value></envar>
+        <envar><name>DATAROOT</name><value>&ROTDIR;/../RUNDIRS/&PSLOT;</value></envar>
 
 	<dependency>
 		<and>

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
@@ -10,8 +10,8 @@
 	<!ENTITY FCST_LENGTH "120">
 
 	<!-- Experiment parameters such as starting, ending dates -->
-	<!ENTITY SDATE    "202403290000">
-	<!ENTITY EDATE    "203403200000">
+	<!ENTITY SDATE    "202406010000">
+	<!ENTITY EDATE    "203406010000">
 	<!ENTITY INTERVAL "24:00:00">
 
 	<!-- Run Envrionment -->
@@ -24,7 +24,8 @@
 	<!-- Experiment related directories -->
 	<!ENTITY EXPDIR "&HOMEgfs;/FV3GFSwfm/&PSLOT;">
 	<!ENTITY ROTDIR "&HOMEgfs;/FV3GFSrun/&PSLOT;">
-	<!ENTITY PYGRAFDIR "/scratch1/BMC/gsd-fv3/exp/pygraf">
+	<!--<!ENTITY PYGRAFDIR "/scratch1/BMC/gsd-fv3/exp/pygraf"> -->
+	<!ENTITY PYGRAFDIR "/scratch1/BMC/gsd-fv3/rtruns/pygraf">
 
 	<!-- Machine related entities -->
 	<!ENTITY ACCOUNT    "gsd-fv3">
@@ -35,7 +36,7 @@
 	<!-- ROCOTO parameters that control workflow -->
 	<!ENTITY CYCLETHROTTLE "4">
 	<!ENTITY TASKTHROTTLE  "25">
-	<!ENTITY MAXTRIES      "2">
+	<!ENTITY MAXTRIES      "4">
 
 	<!-- BEGIN: Resource requirements for the workflow -->
 
@@ -132,3 +133,4 @@
   </metatask>
 
 </workflow>
+
diff --git 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
@@ -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
@@ -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