Changeset fd51d18

Timestamp:

01/26/11 19:41:24 (2 years ago)

Author:

Oleg Batrashev <ogbash@…>

Branches:

master, external, fix-prolong

Children:

3805ac7

Parents:

8e30c0d

git-author:

Oleg Batrashev <ogbash@…> (01/26/11 19:41:24)

git-committer:

Oleg Batrashev <ogbash@…> (01/26/11 19:41:24)

Message:

Start "strong" distribution.

Location:

src

Files:

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

src/coarse/CoarseMtx.F90

@@ -367 +367 @@
       deallocate(indi)
       ! Build smoother
-      call SpMtx_printRaw(A)
       allocate(diag(max(A%nrows,A%ncols)))
       diag=0.0;
@@ -450 +449 @@
       deallocate(val,indj,indi)
       deallocate(diag)
-!write(stream,*)'Smoother matrix is:------------'
-!call SpMtx_printRaw(S)
+write(stream,*)'Smoother matrix is:------------'
+call SpMtx_printRaw(S)
       if (smoothers>=2) then
         ! Build smoother2

src/datatypes/SpMtx/SpMtx_arrangement.F90

@@ -386 +386 @@
 ! Finding strong connections in matrix
 !------------------------------------------------------
-  subroutine SpMtx_find_strong(A,alpha,A_ghost,symmetrise)
+  subroutine SpMtx_find_strong(A,alpha,A_ghost,symmetrise,M)
     Implicit None
     Type(SpMtx),intent(in out) :: A
@@ -392 +392 @@
     Type(SpMtx),intent(in out),optional :: A_ghost
     logical,intent(in),optional :: symmetrise
+    type(Mesh),intent(in),optional :: M
     ! local:
     integer :: i,j,k,start,ending,nnz,ndiags
@@ -479 +480 @@
       enddo
     endif
+    write(stream,*) "STRONG", A%strong
     if (mirror2ghost) then
       if (present(A_ghost).and.associated(A_ghost%indi)) then
@@ -491 +493 @@
           endif
         enddo
-      endif
-    endif
+        write(stream,*) "GHOST STRONG", A_ghost%strong
+      endif
+    endif
+
+  contains
+
+    subroutine exchange_strong()
+      integer :: k, neigh
+      integer,allocatable :: ninds(:)
+      type Buffer
+         character, pointer :: data(:)       
+      end type Buffer
+      type(Buffer),allocatable :: outbuffers(:)
+
+      allocate(ninds(M%nnghbrs))
+
+      ! report to the neighbours which elements we need
+      !! how many elements
+      ninds = 0
+      do k=1,A_ghost%nnz
+        neigh = M%eptnmap(A_ghost%indi(k))
+        if (neigh/=myrank+1) then
+          ninds(neigh) = ninds(neigh)+1
+        end if
+      end do
+      !! collect elements
+      !do neigh=1,M%nnghbrs
+      !  allocate(
+
+      deallocate(ninds)
+    end subroutine exchange_strong
   end subroutine SpMtx_find_strong
 

src/main/aggr.F90

@@ -141 +141 @@
       strong_conn1=0.67_rk
     endif
-    call SpMtx_find_strong(A=A,alpha=strong_conn1,A_ghost=A_ghost)
+    call SpMtx_find_strong(A=A,alpha=strong_conn1,A_ghost=A_ghost,M=M)
     if (sctls%radius1>0) then
       aggr_radius1=sctls%radius1