Changeset 7a5f6b3 for src/solvers/pcg.F90

Timestamp:

02/07/11 15:44:31 (2 years ago)

Author:

Oleg Batrashev <ogbash@…>

Branches:

master, external

Children:

398fecf

Parents:

ee38b77 (diff), d277181 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Oleg Batrashev <ogbash@…> (02/07/11 15:44:31)

git-committer:

Oleg Batrashev <ogbash@…> (02/07/11 15:44:31)

Message:

Merge branch 'd2771816f6b2bc738578b53caf829f5ac2ec4625' into tmp/master

Conflicts:

src/main/aggr.F90
src/solvers/pcg.F90

File:

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

src/solvers/pcg.F90

@@ -359 +359 @@
       if (cdat%active) then
         ! Send coarse vector
-        write(stream,*) "Send coarse vector!"
         call SpMtx_Ax(clrhs,Restrict,rhs,dozero=.true.) ! restrict <RA>
         if (cdat_vec%active) then
@@ -397 +396 @@
                cdat%cdisps,cdat%glg_cfmap,cdat%send)
         endif
-        write(stream,*) "Got coarse vector!"
         !call MPI_BARRIER(MPI_COMM_WORLD,i)
       end if
@@ -411 +409 @@
       end if
 
-      write (stream,*) "Coarse solve"
       ! Coarse solve
       call sparse_singlesolve(CoarseMtx_%DD%subsolve_ids(1),csol,crhs,&
@@ -425 +422 @@
 
       if (cdat_vec%active) then
-        write(stream,*) "clrhs", shape(clrhs), cdat_vec%gl_cfmap
         call Vect_remap(csol,clrhs,cdat_vec%gl_cfmap,dozero=.true.)
-        !write(stream,*) "Restrict%nrows", Restrict%nrows
         call SpMtx_Ax(tmpsol,Restrict,clrhs,dozero=.true.,transp=.true.)
         !write(stream,*) "tmpsol", tmpsol