From ac4d8ede8f6374aec0b87242a5043b897118e122 Mon Sep 17 00:00:00 2001
From: kayeekayee <kayee.wong@noaa.gov>
Date: Mon, 30 Sep 2024 15:31:09 -0600
Subject: [PATCH] Fix init task for real time; Fix archive path; Fix missing
 submodule (FV3/ccpp/framework). (#68)

---
 FV3GFSwfm/rt_v17p8_ugwpv1_c3_mynn/config.base            | 5 ++++-
 FV3GFSwfm/rt_v17p8_ugwpv1_c3_mynn/config.fcst            | 2 +-
 FV3GFSwfm/rt_v17p8_ugwpv1_c3_mynn/config.resources       | 5 +++++
 .../rt_pygraf_global_ugwpv1_c3_mynn.xml                  | 9 +++++----
 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 +-
 8 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/FV3GFSwfm/rt_v17p8_ugwpv1_c3_mynn/config.base b/FV3GFSwfm/rt_v17p8_ugwpv1_c3_mynn/config.base
index f057f78330..d8c0aa6acb 100644
--- a/FV3GFSwfm/rt_v17p8_ugwpv1_c3_mynn/config.base
+++ b/FV3GFSwfm/rt_v17p8_ugwpv1_c3_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_c3_mynn/config.fcst b/FV3GFSwfm/rt_v17p8_ugwpv1_c3_mynn/config.fcst
index 44826db5d1..800e68e1e7 100644
--- a/FV3GFSwfm/rt_v17p8_ugwpv1_c3_mynn/config.fcst
+++ b/FV3GFSwfm/rt_v17p8_ugwpv1_c3_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_c3_mynn/config.resources b/FV3GFSwfm/rt_v17p8_ugwpv1_c3_mynn/config.resources
index 7b737d05f0..9edfa06a46 100644
--- a/FV3GFSwfm/rt_v17p8_ugwpv1_c3_mynn/config.resources
+++ b/FV3GFSwfm/rt_v17p8_ugwpv1_c3_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_c3_mynn/rt_pygraf_global_ugwpv1_c3_mynn.xml b/FV3GFSwfm/rt_v17p8_ugwpv1_c3_mynn/rt_pygraf_global_ugwpv1_c3_mynn.xml
index 4d7d3cdbec..54cd360b04 100644
--- a/FV3GFSwfm/rt_v17p8_ugwpv1_c3_mynn/rt_pygraf_global_ugwpv1_c3_mynn.xml
+++ b/FV3GFSwfm/rt_v17p8_ugwpv1_c3_mynn/rt_pygraf_global_ugwpv1_c3_mynn.xml
@@ -10,8 +10,8 @@
 	<!ENTITY FCST_LENGTH "120">
 
 	<!-- Experiment parameters such as starting, ending dates -->
-	<!ENTITY SDATE    "202403100000">
-	<!ENTITY EDATE    "203401140000">
+	<!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">
@@ -63,7 +64,7 @@
     <var name="T"> 000 006 012 018 024 030 036 042 048 054 060 066 072 078 084 090 096 102 108 114 120 </var>
 
     <task name="remapgrib_#T#" cycledefs="gfs" maxtries="4">
-        <command>&JOBS_DIR;/remapgrib.ksh</command>
+        <command>&JOBS_DIR;/remapgrib.sh</command>
         <account>&ACCOUNT;</account>
         <cores>1</cores>
         <walltime>00:35:00</walltime>
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