Merge remote-tracking branch 'emc/develop' into feature/spack-stack

ci/cases/pr/C48_S2SA_gefs.yaml

@@ -9,9 +9,9 @@ arguments:
   resens: 48
   nens: 2
   gfs_cyc: 1
+  start: cold
   comrot: {{ 'RUNTESTS' | getenv }}/COMROT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
-  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48C48mx500
   idate: 2021032312
   edate: 2021032312
   yaml: {{ HOMEgfs }}/ci/platforms/gefs_ci_defaults.yaml

jobs/JGFS_ATMOS_CYCLONE_GENESIS

@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 
 source "${HOMEgfs}/ush/preamble.sh"
-source "${HOMEgfs}/ush/jjob_header.sh" -e "vrfy" -c "base vrfy"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "genesis" -c "base genesis"
 
 
 ##############################################

jobs/JGFS_ATMOS_CYCLONE_TRACKER

@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 
 source "${HOMEgfs}/ush/preamble.sh"
-source "${HOMEgfs}/ush/jjob_header.sh" -e "vrfy" -c "base vrfy"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "tracker" -c "base tracker"
 
 
 export COMPONENT="atmos"

jobs/JGFS_ATMOS_FSU_GENESIS

@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 
 source "${HOMEgfs}/ush/preamble.sh"
-source "${HOMEgfs}/ush/jjob_header.sh" -e "vrfy" -c "base vrfy"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "genesis_fsu" -c "base genesis_fsu"
 
 export COMPONENT="atmos"
 

jobs/JGLOBAL_FORECAST

@@ -46,7 +46,7 @@ declare -rx gcyc="${GDATE:8:2}"
 
 # Construct COM variables from templates (see config.com)
 YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_RESTART COM_ATMOS_INPUT COM_ATMOS_ANALYSIS \
-  COM_ATMOS_HISTORY COM_ATMOS_MASTER COM_TOP
+  COM_ATMOS_HISTORY COM_ATMOS_MASTER COM_TOP COM_CONF
 
 RUN=${rCDUMP} YMD="${gPDY}" HH="${gcyc}" generate_com -rx \
   COM_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL

jobs/rocoto/genesis.sh

@@ -0,0 +1,20 @@
+#! /usr/bin/env bash
+
+source "${HOMEgfs}/ush/preamble.sh"
+
+###############################################################
+# Source FV3GFS workflow modules
+source "${HOMEgfs}/ush/load_fv3gfs_modules.sh"
+status=$?
+(( status != 0 )) && exit "${status}"
+
+export job="genesis"
+export jobid="${job}.$$"
+
+###############################################################
+# Execute the JJOB
+
+"${HOMEgfs}/jobs/JGFS_ATMOS_CYCLONE_GENESIS"
+status=$?
+
+exit "${status}"

jobs/rocoto/genesis_fsu.sh

@@ -0,0 +1,20 @@
+#! /usr/bin/env bash
+
+source "${HOMEgfs}/ush/preamble.sh"
+
+###############################################################
+# Source FV3GFS workflow modules
+source "${HOMEgfs}/ush/load_fv3gfs_modules.sh"
+status=$?
+(( status != 0 )) && exit "${status}"
+
+export job="genesis_fsu"
+export jobid="${job}.$$"
+
+###############################################################
+# Execute the JJOB
+
+"${HOMEgfs}/jobs/JGFS_ATMOS_FSU_GENESIS"
+status=$?
+
+exit "${status}"

jobs/rocoto/tracker.sh

@@ -0,0 +1,20 @@
+#! /usr/bin/env bash
+
+source "${HOMEgfs}/ush/preamble.sh"
+
+###############################################################
+# Source FV3GFS workflow modules
+source "${HOMEgfs}/ush/load_fv3gfs_modules.sh"
+status=$?
+(( status != 0 )) && exit "${status}"
+
+export job="tracker"
+export jobid="${job}.$$"
+
+###############################################################
+# Execute the JJOB
+
+"${HOMEgfs}/jobs/JGFS_ATMOS_CYCLONE_TRACKER"
+status=$?
+
+exit "${status}"

jobs/rocoto/vrfy.sh

