Remove unused/outdated code (#313)

## DESCRIPTION OF CHANGES: * In setup.sh and generate_FV3LAM_wflow.sh, remove temporary codes that fix bugs in the FV3_GFS_2017_gfdlmp_regional suite definition file because those bugs have been fixed (in the ufs-weather-model repo). * In setup.sh, remove block of code that is no longer necessary because chgres_cube can now initialize from external model data with either 4 or 9 soil levels, and run with LSMs of either 4 or 9 soil levels. * Remove modifications to LD_LIBRARY_PATH in exregional_run_fcst.sh. * For the make_ics and make_lbcs tasks, move the setting of APRUN and other machine-specific actions from the J-job to the ex-script in order to be consistent with the other workflow tasks. * Fix indentation and edit comments. * Remove unused file load_fv3gfs_modules.sh. ## TESTS CONDUCTED: Ran two WE2E tests on hera, new_ESGgrid and new_GFDLgrid: * new_ESGgrid uses the FV3_GFS_2017_gfdlmp_regional suite. The test was successful. * new_GFDLgrid uses the FV3_GFS_2017_gfdlmp suite. The test was successful. ## ISSUE (optional): This resolves issue #198.
ufs-community · Oct 15, 2020 · d2df68c · d2df68c
1 parent 72a1a8a
commit d2df68c
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 302 deletions.
diff --git a/jobs/JREGIONAL_MAKE_ICS b/jobs/JREGIONAL_MAKE_ICS
@@ -49,48 +49,6 @@ for the FV3 (in NetCDF format).
 #
 #-----------------------------------------------------------------------
 #
-# Set machine-dependent parameters.
-#
-#-----------------------------------------------------------------------
-#
-case "$MACHINE" in
-
-  "WCOSS_CRAY")
-    ulimit -s unlimited
-    APRUN="aprun -b -j1 -n48 -N12 -d1 -cc depth"
-    ;;
-
-  "WCOSS_DELL_P3")
-    ulimit -s unlimited
-    APRUN="mpirun"
-    ;;
-
-  "HERA")
-    ulimit -s unlimited
-    APRUN="srun"
-    ;;
-
-  "JET")
-    ulimit -s unlimited
-    APRUN="srun"
-    ;;
-
-  "ODIN")
-    APRUN="srun"
-    ;;
-
-  "CHEYENNE")
-    nprocs=$(( NNODES_MAKE_ICS*PPN_MAKE_ICS ))
-    APRUN="mpirun -np $nprocs"
-    ;;
-  "STAMPEDE")
-    APRUN="ibrun"
-    ;;
-
-esac
-#
-#-----------------------------------------------------------------------
-#
 # Set the name of and create the directory in which the output from this
 # script will be placed (if that directory doesn't already exist).
 #
@@ -106,8 +64,7 @@ mkdir_vrfy -p "${ics_dir}"
 #-----------------------------------------------------------------------
 #
 $SCRIPTSDIR/exregional_make_ics.sh \
-  ics_dir="${ics_dir}" \
-  APRUN="${APRUN}" || \
+  ics_dir="${ics_dir}" || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
 #

diff --git a/jobs/JREGIONAL_MAKE_LBCS b/jobs/JREGIONAL_MAKE_LBCS
@@ -49,49 +49,6 @@ hour zero).
 #
 #-----------------------------------------------------------------------
 #
-# Set machine-dependent parameters.
-#
-#-----------------------------------------------------------------------
-#
-case "$MACHINE" in
-
-  "WCOSS_CRAY")
-    ulimit -s unlimited
-    APRUN="aprun -b -j1 -n48 -N12 -d1 -cc depth"
-    ;;
-
-  "WCOSS_DELL_P3")
-    ulimit -s unlimited
-    APRUN="mpirun"
-    ;;
-
-  "HERA")
-    ulimit -s unlimited
-    APRUN="srun"
-    ;;
-
-  "JET")
-    ulimit -s unlimited
-    APRUN="srun"
-    ;;
-
-  "ODIN")
-    APRUN="srun"
-    ;;
-
-  "CHEYENNE")
-    nprocs=$(( NNODES_MAKE_LBCS*PPN_MAKE_LBCS ))
-    APRUN="mpirun -np $nprocs"
-    ;;
-
-  "STAMPEDE")
-    APRUN="ibrun"
-    ;;
-
-esac
-#
-#-----------------------------------------------------------------------
-#
 # Set the name of and create the directory in which the output from this
 # script will be placed (if it doesn't already exist).
 #
@@ -107,8 +64,7 @@ mkdir_vrfy -p "${lbcs_dir}"
 #-----------------------------------------------------------------------
 #
 $SCRIPTSDIR/exregional_make_lbcs.sh \
-  lbcs_dir="${lbcs_dir}" \
-  APRUN="${APRUN}" || \
+  lbcs_dir="${lbcs_dir}" || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
 #

diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh
@@ -57,7 +57,6 @@ This is the ex-script for the task that generates initial condition
 #
 valid_args=( \
 "ics_dir" \
-"APRUN" \
 )
 process_args valid_args "$@"
 #
@@ -73,6 +72,49 @@ print_input_args valid_args
 #
 #-----------------------------------------------------------------------
 #
+# Set machine-dependent parameters.
+#
+#-----------------------------------------------------------------------
+#
+case "$MACHINE" in
+
+  "WCOSS_CRAY")
+    ulimit -s unlimited
+    APRUN="aprun -b -j1 -n48 -N12 -d1 -cc depth"
+    ;;
+
+  "WCOSS_DELL_P3")
+    ulimit -s unlimited
+    APRUN="mpirun"
+    ;;
+
+  "HERA")
+    ulimit -s unlimited
+    APRUN="srun"
+    ;;
+
+  "JET")
+    ulimit -s unlimited
+    APRUN="srun"
+    ;;
+
+  "ODIN")
+    APRUN="srun"
+    ;;
+
+  "CHEYENNE")
+    nprocs=$(( NNODES_MAKE_ICS*PPN_MAKE_ICS ))
+    APRUN="mpirun -np $nprocs"
+    ;;
+
+  "STAMPEDE")
+    APRUN="ibrun"
+    ;;
+
+esac
+#
+#-----------------------------------------------------------------------
+#
 # Source the file containing definitions of variables associated with the
 # external model for ICs.
 #
@@ -102,26 +144,33 @@ cd_vrfy $workdir
 varmap_file=""
 
 case "${CCPP_PHYS_SUITE}" in
-
-"FV3_GFS_2017_gfdlmp" | "FV3_GFS_2017_gfdlmp_regional" | "FV3_GFS_v16beta" | \
-"FV3_GFS_v15p2" | "FV3_CPT_v0" )
-  varmap_file="GFSphys_var_map.txt"
-  ;;
-"FV3_GSD_v0" | "FV3_GSD_SAR" | \
-"FV3_RRFS_v1beta" )
-  if   [ "${EXTRN_MDL_NAME_ICS}" = "RAPX" ] || [ "${EXTRN_MDL_NAME_ICS}" = "HRRRX" ]; then
+#
+  "FV3_GFS_2017_gfdlmp" | \
+  "FV3_GFS_2017_gfdlmp_regional" | \
+  "FV3_GFS_v16beta" | \
+  "FV3_GFS_v15p2" | "FV3_CPT_v0" )
+    varmap_file="GFSphys_var_map.txt"
+    ;;
+#
+  "FV3_GSD_v0" | \
+  "FV3_GSD_SAR" | \
+  "FV3_RRFS_v1beta" )
+    if [ "${EXTRN_MDL_NAME_ICS}" = "RAPX" ] || \
+       [ "${EXTRN_MDL_NAME_ICS}" = "HRRRX" ]; then
       varmap_file="GSDphys_var_map.txt"
-  elif [ "${EXTRN_MDL_NAME_ICS}" = "NAM" ] || [ "${EXTRN_MDL_NAME_ICS}" = "FV3GFS" ] || \
-       [ "${EXTRN_MDL_NAME_ICS}" = "GSMGFS" ]; then
+    elif [ "${EXTRN_MDL_NAME_ICS}" = "NAM" ] || \
+         [ "${EXTRN_MDL_NAME_ICS}" = "FV3GFS" ] || \
+         [ "${EXTRN_MDL_NAME_ICS}" = "GSMGFS" ]; then
       varmap_file="GFSphys_var_map.txt"
-  fi
-  ;;
-*)
-  print_err_msg_exit "\
+    fi
+    ;;
+#
+  *)
+    print_err_msg_exit "\
 A variable mapping table has not yet been defined for this physics suite:
   CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\""
-  ;;
-
+    ;;
+#
 esac
 #
 #-----------------------------------------------------------------------

diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh
@@ -57,7 +57,6 @@ hour zero).
 #
 valid_args=( \
 "lbcs_dir" \
-"APRUN" \
 )
 process_args valid_args "$@"
 #
@@ -73,6 +72,49 @@ print_input_args valid_args
 #
 #-----------------------------------------------------------------------
 #
+# Set machine-dependent parameters.
+#
+#-----------------------------------------------------------------------
+#
+case "$MACHINE" in
+
+  "WCOSS_CRAY")
+    ulimit -s unlimited
+    APRUN="aprun -b -j1 -n48 -N12 -d1 -cc depth"
+    ;;
+
+  "WCOSS_DELL_P3")
+    ulimit -s unlimited
+    APRUN="mpirun"
+    ;;
+
+  "HERA")
+    ulimit -s unlimited
+    APRUN="srun"
+    ;;
+
+  "JET")
+    ulimit -s unlimited
+    APRUN="srun"
+    ;;
+
+  "ODIN")
+    APRUN="srun"
+    ;;
+
+  "CHEYENNE")
+    nprocs=$(( NNODES_MAKE_LBCS*PPN_MAKE_LBCS ))
+    APRUN="mpirun -np $nprocs"
+    ;;
+
+  "STAMPEDE")
+    APRUN="ibrun"
+    ;;
+
+esac
+#
+#-----------------------------------------------------------------------
+#
 # Source the file containing definitions of variables associated with the
 # external model for LBCs.
 #
