Changeset 609702e

Timestamp:

12/16/10 15:13:01 (2 years ago)

Author:

Oleg Batrashev <ogbash@…>

Branches:

master, external, fix-prolong, refactor, refactor-subsolvers

Children:

d3bc35f

Parents:

41c5343

git-author:

Oleg Batrashev <ogbash@…> (12/16/10 15:13:01)

git-committer:

Oleg Batrashev <ogbash@…> (12/16/10 15:13:01)

Message:

Extract multisolve call for multiplicative Schwarz, so that we do not mess with it during refactoring.

Location:

src/solvers

Files:

• pcg.F90 (modified) (3 diffs)
• subsolvers.F90 (modified) (1 diff)

src/solvers/pcg.F90

@@ -269 +269 @@
                A_interf_=A_interf_, &
                refactor=refactor_) !fine solves 
+
     if (sctls%method>1) then ! For multiplicative Schwarz method...:
-       refactor_=.false.
-       call sparse_multisolve(sol=sol,A=A,M=M,rhs=rhs,res=res, &
-                  A_interf_=A_interf_, &
-                  refactor=refactor_) !fine solves 
-    endif
+      if (numprocs>1) call DOUG_abort('multiplicative Schwarz only for numprocs==1 so far',-1)
+      call multiplicative_sparse_multisolve(sol,A,M,rhs,res,A_interf_,refactor=refactor_)
+      refactor_=.false.
+      call multiplicative_sparse_multisolve(sol,A,M,rhs,res,A_interf_,refactor=refactor_) !fine solves 
+    endif
+
   end subroutine preconditioner_1level
 
@@ -387 +389 @@
 
       ! first level prec
-      if (sctls%input_type==DCTL_INPUT_TYPE_ELEMENTAL.or.numprocs>1) then
-        call sparse_multisolve(sol=sol,A=A,M=M,rhs=rhs,res=res, &
+      if (sctls%method>1) then
+        if (numprocs>1) call DOUG_abort('multiplicative Schwarz only for numprocs==1 so far',-1)
+        if (sctls%input_type==DCTL_INPUT_TYPE_ELEMENTAL.or.numprocs>1) then
+          call multiplicative_sparse_multisolve(sol,A,M,rhs,res,A_interf_,refactor=refactor_)
+        else
+          call multiplicative_sparse_multisolve(sol,A,M,rhs,res,A_interf_,CoarseMtx_,refactor_,Restrict)
+        end if
+      else 
+        if (sctls%input_type==DCTL_INPUT_TYPE_ELEMENTAL.or.numprocs>1) then
+          call sparse_multisolve(sol=sol,A=A,M=M,rhs=rhs,res=res, &
                         A_interf_=A_interf_, &
                         refactor=refactor_) !fine solves 
-      else
-        call sparse_multisolve(sol=sol,A=A,M=M,rhs=rhs,res=res, &
+        else
+          call sparse_multisolve(sol=sol,A=A,M=M,rhs=rhs,res=res, &
                         A_interf_=A_interf_,AC=CoarseMtx_, &
                         refactor=refactor_,Restrict=Restrict) !fine solves 
+        end if
       endif
 
@@ -485 +496 @@
       if (sctls%method>1) then ! For multiplicative Schwarz method...:
         refactor_=.false.
+        if (numprocs>1) call DOUG_abort('multiplicative Schwarz only for numprocs==1 so far',-1)
+
         if (sctls%input_type==DCTL_INPUT_TYPE_ELEMENTAL) then
-            call sparse_multisolve(sol=sol,A=A,M=M,rhs=rhs,res=res, &
+            call multiplicative_sparse_multisolve(sol=sol,A=A,M=M,rhs=rhs,res=res, &
                           A_interf_=A_interf_, &
                           refactor=refactor_) !fine solves 
         else
-            call sparse_multisolve(sol=sol,A=A,M=M,rhs=rhs,res=res, &
+            call multiplicative_sparse_multisolve(sol=sol,A=A,M=M,rhs=rhs,res=res, &
                           A_interf_=A_interf_,AC=CoarseMtx_, &
                           refactor=refactor_,Restrict=Restrict) !fine solves 

src/solvers/subsolvers.F90

@@ -181 +181 @@
     integer :: sd
 
-    if (sctls%method>1) then
-      if (numprocs>1) then
-        call DOUG_abort('multiplicative Schwarz only for numprocs==1 so far',-1)
-      endif
-      call multiplicative_sparse_multisolve(sol,A,M,rhs,res,A_interf_,AC,refactor,Restrict)
-      return
-    endif
     if (present(refactor)) then
       if (refactor) then