Merge to reflect the fork

lanl · Sep 20, 2023 · 07d0a55 · 07d0a55
1 parent 984bd43
commit 07d0a55
Show file tree

Hide file tree

Showing 423 changed files with 41 additions and 4,412,437 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,6 @@
 bin
 _deps
-lib
-build
-build-SGH-cuda
-build-kokkos
+build*
 CMakeFiles
 Makefile
 CMakeCache.txt

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
-[submodule "Elements"]
-	path = Elements
+[submodule "lib/Elements"]
+	path = lib/Elements
 	url = https://github.com/lanl/ELEMENTS.git
+    branch = master
diff --git a/CLI/CMakeLists.txt b/CLI/CMakeLists.txt
diff --git a/CLI/include/FierroParallelBackends.hpp b/CLI/include/FierroParallelBackends.hpp