Merge pull request #316 from jojoasticot/petsc-direct

[femutils] Added direct Petsc solver

Author: grospelliergilles

femutils/CMakeLists.txt

@@ -10,6 +10,10 @@ if (TARGET Arcane::arcane_aleph_hypre)
   list(APPEND ACCELERATOR_SOURCES HypreDoFLinearSystem.cc)
 endif()
 
+if (TARGET Arcane::arcane_aleph_petsc)
+  list(APPEND ACCELERATOR_SOURCES PETScDoFLinearSystem.cc)
+endif()
+
 add_library(FemUtils
   FemUtils.h
   FemUtils.cc
@@ -39,6 +43,7 @@ add_library(FemUtils
   AlephDoFLinearSystemFactory_axl.h
   SequentialBasicDoFLinearSystemFactory_axl.h
   HypreDoFLinearSystemFactory_axl.h
+  PETScDoFLinearSystemFactory_axl.h
   FemBoundaryConditions_axl.h
   MeshTensorVariable.h
   MeshTensorVariable.H
@@ -55,6 +60,7 @@ arcane_accelerator_add_to_target(FemUtils)
 arcane_generate_axl(AlephDoFLinearSystemFactory)
 arcane_generate_axl(SequentialBasicDoFLinearSystemFactory)
 arcane_generate_axl(HypreDoFLinearSystemFactory)
+arcane_generate_axl(PETScDoFLinearSystemFactory)
 arcane_generate_axl(FemBoundaryConditions)
 
 target_compile_definitions(FemUtils PRIVATE $<$<BOOL:${ENABLE_DEBUG_MATRIX}>:ENABLE_DEBUG_MATRIX>)
@@ -83,6 +89,11 @@ if (TARGET Arcane::arcane_aleph_petsc)
   target_link_libraries(FemUtils PRIVATE Arcane::arcane_aleph_petsc)
   message(STATUS "PETSc backend is available")
   set(FEMUTILS_HAS_SOLVER_BACKEND_PETSC TRUE)
+  find_package(PETSc)
+
+  if (TARGET arcconpkg_PETSc)
+    target_link_libraries(FemUtils PRIVATE arcconpkg_PETSc)
+  endif()
 endif()
 
 

femutils/HypreDoFLinearSystem.cc

@@ -550,11 +550,11 @@ solve()
   Real v1 = platform::getRealTime();
   hypreCheck("HYPRE_IJVectorSetValues",
              HYPRE_IJVectorSetValues(ij_vector_b, nb_local_row, rows_index_data,
-                                     rhs_variable.asArray().data()));
+                                     rhs_data));
 
   hypreCheck("HYPRE_IJVectorSetValues",
              HYPRE_IJVectorSetValues(ij_vector_x, nb_local_row, rows_index_data,
-                                     dof_variable.asArray().data()));
+                                     result_data));
 
   hypreCheck("HYPRE_IJVectorAssemble",
              HYPRE_IJVectorAssemble(ij_vector_b));
@@ -581,7 +581,7 @@ solve()
     Timer::Action ta1(tstat, "HypreSetSolver");
 
     switch (m_solver) {
-    case solver::CG:
+    case solver::CG: // iter, rtol, atol
       HYPRE_ParCSRPCGCreate(mpi_comm, &solver);
       HYPRE_PCGSetMaxIter(solver, m_max_iter); // max iterations //
       HYPRE_PCGSetTol(solver, m_rtol); // relative conv. tolerance //
@@ -590,7 +590,7 @@ solve()
       HYPRE_PCGSetPrintLevel(solver, m_verbosity); // print solve info //
       HYPRE_PCGSetLogging(solver, 1); // needed to get run info later //
       break;
-    case solver::GMRES:
+    case solver::GMRES: // dimension, iter, rtol, atol
       HYPRE_ParCSRGMRESCreate(mpi_comm, &solver);
       HYPRE_GMRESSetKDim(solver, m_krylov_dim); // Krylov dimension //
       HYPRE_GMRESSetMaxIter(solver, m_max_iter); // max iterations //
@@ -599,16 +599,16 @@ solve()
       HYPRE_GMRESSetPrintLevel(solver, m_verbosity); // print solve info //
       HYPRE_GMRESSetLogging(solver, 1); // needed to get run info later //
       break;
-    case solver::FGMRES:
+    case solver::FGMRES: // dimension, iter, rtol, atol
       HYPRE_ParCSRFlexGMRESCreate(mpi_comm, &solver);
-      HYPRE_FlexGMRESSetMaxIter(solver, m_max_iter); // max iterations //
       HYPRE_FlexGMRESSetKDim(solver, m_krylov_dim); // Krylov dimension //
+      HYPRE_FlexGMRESSetMaxIter(solver, m_max_iter); // max iterations //
       HYPRE_FlexGMRESSetTol(solver, m_rtol); // relative conv. tolerance //
       HYPRE_FlexGMRESSetAbsoluteTol(solver, m_atol); // absolute conv. tolerance //
       HYPRE_FlexGMRESSetPrintLevel(solver, m_verbosity); // print solve info //
       HYPRE_FlexGMRESSetLogging(solver, 1); // needed to get run info later //
       break;
-    case solver::BICGSTAB:
+    case solver::BICGSTAB: // iter, rtol, atol
       HYPRE_ParCSRBiCGSTABCreate(mpi_comm, &solver);
       HYPRE_BiCGSTABSetMaxIter(solver, m_max_iter); // max iterations //
       HYPRE_BiCGSTABSetTol(solver, m_rtol); // relative conv. tolerance //