Skip to content

Commit

Permalink
Remove all references to WCOSS 1 from UFS_UTILS (#667)
Browse files Browse the repository at this point in the history
WCOSS-Dell and WCOSS-Cray were retired in mid-July.

Fixes #665.
  • Loading branch information
GeorgeGayno-NOAA authored Jul 25, 2022
1 parent 5c6ddb1 commit f658c1e
Show file tree
Hide file tree
Showing 35 changed files with 56 additions and 2,276 deletions.
9 changes: 4 additions & 5 deletions build_all.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#! /usr/bin/env bash
#
# This build script is only used on NOAA WCOSS systems. All other
# users should set module files as needed, and build directly with
# CMake.
# This build script is only used on officially supported machines. All other
# users should set module files as needed, and build directly with CMake.
#
# George Gayno

Expand All @@ -28,9 +27,9 @@ fi

# The unit test data download is part of the build system. Not all machines can
# access the EMC ftp site, so turn off the build (-DBUILD_TESTING=OFF) of the units tests accordingly.
# Those with access to the EMC ftp site are: Orion, Hera, WCOSS-Cray, WCOSS-Dell.
# Those with access to the EMC ftp site are: Orion and Hera.

if [[ "$target" == "hera" || "$target" == "orion" || "$target" == "wcoss_cray" || "$target" == "wcoss_dell_p3" || "$target" == "wcoss2" ]]; then
if [[ "$target" == "hera" || "$target" == "orion" || "$target" == "wcoss2" ]]; then
CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DEMC_EXEC_DIR=ON -DBUILD_TESTING=OFF"
#CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DEMC_EXEC_DIR=ON -DBUILD_TESTING=ON"
#CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DEMC_EXEC_DIR=ON -DENABLE_DOCS=ON -DBUILD_TESTING=ON"
Expand Down
34 changes: 0 additions & 34 deletions cmake/LibMPI.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -45,40 +45,6 @@ function (platform_name RETURN_VARIABLE)

set (${RETURN_VARIABLE} "hera" PARENT_SCOPE)

# wcoss_cray (Luna)
elseif (SITENAME MATCHES "^llogin1" OR
SITENAME MATCHES "^llogin2" OR
SITENAME MATCHES "^llogin3")

set (${RETURN_VARIABLE} "wcoss_cray" PARENT_SCOPE)

# wcoss_cray (Surge)
elseif (SITENAME MATCHES "^slogin1" OR
SITENAME MATCHES "^slogin2" OR
SITENAME MATCHES "^slogin3")

set (${RETURN_VARIABLE} "wcoss_cray" PARENT_SCOPE)

# wcoss_dell_p3 (Venus)
elseif (SITENAME MATCHES "^v71a1.ncep.noaa.gov" OR
SITENAME MATCHES "^v71a2.ncep.noaa.gov" OR
SITENAME MATCHES "^v71a3.ncep.noaa.gov" OR
SITENAME MATCHES "^v72a1.ncep.noaa.gov" OR
SITENAME MATCHES "^v72a2.ncep.noaa.gov" OR
SITENAME MATCHES "^v72a3.ncep.noaa.gov")

set (${RETURN_VARIABLE} "wcoss_dell_p3" PARENT_SCOPE)

# wcoss_dell_p3 (Mars)
elseif (SITENAME MATCHES "^m71a1.ncep.noaa.gov" OR
SITENAME MATCHES "^m71a2.ncep.noaa.gov" OR
SITENAME MATCHES "^m71a3.ncep.noaa.gov" OR
SITENAME MATCHES "^m72a1.ncep.noaa.gov" OR
SITENAME MATCHES "^m72a2.ncep.noaa.gov" OR
SITENAME MATCHES "^m72a3.ncep.noaa.gov")

set (${RETURN_VARIABLE} "wcoss_dell_p3" PARENT_SCOPE)

# wcoss2
elseif (SITENAME MATCHES "^along01" OR
SITENAME MATCHES "^alogin02")
Expand Down
157 changes: 0 additions & 157 deletions driver_scripts/driver_grid.cray.sh

This file was deleted.

155 changes: 0 additions & 155 deletions driver_scripts/driver_grid.dell.sh

This file was deleted.

1 change: 0 additions & 1 deletion driver_scripts/driver_grid.hera.sh
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ export APRUN=time
export APRUN_SFC=srun
export OMP_NUM_THREADS=24
export OMP_STACKSIZE=2048m
export machine=HERA

ulimit -a
ulimit -s unlimited
Expand Down
1 change: 0 additions & 1 deletion driver_scripts/driver_grid.jet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ export APRUN=time
export APRUN_SFC=srun
export OMP_NUM_THREADS=24
export OMP_STACKSIZE=2048m
export machine=JET

ulimit -a
ulimit -s unlimited
Expand Down
Loading

0 comments on commit f658c1e

Please sign in to comment.