Bugfixes for default values of grid parameters and forecast computati…

…onal parameters; bugfix for setting FXILAM_NCO_BASEDIR in WE2E tests; other improvements. (#403)
ufs-community · Jan 20, 2021 · 8c34186 · 8c34186
1 parent 16cfd14
commit 8c34186
Show file tree

Hide file tree

Showing 8 changed files with 349 additions and 217 deletions.
diff --git a/tests/baseline_configs/config.new_ESGgrid.sh b/tests/baseline_configs/config.new_ESGgrid.sh
@@ -3,16 +3,16 @@ PREEXISTING_DIR_METHOD="rename"
 
 GRID_GEN_METHOD="ESGgrid"
 
-ESGgrid_LON_CTR=-97.5
-ESGgrid_LAT_CTR=41.25
+ESGgrid_LON_CTR="-97.5"
+ESGgrid_LAT_CTR="41.25"
 
 ESGgrid_DELX="25000.0"
 ESGgrid_DELY="25000.0"
 
-ESGgrid_NX=216
-ESGgrid_NY=156
+ESGgrid_NX="216"
+ESGgrid_NY="156"
 
-ESGgrid_WIDE_HALO_WIDTH=6
+ESGgrid_WIDE_HALO_WIDTH="6"
 
 DT_ATMOS="40"
 

diff --git a/tests/baseline_configs/config.new_GFDLgrid.sh b/tests/baseline_configs/config.new_GFDLgrid.sh
@@ -3,26 +3,26 @@ PREEXISTING_DIR_METHOD="rename"
 
 GRID_GEN_METHOD="GFDLgrid"
 
-GFDLgrid_LON_T6_CTR=-97.5
-GFDLgrid_LAT_T6_CTR=38.5
-GFDLgrid_STRETCH_FAC=1.0001  # Cannot be exactly 1.0 because then FV3 thinnks it's a global grid.  This needs to be fixed in the ufs_weather_model repo.
+GFDLgrid_LON_T6_CTR="-97.5"
+GFDLgrid_LAT_T6_CTR="38.5"
+GFDLgrid_STRETCH_FAC="1.0001"  # Cannot be exactly 1.0 because then FV3 thinnks it's a global grid.  This needs to be fixed in the ufs_weather_model repo.
 GFDLgrid_RES="96"
-GFDLgrid_REFINE_RATIO=2
+GFDLgrid_REFINE_RATIO="2"
 
-#num_margin_cells_T6_left=9
+#num_margin_cells_T6_left="9"
 #GFDLgrid_ISTART_OF_RGNL_DOM_ON_T6G=$(( num_margin_cells_T6_left + 1 ))
 GFDLgrid_ISTART_OF_RGNL_DOM_ON_T6G="10"
 
-#num_margin_cells_T6_right=9
+#num_margin_cells_T6_right="9"
 #GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_RES - num_margin_cells_T6_right ))
 GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G="87"
 
-#num_margin_cells_T6_bottom=9
+#num_margin_cells_T6_bottom="9"
 #GFDLgrid_JSTART_OF_RGNL_DOM_ON_T6G=$(( num_margin_cells_T6_bottom + 1 ))
 #GFDLgrid_JSTART_OF_RGNL_DOM_ON_T6G="10"
 GFDLgrid_JSTART_OF_RGNL_DOM_ON_T6G="19"
 
-#num_margin_cells_T6_top=9
+#num_margin_cells_T6_top="9"
 #GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_RES - num_margin_cells_T6_top ))
 #GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G="87"
 GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G="78"

diff --git a/.../baseline_configs/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh b/.../baseline_configs/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh
@@ -3,25 +3,25 @@ PREEXISTING_DIR_METHOD="rename"
 
 GRID_GEN_METHOD="GFDLgrid"
 
-GFDLgrid_LON_T6_CTR=-97.5
-GFDLgrid_LAT_T6_CTR=38.5
-GFDLgrid_STRETCH_FAC=1.5
+GFDLgrid_LON_T6_CTR="-97.5"
+GFDLgrid_LAT_T6_CTR="38.5"
+GFDLgrid_STRETCH_FAC="1.5"
 GFDLgrid_RES="96"
-GFDLgrid_REFINE_RATIO=2
+GFDLgrid_REFINE_RATIO="2"
 
-#num_margin_cells_T6_left=9
+#num_margin_cells_T6_left="9"
 #GFDLgrid_ISTART_OF_RGNL_DOM_ON_T6G=$(( num_margin_cells_T6_left + 1 ))
 GFDLgrid_ISTART_OF_RGNL_DOM_ON_T6G="10"
 
-#num_margin_cells_T6_right=9
+#num_margin_cells_T6_right="9"
 #GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_RES - num_margin_cells_T6_right ))
 GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G="87"
 
-#num_margin_cells_T6_bottom=9
+#num_margin_cells_T6_bottom="9"
 #GFDLgrid_JSTART_OF_RGNL_DOM_ON_T6G=$(( num_margin_cells_T6_bottom + 1 ))
 GFDLgrid_JSTART_OF_RGNL_DOM_ON_T6G="10"
 
-#num_margin_cells_T6_top=9
+#num_margin_cells_T6_top="9"
 #GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_RES - num_margin_cells_T6_top ))
 GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G="87"
 

diff --git a/...s/baseline_configs/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh b/...s/baseline_configs/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh
@@ -3,25 +3,25 @@ PREEXISTING_DIR_METHOD="rename"
 
 GRID_GEN_METHOD="GFDLgrid"
 
-GFDLgrid_LON_T6_CTR=-97.5
-GFDLgrid_LAT_T6_CTR=38.5
-GFDLgrid_STRETCH_FAC=1.5
+GFDLgrid_LON_T6_CTR="-97.5"
+GFDLgrid_LAT_T6_CTR="38.5"
+GFDLgrid_STRETCH_FAC="1.5"
 GFDLgrid_RES="96"
-GFDLgrid_REFINE_RATIO=2
+GFDLgrid_REFINE_RATIO="2"
 
-#num_margin_cells_T6_left=9
+#num_margin_cells_T6_left="9"
 #GFDLgrid_ISTART_OF_RGNL_DOM_ON_T6G=$(( num_margin_cells_T6_left + 1 ))
 GFDLgrid_ISTART_OF_RGNL_DOM_ON_T6G="10"
 
-#num_margin_cells_T6_right=9
+#num_margin_cells_T6_right="9"
 #GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_RES - num_margin_cells_T6_right ))
 GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G="87"
 
-#num_margin_cells_T6_bottom=9
+#num_margin_cells_T6_bottom="9"
 #GFDLgrid_JSTART_OF_RGNL_DOM_ON_T6G=$(( num_margin_cells_T6_bottom + 1 ))
 GFDLgrid_JSTART_OF_RGNL_DOM_ON_T6G="10"
 
-#num_margin_cells_T6_top=9
+#num_margin_cells_T6_top="9"
 #GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_RES - num_margin_cells_T6_top ))
 GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G="87"
 

diff --git a/tests/run_experiments.sh b/tests/run_experiments.sh
@@ -502,6 +502,8 @@ VERBOSE=\"${VERBOSE}\""
 
     if [ "$MACHINE" = "HERA" ]; then
       pregen_basedir="/scratch2/BMC/det/FV3LAM_pregen"
+    elif [ "$MACHINE" = "JET" ]; then
+      pregen_basedir="/mnt/lfs4/BMC/wrfruc/FV3-LAM/pregen"
     elif [ "$MACHINE" = "CHEYENNE" ]; then
       pregen_basedir="/glade/p/ral/jntp/UFS_CAM/FV3LAM_pregen"
     else
@@ -603,7 +605,35 @@ SFC_CLIMO_DIR=\"${SFC_CLIMO_DIR}\""
 RUN=\"\${EXPT_SUBDIR}\"
 envir=\"\${EXPT_SUBDIR}\""
 #
-# Set COMINgfs.
+# Set FIXLAM_NCO_BASEDIR.
+#
+    if [ "$MACHINE" = "HERA" ]; then
+      FIXLAM_NCO_BASEDIR="/scratch2/BMC/det/FV3LAM_pregen"
+    elif [ "$MACHINE" = "JET" ]; then
+      FIXLAM_NCO_BASEDIR="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/FV3LAM_pregen"
+    elif [ "$MACHINE" = "CHEYENNE" ]; then
+      FIXLAM_NCO_BASEDIR="/needs/to/be/specified"
+    else
+      print_err_msg_exit "\
+The base directory (FIXLAM_NCO_BASEDIR) in which the pregenerated grid, 
+orography, and surface climatology \"fixed\" files used in NCO mode are 
+located has not been specified for this machine (MACHINE):
+  MACHINE= \"${MACHINE}\""
+    fi
+
+    str=${str}"
+#
+# The base directory in which the pregenerated grid, orography, and surface 
+# climatology \"fixed\" files used in NCO mode are located.  In NCO mode,
+# the workflow scripts will create symlinks (in the directory specified 
+# by FIXLAM) to files in a subdirectory under FIXLAM_NCO_BASDEDIR, where
+# the name of the subdirectory is the name of the predefined grid specified 
+# by PREDEF_GRID_NAME.
+#
+FIXLAM_NCO_BASEDIR=\"${FIXLAM_NCO_BASEDIR}\""
+#
+# Set COMINgfs if using the FV3GFS or the GSMGFS as the external model 
+# for ICs or LBCs.
 #
     if [ "${EXTRN_MDL_NAME_ICS}" = "FV3GFS" ] || \
        [ "${EXTRN_MDL_NAME_ICS}" = "GSMGFS" ] || \
@@ -612,13 +642,10 @@ envir=\"\${EXPT_SUBDIR}\""
 
       if [ "$MACHINE" = "HERA" ]; then
         COMINgfs="/scratch1/NCEPDEV/hwrf/noscrub/hafs-input/COMGFS"
-        FIXLAM_NCO_BASEDIR="/scratch2/BMC/det/FV3LAM_pregen"
       elif [ "$MACHINE" = "JET" ]; then
         COMINgfs="/lfs1/HFIP/hwrf-data/hafs-input/COMGFS"
-        FIXLAM_NCO_BASEDIR="/needs/to/be/specified"
       elif [ "$MACHINE" = "CHEYENNE" ]; then
         COMINgfs="/glade/scratch/ketefian/NCO_dirs/COMGFS"
-        FIXLAM_NCO_BASEDIR="/needs/to/be/specified"
       else
         print_err_msg_exit "\
 The directory (COMINgfs) that needs to be specified when running the
@@ -634,15 +661,7 @@ for this machine (MACHINE):
 # mode (RUN_ENVIR set to \"nco\") AND using the FV3GFS or the GSMGFS as
 # the external model for ICs and/or LBCs.
 #
-COMINgfs=\"${COMINgfs}\"
-#
-# The base directory in which the pregenerated grid, orography, and surface 
-# climatology \"fixed\" files used in NCO mode are located.  In NCO mode,
-# the workflow scripts will create a symlink (at the location specified 
-# by FIXLAM) to a subdirectory under FIXLAM_NCO_BASDEDIR.  (The name of 
-# the subdirectory is the name of the grid specified by PREDEF_GRID_NAME.)
-#
-FIXLAM_NCO_BASEDIR=\"${FIXLAM_NCO_BASEDIR}\""
+COMINgfs=\"${COMINgfs}\""
 
     fi
 #