From be54bde4ae2b436aa9b89496a19f37936be99305 Mon Sep 17 00:00:00 2001 From: gerard ketefian Date: Wed, 9 Sep 2020 18:20:51 -0600 Subject: [PATCH 01/11] Fix bugs that cause the workflow to fail for suites other than RRFS_v1beta. Modifications common to more than one file: ------------------------------------------ (A) Wrap actions that should occur only for the RRFS_v1beta suite inside if-statements that checkwhether this suite is being used. (B) Fix indentation. File-by-file modifications: -------------------------- scripts/exregional_make_orog.sh: (A) scripts/exregional_run_fcst.sh: * Clean up comments. tests/baseline_configs/config.FV3_RRFS_v1beta.sh: * Change the location for the orog files needed by the RRFS_v1beta suite to something more official rather than a use directory (for hera). ush/link_fix.sh: (A), (B) ush/setup.sh: (B) --- scripts/exregional_make_orog.sh | 10 ++----- scripts/exregional_run_fcst.sh | 19 ++++++-------- .../config.FV3_RRFS_v1beta.sh | 3 ++- ush/link_fix.sh | 25 ++++++++---------- ush/setup.sh | 26 +++++++++---------- 5 files changed, 36 insertions(+), 47 deletions(-) diff --git a/scripts/exregional_make_orog.sh b/scripts/exregional_make_orog.sh index 9b7684ad0..1d1f5586e 100755 --- a/scripts/exregional_make_orog.sh +++ b/scripts/exregional_make_orog.sh @@ -355,14 +355,8 @@ mv_vrfy "${raw_orog_fp_orig}" "${raw_orog_fp}" #----------------------------------------------------------------------- # if [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then - cp_vrfy ${GWD_RRFS_v1beta_DIR}/* ${OROG_DIR} -else - print_err_msg_exit "\ -The location from which to copy the files needed by the gravity wave drag -parameterization in the current physics suite (CCPP_PHYS_SUITE) has not -been specified for this machine (MACHINE): - CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\" - MACHINE = \"${MACHINE}\"" + cp_vrfy ${GWD_RRFS_v1beta_DIR}/*_ls*.nc ${OROG_DIR} + cp_vrfy ${GWD_RRFS_v1beta_DIR}/*_ss*.nc ${OROG_DIR} fi print_info_msg "$VERBOSE" " diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh index 54f9fad0c..bd4b1b206 100755 --- a/scripts/exregional_run_fcst.sh +++ b/scripts/exregional_run_fcst.sh @@ -252,11 +252,16 @@ Cannot create symlink because target does not exist: target = \"$target\"" fi # -# two files for drag_suite scheme -# this is only for the drag parameterization in the FV3_RRFS_v1beta physics suite +# If using the FV3_RRFS_v1beta physics suite, there are two files (that +# contain statistics of the orography) that are needed by the drag +# parameterization in that suite. Below, symlinks to these are created +# in the run directory. Note that the symlinks must have specific names +# that the FV3 model is hardcoded to recognize ("${CRES}_" and "halo0" +# must be stripped from the file names). We use those below. # if [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then - # Symlink to orographic statistics fields file with "${CRES}_" and "halo0" stripped from name. +# 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 @@ -445,14 +450,6 @@ if [ "${USE_CCPP}" = "TRUE" ]; then fi fi -#----------------------------------------------------------------------- -# -# If running enemble forecasts, create links to the cycle-specific -# diagnostic tables file and model configuration file in the cycle -# directory. Note that these links should not be made if not running -# ensemble forecasts because in that case, the cycle directory is the -# run directory (and we would be creating a symlink with the name of a -# file that already exists). # #----------------------------------------------------------------------- # diff --git a/tests/baseline_configs/config.FV3_RRFS_v1beta.sh b/tests/baseline_configs/config.FV3_RRFS_v1beta.sh index 270c5a37a..338d9c15f 100644 --- a/tests/baseline_configs/config.FV3_RRFS_v1beta.sh +++ b/tests/baseline_configs/config.FV3_RRFS_v1beta.sh @@ -44,4 +44,5 @@ EXTRN_MDL_NAME_LBCS="RAPX" RUN_TASK_MAKE_GRID="TRUE" RUN_TASK_MAKE_OROG="TRUE" RUN_TASK_MAKE_SFC_CLIMO="TRUE" -GWD_RRFS_v1beta_BASEDIR="/scratch2/BMC/gsd-fv3-test/she/orog" + +GWD_RRFS_v1beta_BASEDIR="/scratch2/BMC/det/FV3LAM_pregen/orog" diff --git a/ush/link_fix.sh b/ush/link_fix.sh index 26b3f4a5f..7e371ac6c 100755 --- a/ush/link_fix.sh +++ b/ush/link_fix.sh @@ -229,31 +229,28 @@ Creating links in the FIXLAM directory to the grid files..." # "grid") fns=( \ -"C*${DOT_OR_USCORE}mosaic.halo${NHW}.nc" \ -"C*${DOT_OR_USCORE}mosaic.halo${NH4}.nc" \ -"C*${DOT_OR_USCORE}mosaic.halo${NH3}.nc" \ -"C*${DOT_OR_USCORE}grid.tile${TILE_RGNL}.halo${NHW}.nc" \ -"C*${DOT_OR_USCORE}grid.tile${TILE_RGNL}.halo${NH3}.nc" \ -"C*${DOT_OR_USCORE}grid.tile${TILE_RGNL}.halo${NH4}.nc" \ + "C*${DOT_OR_USCORE}mosaic.halo${NHW}.nc" \ + "C*${DOT_OR_USCORE}mosaic.halo${NH4}.nc" \ + "C*${DOT_OR_USCORE}mosaic.halo${NH3}.nc" \ + "C*${DOT_OR_USCORE}grid.tile${TILE_RGNL}.halo${NHW}.nc" \ + "C*${DOT_OR_USCORE}grid.tile${TILE_RGNL}.halo${NH3}.nc" \ + "C*${DOT_OR_USCORE}grid.tile${TILE_RGNL}.halo${NH4}.nc" \ ) fps=( "${fns[@]/#/${GRID_DIR}/}" ) run_task="${RUN_TASK_MAKE_GRID}" ;; # "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" \ + ) + if [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then + fns+=( \ "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 + ) + fi fps=( "${fns[@]/#/${OROG_DIR}/}" ) run_task="${RUN_TASK_MAKE_OROG}" diff --git a/ush/setup.sh b/ush/setup.sh index 00d1559e0..e5c617808 100755 --- a/ush/setup.sh +++ b/ush/setup.sh @@ -942,25 +942,25 @@ fi # GWD_RRFS_v1beta_DIR="${GWD_RRFS_v1beta_BASEDIR}/${PREDEF_GRID_NAME}" if [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then - if [ -z "${PREDEF_GRID_NAME}" ]; then - print_err_msg_exit "\ + if [ -z "${PREDEF_GRID_NAME}" ]; then + print_err_msg_exit "\ A predefined grid name (PREDEF_GRID_NAME) must be specified when using the FV3_RRFS_v1beta physic suite: - CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\" - PREDEF_GRID_NAME = \"${PREDEF_GRID_NAME}\"" - else - if [ ! -d "${GWD_RRFS_v1beta_DIR}" ]; then - print_err_msg_exit "\ + CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\" + PREDEF_GRID_NAME = \"${PREDEF_GRID_NAME}\"" + else + if [ ! -d "${GWD_RRFS_v1beta_DIR}" ]; then + print_err_msg_exit "\ The directory (GWD_RRFS_v1beta_DIR) that should contain the gravity wave drag-related orography files for the FV3_RRFS_v1beta does not exist: -GWD_RRFS_v1beta_DIR = \"${GWD_RRFS_v1beta_DIR}\"" - elif [ ! "$( ls -A ${GWD_RRFS_v1beta_DIR} )" ]; then - print_err_msg_exit "\ + GWD_RRFS_v1beta_DIR = \"${GWD_RRFS_v1beta_DIR}\"" + elif [ ! "$( ls -A ${GWD_RRFS_v1beta_DIR} )" ]; then + print_err_msg_exit "\ The directory (GWD_RRFS_v1beta_DIR) that should contain the gravity wave drag related orography files for the FV3_RRFS_v1beta is empty: -GWD_RRFS_v1beta_DIR = \"${GWD_RRFS_v1beta_DIR}\"" - fi - fi + GWD_RRFS_v1beta_DIR = \"${GWD_RRFS_v1beta_DIR}\"" + fi + fi fi # #----------------------------------------------------------------------- From c82d57f1d3b11a7de91dbc93c87a468441cca26a Mon Sep 17 00:00:00 2001 From: gerard ketefian Date: Thu, 10 Sep 2020 11:53:10 -0600 Subject: [PATCH 02/11] Remove suites FV3_GSD_SAR_v1 and FV3_RRFS_v0; fix model_configure generation bug (see below). List of modifications: --------------------- * In scripts/exregional_run_fcst.sh, remove lines that, for the case of ensemble forecasts, create a link in the run directory to a model configure file in the cycle directory (which is one level up from the run directory). These were previously needed but no longer are. That's because in the current version of the workflow, the model configure files are always created directly in the run directory (whereas in previous versions, for ensemble forecasts only one model_configure file was created for each cycle that was pointed to by all members of the ensemble for that cycle). * Remove physics suites FV3_GSD_SAR_v1 and FV3_RRFS_v0 because they are no longer part of the ufs-weather-model repo. This entails: * Removing the names of these suites from the list of valid suite values in valid_param_vals.sh (in the variable valid_vals_CCPP_PHYS_SUITE). * Deleting the corresponding WE2E tests (regional_013 and regional_016). * Removing the names of these suites from the list of WE2E tests in baselines_list.txt. * Change the permissions of the WE2E configuration file config.user_download_extrn_files.sh so that it is not an executable file (it doesn't need to be; it just gets sourced). * Add the FV3_RRFS_v1beta suite to the list of WE2E tests in baselines_list.txt. * Remove the WE2E test user_download_extrn_files from the list in baselines_list.txt because that test starts to download data during the generate step, so any tests that come after this one have to wait for the download to complete before being generated. * Fix comments in ush/create_model_config_file.sh. * Delete unneeded file ush/create_modle_config_files.sh. * Reorder the remaining suites in the variable valid_vals_CCPP_PHYS_SUITE in valid_param_vals.sh alphabetically. --- scripts/exregional_run_fcst.sh | 2 - tests/baseline_configs/config.regional_013.sh | 47 ----- tests/baseline_configs/config.regional_016.sh | 47 ----- .../config.user_download_extrn_files.sh | 0 tests/baselines_list.txt | 4 +- ush/create_model_config_file.sh | 13 +- ush/create_model_config_files.sh | 182 ------------------ ush/valid_param_vals.sh | 8 +- 8 files changed, 11 insertions(+), 292 deletions(-) delete mode 100644 tests/baseline_configs/config.regional_013.sh delete mode 100644 tests/baseline_configs/config.regional_016.sh mode change 100755 => 100644 tests/baseline_configs/config.user_download_extrn_files.sh delete mode 100644 ush/create_model_config_files.sh diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh index bd4b1b206..ad4c8412c 100755 --- a/scripts/exregional_run_fcst.sh +++ b/scripts/exregional_run_fcst.sh @@ -481,8 +481,6 @@ if [ "${DO_ENSEMBLE}" = "TRUE" ]; then relative_or_null="--relative" diag_table_fp="${cycle_dir}/${DIAG_TABLE_FN}" ln_vrfy -sf ${relative_or_null} ${diag_table_fp} ${run_dir} - model_config_fp="${cycle_dir}/${MODEL_CONFIG_FN}" - ln_vrfy -sf ${relative_or_null} ${model_config_fp} ${run_dir} fi # #----------------------------------------------------------------------- diff --git a/tests/baseline_configs/config.regional_013.sh b/tests/baseline_configs/config.regional_013.sh deleted file mode 100644 index 30cdca248..000000000 --- a/tests/baseline_configs/config.regional_013.sh +++ /dev/null @@ -1,47 +0,0 @@ -# -# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required -# inputs to the script that launces the WE2E test experiments. That script -# will use those inputs to fill in the values of these variables below. -# -MACHINE="" -ACCOUNT="" -EXPT_SUBDIR="" -# -# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS -# are optional inputs to the script that launces the WE2E test experiments. -# If one or both of these values are specified, then that script will -# replace the default values of these variables below with those values. -# Otherwise, it will keep the default values. -# -USE_CRON_TO_RELAUNCH="TRUE" -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="ESGgrid" -QUILTING="TRUE" -USE_CCPP="TRUE" -CCPP_PHYS_SUITE="FV3_GSD_SAR_v1" -FCST_LEN_HRS="06" -LBC_SPEC_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/baseline_configs/config.regional_016.sh b/tests/baseline_configs/config.regional_016.sh deleted file mode 100644 index df69233a8..000000000 --- a/tests/baseline_configs/config.regional_016.sh +++ /dev/null @@ -1,47 +0,0 @@ -# -# The values of the variables MACHINE, ACCOUNT, and EXPT_SUBDIR are required -# inputs to the script that launces the WE2E test experiments. That script -# will use those inputs to fill in the values of these variables below. -# -MACHINE="" -ACCOUNT="" -EXPT_SUBDIR="" -# -# The values of the variables USE_CRON_TO_RELAUNCH and CRON_RELAUNCH_INTVL_MNTS -# are optional inputs to the script that launces the WE2E test experiments. -# If one or both of these values are specified, then that script will -# replace the default values of these variables below with those values. -# Otherwise, it will keep the default values. -# -USE_CRON_TO_RELAUNCH="TRUE" -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="ESGgrid" -QUILTING="TRUE" -USE_CCPP="TRUE" -CCPP_PHYS_SUITE="FV3_RRFS_v0" -FCST_LEN_HRS="06" -LBC_SPEC_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/baseline_configs/config.user_download_extrn_files.sh b/tests/baseline_configs/config.user_download_extrn_files.sh old mode 100755 new mode 100644 diff --git a/tests/baselines_list.txt b/tests/baselines_list.txt index 002818dbe..cb23d6132 100644 --- a/tests/baselines_list.txt +++ b/tests/baselines_list.txt @@ -1,3 +1,4 @@ +FV3_RRFS_v1beta GSD_RAP13km community_ensemble_008mems community_ensemble_2mems @@ -19,9 +20,6 @@ regional_009 regional_010 regional_011 regional_012 -regional_013 regional_014 regional_015 -regional_016 user_staged_extrn_files -user_download_extrn_files diff --git a/ush/create_model_config_file.sh b/ush/create_model_config_file.sh index 84505566d..de7497ff3 100644 --- a/ush/create_model_config_file.sh +++ b/ush/create_model_config_file.sh @@ -2,7 +2,7 @@ #----------------------------------------------------------------------- # # This file defines a function that creates a model configuration file -# for the specified cycle. +# in the specified run directory. # #----------------------------------------------------------------------- # @@ -80,16 +80,17 @@ nthreads \ # #----------------------------------------------------------------------- # -# Create a model configuration file within each cycle directory. +# Create a model configuration file in the specified run directory. # #----------------------------------------------------------------------- # print_info_msg "$VERBOSE" " -Creating a model configuration file (\"${MODEL_CONFIG_FN}\") within each -cycle directory..." +Creating a model configuration file (\"${MODEL_CONFIG_FN}\") in the specified +run directory (run_dir): + run_dir = \"${run_dir}\"" # -# Copy template of cycle-dependent model configure files from the templates -# directory to the current cycle directory. +# Copy template model configure files from the templates directory to the +# run directory. # model_config_fp="${run_dir}/${MODEL_CONFIG_FN}" cp_vrfy "${MODEL_CONFIG_TMPL_FP}" "${model_config_fp}" diff --git a/ush/create_model_config_files.sh b/ush/create_model_config_files.sh deleted file mode 100644 index d2f9fd357..000000000 --- a/ush/create_model_config_files.sh +++ /dev/null @@ -1,182 +0,0 @@ -# -#----------------------------------------------------------------------- -# -# This file defines a function that creates a model configuration file -# for each cycle to be run. -# -#----------------------------------------------------------------------- -# -function create_model_config_files() { -# -#----------------------------------------------------------------------- -# -# Save current shell options (in a global array). Then set new options -# for this script/function. -# -#----------------------------------------------------------------------- -# - { save_shell_opts; set -u -x; } > /dev/null 2>&1 -# -#----------------------------------------------------------------------- -# -# Get the full path to the file in which this script/function is located -# (scrfunc_fp), the name of that file (scrfunc_fn), and the directory in -# which the file is located (scrfunc_dir). -# -#----------------------------------------------------------------------- -# - local scrfunc_fp=$( readlink -f "${BASH_SOURCE[0]}" ) - local scrfunc_fn=$( basename "${scrfunc_fp}" ) - local scrfunc_dir=$( dirname "${scrfunc_fp}" ) -# -#----------------------------------------------------------------------- -# -# Get the name of this function. -# -#----------------------------------------------------------------------- -# - local func_name="${FUNCNAME[0]}" -# -#----------------------------------------------------------------------- -# -# Specify the set of valid argument names for this script/function. Then -# process the arguments provided to this script/function (which should -# consist of a set of name-value pairs of the form arg1="value1", etc). -# -#----------------------------------------------------------------------- -# - local valid_args=() - process_args valid_args "$@" -# -#----------------------------------------------------------------------- -# -# For debugging purposes, print out values of arguments passed to this -# script. Note that these will be printed out only if VERBOSE is set to -# TRUE. -# -#----------------------------------------------------------------------- -# - print_input_args valid_args -# -#----------------------------------------------------------------------- -# -# Declare local variables. -# -#----------------------------------------------------------------------- -# - local i \ - cdate \ - cycle_dir \ - model_config_fp \ - yyyy \ - mm \ - dd \ - hh \ - mm \ - dot_quilting_dot \ - dot_print_esmf_dot -# -#----------------------------------------------------------------------- -# -# Create a model configuration file within each cycle directory. -# -#----------------------------------------------------------------------- -# - print_info_msg "$VERBOSE" " -Creating a model configuration file (\"${MODEL_CONFIG_FN}\") within each -cycle directory..." - - for (( i=0; i<${NUM_CYCLES}; i++ )); do - - cdate="${ALL_CDATES[$i]}" - cycle_dir="${CYCLE_BASEDIR}/$cdate" -# -# Copy template of cycle-dependent model configure files from the templates -# directory to the current cycle directory. -# - model_config_fp="${cycle_dir}/${MODEL_CONFIG_FN}" - cp_vrfy "${MODEL_CONFIG_TMPL_FP}" "${model_config_fp}" -# -# Extract from cdate the starting year, month, day, and hour of the forecast. -# - yyyy=${cdate:0:4} - mm=${cdate:4:2} - dd=${cdate:6:2} - hh=${cdate:8:2} -# -# Set parameters in the model configure file. -# - dot_quilting_dot="."${QUILTING,,}"." - dot_print_esmf_dot="."${PRINT_ESMF,,}"." - - set_file_param "${model_config_fp}" "PE_MEMBER01" "${PE_MEMBER01}" - set_file_param "${model_config_fp}" "dt_atmos" "${DT_ATMOS}" - set_file_param "${model_config_fp}" "start_year" "$yyyy" - set_file_param "${model_config_fp}" "start_month" "$mm" - set_file_param "${model_config_fp}" "start_day" "$dd" - set_file_param "${model_config_fp}" "start_hour" "$hh" - set_file_param "${model_config_fp}" "nhours_fcst" "${FCST_LEN_HRS}" - set_file_param "${model_config_fp}" "ncores_per_node" "${NCORES_PER_NODE}" - set_file_param "${model_config_fp}" "quilting" "${dot_quilting_dot}" - set_file_param "${model_config_fp}" "print_esmf" "${dot_print_esmf_dot}" -# -#----------------------------------------------------------------------- -# -# If the write component is to be used, then a set of parameters, in- -# cluding those that define the write component's output grid, need to -# be specified in the model configuration file (model_config_fp). This -# is done by appending a template file (in which some write-component -# parameters are set to actual values while others are set to placehol- -# ders) to model_config_fp and then replacing the placeholder values in -# the (new) model_config_fp file with actual values. The full path of -# this template file is specified in the variable WRTCMP_PA RAMS_TEMP- -# LATE_FP. -# -#----------------------------------------------------------------------- -# - if [ "$QUILTING" = "TRUE" ]; then - - cat ${WRTCMP_PARAMS_TMPL_FP} >> ${model_config_fp} - - set_file_param "${model_config_fp}" "write_groups" "$WRTCMP_write_groups" - set_file_param "${model_config_fp}" "write_tasks_per_group" "$WRTCMP_write_tasks_per_group" - - set_file_param "${model_config_fp}" "output_grid" "\'$WRTCMP_output_grid\'" - set_file_param "${model_config_fp}" "cen_lon" "$WRTCMP_cen_lon" - set_file_param "${model_config_fp}" "cen_lat" "$WRTCMP_cen_lat" - set_file_param "${model_config_fp}" "lon1" "$WRTCMP_lon_lwr_left" - set_file_param "${model_config_fp}" "lat1" "$WRTCMP_lat_lwr_left" - - if [ "${WRTCMP_output_grid}" = "rotated_latlon" ]; then - set_file_param "${model_config_fp}" "lon2" "$WRTCMP_lon_upr_rght" - set_file_param "${model_config_fp}" "lat2" "$WRTCMP_lat_upr_rght" - set_file_param "${model_config_fp}" "dlon" "$WRTCMP_dlon" - set_file_param "${model_config_fp}" "dlat" "$WRTCMP_dlat" - elif [ "${WRTCMP_output_grid}" = "lambert_conformal" ]; then - set_file_param "${model_config_fp}" "stdlat1" "$WRTCMP_stdlat1" - set_file_param "${model_config_fp}" "stdlat2" "$WRTCMP_stdlat2" - set_file_param "${model_config_fp}" "nx" "$WRTCMP_nx" - set_file_param "${model_config_fp}" "ny" "$WRTCMP_ny" - set_file_param "${model_config_fp}" "dx" "$WRTCMP_dx" - set_file_param "${model_config_fp}" "dy" "$WRTCMP_dy" - elif [ "${WRTCMP_output_grid}" = "regional_latlon" ]; then - set_file_param "${model_config_fp}" "lon2" "$WRTCMP_lon_upr_rght" - set_file_param "${model_config_fp}" "lat2" "$WRTCMP_lat_upr_rght" - set_file_param "${model_config_fp}" "dlon" "$WRTCMP_dlon" - set_file_param "${model_config_fp}" "dlat" "$WRTCMP_dlat" - fi - - fi - - done -# -#----------------------------------------------------------------------- -# -# Restore the shell options saved at the beginning of this script/function. -# -#----------------------------------------------------------------------- -# - { restore_shell_opts; } > /dev/null 2>&1 - -} - diff --git a/ush/valid_param_vals.sh b/ush/valid_param_vals.sh index fbd0cbb6f..fc5196bef 100644 --- a/ush/valid_param_vals.sh +++ b/ush/valid_param_vals.sh @@ -21,16 +21,14 @@ valid_vals_PREDEF_GRID_NAME=( \ valid_vals_EMC_GRID_NAME=("ak" "conus" "conus_c96" "conus_orig" "guam" "hi" "pr" "GSD_HRRR3km") valid_vals_USE_CCPP=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no") valid_vals_CCPP_PHYS_SUITE=( \ +"FV3_CPT_v0" \ "FV3_GFS_2017_gfdlmp" \ "FV3_GFS_2017_gfdlmp_regional" \ -"FV3_GSD_v0" \ "FV3_GSD_SAR" \ -"FV3_CPT_v0" \ +"FV3_GSD_v0" \ "FV3_GFS_v15p2" \ "FV3_GFS_v16beta" \ -"FV3_GSD_SAR_v1" \ -"FV3_RRFS_v1beta" \ -"FV3_RRFS_v0" ) +"FV3_RRFS_v1beta" ) valid_vals_OZONE_PARAM_NO_CCPP=("ozphys_2015" "ozphys") valid_vals_GFDLgrid_RES=("48" "96" "192" "384" "768" "1152" "3072") valid_vals_EXTRN_MDL_NAME_ICS=("GSMGFS" "FV3GFS" "RAPX" "HRRRX") From 425e6f5c28a61e77c41995c285a5623e5fd09add Mon Sep 17 00:00:00 2001 From: gerard ketefian Date: Thu, 10 Sep 2020 13:07:33 -0600 Subject: [PATCH 03/11] Remove the FV3_GSD_SAR_v1 and FV3_RRFS_v0 suites from various scripts and other files since they are no longer in ufs-weather-model. --- scripts/exregional_make_ics.sh | 8 +------- scripts/exregional_make_lbcs.sh | 6 +----- scripts/exregional_run_fcst.sh | 2 -- ush/generate_FV3LAM_wflow.sh | 2 -- ush/templates/FV3.input.yml | 12 ------------ 5 files changed, 2 insertions(+), 28 deletions(-) diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh index 78ea18949..465a45e96 100755 --- 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_RRFS_v1beta") +"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_RRFS_v1beta") phys_suite="GSD" ;; "FV3_CPT_v0") @@ -305,8 +305,6 @@ 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_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 @@ -371,8 +369,6 @@ 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_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" ] || \ @@ -419,8 +415,6 @@ of external model (EXTRN_MDL_NAME_ICS) and physics suite (CCPP_PHYS_SUITE): if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ] || \ [ "${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 diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh index 31b37a623..f965ecfa6 100755 --- 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_RRFS_v1beta" ) +"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_RRFS_v1beta" ) phys_suite="GSD" ;; "FV3_CPT_v0" ) @@ -288,8 +288,6 @@ 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_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 @@ -340,8 +338,6 @@ and FV3GFS file type (FV3GFS_FILE_FMT_LBCS): if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ] || \ [ "${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 diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh index ad4c8412c..223a8eac4 100755 --- a/scripts/exregional_run_fcst.sh +++ b/scripts/exregional_run_fcst.sh @@ -442,8 +442,6 @@ if [ "${USE_CCPP}" = "TRUE" ]; then ln_vrfy -sf ${relative_or_null} ${CCPP_PHYS_SUITE_FP} ${run_dir} 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} diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh index 6d9ce5798..d2fb6861e 100755 --- a/ush/generate_FV3LAM_wflow.sh +++ b/ush/generate_FV3LAM_wflow.sh @@ -515,8 +515,6 @@ 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_RRFS_v0" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \ [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then print_info_msg "$VERBOSE" " diff --git a/ush/templates/FV3.input.yml b/ush/templates/FV3.input.yml index 81a441a51..93774d5b7 100644 --- a/ush/templates/FV3.input.yml +++ b/ush/templates/FV3.input.yml @@ -32,18 +32,6 @@ FV3_GSD_SAR: iopt_tbot: 2 shal_cnv: false -FV3_GSD_SAR_v1: - gfs_physics_nml: - <<: *gsd_sar_phys - lsm: 1 - lsoil_lsm: 4 - -FV3_RRFS_v0: - gfs_physics_nml: - <<: *gsd_sar_phys - lsm: 2 - lsoil_lsm: 4 - FV3_RRFS_v1beta: gfs_physics_nml: <<: *gsd_sar_phys From 050bec9a55706f8031d360284d917af142fb7568 Mon Sep 17 00:00:00 2001 From: gerard ketefian Date: Thu, 10 Sep 2020 14:32:39 -0600 Subject: [PATCH 04/11] Fix indentation. --- ush/link_fix.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ush/link_fix.sh b/ush/link_fix.sh index 7e371ac6c..e4bccdd83 100755 --- a/ush/link_fix.sh +++ b/ush/link_fix.sh @@ -247,8 +247,8 @@ Creating links in the FIXLAM directory to the grid files..." ) if [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then fns+=( \ - "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" \ + "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" \ ) fi From 9bee707bb6313684e737626110a3c397e38cd3cb Mon Sep 17 00:00:00 2001 From: gerard ketefian Date: Thu, 10 Sep 2020 15:49:30 -0600 Subject: [PATCH 05/11] Rename function (and file) create_model_config_file(.sh) to create_model_configure_file(.sh) because the file that this function creates is called model_configure, not model_config. --- scripts/exregional_run_fcst.sh | 6 +++--- ..._model_config_file.sh => create_model_configure_file.sh} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename ush/{create_model_config_file.sh => create_model_configure_file.sh} (99%) diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh index 223a8eac4..75bf3588a 100755 --- a/scripts/exregional_run_fcst.sh +++ b/scripts/exregional_run_fcst.sh @@ -16,7 +16,7 @@ # #----------------------------------------------------------------------- # -. $USHDIR/create_model_config_file.sh +. $USHDIR/create_model_configure_file.sh # #----------------------------------------------------------------------- # @@ -456,7 +456,7 @@ fi # #----------------------------------------------------------------------- # -create_model_config_file \ +create_model_configure_file \ cdate="$cdate" \ nthreads=${OMP_NUM_THREADS:-1} \ run_dir="${run_dir}" || print_err_msg_exit "\ @@ -467,7 +467,7 @@ cycle's (cdate) run directory (run_dir) failed: # #----------------------------------------------------------------------- # -# If running enemble forecasts, create a link to the cycle-specific +# If running ensemble forecasts, create a link to the cycle-specific # diagnostic tables file in the cycle directory. Note that this link # should not be made if not running ensemble forecasts because in that # case, the cycle directory is the run directory (and we would be creating diff --git a/ush/create_model_config_file.sh b/ush/create_model_configure_file.sh similarity index 99% rename from ush/create_model_config_file.sh rename to ush/create_model_configure_file.sh index de7497ff3..0707ddc4a 100644 --- a/ush/create_model_config_file.sh +++ b/ush/create_model_configure_file.sh @@ -6,7 +6,7 @@ # #----------------------------------------------------------------------- # -function create_model_config_file() { +function create_model_configure_file() { # #----------------------------------------------------------------------- # From 0a9e4e5c3050ef9c9d71395312185df346cbd343 Mon Sep 17 00:00:00 2001 From: gerard ketefian Date: Thu, 10 Sep 2020 17:22:52 -0600 Subject: [PATCH 06/11] Specify the path on cheyenne where the orography statistics files needed by the WE2E test FV3_RRFS_v1beta are located. --- tests/baseline_configs/config.FV3_RRFS_v1beta.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/baseline_configs/config.FV3_RRFS_v1beta.sh b/tests/baseline_configs/config.FV3_RRFS_v1beta.sh index 338d9c15f..8cf5ce6ac 100644 --- a/tests/baseline_configs/config.FV3_RRFS_v1beta.sh +++ b/tests/baseline_configs/config.FV3_RRFS_v1beta.sh @@ -26,7 +26,8 @@ VERBOSE="TRUE" RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" -PREDEF_GRID_NAME="GSD_HRRR25km" +#PREDEF_GRID_NAME="GSD_HRRR25km" +PREDEF_GRID_NAME="GSD_HRRR3km" GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" @@ -45,4 +46,7 @@ RUN_TASK_MAKE_GRID="TRUE" RUN_TASK_MAKE_OROG="TRUE" RUN_TASK_MAKE_SFC_CLIMO="TRUE" +# On hera: GWD_RRFS_v1beta_BASEDIR="/scratch2/BMC/det/FV3LAM_pregen/orog" +# On cheyenne: +#GWD_RRFS_v1beta_BASEDIR="/glade/p/ral/jntp/UFS_CAM/FV3LAM_pregen/orog/GSD_HRRR25km" From d93cf2944898ecdda01df651710c9099703b5ea9 Mon Sep 17 00:00:00 2001 From: gerard ketefian Date: Fri, 11 Sep 2020 10:46:39 -0600 Subject: [PATCH 07/11] The WE2E test FV3_RRFS_v1beta should use the GSD_HRRR25km grid rather than the GSD_HRRR3km one (so it completes quickly). It was inadvertently set to GSD_HRRR3km. Change it back to GSD_HRRR25km. --- tests/baseline_configs/config.FV3_RRFS_v1beta.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/baseline_configs/config.FV3_RRFS_v1beta.sh b/tests/baseline_configs/config.FV3_RRFS_v1beta.sh index 8cf5ce6ac..e401334b2 100644 --- a/tests/baseline_configs/config.FV3_RRFS_v1beta.sh +++ b/tests/baseline_configs/config.FV3_RRFS_v1beta.sh @@ -26,8 +26,7 @@ VERBOSE="TRUE" RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" -#PREDEF_GRID_NAME="GSD_HRRR25km" -PREDEF_GRID_NAME="GSD_HRRR3km" +PREDEF_GRID_NAME="GSD_HRRR25km" GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" From f2a899c9c7de990853f5cef1a18166c5204eb03a Mon Sep 17 00:00:00 2001 From: gerard ketefian Date: Fri, 11 Sep 2020 13:39:45 -0600 Subject: [PATCH 08/11] Add a comment to the FV3_RRFS_v1beta test configuration file indicating where the orography statistics files needed by this physics suite are located on jet. --- tests/baseline_configs/config.FV3_RRFS_v1beta.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/baseline_configs/config.FV3_RRFS_v1beta.sh b/tests/baseline_configs/config.FV3_RRFS_v1beta.sh index e401334b2..86407db64 100644 --- a/tests/baseline_configs/config.FV3_RRFS_v1beta.sh +++ b/tests/baseline_configs/config.FV3_RRFS_v1beta.sh @@ -47,5 +47,7 @@ RUN_TASK_MAKE_SFC_CLIMO="TRUE" # On hera: GWD_RRFS_v1beta_BASEDIR="/scratch2/BMC/det/FV3LAM_pregen/orog" +# On jet: +#GWD_RRFS_v1beta_BASEDIR="/lfs4/BMC/wrfruc/FV3LAM_pregen/orog" # On cheyenne: #GWD_RRFS_v1beta_BASEDIR="/glade/p/ral/jntp/UFS_CAM/FV3LAM_pregen/orog/GSD_HRRR25km" From 8dbe540962b74b4e1ff9c0c696773c31e0cb2e1b Mon Sep 17 00:00:00 2001 From: Gerard Ketefian Date: Mon, 14 Sep 2020 13:04:37 -0600 Subject: [PATCH 09/11] Preliminary set of changes to get the WE2E tests to run on cheyenne. Want to transfer this to hera before looking at all the changes carefully using xxdiff. --- scripts/exregional_make_ics.sh | 4 + scripts/exregional_make_lbcs.sh | 2 +- .../config.FV3_RRFS_v1beta.sh | 11 - tests/baseline_configs/config.GSD_RAP13km.sh | 5 - .../config.community_ensemble_008mems.sh | 5 - .../config.community_ensemble_2mems.sh | 5 - .../config.nco_GSD_HRRR3km_FV3GFS_FV3GFS.sh | 28 -- .../config.nco_GSD_HRRR3km_HRRRX_RAPX.sh | 30 -- tests/baseline_configs/config.nco_conus.sh | 15 - .../baseline_configs/config.nco_conus_c96.sh | 15 - tests/baseline_configs/config.nco_ensemble.sh | 15 - tests/baseline_configs/config.new_ESGgrid.sh | 34 +-- tests/baseline_configs/config.regional_001.sh | 5 - tests/baseline_configs/config.regional_002.sh | 5 - tests/baseline_configs/config.regional_003.sh | 5 - tests/baseline_configs/config.regional_004.sh | 5 - tests/baseline_configs/config.regional_005.sh | 5 - tests/baseline_configs/config.regional_006.sh | 14 - tests/baseline_configs/config.regional_007.sh | 5 - tests/baseline_configs/config.regional_008.sh | 5 - tests/baseline_configs/config.regional_009.sh | 14 - tests/baseline_configs/config.regional_010.sh | 5 - tests/baseline_configs/config.regional_011.sh | 5 - tests/baseline_configs/config.regional_012.sh | 5 - tests/baseline_configs/config.regional_014.sh | 4 - tests/baseline_configs/config.regional_015.sh | 5 - .../config.user_download_extrn_files.sh | 5 - .../config.user_staged_extrn_files.sh | 5 - tests/run_experiments.sh | 288 +++++++++++++++++- ush/config_defaults.sh | 8 +- ush/generate_FV3LAM_wflow.sh | 2 + ush/launch_FV3LAM_wflow.sh | 5 +- ush/set_extrn_mdl_params.sh | 144 +++------ 33 files changed, 365 insertions(+), 348 deletions(-) diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh index 465a45e96..661918690 100755 --- a/scripts/exregional_make_ics.sh +++ b/scripts/exregional_make_ics.sh @@ -392,6 +392,8 @@ of external model (EXTRN_MDL_NAME_ICS) and physics suite (CCPP_PHYS_SUITE): geogrid_file_input_grid="/scratch2/BMC/det/beck/FV3-LAM/geo_em.d01.nc_HRRRX" elif [ "${MACHINE}" = "JET" ]; then geogrid_file_input_grid="/misc/whome/rtrr/HRRR/static/WPS/geo_em.d01.nc" + elif [ "${MACHINE}" = "CHEYENNE" ]; then + geogrid_file_input_grid="/glade/p/ral/jntp/UFS_CAM/fix/geo_em.d01.nc_HRRRX" fi replace_vgtyp=False @@ -437,6 +439,8 @@ of external model (EXTRN_MDL_NAME_ICS) and physics suite (CCPP_PHYS_SUITE): geogrid_file_input_grid="/scratch2/BMC/det/beck/FV3-LAM/geo_em.d01.nc_RAPX" elif [ "${MACHINE}" = "JET" ]; then geogrid_file_input_grid="/misc/whome/rtrr/HRRR/static/WPS/geo_em.d01.nc" + elif [ "${MACHINE}" = "CHEYENNE" ]; then + geogrid_file_input_grid="/glade/p/ral/jntp/UFS_CAM/fix/geo_em.d01.nc_RAPX" fi replace_vgtyp=False diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh index f965ecfa6..a284aa18b 100755 --- a/scripts/exregional_make_lbcs.sh +++ b/scripts/exregional_make_lbcs.sh @@ -236,7 +236,7 @@ input_type="" tracers_input="\"\"" tracers="\"\"" numsoil_out="" -geogrid_file_input_grid="\"\"" +#geogrid_file_input_grid="\"\"" replace_vgtyp="" replace_sotyp="" replace_vgfrc="" diff --git a/tests/baseline_configs/config.FV3_RRFS_v1beta.sh b/tests/baseline_configs/config.FV3_RRFS_v1beta.sh index 86407db64..ecba54ce1 100644 --- a/tests/baseline_configs/config.FV3_RRFS_v1beta.sh +++ b/tests/baseline_configs/config.FV3_RRFS_v1beta.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" @@ -45,9 +40,3 @@ RUN_TASK_MAKE_GRID="TRUE" RUN_TASK_MAKE_OROG="TRUE" RUN_TASK_MAKE_SFC_CLIMO="TRUE" -# On hera: -GWD_RRFS_v1beta_BASEDIR="/scratch2/BMC/det/FV3LAM_pregen/orog" -# On jet: -#GWD_RRFS_v1beta_BASEDIR="/lfs4/BMC/wrfruc/FV3LAM_pregen/orog" -# On cheyenne: -#GWD_RRFS_v1beta_BASEDIR="/glade/p/ral/jntp/UFS_CAM/FV3LAM_pregen/orog/GSD_HRRR25km" diff --git a/tests/baseline_configs/config.GSD_RAP13km.sh b/tests/baseline_configs/config.GSD_RAP13km.sh index 18185f0c2..52deb86fe 100644 --- a/tests/baseline_configs/config.GSD_RAP13km.sh +++ b/tests/baseline_configs/config.GSD_RAP13km.sh @@ -26,11 +26,6 @@ USE_CRON_TO_RELAUNCH="TRUE" # CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.community_ensemble_008mems.sh b/tests/baseline_configs/config.community_ensemble_008mems.sh index 71063ebda..fbf012049 100644 --- a/tests/baseline_configs/config.community_ensemble_008mems.sh +++ b/tests/baseline_configs/config.community_ensemble_008mems.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.community_ensemble_2mems.sh b/tests/baseline_configs/config.community_ensemble_2mems.sh index 09e1453ac..b8045d9dc 100644 --- a/tests/baseline_configs/config.community_ensemble_2mems.sh +++ b/tests/baseline_configs/config.community_ensemble_2mems.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.nco_GSD_HRRR3km_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.nco_GSD_HRRR3km_FV3GFS_FV3GFS.sh index 9260d08a9..4b6d80a5a 100644 --- a/tests/baseline_configs/config.nco_GSD_HRRR3km_FV3GFS_FV3GFS.sh +++ b/tests/baseline_configs/config.nco_GSD_HRRR3km_FV3GFS_FV3GFS.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="nco" @@ -99,16 +94,6 @@ EXTRN_MDL_NAME_LBCS="FV3GFS" RUN="${EXPT_SUBDIR}" envir="${EXPT_SUBDIR}" -#On Hera: -COMINgfs="/scratch1/NCEPDEV/hwrf/noscrub/hafs-input/COMGFS" -STMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp" -PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" - -#On Jet: -#COMINgfs="/lfs1/HFIP/hwrf-data/hafs-input/COMGFS" -#STMP="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp" -#PTMP="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" - # # In NCO mode, the user must manually (e.g. after doing the build step) # create the symlink "${FIXrrfs}/fix_sar" that points to EMC's FIXsar @@ -124,16 +109,3 @@ PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" # where EMC_GRID_NAME has the value set above. # -# If want to use user-staged external model files: - -#On Hera: -#EXTRN_MDL_SOURCE_DIR_ICS="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/FV3GFS" -#EXTRN_MDL_FILES_ICS=( "gfs.atmanl.nemsio" "gfs.sfcanl.nemsio" ) -#EXTRN_MDL_SOURCE_DIR_LBCS="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/FV3GFS" -#EXTRN_MDL_FILES_LBCS=( "gfs.atmf003.nemsio" "gfs.atmf006.nemsio" ) - -#On Jet: -#EXTRN_MDL_SOURCE_DIR_ICS="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/FV3GFS" -#EXTRN_MDL_FILES_ICS=( "gfs.atmanl.nemsio" "gfs.sfcanl.nemsio" ) -#EXTRN_MDL_SOURCE_DIR_LBCS="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/FV3GFS" -#EXTRN_MDL_FILES_LBCS=( "gfs.atmf003.nemsio" "gfs.atmf006.nemsio" ) diff --git a/tests/baseline_configs/config.nco_GSD_HRRR3km_HRRRX_RAPX.sh b/tests/baseline_configs/config.nco_GSD_HRRR3km_HRRRX_RAPX.sh index 51cd82e7b..689d4e211 100644 --- a/tests/baseline_configs/config.nco_GSD_HRRR3km_HRRRX_RAPX.sh +++ b/tests/baseline_configs/config.nco_GSD_HRRR3km_HRRRX_RAPX.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="nco" @@ -99,17 +94,6 @@ EXTRN_MDL_NAME_LBCS="RAPX" RUN="${EXPT_SUBDIR}" envir="${EXPT_SUBDIR}" -#On Hera: -COMINgfs="/scratch1/NCEPDEV/hwrf/noscrub/hafs-input/COMGFS" -STMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp" -PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" - -#On Jet: -#COMINgfs="/lfs1/HFIP/hwrf-data/hafs-input/COMGFS" -#STMP="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp" -#PTMP="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" - - # # In NCO mode, the user must manually (e.g. after doing the build step) # create the symlink "${FIXrrfs}/fix_sar" that points to EMC's FIXsar @@ -125,17 +109,3 @@ PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" # where EMC_GRID_NAME has the value set above. # -# If want to use user-staged external model files: - -#On Hera: -#EXTRN_MDL_SOURCE_DIR_ICS="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/HRRRX" -#EXTRN_MDL_FILES_ICS=( "hrrrx.out.for_f000" ) -#EXTRN_MDL_SOURCE_DIR_LBCS="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/RAPX" -#EXTRN_MDL_FILES_LBCS=( "rapx.out.for_f003" "rapx.out.for_f006" ) - -#On Jet: -#EXTRN_MDL_SOURCE_DIR_ICS="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/HRRRX" -#EXTRN_MDL_FILES_ICS=( "hrrrx.out.for_f000" ) -#EXTRN_MDL_SOURCE_DIR_LBCS="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/RAPX" -#EXTRN_MDL_FILES_LBCS=( "rapx.out.for_f003" "rapx.out.for_f006" ) - diff --git a/tests/baseline_configs/config.nco_conus.sh b/tests/baseline_configs/config.nco_conus.sh index 4237a14f0..25ceb2e67 100644 --- a/tests/baseline_configs/config.nco_conus.sh +++ b/tests/baseline_configs/config.nco_conus.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="nco" @@ -99,16 +94,6 @@ EXTRN_MDL_NAME_LBCS="FV3GFS" RUN="${EXPT_SUBDIR}" envir="${EXPT_SUBDIR}" -#On Hera: -COMINgfs="/scratch1/NCEPDEV/hwrf/noscrub/hafs-input/COMGFS" -STMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp" -PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" - -#On Jet: -#COMINgfs="/lfs1/HFIP/hwrf-data/hafs-input/COMGFS" -#STMP="" -#PTMP="" - # # In NCO mode, the user must manually (e.g. after doing the build step) # create the symlink "${FIXrrfs}/fix_lam" that points to EMC's FIXLAM diff --git a/tests/baseline_configs/config.nco_conus_c96.sh b/tests/baseline_configs/config.nco_conus_c96.sh index 1840c3b16..01f4cb74a 100644 --- a/tests/baseline_configs/config.nco_conus_c96.sh +++ b/tests/baseline_configs/config.nco_conus_c96.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="nco" @@ -99,16 +94,6 @@ EXTRN_MDL_NAME_LBCS="FV3GFS" RUN="${EXPT_SUBDIR}" envir="${EXPT_SUBDIR}" -#On Hera: -COMINgfs="/scratch1/NCEPDEV/hwrf/noscrub/hafs-input/COMGFS" -STMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp" -PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" - -#On Jet: -#COMINgfs="/lfs1/HFIP/hwrf-data/hafs-input/COMGFS" -#STMP="" -#PTMP="" - # # In NCO mode, the user must manually (e.g. after doing the build step) # create the symlink "${FIXrrfs}/fix_lam" that points to EMC's FIXLAM diff --git a/tests/baseline_configs/config.nco_ensemble.sh b/tests/baseline_configs/config.nco_ensemble.sh index a6f65c7db..8b35ee2d1 100644 --- a/tests/baseline_configs/config.nco_ensemble.sh +++ b/tests/baseline_configs/config.nco_ensemble.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="nco" @@ -99,16 +94,6 @@ EXTRN_MDL_NAME_LBCS="FV3GFS" RUN="${EXPT_SUBDIR}" envir="${EXPT_SUBDIR}" -#On Hera: -COMINgfs="/scratch1/NCEPDEV/hwrf/noscrub/hafs-input/COMGFS" -STMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp" -PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" - -#On Jet: -#COMINgfs="/lfs1/HFIP/hwrf-data/hafs-input/COMGFS" -#STMP="" -#PTMP="" - DO_ENSEMBLE="TRUE" NUM_ENS_MEMBERS="2" diff --git a/tests/baseline_configs/config.new_ESGgrid.sh b/tests/baseline_configs/config.new_ESGgrid.sh index 1aa5db8a2..2ab938c71 100644 --- a/tests/baseline_configs/config.new_ESGgrid.sh +++ b/tests/baseline_configs/config.new_ESGgrid.sh @@ -26,11 +26,6 @@ USE_CRON_TO_RELAUNCH="TRUE" # CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" @@ -55,21 +50,20 @@ LAYOUT_X="8" LAYOUT_Y="12" BLOCKSIZE="13" -if [ "$QUILTING" = "TRUE" ]; then - WRTCMP_write_groups="1" - WRTCMP_write_tasks_per_group=$(( 1*LAYOUT_Y )) - WRTCMP_output_grid="lambert_conformal" - WRTCMP_cen_lon="${ESGgrid_LON_CTR}" - WRTCMP_cen_lat="${ESGgrid_LAT_CTR}" - WRTCMP_stdlat1="${ESGgrid_LAT_CTR}" - WRTCMP_stdlat2="${ESGgrid_LAT_CTR}" - WRTCMP_nx="200" - WRTCMP_ny="150" - WRTCMP_lon_lwr_left="-122.21414225" - WRTCMP_lat_lwr_left="22.41403305" - WRTCMP_dx="${ESGgrid_DELX}" - WRTCMP_dy="${ESGgrid_DELY}" -fi +QUILTING="TRUE" +WRTCMP_write_groups="1" +WRTCMP_write_tasks_per_group=$(( 1*LAYOUT_Y )) +WRTCMP_output_grid="lambert_conformal" +WRTCMP_cen_lon="${ESGgrid_LON_CTR}" +WRTCMP_cen_lat="${ESGgrid_LAT_CTR}" +WRTCMP_stdlat1="${ESGgrid_LAT_CTR}" +WRTCMP_stdlat2="${ESGgrid_LAT_CTR}" +WRTCMP_nx="200" +WRTCMP_ny="150" +WRTCMP_lon_lwr_left="-122.21414225" +WRTCMP_lat_lwr_left="22.41403305" +WRTCMP_dx="${ESGgrid_DELX}" +WRTCMP_dy="${ESGgrid_DELY}" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp_regional" diff --git a/tests/baseline_configs/config.regional_001.sh b/tests/baseline_configs/config.regional_001.sh index 6a8f6655a..7193756ab 100644 --- a/tests/baseline_configs/config.regional_001.sh +++ b/tests/baseline_configs/config.regional_001.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.regional_002.sh b/tests/baseline_configs/config.regional_002.sh index 80f7f895a..78fa3f7d1 100644 --- a/tests/baseline_configs/config.regional_002.sh +++ b/tests/baseline_configs/config.regional_002.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.regional_003.sh b/tests/baseline_configs/config.regional_003.sh index d0fb807d0..f99b12e02 100644 --- a/tests/baseline_configs/config.regional_003.sh +++ b/tests/baseline_configs/config.regional_003.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.regional_004.sh b/tests/baseline_configs/config.regional_004.sh index 7f19f0d17..414796226 100644 --- a/tests/baseline_configs/config.regional_004.sh +++ b/tests/baseline_configs/config.regional_004.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.regional_005.sh b/tests/baseline_configs/config.regional_005.sh index bfd925885..0fe4f7bce 100644 --- a/tests/baseline_configs/config.regional_005.sh +++ b/tests/baseline_configs/config.regional_005.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.regional_006.sh b/tests/baseline_configs/config.regional_006.sh index f5a0aa25b..c43b2de5f 100644 --- a/tests/baseline_configs/config.regional_006.sh +++ b/tests/baseline_configs/config.regional_006.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" @@ -42,15 +37,6 @@ EXTRN_MDL_NAME_ICS="FV3GFS" EXTRN_MDL_NAME_LBCS="FV3GFS" RUN_TASK_MAKE_GRID="FALSE" -GRID_DIR="/scratch2/BMC/det/FV3LAM_pregen/grid/GSD_HRRR25km" - RUN_TASK_MAKE_OROG="FALSE" -OROG_DIR="/scratch2/BMC/det/FV3LAM_pregen/orog/GSD_HRRR25km" - RUN_TASK_MAKE_SFC_CLIMO="FALSE" -SFC_CLIMO_DIR="/scratch2/BMC/det/FV3LAM_pregen/sfc_climo/GSD_HRRR25km" -#On Jet -#GRID_DIR="" -#OROG_DIR="" -#SFC_CLIMO_DIR="" diff --git a/tests/baseline_configs/config.regional_007.sh b/tests/baseline_configs/config.regional_007.sh index 09e843d0e..fa268c86b 100644 --- a/tests/baseline_configs/config.regional_007.sh +++ b/tests/baseline_configs/config.regional_007.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.regional_008.sh b/tests/baseline_configs/config.regional_008.sh index dc7d8b39e..305acdcf9 100644 --- a/tests/baseline_configs/config.regional_008.sh +++ b/tests/baseline_configs/config.regional_008.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.regional_009.sh b/tests/baseline_configs/config.regional_009.sh index 2fc79bfa2..66a32d23f 100644 --- a/tests/baseline_configs/config.regional_009.sh +++ b/tests/baseline_configs/config.regional_009.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="nco" @@ -98,15 +93,6 @@ EXTRN_MDL_NAME_LBCS="FV3GFS" RUN="${EXPT_SUBDIR}" envir="${EXPT_SUBDIR}" -#On Hera: -COMINgfs="/scratch1/NCEPDEV/hwrf/noscrub/hafs-input/COMGFS" -STMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp" -PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" - -#On Jet: -#COMINgfs="/lfs1/projects/hwrf-data/hafs-input/COMGFS" -#STMP="" -#PTMP="" # # In NCO mode, the user must manually (e.g. after doing the build step) diff --git a/tests/baseline_configs/config.regional_010.sh b/tests/baseline_configs/config.regional_010.sh index d8898cb04..74db51ab0 100644 --- a/tests/baseline_configs/config.regional_010.sh +++ b/tests/baseline_configs/config.regional_010.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.regional_011.sh b/tests/baseline_configs/config.regional_011.sh index 9f0393f26..b0aca082b 100644 --- a/tests/baseline_configs/config.regional_011.sh +++ b/tests/baseline_configs/config.regional_011.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.regional_012.sh b/tests/baseline_configs/config.regional_012.sh index f2286353e..c6eb03c61 100644 --- a/tests/baseline_configs/config.regional_012.sh +++ b/tests/baseline_configs/config.regional_012.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.regional_014.sh b/tests/baseline_configs/config.regional_014.sh index c65e62bd4..e8b72d7bb 100644 --- a/tests/baseline_configs/config.regional_014.sh +++ b/tests/baseline_configs/config.regional_014.sh @@ -18,10 +18,6 @@ CRON_RELAUNCH_INTVL_MNTS="02" DOT_OR_USCORE="." -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.regional_015.sh b/tests/baseline_configs/config.regional_015.sh index b5d809dc1..727a543e1 100644 --- a/tests/baseline_configs/config.regional_015.sh +++ b/tests/baseline_configs/config.regional_015.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.user_download_extrn_files.sh b/tests/baseline_configs/config.user_download_extrn_files.sh index 86376e96b..b78d8eb2a 100644 --- a/tests/baseline_configs/config.user_download_extrn_files.sh +++ b/tests/baseline_configs/config.user_download_extrn_files.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/baseline_configs/config.user_staged_extrn_files.sh b/tests/baseline_configs/config.user_staged_extrn_files.sh index 692041ea3..aa9679f32 100644 --- a/tests/baseline_configs/config.user_staged_extrn_files.sh +++ b/tests/baseline_configs/config.user_staged_extrn_files.sh @@ -16,11 +16,6 @@ EXPT_SUBDIR="" USE_CRON_TO_RELAUNCH="TRUE" CRON_RELAUNCH_INTVL_MNTS="02" - -QUEUE_DEFAULT="batch" -QUEUE_HPSS="service" -QUEUE_FCST="batch" - VERBOSE="TRUE" RUN_ENVIR="community" diff --git a/tests/run_experiments.sh b/tests/run_experiments.sh index c3d22e237..3c5d83979 100755 --- a/tests/run_experiments.sh +++ b/tests/run_experiments.sh @@ -395,6 +395,14 @@ fi # #----------------------------------------------------------------------- # +# +# +#----------------------------------------------------------------------- +# + MACHINE="${machine^^}" +# +#----------------------------------------------------------------------- +# # Set any parameters in the experiment configuration file that have been # assigned a value in the arguments list to this script (and thus are # not empty). Any parameters that have not been assigned a value in the @@ -406,7 +414,7 @@ fi #----------------------------------------------------------------------- # if [ ! -z "$machine" ]; then - set_bash_param "${expt_config_fp}" "MACHINE" "$machine" + set_bash_param "${expt_config_fp}" "MACHINE" "${MACHINE}" fi if [ ! -z "$account" ]; then @@ -423,6 +431,284 @@ fi # #----------------------------------------------------------------------- # +# +# +#----------------------------------------------------------------------- +# +# Might be better to source both config_defaults.sh and the configuration +# file for the test. That way, variables will have default values and +# we don't have to check whether or not they're set. Also, do the sourcing +# just once if possible instead of many times as below. +# + + PREDEF_GRID_NAME=$( + . ${expt_config_fp} + if [ -z "${PREDEF_GRID_NAME+x}" ]; then + echo "" + else + echo "${PREDEF_GRID_NAME}" + fi + ) +#echo "PREDEF_GRID_NAME = \"${PREDEF_GRID_NAME}\"" +#exit + + RUN_TASK_MAKE_GRID=$( . ${expt_config_fp} ; echo "${RUN_TASK_MAKE_GRID}" ) + + if [ ${RUN_TASK_MAKE_GRID} = "FALSE" ]; then + + if [ "$MACHINE" = "HERA" ]; then + GRID_DIR="/scratch2/BMC/det/FV3LAM_pregen/grid/${PREDEF_GRID_NAME}" + elif [ "$MACHINE" = "CHEYENNE" ]; then + GRID_DIR="/glade/p/ral/jntp/UFS_CAM/FV3LAM_pregen/grid/${PREDEF_GRID_NAME}" + else + print_err_msg_exit "\ +The directory (GRID_DIR) in which the pregenerated grid files are located +has not been specified for this machine (MACHINE): + MACHINE= \"${MACHINE}\"" + fi + + { cat << EOM >> ${expt_config_fp} +# +# Directory containing the pregenerated grid files. +# +GRID_DIR="${GRID_DIR}" +EOM + } || print_err_msg_exit "\ +Heredoc (cat) command to append the variable GRID_DIR containing the +pregenerated grid files to the workflow configuration file returned +with a nonzero status." + + fi +# +#----------------------------------------------------------------------- +# +# +# +#----------------------------------------------------------------------- +# + RUN_TASK_MAKE_OROG=$( . ${expt_config_fp} ; echo "${RUN_TASK_MAKE_OROG}" ) + + if [ ${RUN_TASK_MAKE_OROG} = "FALSE" ]; then + + if [ "$MACHINE" = "HERA" ]; then + OROG_DIR="/scratch2/BMC/det/FV3LAM_pregen/orog/${PREDEF_GRID_NAME}" + elif [ "$MACHINE" = "CHEYENNE" ]; then + OROG_DIR="/glade/p/ral/jntp/UFS_CAM/FV3LAM_pregen/orog/${PREDEF_GRID_NAME}" + else + print_err_msg_exit "\ +The directory (OROG_DIR) in which the pregenerated grid files are located +has not been specified for this machine (MACHINE): + MACHINE= \"${MACHINE}\"" + fi + + { cat << EOM >> ${expt_config_fp} +# +# Directory containing the pregenerated grid files. +# +OROG_DIR="${OROG_DIR}" +EOM + } || print_err_msg_exit "\ +Heredoc (cat) command to append the variable OROG_DIR containing the +pregenerated orography files to the workflow configuration file returned +with a nonzero status." + + fi +# +#----------------------------------------------------------------------- +# +# +# +#----------------------------------------------------------------------- +# + RUN_TASK_MAKE_SFC_CLIMO=$( . ${expt_config_fp} ; echo "${RUN_TASK_MAKE_SFC_CLIMO}" ) + + if [ ${RUN_TASK_MAKE_SFC_CLIMO} = "FALSE" ]; then + + if [ "$MACHINE" = "HERA" ]; then + SFC_CLIMO_DIR="/scratch2/BMC/det/FV3LAM_pregen/sfc_climo/${PREDEF_GRID_NAME}" + elif [ "$MACHINE" = "CHEYENNE" ]; then + SFC_CLIMO_DIR="/glade/p/ral/jntp/UFS_CAM/FV3LAM_pregen/sfc_climo/${PREDEF_GRID_NAME}" + else + print_err_msg_exit "\ +The directory (SFC_CLIMO_DIR) in which the pregenerated grid files are +located has not been specified for this machine (MACHINE): + MACHINE= \"${MACHINE}\"" + fi + + { cat << EOM >> ${expt_config_fp} +# +# Directory containing the pregenerated grid files. +# +SFC_CLIMO_DIR="${SFC_CLIMO_DIR}" +EOM + } || print_err_msg_exit "\ +Heredoc (cat) command to append the variable SFC_CLIMO_DIR containing +the pregenerated grid files to the workflow configuration file returned +with a nonzero status." + + fi + +#On hera: + +# +#----------------------------------------------------------------------- +# +# +# +#----------------------------------------------------------------------- +# + CCPP_PHYS_SUITE=$( . ${expt_config_fp} ; echo "${CCPP_PHYS_SUITE}" ) + + if [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then + + if [ "$MACHINE" = "HERA" ]; then + GWD_RRFS_v1beta_BASEDIR="/scratch2/BMC/det/FV3LAM_pregen/orog" + elif [ "$MACHINE" = "JET" ]; then + GWD_RRFS_v1beta_BASEDIR="/lfs4/BMC/wrfruc/FV3LAM_pregen/orog" + elif [ "$MACHINE" = "CHEYENNE" ]; then + GWD_RRFS_v1beta_BASEDIR="/glade/p/ral/jntp/UFS_CAM/FV3LAM_pregen/orog" + else + print_err_msg_exit "\ +The base directory (GWD_RRFS_v1beta_BASEDIR) in which the orography +statistics files needed by the gravity wave drag parameterization in +the current physics suite (CCPP_PHYS_SUITE) should be located has not +been specified for this machine (MACHINE): + CCPP_PHYS_SUITE= \"${CCPP_PHYS_SUIT}\" + MACHINE= \"${MACHINE}\"" + fi + + { cat << EOM >> ${expt_config_fp} +# +# Directory containing the orography statistics files needed by the +# gravity wave drag parameterization. +# +GWD_RRFS_v1beta_BASEDIR="${GWD_RRFS_v1beta_BASEDIR}" +EOM + } || print_err_msg_exit "\ +Heredoc (cat) command to append the variable GWD_RRFS_v1beta_BASEDIR +containing the orography statistics files needed by the gravity wave +drag parameterization to the workflow configuration file returned with +a nonzero status." + + fi +# +#----------------------------------------------------------------------- +# +# +# +#----------------------------------------------------------------------- +# + RUN_ENVIR=$( . ${expt_config_fp} ; echo "${RUN_ENVIR}" ) + + if [ "${RUN_ENVIR}" = "nco" ]; then + +# Note: Need COMINgfs only if using FV3GFS or GSMGFS as the external +# model for ICs or LBCs. Modify the logic below later. + + if [ "$MACHINE" = "HERA" ]; then + COMINgfs="/scratch1/NCEPDEV/hwrf/noscrub/hafs-input/COMGFS" + STMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp" + PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" + elif [ "$MACHINE" = "JET" ]; then + COMINgfs="/lfs1/HFIP/hwrf-data/hafs-input/COMGFS" + STMP="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp" + PTMP="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" + elif [ "$MACHINE" = "CHEYENNE" ]; then + COMINgfs="/glade/scratch/ketefian/NCO_dirs/COMGFS" + STMP="/glade/scratch/ketefian/NCO_dirs/stmp" + PTMP="/glade/scratch/ketefian/NCO_dirs/ptmp" + else + print_err_msg_exit "\ +The directories COMINgfs, STMP, and PTMP that need to be specified when +running the workflow in NCO-mode (i.e. RUN_ENVIR set to \"nco\") have +not been specified for this machine (MACHINE): + MACHINE= \"${MACHINE}\"" + fi + + { cat << EOM >> ${expt_config_fp} +# +# Directories COMINgfs, STMP, and PTMP that need to be specified when +# running the workflow in NCO-mode (i.e. RUN_ENVIR set to "nco"). +# +COMINgfs="${COMINgfs}" +STMP="${STMP}" +PTMP="${PTMP}" +EOM + } || print_err_msg_exit "\ +Heredoc (cat) command to append variables specifying user-staged external +model files and locations to the workflow configuration file returned with +a nonzero status." + + fi +# +#----------------------------------------------------------------------- +# +# +# +#----------------------------------------------------------------------- +# + do_user_staged_extrn="TRUE" # Change this to an input argument at some point. + + if [ ${do_user_staged_extrn} = "TRUE" ]; then + + EXTRN_MDL_NAME_ICS=$( . ${expt_config_fp} ; echo "${EXTRN_MDL_NAME_ICS}" ) + EXTRN_MDL_NAME_LBCS=$( . ${expt_config_fp} ; echo "${EXTRN_MDL_NAME_LBCS}" ) + FCST_LEN_HRS=$( . ${expt_config_fp} ; echo "${FCST_LEN_HRS}" ) + LBC_SPEC_INTVL_HRS=$( . ${expt_config_fp} ; echo "${LBC_SPEC_INTVL_HRS}" ) + + if [ "$MACHINE" = "HERA" ]; then + EXTRN_MDL_SOURCE_BASEDIR="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files" + elif [ "$MACHINE" = "JET" ]; then + EXTRN_MDL_SOURCE_BASEDIR="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files" + elif [ "$MACHINE" = "CHEYENNE" ]; then + EXTRN_MDL_SOURCE_BASEDIR="/glade/p/ral/jntp/UFS_CAM/staged_extrn_mdl_files" + else + print_err_msg_exit "\ +The base directory (EXTRN_MDL_SOURCE_BASEDIR) in which the user-staged +external model files should be located has not been specified for this +machine (MACHINE): + MACHINE= \"${MACHINE}\"" + fi + + EXTRN_MDL_SOURCE_DIR_ICS="${EXTRN_MDL_SOURCE_BASEDIR}/${EXTRN_MDL_NAME_ICS}" + if [ "${EXTRN_MDL_NAME_ICS}" = "FV3GFS" ] || \ + [ "${EXTRN_MDL_NAME_ICS}" = "GSMGFS" ]; then + EXTRN_MDL_FILES_ICS=( "gfs.atmanl.nemsio" "gfs.sfcanl.nemsio" ) + elif [ "${EXTRN_MDL_NAME_ICS}" = "HRRRX" ] || \ + [ "${EXTRN_MDL_NAME_ICS}" = "RAPX" ]; then + EXTRN_MDL_FILES_ICS=( "${EXTRN_MDL_NAME_ICS,,}.out.for_f000" ) + fi + + EXTRN_MDL_SOURCE_DIR_LBCS="${EXTRN_MDL_SOURCE_BASEDIR}/${EXTRN_MDL_NAME_LBCS}" + EXTRN_MDL_FILES_LBCS=( $( seq ${LBC_SPEC_INTVL_HRS} ${LBC_SPEC_INTVL_HRS} ${FCST_LEN_HRS} ) ) + if [ "${EXTRN_MDL_NAME_LBCS}" = "FV3GFS" ] || \ + [ "${EXTRN_MDL_NAME_LBCS}" = "GSMGFS" ]; then + EXTRN_MDL_FILES_LBCS=( "${EXTRN_MDL_FILES_LBCS[@]/#/gfs.atmf00}" ) + EXTRN_MDL_FILES_LBCS=( "${EXTRN_MDL_FILES_LBCS[@]/%/.nemsio}" ) + elif [ "${EXTRN_MDL_NAME_LBCS}" = "HRRRX" ] || \ + [ "${EXTRN_MDL_NAME_LBCS}" = "RAPX" ]; then + EXTRN_MDL_FILES_LBCS=( "${EXTRN_MDL_FILES_LBCS[@]/#/${EXTRN_MDL_NAME_LBCS,,}.out.for_f00}" ) + fi + + { cat << EOM >> ${expt_config_fp} +# +# Locations and names of user-staged external model files for generating +# ICs and LBCs. +# +EXTRN_MDL_SOURCE_DIR_ICS="${EXTRN_MDL_SOURCE_DIR_ICS}" +EXTRN_MDL_FILES_ICS=( $( printf "\"%s\" " "${EXTRN_MDL_FILES_ICS[@]}" )) +EXTRN_MDL_SOURCE_DIR_LBCS="${EXTRN_MDL_SOURCE_DIR_LBCS}" +EXTRN_MDL_FILES_LBCS=( $( printf "\"%s\" " "${EXTRN_MDL_FILES_LBCS[@]}" )) +EOM + } || print_err_msg_exit "\ +Heredoc (cat) command to append variables specifying user-staged external +model files and locations to the workflow configuration file returned with +a nonzero status." + + fi +# +#----------------------------------------------------------------------- +# # Set the values of those parameters in the experiment configuration file # that need to be adjusted from their baseline values (as specified in # the current line of the experiments list file) to obtain the configuration diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh index 23254e7da..3ee043cc4 100644 --- a/ush/config_defaults.sh +++ b/ush/config_defaults.sh @@ -89,11 +89,11 @@ RUN_ENVIR="nco" MACHINE="BIG_COMPUTER" ACCOUNT="project_name" SCHED="" -QUEUE_DEFAULT="batch_queue" +QUEUE_DEFAULT="" QUEUE_DEFAULT_TAG="queue" -QUEUE_HPSS="hpss_queue" +QUEUE_HPSS="" QUEUE_HPSS_TAG="partition" -QUEUE_FCST="production_queue" +QUEUE_FCST="" QUEUE_FCST_TAG="queue" # #----------------------------------------------------------------------- @@ -438,6 +438,8 @@ NOMADS_file_type="nemsio" # #----------------------------------------------------------------------- # +EXTRN_MDL_SOURCE_BASEDIR="" + EXTRN_MDL_SOURCE_DIR_ICS="" EXTRN_MDL_FILES_ICS=( "ICS_file1" "ICS_file2" "..." ) diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh index d2fb6861e..0a00737e6 100755 --- a/ush/generate_FV3LAM_wflow.sh +++ b/ush/generate_FV3LAM_wflow.sh @@ -311,6 +311,8 @@ $settings" print_info_msg "$VERBOSE" " Creating the cycle directories..." +echo "CYCLE_BASEDIR = ${CYCLE_BASEDIR}" +set -x for (( i=0; i<${NUM_CYCLES}; i++ )); do cdate="${ALL_CDATES[$i]}" cycle_dir="${CYCLE_BASEDIR}/$cdate" diff --git a/ush/launch_FV3LAM_wflow.sh b/ush/launch_FV3LAM_wflow.sh index 0b5aba00b..9b60f6f07 100755 --- a/ush/launch_FV3LAM_wflow.sh +++ b/ush/launch_FV3LAM_wflow.sh @@ -8,6 +8,7 @@ #----------------------------------------------------------------------- # set -u +#set -x # #----------------------------------------------------------------------- # @@ -91,8 +92,8 @@ expt_name="${EXPT_SUBDIR}" # #----------------------------------------------------------------------- # -module purge -module load rocoto +#module purge +#module load rocoto # #----------------------------------------------------------------------- # diff --git a/ush/set_extrn_mdl_params.sh b/ush/set_extrn_mdl_params.sh index fac2e50bc..36860b50f 100644 --- a/ush/set_extrn_mdl_params.sh +++ b/ush/set_extrn_mdl_params.sh @@ -51,8 +51,7 @@ if [ "${RUN_ENVIR}" = "nco" ]; then else case ${EXTRN_MDL_NAME_ICS} in - - + "GSMGFS") case $MACHINE in "WCOSS_CRAY") @@ -76,18 +75,9 @@ else "STAMPEDE") EXTRN_MDL_SYSBASEDIR_ICS="/scratch/00315/tg455890/GDAS/20190530/2019053000_mem001" ;; - *) - print_err_msg_exit "\ -The system directory in which to look for the files generated by the ex- -ternal model specified by EXTRN_MDL_NAME_ICS has not been specified for -this machine and external model combination: - MACHINE = \"$MACHINE\" - EXTRN_MDL_NAME_ICS = \"${EXTRN_MDL_NAME_ICS}\"" - ;; esac ;; - - + "FV3GFS") case $MACHINE in "WCOSS_CRAY") @@ -108,18 +98,9 @@ this machine and external model combination: "CHEYENNE") EXTRN_MDL_SYSBASEDIR_ICS="/glade/p/ral/jntp/UFS_CAM/COMGFS" ;; - *) - print_err_msg_exit "\ -The system directory in which to look for the files generated by the ex- -ternal model specified by EXTRN_MDL_NAME_ICS has not been specified for -this machine and external model combination: - MACHINE = \"$MACHINE\" - EXTRN_MDL_NAME_ICS = \"${EXTRN_MDL_NAME_ICS}\"" - ;; esac ;; - - + "RAPX") case $MACHINE in "HERA") @@ -128,18 +109,14 @@ this machine and external model combination: "JET") EXTRN_MDL_SYSBASEDIR_ICS="/misc/whome/rtrr/rap" ;; - *) - print_err_msg_exit "\ -The system directory in which to look for the files generated by the ex- -ternal model specified by EXTRN_MDL_NAME_ICS has not been specified for -this machine and external model combination: - MACHINE = \"$MACHINE\" - EXTRN_MDL_NAME_ICS = \"${EXTRN_MDL_NAME_ICS}\"" +# This goes with the comment below for the if-statement (-z EXTRN_MDL_SYSBASEDIR_ICS). +# Should not need this case. + "CHEYENNE") + EXTRN_MDL_SYSBASEDIR_ICS="dummy_value" ;; esac ;; - "HRRRX") case $MACHINE in "HERA") @@ -148,21 +125,28 @@ this machine and external model combination: "JET") EXTRN_MDL_SYSBASEDIR_ICS="/misc/whome/rtrr/hrrr" ;; - *) - print_err_msg_exit "\ -The system directory in which to look for the files generated by the ex- -ternal model specified by EXTRN_MDL_NAME_ICS has not been specified -for this machine and external model combination: - MACHINE = \"$MACHINE\" - EXTRN_MDL_NAME_ICS = \"${EXTRN_MDL_NAME_ICS}\"" + "CHEYENNE") + EXTRN_MDL_SYSBASEDIR_ICS="dummy_value" ;; esac ;; - esac fi + +# This approach needs to be rechecked. It gives this error if EXTRN_MDL_SYSBASEDIR_ICS +# does not get set above: +# ./set_extrn_mdl_params.sh: line 134: EXTRN_MDL_SYSBASEDIR_ICS: unbound variable +if [ -z "${EXTRN_MDL_SYSBASEDIR_ICS}" ]; then + print_err_msg_exit "\ +The variable EXTRN_MDL_SYSBASEDIR_ICS specifying the system directory +in which to look for the files generated by the external model for ICs +has not been set for the current combination of machine (MACHINE) and +external model (EXTRN_MDL_NAME_ICS): + MACHINE = \"$MACHINE\" + EXTRN_MDL_NAME_ICS = \"${EXTRN_MDL_NAME_ICS}\"" +fi # #----------------------------------------------------------------------- # @@ -173,18 +157,18 @@ fi #----------------------------------------------------------------------- # case ${EXTRN_MDL_NAME_LBCS} in -"GSMGFS") - EXTRN_MDL_LBCS_OFFSET_HRS="0" - ;; -"FV3GFS") - EXTRN_MDL_LBCS_OFFSET_HRS="0" - ;; -"RAPX") - EXTRN_MDL_LBCS_OFFSET_HRS="3" - ;; -"HRRRX") - EXTRN_MDL_LBCS_OFFSET_HRS="0" - ;; + "GSMGFS") + EXTRN_MDL_LBCS_OFFSET_HRS="0" + ;; + "FV3GFS") + EXTRN_MDL_LBCS_OFFSET_HRS="0" + ;; + "RAPX") + EXTRN_MDL_LBCS_OFFSET_HRS="3" + ;; + "HRRRX") + EXTRN_MDL_LBCS_OFFSET_HRS="0" + ;; esac # #----------------------------------------------------------------------- @@ -209,8 +193,7 @@ if [ "${RUN_ENVIR}" = "nco" ]; then else case ${EXTRN_MDL_NAME_LBCS} in - - + "GSMGFS") case $MACHINE in "WCOSS_CRAY") @@ -234,20 +217,10 @@ else "STAMPEDE") EXTRN_MDL_SYSBASEDIR_LBCS="/scratch/00315/tg455890/GDAS/20190530/2019053000_mem001" ;; - *) - print_err_msg_exit "\ -The system directory in which to look for the files generated by the ex- -ternal model specified by EXTRN_MDL_NAME_LBCS has not been specified for -this machine and external model combination: - MACHINE = \"$MACHINE\" - EXTRN_MDL_NAME_LBCS = \"${EXTRN_MDL_NAME_LBCS}\"" - ;; esac ;; - "FV3GFS") - case $MACHINE in "WCOSS_CRAY") EXTRN_MDL_SYSBASEDIR_LBCS="/gpfs/dell1/nco/ops/com/gfs/prod" @@ -267,20 +240,10 @@ this machine and external model combination: "CHEYENNE") EXTRN_MDL_SYSBASEDIR_LBCS="/glade/p/ral/jntp/UFS_CAM/COMGFS" ;; - *) - print_err_msg_exit "\ -The system directory in which to look for the files generated by the ex- -ternal model specified by EXTRN_MDL_NAME_LBCS has not been specified for -this machine and external model combination: - MACHINE = \"$MACHINE\" - EXTRN_MDL_NAME_LBCS = \"${EXTRN_MDL_NAME_LBCS}\"" - ;; esac ;; - "RAPX") - case $MACHINE in "HERA") EXTRN_MDL_SYSBASEDIR_LBCS="/scratch2/BMC/public/data/gsd/rap/full/wrfnat" @@ -288,21 +251,13 @@ this machine and external model combination: "JET") EXTRN_MDL_SYSBASEDIR_LBCS="/misc/whome/rtrr/rap" ;; - *) - print_err_msg_exit "\ -The system directory in which to look for the files generated by the ex- -ternal model specified by EXTRN_MDL_NAME_LBCS has not been specified for -this machine and external model combination: - MACHINE = \"$MACHINE\" - EXTRN_MDL_NAME_LBCS = \"${EXTRN_MDL_NAME_LBCS}\"" + "CHEYENNE") + EXTRN_MDL_SYSBASEDIR_LBCS="dummy_value" ;; esac ;; - - - + "HRRRX") - case $MACHINE in "HERA") EXTRN_MDL_SYSBASEDIR_LBCS="/scratch2/BMC/public/data/gsd/hrrr/conus/wrfnat" @@ -310,24 +265,23 @@ this machine and external model combination: "JET") EXTRN_MDL_SYSBASEDIR_LBCS="/misc/whome/rtrr/hrrr" ;; - - *) - print_err_msg_exit "\ -The system directory in which to look for the files generated by the ex- -ternal model specified by EXTRN_MDL_NAME_LBCS has not been specified for -this machine and external model combination: - MACHINE = \"$MACHINE\" - EXTRN_MDL_NAME_LBCS = \"${EXTRN_MDL_NAME_LBCS}\"" - ;; esac ;; - - - + esac fi +# This approach needs to be rechecked. +if [ -z "${EXTRN_MDL_SYSBASEDIR_LBCS}" ]; then + print_err_msg_exit "\ +The variable EXTRN_MDL_SYSBASEDIR_LBCS specifying the system directory +in which to look for the files generated by the external model for LBCs +has not been set for the current combination of machine (MACHINE) and +external model (EXTRN_MDL_NAME_LBCS): + MACHINE = \"$MACHINE\" + EXTRN_MDL_NAME_LBCS = \"${EXTRN_MDL_NAME_LBCS}\"" +fi } # #----------------------------------------------------------------------- From 70cf3652f5eccbefade9ecb66953987174c7e9ca Mon Sep 17 00:00:00 2001 From: gerard ketefian Date: Mon, 14 Sep 2020 13:50:56 -0600 Subject: [PATCH 10/11] Additional mods after getting a look at the previous set of mods with xxdiff on hera. --- .../config.user_staged_extrn_files.sh | 6 ------ tests/run_experiments.sh | 12 ++++++------ ush/config_defaults.sh | 2 -- ush/generate_FV3LAM_wflow.sh | 2 -- ush/launch_FV3LAM_wflow.sh | 7 ++++--- 5 files changed, 10 insertions(+), 19 deletions(-) diff --git a/tests/baseline_configs/config.user_staged_extrn_files.sh b/tests/baseline_configs/config.user_staged_extrn_files.sh index aa9679f32..78fa3f7d1 100644 --- a/tests/baseline_configs/config.user_staged_extrn_files.sh +++ b/tests/baseline_configs/config.user_staged_extrn_files.sh @@ -40,9 +40,3 @@ RUN_TASK_MAKE_GRID="TRUE" RUN_TASK_MAKE_OROG="TRUE" RUN_TASK_MAKE_SFC_CLIMO="TRUE" -EXTRN_MDL_SOURCE_DIR_ICS="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/FV3GFS" -EXTRN_MDL_FILES_ICS=( "gfs.atmanl.nemsio" "gfs.sfcanl.nemsio" ) - -EXTRN_MDL_SOURCE_DIR_LBCS="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files/FV3GFS" -EXTRN_MDL_FILES_LBCS=( "gfs.atmf003.nemsio" "gfs.atmf006.nemsio" ) - diff --git a/tests/run_experiments.sh b/tests/run_experiments.sh index 3c5d83979..075e3d88f 100755 --- a/tests/run_experiments.sh +++ b/tests/run_experiments.sh @@ -657,20 +657,20 @@ a nonzero status." LBC_SPEC_INTVL_HRS=$( . ${expt_config_fp} ; echo "${LBC_SPEC_INTVL_HRS}" ) if [ "$MACHINE" = "HERA" ]; then - EXTRN_MDL_SOURCE_BASEDIR="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files" + extrn_mdl_source_baseir="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files" elif [ "$MACHINE" = "JET" ]; then - EXTRN_MDL_SOURCE_BASEDIR="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files" + extrn_mdl_source_baseir="/mnt/lfs1/BMC/fim/Gerard.Ketefian/UFS_CAM/staged_extrn_mdl_files" elif [ "$MACHINE" = "CHEYENNE" ]; then - EXTRN_MDL_SOURCE_BASEDIR="/glade/p/ral/jntp/UFS_CAM/staged_extrn_mdl_files" + extrn_mdl_source_baseir="/glade/p/ral/jntp/UFS_CAM/staged_extrn_mdl_files" else print_err_msg_exit "\ -The base directory (EXTRN_MDL_SOURCE_BASEDIR) in which the user-staged +The base directory (extrn_mdl_source_baseir) in which the user-staged external model files should be located has not been specified for this machine (MACHINE): MACHINE= \"${MACHINE}\"" fi - EXTRN_MDL_SOURCE_DIR_ICS="${EXTRN_MDL_SOURCE_BASEDIR}/${EXTRN_MDL_NAME_ICS}" + EXTRN_MDL_SOURCE_DIR_ICS="${extrn_mdl_source_baseir}/${EXTRN_MDL_NAME_ICS}" if [ "${EXTRN_MDL_NAME_ICS}" = "FV3GFS" ] || \ [ "${EXTRN_MDL_NAME_ICS}" = "GSMGFS" ]; then EXTRN_MDL_FILES_ICS=( "gfs.atmanl.nemsio" "gfs.sfcanl.nemsio" ) @@ -679,7 +679,7 @@ machine (MACHINE): EXTRN_MDL_FILES_ICS=( "${EXTRN_MDL_NAME_ICS,,}.out.for_f000" ) fi - EXTRN_MDL_SOURCE_DIR_LBCS="${EXTRN_MDL_SOURCE_BASEDIR}/${EXTRN_MDL_NAME_LBCS}" + EXTRN_MDL_SOURCE_DIR_LBCS="${extrn_mdl_source_baseir}/${EXTRN_MDL_NAME_LBCS}" EXTRN_MDL_FILES_LBCS=( $( seq ${LBC_SPEC_INTVL_HRS} ${LBC_SPEC_INTVL_HRS} ${FCST_LEN_HRS} ) ) if [ "${EXTRN_MDL_NAME_LBCS}" = "FV3GFS" ] || \ [ "${EXTRN_MDL_NAME_LBCS}" = "GSMGFS" ]; then diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh index 3ee043cc4..f99acdd60 100644 --- a/ush/config_defaults.sh +++ b/ush/config_defaults.sh @@ -438,8 +438,6 @@ NOMADS_file_type="nemsio" # #----------------------------------------------------------------------- # -EXTRN_MDL_SOURCE_BASEDIR="" - EXTRN_MDL_SOURCE_DIR_ICS="" EXTRN_MDL_FILES_ICS=( "ICS_file1" "ICS_file2" "..." ) diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh index 0a00737e6..d2fb6861e 100755 --- a/ush/generate_FV3LAM_wflow.sh +++ b/ush/generate_FV3LAM_wflow.sh @@ -311,8 +311,6 @@ $settings" print_info_msg "$VERBOSE" " Creating the cycle directories..." -echo "CYCLE_BASEDIR = ${CYCLE_BASEDIR}" -set -x for (( i=0; i<${NUM_CYCLES}; i++ )); do cdate="${ALL_CDATES[$i]}" cycle_dir="${CYCLE_BASEDIR}/$cdate" diff --git a/ush/launch_FV3LAM_wflow.sh b/ush/launch_FV3LAM_wflow.sh index 9b60f6f07..8004e32e4 100755 --- a/ush/launch_FV3LAM_wflow.sh +++ b/ush/launch_FV3LAM_wflow.sh @@ -8,7 +8,6 @@ #----------------------------------------------------------------------- # set -u -#set -x # #----------------------------------------------------------------------- # @@ -92,8 +91,10 @@ expt_name="${EXPT_SUBDIR}" # #----------------------------------------------------------------------- # -#module purge -#module load rocoto +if [ "$MACHINE" != "CHEYENNE" ]; then + module purge + module load rocoto +fi # #----------------------------------------------------------------------- # From 2f91cd60f1073f395b8558ffa15669623c2f7e42 Mon Sep 17 00:00:00 2001 From: gerard ketefian Date: Mon, 14 Sep 2020 15:11:54 -0600 Subject: [PATCH 11/11] Additional bug fixes after rerunning WE2E tests on hera. --- ush/set_extrn_mdl_params.sh | 18 ++++++++++-------- ush/setup.sh | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ush/set_extrn_mdl_params.sh b/ush/set_extrn_mdl_params.sh index 36860b50f..02fbbbf00 100644 --- a/ush/set_extrn_mdl_params.sh +++ b/ush/set_extrn_mdl_params.sh @@ -134,11 +134,11 @@ else esac fi - -# This approach needs to be rechecked. It gives this error if EXTRN_MDL_SYSBASEDIR_ICS -# does not get set above: -# ./set_extrn_mdl_params.sh: line 134: EXTRN_MDL_SYSBASEDIR_ICS: unbound variable -if [ -z "${EXTRN_MDL_SYSBASEDIR_ICS}" ]; then +# +# If EXTRN_MDL_SYSBASEDIR_ICS has not been set (not even to a null string), +# print out an error message and exit. +# +if [ -z "${EXTRN_MDL_SYSBASEDIR_ICS+x}" ]; then print_err_msg_exit "\ The variable EXTRN_MDL_SYSBASEDIR_ICS specifying the system directory in which to look for the files generated by the external model for ICs @@ -271,9 +271,11 @@ else esac fi - -# This approach needs to be rechecked. -if [ -z "${EXTRN_MDL_SYSBASEDIR_LBCS}" ]; then +# +# If EXTRN_MDL_SYSBASEDIR_LBCS has not been set (not even to a null string), +# print out an error message and exit. +# +if [ -z "${EXTRN_MDL_SYSBASEDIR_LBCS+x}" ]; then print_err_msg_exit "\ The variable EXTRN_MDL_SYSBASEDIR_LBCS specifying the system directory in which to look for the files generated by the external model for LBCs diff --git a/ush/setup.sh b/ush/setup.sh index e5c617808..8eed18239 100755 --- a/ush/setup.sh +++ b/ush/setup.sh @@ -344,7 +344,7 @@ case $MACHINE in SCHED="${SCHED:-slurm}" QUEUE_DEFAULT=${QUEUE_DEFAULT:-"batch"} QUEUE_HPSS=${QUEUE_HPSS:-"service"} - QUEUE_FCST=${QUEUE_FCST:-""} + QUEUE_FCST=${QUEUE_FCST:-"batch"} ;; # "JET")