Thm

.circleci/config.yml

@@ -17,7 +17,7 @@ jobs:
             export MODULEPATH=$MODULEPATH:/usr/share/modulefiles
             module load mpi/openmpi-x86_64
             export CXX_COMPILER=mpicxx
-            cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_EXPORT_COMPILE_COMMANDS=On ..
+            cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_EXPORT_COMPILE_COMMANDS=On -DDEAL_II_DIR=/home/cbgeo/research/dealii/ ..
             make -j2
             ctest -VV
       # Clang-6.0
@@ -27,7 +27,7 @@ jobs:
             mkdir -p build
             [ "$(ls -A build)" ] && rm -rf build/*
             cd build
-            scan-build cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_EXPORT_COMPILE_COMMANDS=On ..
+            scan-build cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_EXPORT_COMPILE_COMMANDS=On -DDEAL_II_DIR=/home/cbgeo/research/dealii/ ..
             scan-build make -j2 
             ctest -VV
       # cppcheck
@@ -48,7 +48,7 @@ jobs:
             mkdir -p build
             [ "$(ls -A build)" ] && rm -rf build/*
             cd build
-            cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ -DCMAKE_EXPORT_COMPILE_COMMANDS=On -DENABLE_COVERAGE=On ..
+            cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ -DCMAKE_EXPORT_COMPILE_COMMANDS=On -DENABLE_COVERAGE=On -DDEAL_II_DIR=/home/cbgeo/research/dealii/ ..
             make mpmtest_coverage -j2
             ./mpmtest_coverage
             make gcov -j2  --ignore-errors

.gitignore

@@ -59,3 +59,10 @@ configure.scan
 *missing
 *stamp-h1
 benchmarks/
+build/*
+*copy*
+*.geo*
+*.msh*
+*.db*
+*.nas*
+*.vscode/*

CMakeLists.txt

@@ -1,4 +1,6 @@
-project(thm LANGUAGES CXX)
+#project(thm LANGUAGES CXX)
+# Set the name of the project and target:
+SET(TARGET "thm")
 
 # Require C++14-compliant compiler; only available for CMake v3.10 and up
 set(CMAKE_CXX_STANDARD 14)
@@ -36,22 +38,42 @@ option(THM_BUILD_TESTING "enable testing for thm" ON)
 # CMake Modules
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 
+# Dealii
+FIND_PACKAGE(deal.II 8.5.0 QUIET
+  HINTS ${deal.II_DIR} ${DEAL_II_DIR} ../ ../../ $ENV{DEAL_II_DIR}
+  )
+if(NOT ${deal.II_FOUND})
+  MESSAGE(FATAL_ERROR "\n"
+    "*** Could not locate a (sufficiently recent) version of deal.II. ***\n\n"
+    "You may want to either pass a flag -DDEAL_II_DIR=/path/to/deal.II to cmake\n"
+    "or set an environment variable \"DEAL_II_DIR\" that contains this path."
+    )
+endif()
 
+if (${deal.II_FOUND})
+  include_directories(${DEAL_II_DIR}/include/)
+endif()
+
+#thm executable
+SET(thm_src
+  ./src/main.cc
+)
 
 # Include directories
-include_directories(BEFORE
-  ${thm_SOURCE_DIR}/include/
-  ${thm_SOURCE_DIR}/external/
+include_directories(
+  ./include/
+  ./external/
 )
 
-# thm executable
-#SET(thm_src
-#  ${thm_SOURCE_DIR}/src/thm.cc
-#)
+SET(TARGET_SRC ${thm_src})
+
+DEAL_II_INITIALIZE_CACHED_VARIABLES()
+PROJECT(${TARGET})
+DEAL_II_INVOKE_AUTOPILOT()
 
 #add_library(lthm SHARED ${thm_src})
 
-add_executable(thm ${thm_SOURCE_DIR}/src/main.cc)
+# add_executable(geothm ${thm_SOURCE_DIR}/src/main.cc)
 #target_link_libraries(thm lthm)
 
 # Unit test