Changeset 93b6f6c

Timestamp:

02/08/11 20:01:48 (2 years ago)

Author:

Oleg Batrashev <ogbash@…>

Branches:

master, external

Children:

c4aa2f1

Parents:

60e3a65

git-author:

Oleg Batrashev <ogbash@…> (02/08/11 20:01:48)

git-committer:

Oleg Batrashev <ogbash@…> (02/08/11 20:01:48)

Message:

Save and loads the aggregates, but non-parallel has twice as more iterations.

Location:

src

Files:

• datatypes/Aggregate_mod.F90 (modified) (1 diff)
• datatypes/Aggregate_utils.f90 (added)
• datatypes/Makefile.am (modified) (1 diff)
• main/aggr.F90 (modified) (5 diffs)

src/datatypes/Aggregate_mod.F90

@@ -1008 +1008 @@
  end subroutine cprintall
 
- !> Write out aggregates to the specified file.
- !! If coarse aggregates are specified then it used to map fine aggregates to 
- !! coarse aggregates and write coarse aggregate numbers to file.
- subroutine Aggr_writeFile(aggr, filename, caggr)
-   type(Aggrs), intent(in) :: aggr !< fine aggregates
-   character(*) :: filename
-   type(Aggrs), intent(in), optional :: caggr !< coarse aggregates
-   integer :: i
-
-   open(78, file=filename)
-   if (.NOT.present(caggr)) then
-      write (78,*) aggr%nagr, size(aggr%num)
-      do i=1,size(aggr%num)
-         write (78,*) aggr%num(i)
-      end do
-   else
-      write (78,*) caggr%nagr, size(aggr%num)
-      do i=1,size(aggr%num)
-         write (78,*) caggr%num(aggr%num(i))
-      end do
-   end if
-   close(78)
- end subroutine Aggr_writeFile
-
- !> Write all aggregates to file for testing with non-paralel case.
- subroutine Aggrs_writeFile(M, fAggr, cAggr, filename)
-   type(Mesh), intent(in) :: M
-   type(AggrInfo), intent(in) :: fAggr, cAggr
-   character(*), intent(in) :: filename
-
-   open(79, file=filename)
-   
-   close(79)
-   
- end subroutine Aggrs_writeFile
 !------------------------------------------------------
 end Module Aggregate_mod

src/datatypes/Makefile.am

@@ -2 +2 @@
 libdoug_la_SOURCES += \
         datatypes/Aggregate_mod.F90 \
+        datatypes/Aggregate_utils.f90 \
         datatypes/Graph.f90 \
         datatypes/Decomposition.f90 \

src/main/aggr.F90

@@ -72 +72 @@
   use solvers_mod
   use Aggregate_mod
+  use Aggregate_utils_mod
   use CoarseMtx_mod
   use CoarseAllgathers
@@ -167 +168 @@
       plotting=sctls%plotting
     endif
-    !call SpMtx_aggregate(A,aggr_radius1, &
-    !       minaggrsize=min_asize1,       &
-    !       maxaggrsize=max_asize1,       &
-    !       alpha=strong_conn1,           &
-    !       M=M,                          &
-    !       plotting=plotting)    
-    !call SpMtx_unscale(A)
-    ! todo: to be rewritten with aggr%starts and aggr%nodes...:
-
-    !if (sctls%plotting>=2) then
-    !   call Aggr_writeFile(A%aggr%inner, 'aggr1.txt')
-    !end if
-
+
+    ! find fine aggregates
     if (numprocs > 1) then
       ! we need to create aggregates only on inner nodes, so use local matrix LA
@@ -195 +185 @@
       A%aggr => LA%aggr
       nullify(LA%aggr)
+
     else
       ! non-parallel case use the whole matrix
       call SpMtx_find_strong(A=A,alpha=strong_conn1)
-      call SpMtx_aggregate(A,aggr_radius1, &
-           minaggrsize=min_asize1,       &
-           maxaggrsize=max_asize1,       &
-           alpha=strong_conn1,           &
-           M=M,                          &
-           plotting=plotting)
-      call SpMtx_unscale(A)      
+      ! call SpMtx_aggregate(A,aggr_radius1, &
+      !      minaggrsize=min_asize1,       &
+      !      maxaggrsize=max_asize1,       &
+      !      alpha=strong_conn1,           &
+      !      M=M,                          &
+      !      plotting=plotting)
+      ! call SpMtx_unscale(A)
+      call Aggrs_readFile_fine(A%aggr, "aggregates.txt")
     end if
     ! profile info
@@ -302 +294 @@
         max_asize2=(2*aggr_radius2+1)**2
       endif
-      call SpMtx_aggregate(AC,aggr_radius2, &
-           minaggrsize=min_asize2,          &
-           maxaggrsize=max_asize2,          &
-           alpha=strong_conn2,              &
-           Afine=A)    
-      call SpMtx_unscale(AC)
+      ! call SpMtx_aggregate(AC,aggr_radius2, &
+      !      minaggrsize=min_asize2,          &
+      !      maxaggrsize=max_asize2,          &
+      !      alpha=strong_conn2,              &
+      !      Afine=A)    
+      ! call SpMtx_unscale(AC)
+      call Aggrs_readFile_coarse(AC%aggr, "aggregates.txt")
 
       ! profile info
@@ -331 +324 @@
     endif 
   endif
+
+  if (numprocs>1) then
+    call Aggrs_writeFile(M, A%aggr, AC%aggr, cdat, "aggregates.txt")
+  end if
 
   ! Testing UMFPACK: