Merge branch 'develop' into feature/new_sfcsub

Fixes #670.

.github/workflows/intel.yml

@@ -16,7 +16,7 @@ jobs:
       CXX: icpc
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
 
     steps:
 

.github/workflows/linux-mac-nceplibs-mpi.yml

@@ -14,7 +14,7 @@ jobs:
       CXX: g++-9
     strategy:
       matrix:
-        os: [macos-10.15, ubuntu-20.04]
+        os: [macos-latest, ubuntu-latest]
         compiler: [gcc-9]
         nceplibs_version: [develop, 1.4.0]
         mpi_type: [mpich, openmpi]
@@ -25,11 +25,11 @@ jobs:
     - name: install-dependencies
       run: |
         echo "$HOME/mpi/bin" >> $GITHUB_PATH
-        if [[ ${{ matrix.os }} == "ubuntu-20.04" ]]; then
+        if [[ ${{ matrix.os }} == "ubuntu-latest" ]]; then
           sudo apt-get update
           sudo apt-get install libpng-dev
           sudo apt-get install libjpeg-dev
-        elif [[ ${{ matrix.os }} == "macos-10.15" ]]; then
+        elif [[ ${{ matrix.os }} == "macos-latest" ]]; then
             brew update
           brew install wget
           if [[ ${{ matrix.compiler }} == "gcc-9" ]]; then
@@ -61,9 +61,9 @@ jobs:
           wget https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.1.tar.gz &> /dev/null
           tar -xzf openmpi-4.1.1.tar.gz
           cd openmpi-4.1.1
-          if [[ ${{ matrix.os }} == "ubuntu-20.04" ]]; then
+          if [[ ${{ matrix.os }} == "ubuntu-latest" ]]; then
             ./configure --prefix=$HOME/mpi --enable-mpi-fortran --enable-mpi-cxx
-          elif [[ ${{ matrix.os }} == "macos-10.15" ]]; then
+          elif [[ ${{ matrix.os }} == "macos-latest" ]]; then
             ./configure --prefix=$HOME/mpi --enable-mpi-fortran --enable-mpi-cxx --enable-two-level-namespace
           fi
           make -j2

build_all.sh

@@ -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
 
@@ -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"

cmake/LibMPI.cmake

@@ -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")