Remove references to Cheyenne.

DavidHuber-NOAA · Jan 31, 2024 · bfb46e2 · bfb46e2
1 parent 04a737d
commit bfb46e2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 62 deletions.
diff --git a/regression/regression_param.sh b/regression/regression_param.sh
@@ -36,11 +36,6 @@ case $machine in
  ;;
  Discover)
  sub_cmd="sub_discover"
- ;;
- Cheyenne)
- sub_cmd="sub_cheyenne"
- memnode=128
- numcore=36
  ;;
  *) # EXIT out for unresolved machine
  echo "unknown $machine"
@@ -73,9 +68,6 @@ case $regtest in
  elif [[ "$machine" = "Discover" ]]; then
  topts[1]="0:30:00" ; popts[1]="48/2" ; ropts[1]="/1"
  topts[2]="0:30:00" ; popts[2]="60/3" ; ropts[2]="/2"
- elif [[ "$machine" = "Cheyenne" ]]; then
- topts[1]="0:10:00" ; popts[1]="12/8/" ; ropts[1]="/1"
- topts[2]="0:10:00" ; popts[2]="12/10/" ; ropts[2]="/2"
  elif [[ "$machine" = "Gaea" ]]; then
  topts[1]="0:10:00" ; popts[1]="12/8/" ; ropts[1]="/1"
  topts[2]="0:10:00" ; popts[2]="12/10/" ; ropts[2]="/2"
@@ -106,9 +98,6 @@ case $regtest in
  elif [[ "$machine" = "Jet" ]]; then
  topts[1]="0:15:00" ; popts[1]="20/1/" ; ropts[1]="/1"
  topts[2]="0:15:00" ; popts[2]="20/2/" ; ropts[2]="/1"
- elif [[ "$machine" = "Cheyenne" ]]; then
- topts[1]="0:15:00" ; popts[1]="20/1/" ; ropts[1]="/1"
- topts[2]="0:15:00" ; popts[2]="20/2/" ; ropts[2]="/2"
  elif [[ "$machine" = "Gaea" ]]; then
  topts[1]="0:15:00" ; popts[1]="64/1/" ; ropts[1]="/1"
  topts[2]="0:15:00" ; popts[2]="128/2/" ; ropts[2]="/1"
@@ -139,9 +128,6 @@ case $regtest in
  elif [[ "$machine" = "Jet" ]]; then
  topts[1]="0:15:00" ; popts[1]="20/1/" ; ropts[1]="/1"
  topts[2]="0:15:00" ; popts[2]="20/2/" ; ropts[2]="/1"
- elif [[ "$machine" = "Cheyenne" ]]; then
- topts[1]="0:15:00" ; popts[1]="20/1/" ; ropts[1]="/1"
- topts[2]="0:15:00" ; popts[2]="20/2/" ; ropts[2]="/2"
  elif [[ "$machine" = "Gaea" ]]; then
  topts[1]="0:15:00" ; popts[1]="64/1/" ; ropts[1]="/1"
  topts[2]="0:15:00" ; popts[2]="128/2/" ; ropts[2]="/1"
@@ -171,9 +157,6 @@ case $regtest in
  elif [[ "$machine" = "Jet" ]]; then
  topts[1]="0:15:00" ; popts[1]="20/1/" ; ropts[1]="/1"
  topts[2]="0:15:00" ; popts[2]="20/2/" ; ropts[2]="/1"
- elif [[ "$machine" = "Cheyenne" ]]; then
- topts[1]="0:15:00" ; popts[1]="20/1/" ; ropts[1]="/1"
- topts[2]="0:15:00" ; popts[2]="20/2/" ; ropts[2]="/2"
  elif [[ "$machine" = "Gaea" ]]; then
  topts[1]="0:15:00" ; popts[1]="64/1/" ; ropts[1]="/1"
  topts[2]="0:15:00" ; popts[2]="128/2/" ; ropts[2]="/1"
@@ -204,9 +187,6 @@ case $regtest in
  elif [[ "$machine" = "Jet" ]]; then
  topts[1]="0:15:00" ; popts[1]="4/4/" ; ropts[1]="/1"
  topts[2]="0:15:00" ; popts[2]="6/6/" ; ropts[2]="/1"
- elif [[ "$machine" = "Cheyenne" ]]; then
- topts[1]="0:15:00" ; popts[1]="4/4/" ; ropts[1]="/1"
- topts[2]="0:15:00" ; popts[2]="6/6/" ; ropts[2]="/2"
  elif [[ "$machine" = "Gaea" ]]; then
  topts[1]="0:15:00" ; popts[1]="28/1/" ; ropts[1]="/1"
  topts[2]="0:15:00" ; popts[2]="28/2/" ; ropts[2]="/1"
@@ -237,9 +217,6 @@ case $regtest in
  elif [[ "$machine" = "Jet" ]]; then
  topts[1]="0:30:00" ; popts[1]="6/12/" ; ropts[1]="/1"
  topts[2]="0:30:00" ; popts[2]="8/12/" ; ropts[2]="/1"
