Added caches for CG solver

gridap · Sep 7, 2023 · 19921de · 19921de
1 parent 93addb6
commit 19921de
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/LinearSolvers/IterativeLinearSolvers.jl b/src/LinearSolvers/IterativeLinearSolvers.jl
@@ -82,6 +82,14 @@ function Gridap.Algebra.numerical_setup(::IterativeLinearSolverType,
   IterativeLinearSolverNS(ss.solver,A,nothing)
 end
 
+function Gridap.Algebra.numerical_setup(::CGIterativeSolverType,
+                                        ss::IterativeLinearSolverSS,
+                                        A::AbstractMatrix)
+  x = allocate_col_vector(A)
+  caches = IterativeSolvers.CGStateVariables(zero(x), similar(x), similar(x))
+  return IterativeLinearSolverNS(ss.solver,A,caches)
+end
+
 function Gridap.Algebra.numerical_setup(::SSORIterativeSolverType,
                                         ss::IterativeLinearSolverSS,
                                         A::AbstractMatrix)
@@ -131,8 +139,8 @@ function Gridap.Algebra.solve!(::CGIterativeSolverType,
                                x::AbstractVector,
                                ns::IterativeLinearSolverNS,
                                y::AbstractVector)
-  A, kwargs = ns.A, ns.solver.kwargs
-  return cg!(x,A,y;kwargs...)
+  A, kwargs, caches = ns.A, ns.solver.kwargs, ns.caches
+  return cg!(x,A,y;kwargs...,statevars=caches)
 end
 
 function Gridap.Algebra.solve!(::GMRESIterativeSolverType,

diff --git a/src/PatchBasedSmoothers/mpi/PatchFESpaces.jl b/src/PatchBasedSmoothers/mpi/PatchFESpaces.jl
@@ -53,10 +53,9 @@ function prolongate!(x::PVector,
   if is_consistent 
     map(prolongate!,partition(x),local_views(Ph),partition(y))
   else
-    # Communicate ghosts
+    # Transfer ghosts while copying owned dofs
     rows = axes(y,1)
     t = consistent!(y)
-    # Start copying owned dofs
     map(partition(x),local_views(Ph),partition(y),own_to_local(rows)) do x,Ph,y,ids
       prolongate!(x,Ph,y;dof_ids=ids)
     end