[v2.1.4-3.0] Hotfix for continuous surface cycling (#1558)

* Hotfix for continuous surface cycling
* Update .ignore.compare_xml_yaml_outputs
XML differences expected
---------

Author: chunhuazhou

scripts/exrrfs_prep_ic.sh

@@ -108,7 +108,7 @@ for index in "${mem_list[@]}"; do # loop through all the members
         if [[ "${cyc}" == "${shr}" ]]; then
           source_file=""
           # look back ${NUM} cycles to find mpasout files for surface cycling
-          NUM=3
+          NUM=27
           for (( ii=cyc_interval; ii<=$(( NUM*cyc_interval )); ii=ii+cyc_interval )); do
             CDATEp=$(${NDATE} -${ii} "${CDATE}" )
             PDYii=${CDATEp:0:8}

tests/.ignore.compare_xml_yaml_outputs

@@ -1,2 +1,2 @@
-1559
+1558
 # put the exact PR number in the first line without any empty spaces

workflow/exp/rt_ursa/exp.rrfsv2x

@@ -51,7 +51,7 @@ for i in {0..23..12}; do arr[$i]="72"; done # 24hr fcst every 12hrs
 export FCST_LEN_HRS_CYCLES="${arr[*]}"
 export HISTORY_INTERVAL=1
 export DIAG_INTERVAL=1
-export MPASOUT_TIMELEVELS='0 1 2 3'
+export MPASOUT_TIMELEVELS='0 1 2 3 15 27'
 export POST_GROUP_TOT_NUM=10
 
 export IC_OFFSET=3
@@ -141,7 +141,7 @@ export STARTTIME_JEDIVAR="00:40:00"
 export STARTTIME_FCST="00:10:00"
 export STARTTIME_MPASSIT="00:15:00"
 export STARTTIME_UPP="00:15:00"
-export STARTTIME_PREP_IC="02:00:00"
+export STARTTIME_PREP_IC="03:00:00"
 export STARTTIME_PREP_LBC="00:15:00"
 export MORE_XML_ENTITIES=true
 export DO_CLEAN=true

workflow/rocoto_funcs/prep_ic.py

@@ -89,7 +89,7 @@ def prep_ic(xmlFile, expdir, do_ensemble=False, spinup_mode=0):
         for i in range(1, int(sfc_update_look_back_hrs) + 1, 1):
             datadep_sfc = datadep_sfc + f'''\n        <datadep age="00:00:05"><cyclestr offset="-{i}:00:00">&COMROOT;/&NET;/&rrfs_ver;/&RUN;.@Y@m@d/@H/fcst/&WGF;/fcst_f{i:0>3}.done</cyclestr></datadep>'''
         sfc_dep = f'''
-      <or>{datadep_sfc}
+      <or>{timedep}{datadep_sfc}
       </or>'''
 
     #