@@ -52,34 +52,6 @@ if [[ "${RUNMOS}" == "YES" && "${CDUMP}" == "gfs" ]]; then
 fi
 
 
-################################################################################
-echo
-echo "=============== START TO RUN CYCLONE TRACK VERIFICATION ==============="
-if [[ ${VRFYTRAK} = "YES" ]]; then
-
-    COMINsyn=${COMINsyn:-$(compath.py "${envir}/com/gfs/${gfs_ver}")/syndat}
-    export COMINsyn
-
-    ${TRACKERSH}
-fi
-
-
-################################################################################
-echo
-echo "=============== START TO RUN CYCLONE GENESIS VERIFICATION ==============="
-if [[ ${VRFYGENESIS} = "YES" && "${CDUMP}" = "gfs" ]]; then
-    ${GENESISSH}
-fi
-
-
-################################################################################
-echo
-echo "=============== START TO RUN CYCLONE GENESIS VERIFICATION (FSU) ==============="
-if [[ ${VRFYFSU} = "YES" && "${CDUMP}" = "gfs" ]]; then
-    ${GENESISFSU}
-fi
-
-
 ###############################################################
 # Force Exit out cleanly
 cd "${DATAROOT}"

parm/config/gefs/config.base.emc.dyn

@@ -138,7 +138,7 @@ export DO_WAVE="NO"
 export DO_OCN="NO"
 export DO_ICE="NO"
 export DO_AERO="NO"
-export CCPP_SUITE="FV3_GFS_v17_p8"
+export CCPP_SUITE="FV3_GFS_v17_p8_ugwpv1"
 export WAVE_CDUMP="" # When to include wave suite: gdas, gfs, or both
 export DOBNDPNT_WAVE="NO"
 export cplwav2atm=".false."
@@ -204,7 +204,7 @@ case "${APP}" in
     export DO_COUPLED="YES"
     export DO_OCN="YES"
     export DO_ICE="YES"
-    export CCPP_SUITE="FV3_GFS_v17_coupled_p8"  # TODO: Does this include FV3_GFS_v17_p8?  Can this be used instead of FV3_GFS_v17_p8 on L141
+    export CCPP_SUITE="FV3_GFS_v17_coupled_p8_ugwpv1"  # TODO: Does this include FV3_GFS_v17_p8?  Can this be used instead of FV3_GFS_v17_p8 on L141
     export confignamevarfornems="cpld"
 
     if [[ "${APP}" =~ A$ ]]; then
@@ -282,11 +282,16 @@ export NMEM_ENS=@NMEM_ENS@
 export ENSMEM="000"
 export MEMDIR="mem${ENSMEM}"
 
+export DOIAU="NO"  # While we are not doing IAU, we may want to warm start w/ IAU in the future
 # Check if cycle is cold starting
 if [[ "${EXP_WARM_START}" = ".false." ]]; then
-    export IAU_FHROT=0
+  export IAU_FHROT=0
 else
+  if [[ "${DOIAU}" = "YES" ]]; then
     export IAU_FHROT=3
+  else
+    export IAU_FHROT=0
+  fi
 fi
 
 # turned on nsst in anal and/or fcst steps, and turn off rtgsst

parm/config/gefs/config.fcst

@@ -119,24 +119,27 @@ if (( gwd_opt == 2 )); then
     #export  do_ugwp_v1_orog_only=".false."
 
     #--used for UFS p8
-    export knob_ugwp_version=0
+    export knob_ugwp_version=1
     export do_ugwp=".false."
     export do_tofd=".false."
-    export do_ugwp_v0=".true."
-    export do_ugwp_v1=".false."
+    export do_ugwp_v0=".false."
+    export do_ugwp_v1=".true."
     export do_ugwp_v0_orog_only=".false."
     export do_ugwp_v0_nst_only=".false."
-    export do_gsl_drag_ls_bl=".false."
+    export do_gsl_drag_ls_bl=".true."
     export do_gsl_drag_ss=".true."
-    export do_gsl_drag_tofd=".false."
+    export do_gsl_drag_tofd=".true."
     export do_ugwp_v1_orog_only=".false."
     launch_level=$(echo "${LEVS}/2.35" |bc)
     export launch_level
