Changeset 13bb187

Timestamp:

12/14/10 11:08:56 (2 years ago)

Author:

Oleg Batrashev <ogbash@…>

Branches:

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

Children:

d69332b

Parents:

8a2eebe

git-author:

Oleg Batrashev <ogbash@…> (12/14/10 11:08:56)

git-committer:

Oleg Batrashev <ogbash@…> (12/14/10 11:08:56)

Message:

Remove coarse preliminary factorisation, move coarse solve into levels>1.

File:

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

src/solvers/pcg.F90

@@ -429 +429 @@
         ! First iteration - send matrix
         call prec2Level_exchangeMatrix(CoarseMtx_)
-
-        ! factorise coarse matrix
-        write (stream,*) &
-             'factorising coarse matrix of size',CoarseMtx_%nrows, &
-             ' and nnz:',CoarseMtx_%nnz
-        call free_spmtx_subsolves(CoarseMtx_)
-        allocate(CoarseMtx_%subsolve_ids(1))
-        CoarseMtx_%subsolve_ids=0
-        CoarseMtx_%nsubsolves=1
-
-        ! Factorise the matrix
-        if (sctls%verbose>2) then
-          write(stream,*)'Global coarse matrix is:---------'
-          do i=1,CoarseMtx_%nnz
-             write(stream,*) CoarseMtx_%indi(i),&
-                  CoarseMtx_%indj(i),CoarseMtx_%val(i)
-          enddo
-          write(stream,*)'---------------------------------'
+      end if
+
+      ! after coarse matrix is received allocate coarse vectors
+      if (isFirstIter.and.sctls%levels>1) then
+        if (associated(crhs)) then
+          if (size(crhs)/=CoarseMtx_%ncols) then
+            deallocate(csol)
+            deallocate(crhs)
+            allocate(crhs(CoarseMtx_%ncols))
+            allocate(csol(CoarseMtx_%nrows))
+          endif
+        else
+          allocate(crhs(CoarseMtx_%ncols))
+          allocate(csol(CoarseMtx_%nrows))
         endif
-        call factorise(CoarseMtx_%subsolve_ids(1), &
-             nfreds=CoarseMtx_%nrows,   &
-             nnz=CoarseMtx_%nnz,        &
-             indi=CoarseMtx_%indi,      &
-             indj=CoarseMtx_%indj,      &
-             val=CoarseMtx_%val)
-        CoarseMtx_%indi=CoarseMtx_%indi+1
-        CoarseMtx_%indj=CoarseMtx_%indj+1
-     end if
-
-     ! after coarse matrix is received allocate coarse vectors
-     if (isFirstIter.and.sctls%levels>1) then
-       if (associated(crhs)) then
-         if (size(crhs)/=CoarseMtx_%ncols) then
-           deallocate(csol)
-           deallocate(crhs)
-           allocate(crhs(CoarseMtx_%ncols))
-           allocate(csol(CoarseMtx_%nrows))
-         endif
-       else
-         allocate(crhs(CoarseMtx_%ncols))
-         allocate(csol(CoarseMtx_%nrows))
-       endif
-       allocate(clrhs(Restrict%nrows)) ! allocate memory for vector
-     end if
-     if (.not.associated(tmpsol)) then
-       !allocate(tmpsol(A%nrows))
-       allocate(tmpsol(size(rhs)))
-     endif
-
-     if (cdat%active) then
+        allocate(clrhs(Restrict%nrows)) ! allocate memory for vector
+      end if
+      if (.not.associated(tmpsol)) then
+        !allocate(tmpsol(A%nrows))
+        allocate(tmpsol(size(rhs)))
+      endif
+
+      if (cdat%active) then
         ! Send coarse vector
         call SpMtx_Ax(clrhs,Restrict,rhs,dozero=.true.) ! restrict <RA>
@@ -503 +476 @@
       if (sctls%levels>1) then
         ol=max(sctls%overlap,sctls%smoothers)
-        if (isFirstIter) then
-          if (.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
+        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
+          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
-        end if
+        endif
       end if
 
-        !csol=0.0_rk
+      !csol=0.0_rk
       if (cdat%active) then
         ! Recieve the vector for solve
@@ -533 +504 @@
         !write(stream,*) "Got coarse vector!"
         !call MPI_BARRIER(MPI_COMM_WORLD,i)
-
-        call sparse_singlesolve(CoarseMtx_%subsolve_ids(1),csol,crhs,nfreds=CoarseMtx_%nrows)
-        write (stream,*) 'coarse factorisation done!',CoarseMtx_%subsolve_ids(1)
+      end if
+
+      if (sctls%levels>1) then
+        if (isFirstIter) then
+          write (stream,*) &
+               'factorising coarse matrix of size',CoarseMtx_%nrows, &
+               ' and nnz:',CoarseMtx_%nnz
+          call free_spmtx_subsolves(CoarseMtx_)
+          allocate(CoarseMtx_%subsolve_ids(1))
+          CoarseMtx_%subsolve_ids=0
+          CoarseMtx_%nsubsolves=1
+        end if
+
+        ! Coarse solve
+        call sparse_singlesolve(CoarseMtx_%subsolve_ids(1),csol,crhs,&
+             nfreds=CoarseMtx_%nrows, &
+             nnz=CoarseMtx_%nnz,        &
+             indi=CoarseMtx_%indi,      &
+             indj=CoarseMtx_%indj,      &
+             val=CoarseMtx_%val)
         if (bugtrack)write(stream,*) "(f) Coarse SOL is:",csol
-      end if
-
-      if (sctls%levels>1) then
+
         if (cdat_vec%active) then
           call Vect_remap(csol,clrhs,cdat_vec%gl_cfmap,dozero=.true.)