Merge branch 'community_develop' of https://github.com/NOAA-EMC/regio…

…nal_workflow into community_develop
ufs-community · Mar 22, 2020 · e890764 · e890764
2 parents bfe552e + 817db9f
commit e890764
Show file tree

Hide file tree

Showing 11 changed files with 804 additions and 3 deletions.
diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh
@@ -101,7 +101,7 @@ case "${CCPP_PHYS_SUITE}" in
   phys_suite="GFS"
   ;;
 
-"FV3_GSD_v0" | "FV3_GSD_SAR")
+"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_GSD_SAR_v1" )
   phys_suite="GSD"
   ;;
 "FV3_CPT_v0")
@@ -297,6 +297,7 @@ case "${EXTRN_MDL_NAME_ICS}" in
          [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ] ; then
         tracers="\"sphum\",\"liq_wat\",\"o3mr\",\"ice_wat\",\"rainwat\",\"snowwat\",\"graupel\""
       elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
+           [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
            [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
 # For GSD physics, add three additional tracers (the ice, rain and water
 # number concentrations) that are required for Thompson microphysics.
@@ -350,6 +351,7 @@ HRRRX grib2 files created after about \"${cdate_min_HRRRX}\"..."
 
   if [ "${USE_CCPP}" = "TRUE" ]; then
     if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ] ; then
@@ -380,6 +382,7 @@ HRRRX grib2 files created after about \"${cdate_min_HRRRX}\"..."
   if [ "${USE_CCPP}" = "TRUE" ]; then
     if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ] ; then
       numsoil_out="4"

diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh
@@ -102,7 +102,7 @@ case "${CCPP_PHYS_SUITE}" in
   phys_suite="GFS"
   ;;
 
-"FV3_GSD_v0" | "FV3_GSD_SAR")
+"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_GSD_SAR_v1")
   phys_suite="GSD"
   ;;
 "FV3_CPT_v0" )
@@ -283,6 +283,7 @@ case "${EXTRN_MDL_NAME_LBCS}" in
          [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ] ; then
         tracers="\"sphum\",\"liq_wat\",\"o3mr\",\"ice_wat\",\"rainwat\",\"snowwat\",\"graupel\""
       elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
+           [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
            [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
 # For GSD physics, add three additional tracers (the ice, rain and water
 # number concentrations) that are required for Thompson microphysics.
@@ -323,6 +324,7 @@ case "${EXTRN_MDL_NAME_LBCS}" in
   if [ "${USE_CCPP}" = "TRUE" ]; then
     if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ] ; then
       numsoil_out="4"

diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh
@@ -419,6 +419,7 @@ if [ "${USE_CCPP}" = "TRUE" ]; then
   ln_vrfy -sf -t ${CYCLE_DIR} ${CCPP_PHYS_SUITE_FP}
 
   if [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
+     [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
     ln_vrfy -sf -t ${CYCLE_DIR} $EXPTDIR/CCN_ACTIVATE.BIN
   fi

diff --git a/tests/baseline_configs/config.regional_013.sh b/tests/baseline_configs/config.regional_013.sh
@@ -0,0 +1,57 @@
+#
+# MACHINE will be set by the workflow launch script (launch_FV3SAR_-
+# wflow.sh) to value passed in as an argument to that script.
+#
+MACHINE=""
+#
+# ACCOUNT will be set by the workflow launch script (launch_FV3SAR_-
+# wflow.sh) to value passed in as an argument to that script.
+#
+ACCOUNT=""
+#
+# EXPT_SUBDIR will be set by the workflow launch script (launch_FV3SAR_-
+# wflow.sh) to a value obtained from the name of this file.
+#
+EXPT_SUBDIR=""
+#
+# USE_CRON_TO_RELAUNCH may be reset by the workflow launch script
+# (launch_FV3SAR_wflow.sh) to value passed in as an argument to that
+# script, but in case it is not, we give it a default value here.
+#
+USE_CRON_TO_RELAUNCH="TRUE"
+#
+# CRON_RELAUNCH_INTVL_MNTS may be reset by the workflow launch script
+# (launch_FV3SAR_wflow.sh) to value passed in as an argument to that
+# script, but in case it is not, we give it a default value here.
+#
+CRON_RELAUNCH_INTVL_MNTS="02"
+
+
+QUEUE_DEFAULT="batch"
+QUEUE_HPSS="service"
+QUEUE_FCST="batch"
+
+VERBOSE="TRUE"
+
+RUN_ENVIR="community"
+PREEXISTING_DIR_METHOD="rename"
+
+PREDEF_GRID_NAME="GSD_HRRR25km"
+GRID_GEN_METHOD="JPgrid"
+QUILTING="TRUE"
+USE_CCPP="TRUE"
+CCPP_PHYS_SUITE="FV3_GSD_SAR_v1"
+FCST_LEN_HRS="06"
+LBC_UPDATE_INTVL_HRS="6"
+
+DATE_FIRST_CYCL="20190520"
+DATE_LAST_CYCL="20190520"
+CYCL_HRS=( "00" )
+
+EXTRN_MDL_NAME_ICS="GSMGFS"
+EXTRN_MDL_NAME_LBCS="GSMGFS"
+
+RUN_TASK_MAKE_GRID="TRUE"
+RUN_TASK_MAKE_OROG="TRUE"
+RUN_TASK_MAKE_SFC_CLIMO="TRUE"
+
diff --git a/tests/baselines_list.txt b/tests/baselines_list.txt
@@ -10,3 +10,4 @@ regional_009
 regional_010
 regional_011
 regional_012
+regional_013
diff --git a/ush/generate_FV3SAR_wflow.sh b/ush/generate_FV3SAR_wflow.sh
@@ -450,6 +450,7 @@ the forecast model directory sturcture to the experiment directory..."
 # Thompson microphysics parameterization to the experiment directory.
 #
   if [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
+     [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
     print_info_msg "$VERBOSE" "
 Copying the fixed file containing cloud condensation nuclei (CCN) data