Changeset d69332b

Timestamp:

12/14/10 12:10:00 (2 years ago)

Author:

Oleg Batrashev <ogbash@…>

Branches:

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

Children:

87d2b17

Parents:

13bb187

git-author:

Oleg Batrashev <ogbash@…> (12/14/10 12:10:00)

git-committer:

Oleg Batrashev <ogbash@…> (12/14/10 12:10:00)

Message:

Do a restriction every iteration.

File:

• src/solvers/pcg.F90 (modified) (2 diffs)

src/solvers/pcg.F90

@@ -474 +474 @@
       endif
 
-      if (sctls%levels>1) then
-        ol=max(sctls%overlap,sctls%smoothers)
-        if (isFirstIter.and..not.cdat%active) then ! 1 processor case
-          if (sctls%smoothers==-1) then
-            allocate(tmpsol2(A%nrows))
-            tmpsol2=0.0_rk
-            call exact_sparse_multismoother(tmpsol2,A,rhs)
-            call SpMtx_Ax(crhs,Restrict,tmpsol2,dozero=.true.) ! restriction
+      ol=max(sctls%overlap,sctls%smoothers)
+      if (sctls%levels>1.and..not.cdat%active) then ! 1 processor case
+        if (sctls%smoothers==-1) then
+          allocate(tmpsol2(A%nrows))
+          tmpsol2=0.0_rk
+          call exact_sparse_multismoother(tmpsol2,A,rhs)
+          call SpMtx_Ax(crhs,Restrict,tmpsol2,dozero=.true.) ! restriction
+        else
+          if (sctls%method>1.and.sctls%method/=5) then ! multiplicative Schwarz
+            call SpMtx_Ax(crhs,Restrict,res,dozero=.true.) ! restriction
           else
-            if (sctls%method>1.and.sctls%method/=5) then ! multiplicative Schwarz
-              call SpMtx_Ax(crhs,Restrict,res,dozero=.true.) ! restriction
-            else
-              call SpMtx_Ax(crhs,Restrict,rhs,dozero=.true.) ! restriction
-            endif
+            call SpMtx_Ax(crhs,Restrict,rhs,dozero=.true.) ! restriction
           endif
         endif
@@ -525 +523 @@
              val=CoarseMtx_%val)
         if (bugtrack)write(stream,*) "(f) Coarse SOL is:",csol
+        CoarseMtx_%indi=CoarseMtx_%indi+1
+        CoarseMtx_%indj=CoarseMtx_%indj+1
 
         if (cdat_vec%active) then