Skip to content

Remove unused/outdated code #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gsketefian merged 16 commits into from
Oct 26, 2020
Merged

Remove unused/outdated code #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a616c1d
Modify/add predefined grids (#305)
gsketefian Oct 8, 2020
d79ebc3
Modifications to run workflow with unmodified executable names from e…
mkavulich Oct 9, 2020
e72f8d7
Feature to read in FVCOM lake surface conditions into FV3-LAM (#293)
dmwright526 Oct 12, 2020
52b49f1
Add NOMADS script call back into generate script. (#311)
JeffBeck-NOAA Oct 13, 2020
a94a89e
Wrapped global_equiv_resol exec_fp with APRUN just as other commands …
ywangwof Oct 13, 2020
3d6e1df
Remove the USE_CCPP variable (#308)
gsketefian Oct 13, 2020
42e5eb5
Changes needed to run the regional workflow on WCOSS (#310)
BenjaminBlake-NOAA Oct 14, 2020
650c4e7
Fix indentation.
gsketefian Oct 14, 2020
35eea6c
Comment out modifications to LD_LIBRARY_PATH.
gsketefian Oct 14, 2020
80a9ef6
Remove temporary codes that fix bugs in the FV3_GFS_2017_gfdlmp_regio…
gsketefian Oct 14, 2020
64fe235
Remove block of code that is no longer necessary because chgres_cube …
gsketefian Oct 14, 2020
5a0ea74
Remove unused file.
gsketefian Oct 14, 2020
17a50ac
Bug fix: Move call to set_ozone_param to after the variable CCPP_PHYS…
gsketefian Oct 14, 2020
5c8e5cf
For the make_ics and make_lbcs tasks, move the setting of APRUN and o…
gsketefian Oct 14, 2020
99af761
Remove commented-out code.
gsketefian Oct 14, 2020
af58d97
Merge branch 'bugfix/remove_unused_code' into release/public-v1_bugfi…
gsketefian Oct 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 1 addition & 44 deletions jobs/JREGIONAL_MAKE_ICS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
#
Expand All @@ -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."
#
Expand Down
46 changes: 1 addition & 45 deletions jobs/JREGIONAL_MAKE_LBCS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
#
Expand All @@ -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."
#
Expand Down
83 changes: 66 additions & 17 deletions scripts/exregional_make_ics.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
#
Expand All @@ -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.
#
Expand Down Expand Up @@ -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
#
#-----------------------------------------------------------------------
Expand Down
79 changes: 64 additions & 15 deletions scripts/exregional_make_lbcs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ hour zero).
#
valid_args=( \
"lbcs_dir" \
"APRUN" \
)
process_args valid_args "$@"
#
Expand All @@ -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.
#
Expand Down Expand Up @@ -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
#
#-----------------------------------------------------------------------
Expand Down
4 changes: 0 additions & 4 deletions scripts/exregional_run_fcst.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
;;
#
Expand All @@ -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}"
;;
#

Expand All @@ -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
Expand Down
Loading