Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Remove all references to WCOSS 1 from UFS_UTILS #667

Merged
merged 21 commits into from
Jul 25, 2022
Merged

Remove all references to WCOSS 1 from UFS_UTILS #667

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
fcbfcea
Remove references to wcoss1 from ./fix/link_fixdirs.sh
GeorgeGayno-NOAA Jul 11, 2022
73ffbda
Remove references to wcoss1 from ./sorc/machine-setup.sh
GeorgeGayno-NOAA Jul 12, 2022
59de683
Remove references to wcoss1 from the vcoord_gen utility.
GeorgeGayno-NOAA Jul 12, 2022
ed79a01
Remove Dell script from sfc_climo_gen utility.
GeorgeGayno-NOAA Jul 12, 2022
182bdcb
Remove wcoss1 scripts from gdas_init utility.
GeorgeGayno-NOAA Jul 12, 2022
3a9d875
Remove references to wcoss1 from the 'build_all.sh' script.
GeorgeGayno-NOAA Jul 12, 2022
80c7b58
Remove wcoss1 references from ./cmake/LibMPI.cmake.
GeorgeGayno-NOAA Jul 12, 2022
cea9f01
Remove grid generation scripts for wcoss1.
GeorgeGayno-NOAA Jul 12, 2022
8feb989
Delete wcoss1 build modules.
GeorgeGayno-NOAA Jul 12, 2022
9bb7af1
Remove wcoss1 references from chgres_cube consistency tests.
GeorgeGayno-NOAA Jul 12, 2022
59a1b71
Remove global_cycle consistency scripts for wcoss1.
GeorgeGayno-NOAA Jul 12, 2022
a07fdf1
Remove wcoss1 grid_gen consistency test scripts.
GeorgeGayno-NOAA Jul 12, 2022
fca20dc
Remove wcoss1 consistency test scripts for ice_blend.
GeorgeGayno-NOAA Jul 12, 2022
40761ea
Remove wcoss1 consistency tests for snow2mdl.
GeorgeGayno-NOAA Jul 12, 2022
47c4322
Remove wcoss1 references from ./reg_tests/rt.sh
GeorgeGayno-NOAA Jul 12, 2022
77856e6
Remove wcoss1 cray logic from grid_gen scripts.
GeorgeGayno-NOAA Jul 12, 2022
a21169d
Remove unused variable from ./ush/global_cycle_driver.sh.
GeorgeGayno-NOAA Jul 12, 2022
2d24197
Merge branch 'develop' into feature/cleanup
GeorgeGayno-NOAA Jul 18, 2022
bffccd0
Minor script updates.
GeorgeGayno-NOAA Jul 18, 2022
d258f4a
Merge branch 'develop' into feature/cleanup
GeorgeGayno-NOAA Jul 19, 2022
2bfc07c
Merge branch 'develop' into feature/cleanup
GeorgeGayno-NOAA Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions build_all.sh
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

155 changes: 0 additions & 155 deletions driver_scripts/driver_grid.dell.sh
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion driver_scripts/driver_grid.hera.sh
View file
Open in desktop
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
View file
Open in desktop
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