Changeset a16eb98

Timestamp:

01/30/11 12:35:33 (2 years ago)

Author:

Oleg Batrashev <ogbash@…>

Branches:

fix-prolong

Parents:

3c81144

git-author:

Oleg Batrashev <ogbash@…> (01/30/11 12:35:33)

git-committer:

Oleg Batrashev <ogbash@…> (01/30/11 12:35:33)

Message:

localize aggregate numbers in prolong exchange.

Location:

src

Files:

• coarse/CoarseMtx.F90 (modified) (2 diffs)
• datatypes/SpMtx/SpMtx_aggregation.F90 (modified) (1 diff)
• main/aggr.F90 (modified) (2 diffs)

src/coarse/CoarseMtx.F90

@@ -116 +116 @@
     integer :: nnz
     type(SpMtx) :: extR
+    integer :: k, k2
 
     ! collect restrict values from external node to local coarse support
     call collectRestrictValues(extR)
-    extR%indj = M%gl_fmap(extR%indj)
     write(stream,*) "extRESTRICT"
     call SpMtx_printRaw(extR)
+
+    ! debug, test if all values are present
+    do k=1,extR%nnz
+      k2 = SpMtx_findElem(R, extR%indi(k), extR%indj(k))
+      if (k2<=0) then
+        write(stream,*) "NOT FOUND", k
+        cycle
+      end if
+      if (abs(R%val(k2)-extR%val(k))>1E-6) then
+        write(stream,*) "NOT EQUAL", k
+      end if
+    end do
 
   contains
@@ -257 +269 @@
          nnz = nnz+ninds
       end do
+
+      ! localize
+      eR%indi = cdat%gl_cfmap(eR%indi)
+      eR%indj = M%gl_fmap(eR%indj)
 
       ! wait for all data to be sent

src/datatypes/SpMtx/SpMtx_aggregation.F90

@@ -614 +614 @@
     if (plot==1.or.plot==3) then
       if (numprocs>1) then
+        write(stream,*) "PLOTTING"
         if (ismaster()) then
           allocate(aggrnum(M%ngf))

src/main/aggr.F90

@@ -160 +160 @@
     endif
     if (numprocs>1) then
-      plotting=0
+      plotting=sctls%plotting
     else
       plotting=sctls%plotting
@@ -211 +211 @@
       call CoarseMtxBuild(A,cdat%LAC,Restrict,A_ghost)
       !write(stream,*) "A%aggr%num", A%aggr%num
-      !call KeepGivenRowIndeces(Restrict,A%aggr%num)
+      call KeepGivenRowIndeces(Restrict,A%aggr%num)
       !write(stream,*) "Restrict%nrows", Restrict%nrows
 !write(stream,*)'Restrict local is:=================='