Bring up-to-date with master

sandialabs · Sep 20, 2023 · fd4d581 · fd4d581
1 parent 8f78f6b
commit fd4d581
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 25 deletions.
diff --git a/.github/workflows/build_variant.yml b/.github/workflows/build_variant.yml
@@ -301,20 +301,6 @@ jobs:
             extra: "",
             sanitizer: "NO" # address, integer, thread, memory, undefined
           }
-        - {
-            name: "KOKKOS, parallel",
-            os: ubuntu-latest,
-            compiler: "mpi",
-            debug: "NO",
-            threadsafe: "NO",
-            fortran: "YES",
-            use_kokkos: "YES",
-            use_adios2: "NO",
-            use_catalyst2: "NO",
-            gtest: "NO",
-            extra: "",
-            sanitizer: "NO" # address, integer, thread, memory, undefined
-          }
     steps:
 
       - uses: actions/checkout@v3

diff --git a/cmake-config b/cmake-config
@@ -122,16 +122,6 @@ then
       CXXFLAGS="-Wall -Wextra  -Wunused -pedantic -Wshadow"
   fi
 
-  if [ "$COMPILER" == "gnubrew" ]
-  then
-      VER=${VER:-10}
-      CXX=g++-${VER}
-      CC=gcc-${VER}
-      FC=gfortran-${VER}
-      CFLAGS="-Wall -Wunused -pedantic -std=c11"
-      CXXFLAGS="-Wall -Wunused -pedantic"
-  fi
-
   if [ "$COMPILER" == "gnumacport" ]
   then
       VER=${VER:-10}

diff --git a/packages/seacas/applications/epu/pepu.C b/packages/seacas/applications/epu/pepu.C
@@ -19,7 +19,6 @@
 #include <mpi.h>
 
 #include "epu.C"
-#include <mpi.h>
 #else
 #error "PEPU: Parallel capability not enabled. This should not happen."
 #endif