@@ -102,26 +144,33 @@ cd_vrfy $workdir
 varmap_file=""
 
 case "${CCPP_PHYS_SUITE}" in
-
-"FV3_GFS_2017_gfdlmp" | "FV3_GFS_2017_gfdlmp_regional" | "FV3_GFS_v16beta" | \
-"FV3_GFS_v15p2" | "FV3_CPT_v0" )
-  varmap_file="GFSphys_var_map.txt"
-  ;;
-"FV3_GSD_v0" | "FV3_GSD_SAR" | \
-"FV3_RRFS_v1beta" )
-  if   [ "${EXTRN_MDL_NAME_LBCS}" = "RAPX" ] || [ "${EXTRN_MDL_NAME_LBCS}" = "HRRRX" ]; then
+#
+  "FV3_GFS_2017_gfdlmp" | \
+  "FV3_GFS_2017_gfdlmp_regional" | \
+  "FV3_GFS_v16beta" | \
+  "FV3_GFS_v15p2" | "FV3_CPT_v0" )
+    varmap_file="GFSphys_var_map.txt"
+    ;;
+#
+  "FV3_GSD_v0" | \
+  "FV3_GSD_SAR" | \
+  "FV3_RRFS_v1beta" )
+    if [ "${EXTRN_MDL_NAME_LBCS}" = "RAPX" ] || \
+       [ "${EXTRN_MDL_NAME_LBCS}" = "HRRRX" ]; then
       varmap_file="GSDphys_var_map.txt"
-  elif [ "${EXTRN_MDL_NAME_LBCS}" = "NAM" ] || [ "${EXTRN_MDL_NAME_LBCS}" = "FV3GFS" ] || \
-       [ "${EXTRN_MDL_NAME_LBCS}" = "GSMGFS" ]; then
+    elif [ "${EXTRN_MDL_NAME_LBCS}" = "NAM" ] || \
+         [ "${EXTRN_MDL_NAME_LBCS}" = "FV3GFS" ] || \
+         [ "${EXTRN_MDL_NAME_LBCS}" = "GSMGFS" ]; then
       varmap_file="GFSphys_var_map.txt"
-  fi
-  ;;
-*)
+    fi
+    ;;
+#
+  *)
   print_err_msg_exit "\
 A variable mapping table has not yet been defined for this physics suite:
   CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\""
   ;;
-
+#
 esac
 #
 #-----------------------------------------------------------------------

diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh
@@ -106,15 +106,13 @@ case $MACHINE in
   ulimit -s unlimited
   ulimit -a
   APRUN="srun"
-  LD_LIBRARY_PATH="${UFS_WTHR_MDL_DIR}/FV3/ccpp/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
   OMP_NUM_THREADS=4
   ;;
 #
 "JET")
   ulimit -s unlimited
   ulimit -a
   APRUN="srun"
-  LD_LIBRARY_PATH="${UFS_WTHR_MDL_DIR}/FV3/ccpp/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
   OMP_NUM_THREADS=4
   ;;
 #
@@ -132,7 +130,6 @@ case $MACHINE in
   module list
   nprocs=$(( NNODES_RUN_FCST*PPN_RUN_FCST ))
   APRUN="mpirun -np $nprocs"
-  LD_LIBRARY_PATH="${UFS_WTHR_MDL_DIR}/FV3/ccpp/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
   ;;
 #
 
@@ -141,7 +138,6 @@ case $MACHINE in
   module list
 
   APRUN="ibrun -np ${PE_MEMBER01}"
-  #LD_LIBRARY_PATH="${UFS_WTHR_MDL_DIR}/FV3/ccpp/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
   ;;
 
 esac

diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh
@@ -532,23 +532,6 @@ Copying the fixed file containing cloud condensation nuclei (CCN) data
 directory..."
   cp_vrfy "${FIXgsm}/CCN_ACTIVATE.BIN" "$EXPTDIR"
 fi
-#
-#-----------------------------------------------------------------------
-#
-# This if-statement is a temporary fix that makes corrections to the suite
-# definition file for the "FV3_GFS_2017_gfdlmp_regional" physics suite
-# that EMC uses.
-#
-# IMPORTANT:
-# This if-statement must be removed once these corrections are made to
-# the suite definition file in the dtc/develop branch of the NCAR fork
-# of the fv3atm repository.
-#
-#-----------------------------------------------------------------------
-#
-if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ]; then
-  mv_vrfy "${CCPP_PHYS_SUITE_FP}.tmp" "${CCPP_PHYS_SUITE_FP}"
-fi