add and test FV3_RRFS_v1beta (#270)

* RRFS_v1beta test finished * remove config.sh * revoke change on DT_ATMOS * add if condition for RRFS_v1beta * bug fix for atmos_nthreads * FIXsar to FIXLAM
ufs-community · Aug 22, 2020 · 0a8c4c5 · 0a8c4c5
1 parent 07ef18d
commit 0a8c4c5
Show file tree

Hide file tree

Showing 11 changed files with 488 additions and 4 deletions.
diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh
@@ -107,7 +107,7 @@ case "${CCPP_PHYS_SUITE}" in
 "FV3_GFS_2017_gfdlmp" | "FV3_GFS_2017_gfdlmp_regional" )
   phys_suite="GFS"
   ;;
-"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_GSD_SAR_v1" |"FV3_RRFS_v0" )
+"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_GSD_SAR_v1" |"FV3_RRFS_v0" |"FV3_RRFS_v1beta")
   phys_suite="GSD"
   ;;
 "FV3_CPT_v0")
@@ -307,6 +307,7 @@ case "${EXTRN_MDL_NAME_ICS}" in
       elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
            [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
            [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
+           [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
            [ "${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.
@@ -372,6 +373,7 @@ HRRRX grib2 files created after about \"${cdate_min_HRRRX}\"..."
        [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
@@ -419,6 +421,7 @@ of external model (EXTRN_MDL_NAME_ICS) and physics suite (CCPP_PHYS_SUITE):
        [ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
        [ "${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
@@ -107,7 +107,7 @@ case "${CCPP_PHYS_SUITE}" in
 "FV3_GFS_2017_gfdlmp" | "FV3_GFS_2017_gfdlmp_regional")
   phys_suite="GFS"
   ;;
-"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_GSD_SAR_v1" | "FV3_RRFS_v0" )
+"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_GSD_SAR_v1" | "FV3_RRFS_v0" | "FV3_RRFS_v1beta" )
   phys_suite="GSD"
   ;;
 "FV3_CPT_v0" )
@@ -290,6 +290,7 @@ case "${EXTRN_MDL_NAME_LBCS}" in
       elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
            [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
            [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
+           [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
            [ "${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.
@@ -341,6 +342,7 @@ and FV3GFS file type (FV3GFS_FILE_FMT_LBCS):
        [ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
       numsoil_out="4"

diff --git a/scripts/exregional_make_orog.sh b/scripts/exregional_make_orog.sh
@@ -342,6 +342,9 @@ raw_orog_fn="${raw_orog_fn_prefix}.${fn_suffix_with_halo}"
 raw_orog_fp="${raw_dir}/${raw_orog_fn}"
 mv_vrfy "${raw_orog_fp_orig}" "${raw_orog_fp}"
 
+# copy two files for drag_suite to the orog directory (temporary)
+cp_vrfy /scratch2/BMC/gsd-fv3-test/she/orog/* ${OROG_DIR}    # temporary code
+
 print_info_msg "$VERBOSE" "
 Orography file generation complete."
 #

diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh
@@ -252,6 +252,28 @@ Cannot create symlink because target does not exist:
   target = \"$target\""
 fi
 
+# two files for drag_suite scheme
+if [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
+    # Symlink to orographic statistics fields file with "${CRES}_" and "halo0" stripped from name.
+    target="${FIXLAM}/${CRES}${DOT_OR_USCORE}oro_data_ls.tile${TILE_RGNL}.halo${NH0}.nc"
+    symlink="oro_data_ls.nc"
+    if [ -f "${target}" ]; then
+      ln_vrfy -sf ${relative_or_null} $target $symlink
+    else
+      print_err_msg_exit "\
+    Cannot create symlink because target does not exist:
+      target = \"$target}\""
+    fi
+    target="${FIXLAM}/${CRES}${DOT_OR_USCORE}oro_data_ss.tile${TILE_RGNL}.halo${NH0}.nc"
+    symlink="oro_data_ss.nc"
+    if [ -f "${target}" ]; then
+      ln_vrfy -sf ${relative_or_null} $target $symlink
+    else
+      print_err_msg_exit "\
+    Cannot create symlink because target does not exist:
+      target = \"$target}\""
+    fi
+fi
 #
 # Symlink to halo-4 orography file with "${CRES}_" stripped from name.
 #
@@ -415,6 +437,7 @@ if [ "${USE_CCPP}" = "TRUE" ]; then
   if [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
+     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
     ln_vrfy -sf ${relative_or_null} $EXPTDIR/CCN_ACTIVATE.BIN ${run_dir}
   fi

diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh
@@ -517,6 +517,7 @@ the forecast model directory sturcture to the experiment directory..."
   if [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
+     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
     print_info_msg "$VERBOSE" "
 Copying the fixed file containing cloud condensation nuclei (CCN) data

diff --git a/ush/link_fix.sh b/ush/link_fix.sh
@@ -241,10 +241,20 @@ Creating links in the FIXLAM directory to the grid files..."
     ;;
 #
   "orog")
+  if [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
     fns=( \
-"C*${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH0}.nc" \
-"C*${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH4}.nc" \
+    "C*${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH0}.nc" \
+    "C*${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH4}.nc" \
+    "C*${DOT_OR_USCORE}oro_data_ss.tile${TILE_RGNL}.halo${NH0}.nc" \
+    "C*${DOT_OR_USCORE}oro_data_ls.tile${TILE_RGNL}.halo${NH0}.nc" \
         )
+  else
+    fns=( \
+    "C*${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH0}.nc" \
+    "C*${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH4}.nc" \
+        )
+  fi
+
     fps=( "${fns[@]/#/${OROG_DIR}/}" )
     run_task="${RUN_TASK_MAKE_OROG}"
     ;;

diff --git a/ush/templates/FV3.input.yml b/ush/templates/FV3.input.yml
@@ -44,6 +44,18 @@ FV3_RRFS_v0:
     lsm: 2
     lsoil_lsm: 4
 
+FV3_RRFS_v1beta:
+  gfs_physics_nml:
+    <<: *gsd_sar_phys
+    lsm: 2
+    lsoil_lsm: 4
+    imfshalcnv: -1
+    IMFDEEPCNV: -1
+    DO_MYNNSFCLAY: true
+    GWD_OPT: 3
+  atmos_model_nml:
+    fdiag: 3
+
 FV3_GFS_2017_gfdlmp:
   atmos_model_nml:
     avg_max_length: 3600.0
@@ -429,3 +441,4 @@ FV3_CPT_v0:
     xkzm_s: 1.0
   nam_sfcperts: !!python/none
   surf_map_nml: !!python/none
+