Changeset 026b2c5 for src/solvers/pcg.F90

Timestamp:

12/11/10 14:04:07 (2 years ago)

Author:

Oleg Batrashev <ogbash@…>

Branches:

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

Children:

82752f1

Parents:

b77a46f

git-author:

Oleg Batrashev <ogbash@…> (12/11/10 14:04:07)

git-committer:

Oleg Batrashev <ogbash@…> (12/11/10 14:04:07)

Message:

Fixes to coarse preconditioner refactoring to restore most tests.

File:

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

src/solvers/pcg.F90

@@ -414 +414 @@
     endif
     ! ----------------------------
-    isFirstIter = .not.(present(refactor_).and.refactor_)
+    isFirstIter = present(refactor_).and.refactor_
     if (sctls%method==0) then
       sol=rhs
@@ -458 +458 @@
         end if
 
-        ! Send coarse vector
-        call SpMtx_Ax(clrhs,Restrict,rhs,dozero=.true.) ! restrict <RA>
-        if (cdat_vec%active) then
-          call AllSendCoarseVector(clrhs,cdat_vec%nprocs,cdat_vec%cdisps,&
-               cdat_vec%send,useprev=isFirstIter)
-        else
-          call AllSendCoarseVector(clrhs,cdat%nprocs,cdat%cdisps,&
-               cdat%send,useprev=isFirstIter)
-        endif
-
         ! allocate coarse vectors
         if (isFirstIter) then
@@ -485 +475 @@
             allocate(tmpsol(size(rhs)))
           endif
+          allocate(clrhs(Restrict%nrows)) ! allocate memory for vector
         end if
+
+        ! Send coarse vector
+        call SpMtx_Ax(clrhs,Restrict,rhs,dozero=.true.) ! restrict <RA>
+        if (cdat_vec%active) then
+          call AllSendCoarseVector(clrhs,cdat_vec%nprocs,cdat_vec%cdisps,&
+               cdat_vec%send,useprev=.not.isFirstIter)
+        else
+          call AllSendCoarseVector(clrhs,cdat%nprocs,cdat%cdisps,&
+               cdat%send,useprev=.not.isFirstIter)
+        endif
 
         ! first level prec