Merge pull request #83 from Adrian-Diaz/Parallel-Explicit-Solver

Parallel explicit solver
lanl · Aug 29, 2023 · 32250a7 · 32250a7
2 parents 96ea2e7 + 663a6aa
commit 32250a7
Show file tree

Hide file tree

Showing 20 changed files with 3,483 additions and 3,913 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,5 @@ Trilinos
 main
 .vscode
 *.swp
+cmake_uninstall.cmake
+CTestTestfile.cmake
diff --git a/Parallel-Solvers/Material-Models/.gitignore b/Parallel-Solvers/Material-Models/.gitignore
@@ -1 +1,6 @@
 build
+libmaterial_models.a
+CMakeFiles
+Makefile
+CTestTestfile.CMake
+cmake_install.cmake
diff --git a/Parallel-Solvers/Parallel-Explicit/CMakeLists.txt b/Parallel-Solvers/Parallel-Explicit/CMakeLists.txt
@@ -5,11 +5,12 @@ set(CMAKE_C_FLAGS  "${Trilinos_C_COMPILER_FLAGS} ${CMAKE_C_FLAGS}")
 set(CMAKE_Fortran_FLAGS  "${Trilinos_Fortran_COMPILER_FLAGS} ${CMAKE_Fortran_FLAGS}")
 
 include_directories(SGH_Solver)
+#include_directories(Dynamic_Elastic_Solver)
 include_directories(Eulerian_Solver)
 include_directories(Topology_Optimization)
 include_directories(..)
 include_directories(${CMAKE_SOURCE_DIR}/Implicit-Lagrange)
-add_executable(fierro-parallel-explicit main.cpp Explicit_Solver.cpp)
+add_executable(fierro-parallel-explicit main.cpp Explicit_Solver.cpp outputs.cpp)
 
 if (CUDA)
   add_definitions(-DHAVE_CUDA=1)
@@ -22,6 +23,7 @@ elseif (THREADS)
 endif()
 
 add_subdirectory(SGH_Solver)
+#add_subdirectory(Dynamic_Elastic_Solver)
 add_subdirectory(Eulerian_Solver)
 
 target_include_directories(fierro-parallel-explicit PRIVATE