diff --git a/modulefiles/module-setup.csh.inc b/modulefiles/module-setup.csh.inc index 5ac893cab8..cb6cefb90f 100644 --- a/modulefiles/module-setup.csh.inc +++ b/modulefiles/module-setup.csh.inc @@ -13,34 +13,6 @@ else if ( { test -d /scratch3 } ) then source /apps/lmod/lmod/init/$__ms_shell endif module purge -else if ( { test -d /gpfs/hps -a -e /etc/SuSE-release } ) then - # We are on NOAA Luna or Surge - if ( ! { module help >& /dev/null } ) then - source /opt/modules/default/init/$__ms_shell - endif - module purge - module purge - unset _LMFILES_ - unset LOADEDMODULES - module use /opt/modulefiles - module use /opt/cray/ari/modulefiles - module use /opt/cray/craype/default/alt-modulefiles - module use /opt/cray/alt-modulefiles - module use /gpfs/hps/nco/ops/nwprod/modulefiles - module use /gpfs/hps/nco/ops/nwprod/lib/modulefiles - module use /usrx/local/prod/modulefiles -else if ( { test -d /dcom -a -d /hwrf } ) then - # We are on NOAA Tide or Gyre - if ( ! { module help >& /dev/null } ) then - source /usrx/local/Modules/default/init/$__ms_shell - endif - module purge -else if ( { test -L /usrx && sh -c "readlink /usrx 2> /dev/null | grep dell" } ) then - # We are on WCOSS Mars or Venus - if ( ! { module help >& /dev/null } ) then - source /usrx/local/prod/lmod/lmod/init/$__ms_shell - endif - module purge else if ( { test -d /glade } ) then # We are on NCAR Yellowstone if ( ! { module help >& /dev/null } ) then diff --git a/modulefiles/module-setup.sh.inc b/modulefiles/module-setup.sh.inc index ec81c0187b..bf07ad9b13 100644 --- a/modulefiles/module-setup.sh.inc +++ b/modulefiles/module-setup.sh.inc @@ -28,35 +28,6 @@ elif [[ -d /scratch3 ]] ; then source /apps/lmod/lmod/init/$__ms_shell fi module purge -elif [[ -d /gpfs/hps && -e /etc/SuSE-release ]] ; then - # We are on NOAA Luna or Surge - if ( ! eval module help > /dev/null 2>&1 ) ; then - source /opt/modules/default/init/$__ms_shell - fi - module purge - module purge - # Workaround until module issues are fixed: - unset _LMFILES_ - unset LOADEDMODULES - module use /opt/modulefiles - module use /opt/cray/ari/modulefiles - module use /opt/cray/craype/default/alt-modulefiles - module use /opt/cray/alt-modulefiles - module use /gpfs/hps/nco/ops/nwprod/modulefiles - module use /gpfs/hps/nco/ops/nwprod/lib/modulefiles - module use /usrx/local/prod/modulefiles -elif [[ -d /dcom && -d /hwrf ]] ; then - # We are on NOAA Tide or Gyre - if ( ! eval module help > /dev/null 2>&1 ) ; then - source /usrx/local/Modules/default/init/$__ms_shell - fi - module purge -elif [[ -L /usrx && "$( readlink /usrx 2> /dev/null )" =~ dell ]] ; then - # We are on NOAA Mars or Venus - if ( ! eval module help > /dev/null 2>&1 ) ; then - source /usrx/local/prod/lmod/lmod/init/$__ms_shell - fi - module purge elif [[ -d /lustre && -d /ncrc ]] ; then # We are on GAEA. if ( ! eval module help > /dev/null 2>&1 ) ; then diff --git a/modulefiles/tasks/wcoss_dell_p3/get_extrn_ics.local b/modulefiles/tasks/wcoss_dell_p3/get_extrn_ics.local deleted file mode 100644 index 9900015d1f..0000000000 --- a/modulefiles/tasks/wcoss_dell_p3/get_extrn_ics.local +++ /dev/null @@ -1,6 +0,0 @@ -#%Module##################################################### -## Module file for get_extrn_ics task. -############################################################# - -module purge -module load HPSS/5.0.2.5 diff --git a/modulefiles/tasks/wcoss_dell_p3/get_extrn_lbcs.local b/modulefiles/tasks/wcoss_dell_p3/get_extrn_lbcs.local deleted file mode 100644 index 4a8b7431f9..0000000000 --- a/modulefiles/tasks/wcoss_dell_p3/get_extrn_lbcs.local +++ /dev/null @@ -1,6 +0,0 @@ -#%Module##################################################### -## Module file for get_extrn_lbcs task. -############################################################# - -module purge -module load HPSS/5.0.2.5 diff --git a/modulefiles/tasks/wcoss_dell_p3/get_obs.local b/modulefiles/tasks/wcoss_dell_p3/get_obs.local deleted file mode 100644 index 825bfe3c3a..0000000000 --- a/modulefiles/tasks/wcoss_dell_p3/get_obs.local +++ /dev/null @@ -1,6 +0,0 @@ -#%Module##################################################### -## Module file for get_obs_ccpa, get_obs_mrms, get_obs_ndas -############################################################# - -module purge -module load HPSS/5.0.2.5 diff --git a/modulefiles/tasks/wcoss_dell_p3/make_grid.local b/modulefiles/tasks/wcoss_dell_p3/make_grid.local deleted file mode 100644 index 0e25550649..0000000000 --- a/modulefiles/tasks/wcoss_dell_p3/make_grid.local +++ /dev/null @@ -1,7 +0,0 @@ -#%Module - -module load lsf/10.1 -module load python/3.6.3 - -module use /usrx/local/nceplibs/dev/modulefiles -module load srw-app-python/1.0.0 diff --git a/modulefiles/tasks/wcoss_dell_p3/make_ics.local b/modulefiles/tasks/wcoss_dell_p3/make_ics.local deleted file mode 100644 index 0e25550649..0000000000 --- a/modulefiles/tasks/wcoss_dell_p3/make_ics.local +++ /dev/null @@ -1,7 +0,0 @@ -#%Module - -module load lsf/10.1 -module load python/3.6.3 - -module use /usrx/local/nceplibs/dev/modulefiles -module load srw-app-python/1.0.0 diff --git a/modulefiles/tasks/wcoss_dell_p3/make_lbcs.local b/modulefiles/tasks/wcoss_dell_p3/make_lbcs.local deleted file mode 100644 index 0e25550649..0000000000 --- a/modulefiles/tasks/wcoss_dell_p3/make_lbcs.local +++ /dev/null @@ -1,7 +0,0 @@ -#%Module - -module load lsf/10.1 -module load python/3.6.3 - -module use /usrx/local/nceplibs/dev/modulefiles -module load srw-app-python/1.0.0 diff --git a/modulefiles/tasks/wcoss_dell_p3/run_fcst.local b/modulefiles/tasks/wcoss_dell_p3/run_fcst.local deleted file mode 100644 index 5b62d935fd..0000000000 --- a/modulefiles/tasks/wcoss_dell_p3/run_fcst.local +++ /dev/null @@ -1,7 +0,0 @@ -#%Module - -module unload python/2.7.14 -module load python/3.6.3 - -module use /usrx/local/nceplibs/dev/modulefiles -module load srw-app-python/1.0.0 diff --git a/modulefiles/tasks/wcoss_dell_p3/run_vx.local b/modulefiles/tasks/wcoss_dell_p3/run_vx.local deleted file mode 100644 index 3806a6c4c2..0000000000 --- a/modulefiles/tasks/wcoss_dell_p3/run_vx.local +++ /dev/null @@ -1,3 +0,0 @@ -#%Module - -module unload netcdf diff --git a/scripts/exregional_make_orog.sh b/scripts/exregional_make_orog.sh index 3904924433..e0a5b48935 100755 --- a/scripts/exregional_make_orog.sh +++ b/scripts/exregional_make_orog.sh @@ -68,8 +68,7 @@ print_input_args valid_args # #----------------------------------------------------------------------- # -# Set OpenMP variables. The orog executable runs with OMP. On -# WCOSS (Cray), it is optimized for six threads, which is the default. +# Set OpenMP variables. The orog executable runs with OMP. # #----------------------------------------------------------------------- # diff --git a/ush/get_crontab_contents.py b/ush/get_crontab_contents.py index 3f885ad978..50d0aea1f7 100644 --- a/ush/get_crontab_contents.py +++ b/ush/get_crontab_contents.py @@ -42,22 +42,18 @@ def get_crontab_contents(called_from_cron): IMPORTS = ["MACHINE", "USER"] import_vars(env_vars=IMPORTS) - if MACHINE == "WCOSS_DELL_P3": - __crontab_cmd__="" - (_,__crontab_contents__,_)=run_command(f'''cat "/u/{USER}/cron/mycrontab"''') - else: - __crontab_cmd__="crontab" - # - # On Cheyenne, simply typing "crontab" will launch the crontab command - # at "/glade/u/apps/ch/opt/usr/bin/crontab". This is a containerized - # version of crontab that will work if called from scripts that are - # themselves being called as cron jobs. In that case, we must instead - # call the system version of crontab at /usr/bin/crontab. - # - if MACHINE == "CHEYENNE": - if called_from_cron: - __crontab_cmd__="/usr/bin/crontab" - (_,__crontab_contents__,_)=run_command(f'''{__crontab_cmd__} -l''') + __crontab_cmd__="crontab" + # + # On Cheyenne, simply typing "crontab" will launch the crontab command + # at "/glade/u/apps/ch/opt/usr/bin/crontab". This is a containerized + # version of crontab that will work if called from scripts that are + # themselves being called as cron jobs. In that case, we must instead + # call the system version of crontab at /usr/bin/crontab. + # + if MACHINE == "CHEYENNE": + if called_from_cron: + __crontab_cmd__="/usr/bin/crontab" + (_,__crontab_contents__,_)=run_command(f'''{__crontab_cmd__} -l''') return __crontab_cmd__, __crontab_contents__ @@ -108,10 +104,7 @@ def add_crontab_line(): NEWLINE_CHAR="\n" #add the crontab line - if MACHINE == "WCOSS_DELL_P3": - run_command(f'''printf "%b%s\n" '{NEWLINE_CHAR}' '{CRONTAB_LINE}' >> "/u/{USER}/cron/mycrontab"''') - else: - run_command(f'''printf "%s%b%s\n" '{crontab_contents}' '{NEWLINE_CHAR}' '{CRONTAB_LINE}' | {crontab_cmd}''') + run_command(f'''printf "%s%b%s\n" '{crontab_contents}' '{NEWLINE_CHAR}' '{CRONTAB_LINE}' | {crontab_cmd}''') def delete_crontab_line(called_from_cron): """ Delete crontab line after job is complete i.e. either SUCCESS/FAILURE @@ -137,10 +130,7 @@ def delete_crontab_line(called_from_cron): else: crontab_contents = crontab_contents.replace(CRONTAB_LINE,'') - if MACHINE == "WCOSS_DELL_P3": - run_command(f'''echo '{crontab_contents}' > "/u/{USER}/cron/mycrontab"''') - else: - run_command(f'''echo '{crontab_contents}' | {crontab_cmd}''') + run_command(f'''echo '{crontab_contents}' | {crontab_cmd}''') def parse_args(argv): """ Parse command line arguments for deleting crontab line. diff --git a/ush/launch_FV3LAM_wflow.sh b/ush/launch_FV3LAM_wflow.sh index 17734b9477..de05d0e087 100755 --- a/ush/launch_FV3LAM_wflow.sh +++ b/ush/launch_FV3LAM_wflow.sh @@ -401,7 +401,6 @@ script for this experiment: MACHINE=$MACHINE CRONTAB_LINE=$CRONTAB_LINE \ python3 $USHDIR/get_crontab_contents.py --delete fi - fi # # Print the workflow completion message to the launch log file. diff --git a/ush/machine/wcoss_dell_p3.sh b/ush/machine/wcoss_dell_p3.sh deleted file mode 100644 index c4b6b038d7..0000000000 --- a/ush/machine/wcoss_dell_p3.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash - -function file_location() { - - # Return the default location of external model files on disk - - local external_file_fmt external_model location - - external_model=${1} - external_file_fmt=${2} - - location="" - case ${external_model} in - - "FV3GFS") - location='/gpfs/dell1/nco/ops/com/gfs/prod/gfs.${yyyymmdd}/${hh}/atmos' - ;; - "RAP") - location='/gpfs/hps/nco/ops/com/rap/prod' - ;; - "HRRR") - location='/gpfs/hps/nco/ops/com/hrrr/prod' - ;; - "NAM") - location='/gpfs/dell1/nco/ops/com/nam/prod' - ;; - - esac - echo ${location:-} - -} - -EXTRN_MDL_SYSBASEDIR_ICS=${EXTRN_MDL_SYSBASEDIR_ICS:-$(file_location \ - ${EXTRN_MDL_NAME_ICS} \ - ${FV3GFS_FILE_FMT_ICS})} -EXTRN_MDL_SYSBASEDIR_LBCS=${EXTRN_MDL_SYSBASEDIR_LBCS:-$(file_location \ - ${EXTRN_MDL_NAME_LBCS} \ - ${FV3GFS_FILE_FMT_LBCS})} - -EXTRN_MDL_DATA_STORES=${EXTRN_MDL_DATA_STORES:-"hpss"} - -# System scripts to source to initialize various commands within workflow -# scripts (e.g. "module"). -if [ -z ${ENV_INIT_SCRIPTS_FPS:-""} ]; then - ENV_INIT_SCRIPTS_FPS=( "/etc/profile" "/usrx/local/prod/lmod/lmod/init/sh" ) -fi - -# Commands to run at the start of each workflow task. -PRE_TASK_CMDS='{ ulimit -s unlimited; ulimit -a; }' - -# Architecture information -WORKFLOW_MANAGER="rocoto" -NCORES_PER_NODE=${NCORES_PER_NODE:-24} -SCHED=${SCHED:-"lsf"} -QUEUE_DEFAULT=${QUEUE_DEFAULT:-"dev"} -QUEUE_HPSS=${QUEUE_HPSS:-"dev_transfer"} -QUEUE_FCST=${QUEUE_FCST:-"dev"} - -# UFS SRW App specific paths -staged_data_dir="/gpfs/dell2/emc/modeling/noscrub/UFS_SRW_App/develop" -FIXgsm=${FIXgsm:-"${staged_data_dir}/fix/fix_am"} -FIXaer=${FIXaer:-"${staged_data_dir}/fix/fix_aer"} -FIXlut=${FIXlut:-"${staged_data_dir}/fix/fix_lut"} -TOPO_DIR=${TOPO_DIR:-"${staged_data_dir}/fix/fix_orog"} -SFC_CLIMO_INPUT_DIR=${SFC_CLIMO_INPUT_DIR:-"${staged_data_dir}/fix/fix_sfc_climo"} -DOMAIN_PREGEN_BASEDIR=${DOMAIN_PREGEN_BASEDIR:-"${staged_data_dir}/FV3LAM_pregen"} - -# Run commands for executables -RUN_CMD_SERIAL="mpirun" -RUN_CMD_UTILS="mpirun" -RUN_CMD_FCST='mpirun -l -np ${PE_MEMBER01}' -RUN_CMD_POST="mpirun" - -# MET/METplus-Related Paths -MET_INSTALL_DIR=${MET_INSTALL_DIR:-"/gpfs/dell2/emc/verification/noscrub/emc.metplus/met/10.1.1"} -METPLUS_PATH=${METPLUS_PATH:-"/gpfs/dell2/emc/verification/noscrub/emc.metplus/METplus/METplus-4.1.1"} -CCPA_OBS_DIR=${CCPA_OBS_DIR:-"${staged_data_dir}/obs_data/ccpa/proc"} -MRMS_OBS_DIR=${MRMS_OBS_DIR:-"${staged_data_dir}/obs_data/mrms/proc"} -NDAS_OBS_DIR=${NDAS_OBS_DIR:-"${staged_data_dir}/obs_data/ndas/proc"} -MET_BIN_EXEC=${MET_BIN_EXEC:-"exec"} - -# Test Data Locations -TEST_PREGEN_BASEDIR="${staged_data_dir}/FV3LAM_pregen" -TEST_COMIN="${staged_data_dir}/COMGFS" -TEST_EXTRN_MDL_SOURCE_BASEDIR="${staged_data_dir}/input_model_data" - -# Computational resources -WTIME_MAKE_OROG="01:00:00" - diff --git a/ush/templates/FV3LAM_wflow.xml b/ush/templates/FV3LAM_wflow.xml index 8dff08780d..219798afb1 100644 --- a/ush/templates/FV3LAM_wflow.xml +++ b/ush/templates/FV3LAM_wflow.xml @@ -178,11 +178,7 @@ MODULES_RUN_TASK_FP script. &RSRV_DEFAULT; &LOAD_MODULES_RUN_TASK_FP; "&MAKE_GRID_TN;" "&JOBSDIR;/JREGIONAL_MAKE_GRID" - {%- if machine in ["WCOSS_DELL_P3"] %} - {{ nnodes_make_grid }}:ppn=1 - {%- else %} {{ nnodes_make_grid }}:ppn={{ ppn_make_grid }} - {%- endif %} {{ wtime_make_grid }} &NCORES_PER_NODE; {%- if machine in ["GAEA"] %} @@ -204,11 +200,7 @@ MODULES_RUN_TASK_FP script. &RSRV_DEFAULT; &LOAD_MODULES_RUN_TASK_FP; "&MAKE_OROG_TN;" "&JOBSDIR;/JREGIONAL_MAKE_OROG" - {%- if machine in ["WCOSS_DELL_P3"] %} - {{ nnodes_make_orog }}:ppn=1 - {%- else %} {{ nnodes_make_orog }}:ppn={{ ppn_make_orog }} - {%- endif %} {{ wtime_make_orog }} &NCORES_PER_NODE; {%- if machine in ["GAEA"] %} @@ -275,9 +267,6 @@ MODULES_RUN_TASK_FP script. &RSRV_HPSS; &LOAD_MODULES_RUN_TASK_FP; "&GET_EXTRN_ICS_TN;" "&JOBSDIR;/JREGIONAL_GET_EXTRN_MDL_FILES" - {%- if machine in ["WCOSS_DELL_P3"] %} - 2048M-R affinity[core] - {%- endif %} {{ nnodes_get_extrn_ics }}:ppn={{ ppn_get_extrn_ics }} {{ wtime_get_extrn_ics }} &NCORES_PER_NODE; @@ -304,9 +293,6 @@ MODULES_RUN_TASK_FP script. &RSRV_HPSS; &LOAD_MODULES_RUN_TASK_FP; "&GET_EXTRN_LBCS_TN;" "&JOBSDIR;/JREGIONAL_GET_EXTRN_MDL_FILES" - {%- if machine in ["WCOSS_DELL_P3"] %} - 2048M-R affinity[core] - {%- endif %} {{ nnodes_get_extrn_lbcs }}:ppn={{ ppn_get_extrn_lbcs }} {{ wtime_get_extrn_lbcs }} &NCORES_PER_NODE; @@ -728,9 +714,6 @@ the tag to be identical to the ones above for other output times. &RSRV_HPSS; &LOAD_MODULES_RUN_TASK_FP; "&GET_OBS;" "&JOBSDIR;/JREGIONAL_GET_OBS_CCPA" - {%- if machine in ["WCOSS_DELL_P3"] %} - 2048M-R affinity[core] - {%- endif %} {{ nnodes_get_obs_ccpa }}:ppn={{ ppn_get_obs_ccpa }} {{ wtime_get_obs_ccpa }} &NCORES_PER_NODE; @@ -761,9 +744,6 @@ the tag to be identical to the ones above for other output times. &RSRV_HPSS; &LOAD_MODULES_RUN_TASK_FP; "&GET_OBS;" "&JOBSDIR;/JREGIONAL_GET_OBS_MRMS" - {%- if machine in ["WCOSS_DELL_P3"] %} - 2048M-R affinity[core] - {%- endif %} {{ nnodes_get_obs_mrms }}:ppn={{ ppn_get_obs_mrms }} {{ wtime_get_obs_mrms }} &NCORES_PER_NODE; @@ -795,9 +775,6 @@ the tag to be identical to the ones above for other output times. &RSRV_HPSS; &LOAD_MODULES_RUN_TASK_FP; "&GET_OBS;" "&JOBSDIR;/JREGIONAL_GET_OBS_NDAS" - {%- if machine in ["WCOSS_DELL_P3"] %} - 2048M-R affinity[core] - {%- endif %} {{ nnodes_get_obs_ndas }}:ppn={{ ppn_get_obs_ndas }} {{ wtime_get_obs_ndas }} &NCORES_PER_NODE; diff --git a/ush/valid_param_vals.yaml b/ush/valid_param_vals.yaml index 64759b5a33..4d6b40278a 100644 --- a/ush/valid_param_vals.yaml +++ b/ush/valid_param_vals.yaml @@ -4,7 +4,7 @@ valid_vals_RUN_ENVIR: ["nco", "community"] valid_vals_VERBOSE: [True, False] valid_vals_DEBUG: [True, False] -valid_vals_MACHINE: ["WCOSS_DELL_P3", "HERA", "ORION", "JET", "ODIN", "CHEYENNE", "STAMPEDE", "LINUX", "MACOS", "NOAACLOUD", "SINGULARITY", "GAEA"] +valid_vals_MACHINE: ["HERA", "ORION", "JET", "ODIN", "CHEYENNE", "STAMPEDE", "LINUX", "MACOS", "NOAACLOUD", "SINGULARITY", "GAEA"] valid_vals_SCHED: ["slurm", "pbspro", "lsf", "lsfcray", "none"] valid_vals_FCST_MODEL: ["ufs-weather-model", "fv3gfs_aqm"] valid_vals_WORKFLOW_MANAGER: ["rocoto", "none"]