Tresca added but there are files missing.

datafl4sh · Mar 1, 2023 · 22edfda · 22edfda
1 parent 247ad70
commit 22edfda
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 31 deletions.
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
@@ -36,4 +36,10 @@ endif()
 option(BUILD_APP_HELMHOLTZ "Build Helmholtz applications" ON)
 if (BUILD_APP_HELMHOLTZ)
     add_subdirectory(helmholtz)
-endif()
+endif()
+
+option(BUILD_APP_TRESCA "Build Tresca applications" ON)
+if (BUILD_APP_TRESCA)
+    add_subdirectory(tresca)
+endif()
+
diff --git a/apps/tresca/CMakeLists.txt b/apps/tresca/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(LINK_LIBS diskpp)
+
+add_executable(tresca src/tresca.cpp)
+target_link_libraries(tresca ${LINK_LIBS})
+install(TARGETS tresca RUNTIME DESTINATION bin)
+
+add_executable(tresca_test src/tresca_test.cpp)
+target_link_libraries(tresca_test ${LINK_LIBS})
+install(TARGETS tresca_test RUNTIME DESTINATION bin)
+
+install(DIRECTORY share/ DESTINATION share)
+
+
diff --git a/...nSolver/tresca_elementary_computation.hpp → ...nSolver/tresca_elementary_computation.hpp b/...nSolver/tresca_elementary_computation.hpp → ...nSolver/tresca_elementary_computation.hpp
@@ -27,11 +27,9 @@
 
 #include <cassert>
 
-#include "bases/bases.hpp"
-#include "common/eigen.hpp"
-#include "mechanics/behaviors/maths_tensor.hpp"
-#include "methods/hho"
-#include "quadratures/quadratures.hpp"
+#include "diskpp/common/eigen.hpp"
+#include "diskpp/mechanics/behaviors/maths_tensor.hpp"
+#include "diskpp/methods/hho"
 
 #include "timecounter.h"
 
@@ -1620,4 +1618,4 @@ class tresca
     }
 };
 
-} // end namespace MK
+} // end namespace MK
diff --git a/...or_old_diskpp_code/apps/tresca/tresca.cpp → apps/tresca/src/tresca.cpp b/...or_old_diskpp_code/apps/tresca/tresca.cpp → apps/tresca/src/tresca.cpp
@@ -29,21 +29,18 @@
 #include <regex>
 #include <sstream>
 #include <unistd.h>
-
 #include <map>
-
-#include "Informations.hpp"
-#include "Parameters.hpp"
-#include "boundary_conditions/boundary_conditions.hpp"
-#include "loaders/loader.hpp"
-#include "mechanics/behaviors/laws/materialData.hpp"
-
-#include "timecounter.h"
-
 #define _USE_MATH_DEFINES
 #include <cmath>
 
-#include "tresca_solver.hpp"
+#include "src/Informations.hpp"
+#include "src/Parameters.hpp"
+#include "diskpp/boundary_conditions/boundary_conditions.hpp"
+#include "diskpp/loaders/loader.hpp"
+#include "diskpp/mechanics/behaviors/laws/materialData.hpp"
+
+#include "diskpp/common/timecounter.hpp"
+//#include "src/tresca_solver.hpp"
 
 template<template<typename, size_t, typename> class Mesh, typename T, typename Storage>
 void

diff --git a/...d_diskpp_code/apps/tresca/tresca_test.cpp → apps/tresca/src/tresca_test.cpp b/...d_diskpp_code/apps/tresca/tresca_test.cpp → apps/tresca/src/tresca_test.cpp
@@ -30,18 +30,15 @@
 #include <sstream>
 #include <unistd.h>
 
-#include "colormanip.h"
-
-#include "loaders/loader.hpp"
-
-#include "timecounter.h"
-
-#include "Informations.hpp"
-#include "Parameters.hpp"
-#include "boundary_conditions/boundary_conditions.hpp"
-#include "loaders/loader.hpp"
-#include "mechanics/behaviors/laws/materialData.hpp"
-#include "tresca_solver.hpp"
+#include "diskpp/common/colormanip.h"
+#include "diskpp/loaders/loader.hpp"
+#include "diskpp/common/timecounter.hpp"
+#include "diskpp/boundary_conditions/boundary_conditions.hpp"
+#include "diskpp/loaders/loader.hpp"
+#include "diskpp/mechanics/behaviors/laws/materialData.hpp"
+#include "src/tresca_solver.hpp"
+#include "src/Informations.hpp"
+#include "src/Parameters.hpp"
 
 struct error_type
 {
@@ -1036,4 +1033,4 @@ main(int argc, char** argv)
             std::cout << " " << std::endl;
         }
     }
-}
+}