Refactor

cbritopacheco · cbritopacheco · commit 44a3f682ea97 · 2025-05-26T23:39:55.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -140,18 +140,8 @@ endif()
 
 if (RODIN_BUILD_SRC)
   # ---- Find and build dependencies -----------------------------------------
-  # ---- PThreads ----
-  set(THREADS_PREFER_PTHREAD_FLAG ON)
-  find_package(Threads REQUIRED)
-
-  if (RODIN_USE_OPENMP)
-    find_package(OpenMP REQUIRED)
-  endif()
-
   # ---- Boost ----
   add_compile_definitions(PRIVATE BOOST_ASIO_HAS_STD_INVOKE_RESULT=1)
-  # set(Boost_USE_STATIC_LIBS        OFF)
-  # set(Boost_USE_STATIC_RUNTIME     OFF)
 
   find_package(Boost 1.74 REQUIRED
     COMPONENTS
diff --git a/examples/Misc/RS2023/CellFunction.cpp b/examples/Misc/RS2023/CellFunction.cpp
@@ -6,6 +6,7 @@
  */
 #include <Rodin/Solver.h>
 #include <Rodin/Geometry.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Variational.h>
 
 using namespace Rodin;
diff --git a/examples/Misc/RS2023/Conductivity/CMakeLists.txt b/examples/Misc/RS2023/Conductivity/CMakeLists.txt
@@ -2,6 +2,7 @@ add_executable(RS2023_Conductivity_Simulation Simulation.cpp)
 target_link_libraries(RS2023_Conductivity_Simulation
   PUBLIC
   Rodin::Geometry
+  Rodin::Assembly
   Rodin::Solver
   Rodin::Variational
   )
@@ -10,6 +11,7 @@ add_executable(RS2023_Conductivity_Perturbed Perturbed.cpp)
 target_link_libraries(RS2023_Conductivity_Perturbed
   PUBLIC
   Rodin::Geometry
+  Rodin::Assembly
   Rodin::Solver
   Rodin::Variational
   Rodin::External::MMG
diff --git a/examples/Misc/RS2023/Conductivity/Perturbed.cpp b/examples/Misc/RS2023/Conductivity/Perturbed.cpp
@@ -6,6 +6,7 @@
  */
 #include <Rodin/Solver.h>
 #include <Rodin/Geometry.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Variational.h>
 
 #include <RodinExternal/MMG.h>
diff --git a/examples/Misc/RS2023/Conductivity/Simulation.cpp b/examples/Misc/RS2023/Conductivity/Simulation.cpp
@@ -8,6 +8,7 @@
 #include <fstream>
 #include <Rodin/Solver.h>
 #include <Rodin/Geometry.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Variational.h>
 
 using namespace Rodin;
diff --git a/examples/Misc/RS2023/Helmholtz/Animation.cpp b/examples/Misc/RS2023/Helmholtz/Animation.cpp
@@ -8,6 +8,7 @@
 #include <fstream>
 #include <Rodin/Solver.h>
 #include <Rodin/Geometry.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Variational.h>
 
 using namespace Rodin;
diff --git a/examples/Misc/RS2023/Helmholtz/CMakeLists.txt b/examples/Misc/RS2023/Helmholtz/CMakeLists.txt
@@ -1,36 +1,40 @@
 add_executable(RS2023_Helmholtz_NoScreen NoScreen.cpp)
 target_link_libraries(RS2023_Helmholtz_NoScreen
   PUBLIC
-  Rodin::Geometry
   Rodin::Solver
+  Rodin::Geometry
+  Rodin::Assembly
   Rodin::Variational
   PRIVATE
-  Threads::Threads
+  Rodin::Threads
   )
 
 add_executable(RS2023_Helmholtz_Perturbed Perturbed.cpp)
 target_link_libraries(RS2023_Helmholtz_Perturbed
   PUBLIC
-  Rodin::Geometry
   Rodin::Solver
+  Rodin::Geometry
+  Rodin::Assembly
   Rodin::Variational
   )
 
 add_executable(RS2023_Helmholtz_Simulation Simulation.cpp)
 target_link_libraries(RS2023_Helmholtz_Simulation
   PUBLIC
-  Rodin::Geometry
   Rodin::Solver
+  Rodin::Geometry
+  Rodin::Assembly
   Rodin::Variational
   PRIVATE
-  Threads::Threads
+  Rodin::Threads
   )
 
 add_executable(RS2023_Helmholtz_Animation Animation.cpp)
 target_link_libraries(RS2023_Helmholtz_Animation
   PUBLIC
-  Rodin::Geometry
   Rodin::Solver
+  Rodin::Geometry
+  Rodin::Assembly
   Rodin::Variational
   )
 
diff --git a/examples/Misc/RS2023/Helmholtz/NoScreen.cpp b/examples/Misc/RS2023/Helmholtz/NoScreen.cpp
@@ -8,6 +8,7 @@
 #include <chrono>
 #include <fstream>
 #include <Rodin/Solver.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Geometry.h>
 #include <Rodin/Variational.h>
 
diff --git a/examples/Misc/RS2023/Helmholtz/Perturbed.cpp b/examples/Misc/RS2023/Helmholtz/Perturbed.cpp
@@ -6,6 +6,7 @@
  */
 #include <Rodin/Solver.h>
 #include <Rodin/Geometry.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Variational.h>
 
 using namespace Rodin;
diff --git a/examples/Misc/RS2023/Helmholtz/Simulation.cpp b/examples/Misc/RS2023/Helmholtz/Simulation.cpp
@@ -8,6 +8,7 @@
 #include <chrono>
 #include <fstream>
 #include <Rodin/Solver.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Geometry.h>
 #include <Rodin/Variational.h>
 
diff --git a/examples/Models/Distance/SpaldingTucker.cpp b/examples/Models/Distance/SpaldingTucker.cpp
@@ -7,6 +7,7 @@
 #include <Rodin/Math.h>
 #include <Rodin/Solver.h>
 #include <Rodin/Geometry.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Variational.h>
 #include <Rodin/Models/Distance/Poisson.h>
 #include <Rodin/Models/Distance/SignedPoisson.h>
diff --git a/examples/PDEs/Darcy.cpp b/examples/PDEs/Darcy.cpp
@@ -6,6 +6,7 @@
  */
 #include <Rodin/Solver.h>
 #include <Rodin/Geometry.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Variational.h>
 #include <Rodin/Variational/LinearElasticity.h>
 #include <Rodin/Solver/UMFPack.h>
diff --git a/examples/PDEs/Elasticity.cpp b/examples/PDEs/Elasticity.cpp
@@ -6,6 +6,7 @@
  */
 #include <Rodin/Solver.h>
 #include <Rodin/Geometry.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Variational.h>
 #include <Rodin/Variational/LinearElasticity.h>
 
diff --git a/examples/PDEs/Helmholtz.cpp b/examples/PDEs/Helmholtz.cpp
@@ -6,6 +6,7 @@
  */
 #include <Rodin/Solver.h>
 #include <Rodin/Geometry.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Variational.h>
 
 using namespace Rodin;
diff --git a/examples/PDEs/Periodic.cpp b/examples/PDEs/Periodic.cpp
@@ -6,6 +6,7 @@
  */
 #include <Rodin/Solver.h>
 #include <Rodin/Geometry.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Variational.h>
 
 using namespace Rodin;
diff --git a/examples/PDEs/Poisson.cpp b/examples/PDEs/Poisson.cpp
@@ -6,6 +6,7 @@
  */
 #include <Rodin/Types.h>
 #include <Rodin/Solver.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Geometry.h>
 #include <Rodin/Variational.h>
 
diff --git a/examples/PDEs/SurfaceMesh.cpp b/examples/PDEs/SurfaceMesh.cpp
@@ -1,4 +1,5 @@
 #include <Rodin/Geometry.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Solver.h>
 #include <Rodin/Variational.h>
 
diff --git a/examples/ShapeOptimization/SimpleCantilever2D.cpp b/examples/ShapeOptimization/SimpleCantilever2D.cpp
@@ -6,6 +6,7 @@
  */
 #include <Rodin/Solver.h>
 #include <Rodin/Geometry.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Variational.h>
 #include <Rodin/Variational/LinearElasticity.h>
 #include <RodinExternal/MMG.h>
diff --git a/examples/Variational/P1/P1Potential.cpp b/examples/Variational/P1/P1Potential.cpp
@@ -5,6 +5,7 @@
  *          https://www.boost.org/LICENSE_1_0.txt)
  */
 #include <Rodin/Geometry.h>
+#include <Rodin/Assembly.h>
 #include <Rodin/Variational.h>
 #include <RodinExternal/MMG.h>
 
diff --git a/src/Rodin/Assembly.h b/src/Rodin/Assembly.h
@@ -2,8 +2,11 @@
 #define RODIN_ASSEMBLY_H
 
 #include "Assembly/Default.h"
-#include "Assembly/Multithreaded.h"
 #include "Assembly/Sequential.h"
 
+#ifdef RODIN_USE_OPENMP
+#include "Assembly/OpenMP.h"
+#endif
+
 #endif
 
diff --git a/src/Rodin/Assembly/CMakeLists.txt b/src/Rodin/Assembly/CMakeLists.txt
@@ -1,30 +1,25 @@
-set(RodinAssembly_HEADERS
-  AssemblyBase.h
-  Sequential.h
-  Multithreaded.h)
+set(RodinAssembly_HEADERS AssemblyBase.h Sequential.h)
 
-set(RodinAssembly_SRCS
-  Sequential.cpp
-  Multithreaded.cpp)
+set(RodinAssembly_SRCS Sequential.cpp)
 
 add_library(RodinAssembly
   ${RodinAssembly_SRCS} ${RodinAssembly_HEADERS})
 add_library(Rodin::Assembly ALIAS RodinAssembly)
 
-if (RODIN_USE_OPENMP)
-  target_link_libraries(RodinAssembly PUBLIC OpenMP::OpenMP_CXX)
-endif()
-
 # ---- Link targets ----------------------------------------------------------
 target_include_directories(RodinAssembly
   INTERFACE $<TARGET_PROPERTY:Rodin,INTERFACE_INCLUDE_DIRECTORIES>)
 
 target_link_libraries(RodinAssembly
   PUBLIC
-  Threads::Threads
-  Rodin::Utility
-  Rodin::FormLanguage
-  Rodin::Variational)
+  Rodin::Variational
+  Rodin::FormLanguage)
+
+if (RODIN_USE_OPENMP)
+  target_sources(RodinAssembly PRIVATE OpenMP.cpp)
+  find_package(OpenMP REQUIRED)
+  target_link_libraries(RodinAssembly PUBLIC OpenMP::OpenMP_CXX)
+endif()
 
 install(TARGETS RodinAssembly
   EXPORT       RodinTargets
diff --git a/src/Rodin/Assembly/Default.h b/src/Rodin/Assembly/Default.h
@@ -5,37 +5,52 @@
 
 #include "ForwardDecls.h"
 
-#include "Sequential.h"
-#include "Multithreaded.h"
+#ifdef RODIN_USE_OPENMP
+
+#include "OpenMP.h"
 
 namespace Rodin::Assembly
 {
   template <>
   class Default<Context::Local>
   {
     public:
-#ifdef RODIN_MULTITHREADED
       template <class LinearAlgebraType, class Object>
-      using Type = Multithreaded<LinearAlgebraType, Object>;
+      using Type = OpenMP<LinearAlgebraType, Object>;
+  };
+
+  template <>
+  class Default<Context::Local, Context::Local>
+  {
+    public:
+      template <class LinearAlgebraType, class Object>
+      using Type = OpenMP<LinearAlgebraType, Object>;
+ };
+}
+
 #else
+
+#include "Sequential.h"
+
+namespace Rodin::Assembly
+{
+  template <>
+  class Default<Context::Local>
+  {
+    public:
       template <class LinearAlgebraType, class Object>
       using Type = Sequential<LinearAlgebraType, Object>;
-#endif
   };
 
   template <>
   class Default<Context::Local, Context::Local>
   {
     public:
-#ifdef RODIN_MULTITHREADED
-      template <class LinearAlgebraType, class Object>
-      using Type = Multithreaded<LinearAlgebraType, Object>;
-#else
       template <class LinearAlgebraType, class Object>
       using Type = Sequential<LinearAlgebraType, Object>;
-#endif
  };
-
 }
 
 #endif
+
+#endif
diff --git a/src/Rodin/Assembly/ForwardDecls.h b/src/Rodin/Assembly/ForwardDecls.h
@@ -9,11 +9,8 @@ namespace Rodin::Assembly
   template <class LinearAlgebraType, class Operand>
   class Sequential;
 
-  template <class LinearAlgebraType, class Operand>
-  class Multithreaded;
-
-  template <class Operand>
-  class OpenMP;
+  template <class Mesh>
+  class SequentialIteration;
 
   template <class TrialFES, class TestFES>
   class BilinearFormAssemblyInput;
@@ -27,14 +24,19 @@ namespace Rodin::Assembly
   template <class Scalar, class FES, class ValueDerived>
   class DirichletBCAssemblyInput;
 
-  template <class Mesh>
-  class SequentialIteration;
-
-  template <class Mesh>
-  class MultithreadedIteration;
-
   template <class ... Ts>
   class Default;
 }
 
+#ifdef RODIN_USE_OPENMP
+namespace Rodin::Assembly
+{
+  template <class LinearAlgebraType, class Operand>
+  class OpenMP;
+
+  template <class Mesh>
+  class OpenMPIteration;
+}
+#endif
+
 #endif
diff --git a/src/Rodin/Assembly/Multithreaded.h b/src/Rodin/Assembly/Multithreaded.h
diff --git a/src/Rodin/Assembly/OpenMP.cpp b/src/Rodin/Assembly/OpenMP.cpp
diff --git a/src/Rodin/Assembly/OpenMP.h b/src/Rodin/Assembly/OpenMP.h
diff --git a/src/Rodin/Assembly/Sequential.h b/src/Rodin/Assembly/Sequential.h
diff --git a/src/Rodin/PETSc/Assembly/Multithreaded.h b/src/Rodin/PETSc/Assembly/Multithreaded.h
diff --git a/src/Rodin/Threads/CMakeLists.txt b/src/Rodin/Threads/CMakeLists.txt
diff --git a/src/Rodin/Variational/CMakeLists.txt b/src/Rodin/Variational/CMakeLists.txt
diff --git a/src/Rodin/Variational/GridFunction.h b/src/Rodin/Variational/GridFunction.h