- elif [[ "$machine" = "Cheyenne" ]]; then
- topts[1]="0:30:00" ; popts[1]="6/12/" ; ropts[1]="/1"
- topts[2]="0:30:00" ; popts[2]="8/12/" ; ropts[2]="/1"
  elif [[ "$machine" = "Gaea" ]]; then
  topts[1]="0:30:00" ; popts[1]="14/8/" ; ropts[1]="/1"
  topts[2]="0:30:00" ; popts[2]="14/14/" ; ropts[2]="/1"
@@ -270,9 +247,6 @@ case $regtest in
  elif [[ "$machine" = "Jet" ]]; then
  topts[1]="0:10:00" ; popts[1]="12/3/" ; ropts[1]="/1"
  topts[2]="0:10:00" ; popts[2]="12/5/" ; ropts[2]="/2"
- elif [[ "$machine" = "Cheyenne" ]]; then
- topts[1]="0:15:00" ; popts[1]="12/3/" ; ropts[1]="/1"
- topts[2]="0:15:00" ; popts[2]="12/5/" ; ropts[2]="/2"
  elif [[ "$machine" = "Gaea" ]]; then
  topts[1]="0:10:00" ; popts[1]="16/2/" ; ropts[1]="/1"
  topts[2]="0:10:00" ; popts[2]="16/4/" ; ropts[2]="/2"
@@ -342,12 +316,6 @@ elif [[ "$machine" = "Gaea" ]]; then
  export MPI_BUFS_PER_HOST=256
  export MPI_GROUP_MAX=256
  export APRUN="srun -n \$ntasks --cpus-per-task=\$threads"
-elif [[ "$machine" = "Cheyenne" ]]; then
- export OMP_STACKSIZE=1024M
- export MPI_BUFS_PER_PROC=256
- export MPI_BUFS_PER_HOST=256
- export MPI_GROUP_MAX=256
- export APRUN="mpirun -v -np \$ntasks"
 elif [[ "$machine" = "wcoss2" ]]; then
  export OMP_PLACES=cores
  export OMP_STACKSIZE=2G

diff --git a/regression/regression_var.sh b/regression/regression_var.sh
@@ -30,9 +30,7 @@ else
 fi
 
 # Determine the machine
-if [[ -d /glade ]]; then # Cheyenne
- export machine="Cheyenne"
-elif [[ -d /scratch1 ]]; then # Hera
+if [[ -d /scratch1 ]]; then # Hera
  export machine="Hera"
 elif [[ -d /mnt/lfs4 || -d /jetmon || -d /mnt/lfs1 ]]; then # Jet
  export machine="Jet"
@@ -66,20 +64,6 @@ case $machine in
  export check_resource="no"
  export accnt="nggps_emc"
  ;;
- Cheyenne)
- export queue="regular"
- export noscrub="/glade/scratch/$LOGNAME/noscrub"
- export group="global"
- if [[ "$cmaketest" = "false" ]]; then
- export basedir="/glade/scratch/$LOGNAME"
- fi
- export ptmp="/glade/scratch/$LOGNAME/$ptmpName"
-
- export casesdir="/glade/work/epicufsrt/contrib/GSI_data/CASES/regtest"
-
- export check_resource="no"
- export accnt="NRAL0032"
- ;;
  wcoss2)
  export local_or_default="${local_or_default:-/lfs/h2/emc/da/noscrub/$LOGNAME}"
  if [ -d $local_or_default ]; then

diff --git a/ush/detect_machine.sh b/ush/detect_machine.sh
@@ -24,11 +24,6 @@ case $(hostname -f) in
 
  Hercules-login-[1-4].HPC.MsState.Edu) MACHINE_ID=hercules ;; ### hercules1-4
 
- cheyenne[1-6].cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1-6
- cheyenne[1-6].ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1-6
- chadmin[1-6].ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1-6
- chadmin[1-6].ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1-6
-
  login[1-4].stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede1-4
 
  login0[1-2].expanse.sdsc.edu) MACHINE_ID=expanse ;; ### expanse1-2
@@ -40,6 +35,6 @@ esac
 MACHINE_ID=${MACHINE:-${MACHINE_ID}}
 
 # Append compiler (only on machines that have multiple compilers)
-if [ $MACHINE_ID = hera ] || [ $MACHINE_ID = cheyenne ]; then
+if [ $MACHINE_ID = hera ]; then
  MACHINE_ID=${MACHINE_ID}.${COMPILER}
 fi
diff --git a/ush/module-setup.sh b/ush/module-setup.sh
@@ -40,13 +40,6 @@ elif [[ $MACHINE_ID = wcoss2 ]]; then
  # We are on WCOSS2
  module reset
 
-elif [[ $MACHINE_ID = cheyenne* ]] ; then
- # We are on NCAR Cheyenne
- if ( ! eval module help > /dev/null 2>&1 ) ; then
- source /glade/u/apps/ch/modulefiles/default/localinit/localinit.sh
- fi
- module purge
-
 elif [[ $MACHINE_ID = stampede* ]] ; then
  # We are on TACC Stampede
  if ( ! eval module help > /dev/null 2>&1 ) ; then