+    if [[ ${do_gsl_drag_ls_bl} == ".true." ]]; then
+       export cdmbgwd=${cdmbgwd_gsl}
+    fi
 fi
 
 # Sponge layer settings
-export tau=10.0
-export rf_cutoff=7.5e2
+export tau=0.
+export rf_cutoff=10.
 export d2_bg_k1=0.20
 export d2_bg_k2=0.04
 export dz_min=6

parm/config/gefs/config.ufs

@@ -112,6 +112,8 @@ case "${fv3_res}" in
         export nthreads_fv3=1
         export nthreads_fv3_gfs=1
         export cdmbgwd="0.071,2.1,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
+        export cdmbgwd_gsl="40.0,1.77,1.0,1.0"   # settings for GSL drag suite
+        export knob_ugwp_tauamp=6.0e-3      # setting for UGWPv1 non-stationary GWD
         export WRITE_GROUP=1
         export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=1
         export WRITE_GROUP_GFS=1
@@ -126,6 +128,8 @@ case "${fv3_res}" in
         export nthreads_fv3=1
         export nthreads_fv3_gfs=1
         export cdmbgwd="0.14,1.8,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
+        export cdmbgwd_gsl="20.0,2.5,1.0,1.0"   # settings for GSL drag suite
+        export knob_ugwp_tauamp=3.0e-3      # setting for UGWPv1 non-stationary GWD
         export WRITE_GROUP=1
         export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=1
         export WRITE_GROUP_GFS=1
@@ -140,6 +144,8 @@ case "${fv3_res}" in
         export nthreads_fv3=1
         export nthreads_fv3_gfs=2
         export cdmbgwd="0.23,1.5,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
+        export cdmbgwd_gsl="10.0,3.5,1.0,1.0"   # settings for GSL drag suite
+        export knob_ugwp_tauamp=1.5e-3      # setting for UGWPv1 non-stationary GWD
         export WRITE_GROUP=1
         export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10
         export WRITE_GROUP_GFS=2
@@ -154,6 +160,8 @@ case "${fv3_res}" in
         export nthreads_fv3=1
         export nthreads_fv3_gfs=2
         export cdmbgwd="1.1,0.72,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
+        export cdmbgwd_gsl="5.0,5.0,1.0,1.0"   # settings for GSL drag suite
+        export knob_ugwp_tauamp=0.8e-3      # setting for UGWPv1 non-stationary GWD
         export WRITE_GROUP=2
         export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=8
         export WRITE_GROUP_GFS=2
@@ -168,6 +176,8 @@ case "${fv3_res}" in
         export nthreads_fv3=4
         export nthreads_fv3_gfs=4
         export cdmbgwd="4.0,0.15,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
+        export cdmbgwd_gsl="2.5,7.5,1.0,1.0"   # settings for GSL drag suite
+        export knob_ugwp_tauamp=0.5e-3      # setting for UGWPv1 non-stationary GWD
         export WRITE_GROUP=2
         export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10
         export WRITE_GROUP_GFS=4
@@ -182,6 +192,8 @@ case "${fv3_res}" in
         export nthreads_fv3=4
         export nthreads_fv3_gfs=4
         export cdmbgwd="4.0,0.10,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
+        export cdmbgwd_gsl="1.67,8.8,1.0,1.0"   # settings for GSL drag suite
+        export knob_ugwp_tauamp=0.35e-3      # setting for UGWPv1 non-stationary GWD
         export WRITE_GROUP=4
         export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10  # TODO: refine these numbers when a case is available
         export WRITE_GROUP_GFS=4
@@ -196,6 +208,8 @@ case "${fv3_res}" in
         export nthreads_fv3=4
         export nthreads_fv3_gfs=4
         export cdmbgwd="4.0,0.05,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
+        export cdmbgwd_gsl="0.625,14.1,1.0,1.0"   # settings for GSL drag suite
+        export knob_ugwp_tauamp=0.13e-3      # setting for UGWPv1 non-stationary GWD
         export WRITE_GROUP=4
         export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10  # TODO: refine these numbers when a case is available
         export WRITE_GROUP_GFS=4

parm/config/gfs/config.base.emc.dyn

