Changeset c731b25

Timestamp:

12/12/10 22:43:44 (2 years ago)

Author:

Oleg Batrashev <ogbash@…>

Branches:

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

Children:

62787ad

Parents:

82752f1

git-author:

Oleg Batrashev <ogbash@…> (12/12/10 22:43:44)

git-committer:

Oleg Batrashev <ogbash@…> (12/12/10 22:43:44)

Message:

Coarse level preconditioner refactoring: fix error in 1 level, 1-processor, additive and multiplicative Schwarz.

Location:

src/solvers

Files:

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

src/solvers/pcg.F90

@@ -489 +489 @@
                cdat%send,useprev=.not.isFirstIter)
         endif
-
-        ! 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, &
+      end if ! cdat%active
+
+      ! 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, &
                         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 
-        endif
-      end if ! cdat%active
+      endif
 
       if (sctls%levels>1) then

src/solvers/subsolvers.F90

@@ -1508 +1508 @@
     integer :: i,j,ii,jj
     logical,save :: alloc=.false.
-    type(indlist),dimension(:),pointer :: ind
+    type(indlist),dimension(:),pointer,save :: ind
     if (A%arrange_type/=D_SpMtx_ARRNG_ROWS) then
       call SpMtx_arrange(A,arrange_type=D_SpMtx_ARRNG_ROWS,sort=.true.)   !