@@ -57,6 +57,9 @@ export DO_BUFRSND="NO"     # BUFR sounding products
 export DO_GEMPAK="NO"      # GEMPAK products
 export DO_AWIPS="NO"       # AWIPS products
 export DO_VRFY="YES"       # VRFY step
+export DO_TRACKER="YES"    # Hurricane track verification
+export DO_GENESIS="YES"    # Cyclone genesis verification
+export DO_GENESIS_FSU="NO" # Cyclone genesis verification (FSU)
 export DO_VERFOZN="YES"    # Ozone data assimilation monitoring
 export DO_VERFRAD="YES"    # Radiance data assimilation monitoring
 export DO_VMINMON="YES"    # GSI minimization monitoring
@@ -148,7 +151,7 @@ export DO_WAVE="NO"
 export DO_OCN="NO"
 export DO_ICE="NO"
 export DO_AERO="NO"
-export CCPP_SUITE="FV3_GFS_v17_p8"
+export CCPP_SUITE="FV3_GFS_v17_p8_ugwpv1"
 export WAVE_CDUMP="" # When to include wave suite: gdas, gfs, or both
 export DOBNDPNT_WAVE="NO"
 export cplwav2atm=".false."
@@ -214,7 +217,7 @@ case "${APP}" in
     export DO_COUPLED="YES"
     export DO_OCN="YES"
     export DO_ICE="YES"
-    export CCPP_SUITE="FV3_GFS_v17_coupled_p8"  # TODO: Does this include FV3_GFS_v17_p8?  Can this be used instead of FV3_GFS_v17_p8 on L149
+    export CCPP_SUITE="FV3_GFS_v17_coupled_p8_ugwpv1"  # TODO: Does this include FV3_GFS_v17_p8?  Can this be used instead of FV3_GFS_v17_p8 on L149
     export confignamevarfornems="cpld"
 
     if [[ "${APP}" =~ A$ ]]; then

parm/config/gfs/config.fcst

@@ -119,24 +119,27 @@ if (( gwd_opt == 2 )); then
     #export  do_ugwp_v1_orog_only=".false."
 
     #--used for UFS p8
-    export knob_ugwp_version=0
+    export knob_ugwp_version=1
     export do_ugwp=".false."
     export do_tofd=".false."
-    export do_ugwp_v0=".true."
-    export do_ugwp_v1=".false."
+    export do_ugwp_v0=".false."
+    export do_ugwp_v1=".true."
     export do_ugwp_v0_orog_only=".false."
     export do_ugwp_v0_nst_only=".false."
-    export do_gsl_drag_ls_bl=".false."
+    export do_gsl_drag_ls_bl=".true."
     export do_gsl_drag_ss=".true."
-    export do_gsl_drag_tofd=".false."
+    export do_gsl_drag_tofd=".true."
     export do_ugwp_v1_orog_only=".false."
     launch_level=$(echo "${LEVS}/2.35" |bc)
     export launch_level
+    if [[ ${do_gsl_drag_ls_bl} == ".true." ]]; then
+       export cdmbgwd=${cdmbgwd_gsl}
+    fi
 fi
 
 # Sponge layer settings
-export tau=10.0
-export rf_cutoff=7.5e2
+export tau=0.
+export rf_cutoff=10.
 export d2_bg_k1=0.20
 export d2_bg_k2=0.04
 export dz_min=6

parm/config/gfs/config.genesis

@@ -0,0 +1,12 @@
+#! /usr/bin/env bash
+
+########## config.genesis ##########
+echo "BEGIN: config.genesis"
+
+# Get task specific resources
+. "${EXPDIR}/config.resources" genesis
+
+# Get tropcy settings
+. "${EXPDIR}/config.tropcy"
+
+echo "END: config.genesis"

parm/config/gfs/config.genesis_fsu

@@ -0,0 +1,12 @@
+#! /usr/bin/env bash
+
+########## config.genesis_fsu ##########
+echo "BEGIN: config.genesis_fsu"
+
+# Get task specific resources
+. "${EXPDIR}/config.resources" genesis_fsu
+
+# Get tropcy settings
+. "${EXPDIR}/config.tropcy"
+
+echo "END: config.genesis_fsu"