Changeset 41c5343

Timestamp:

12/15/10 18:20:30 (2 years ago)

Author:

Oleg Batrashev <ogbash@…>

Branches:

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

Children:

609702e

Parents:

82697a3

git-author:

Oleg Batrashev <ogbash@…> (12/15/10 18:20:30)

git-committer:

Oleg Batrashev <ogbash@…> (12/15/10 18:20:30)

Message:

Sort values in sum_with_interf subroutine.

File:

• src/solvers/subsolvers.F90 (modified) (6 diffs)

src/solvers/subsolvers.F90

@@ -27 +27 @@
   use DOUG_utils
   use Fact_class
+  use SpMtx_class
+  use SpMtx_arrangement
   implicit none
 
@@ -49 +51 @@
 contains
 
-  subroutine sum_with_interf(nnz, val, indi, indj, &
-                             nnz_interf, val_interf, indi_interf, indj_interf, &
-                             snnz, sval, sindi, sindj)
+  subroutine sum_with_interf(nfreds, &
+       nnz, val, indi, indj, &
+       nnz_interf, val_interf, indi_interf, indj_interf, &
+       snnz, sval, sindi, sindj)
     implicit none
-    integer,intent(in) :: nnz
+    integer,intent(in) :: nnz, nfreds
     real(kind=rk),dimension(:) :: val
     integer,dimension(:) :: indi,indj
@@ -63 +66 @@
     integer,dimension(:) :: sindi,sindj
     integer :: i, ii
+    type(SpMtx) :: TmpA ! temporary sparse matrix to sort the entries
 
     if (numprocs==1.or..not.present(nnz_interf)) then 
@@ -73 +77 @@
       enddo
     else
+      TmpA = SpMtx_newInit(nnz,nrows=nfreds,indi=indi(1:nnz),indj=indj(1:nnz),val=val(1:nnz))
+      call SpMtx_arrange(TmpA,sort=.true.)
+      indi(1:nnz) = TmpA%indi; indj(1:nnz) = TmpA%indj; val(1:nnz) = TmpA%val
+      call SpMtx_destroy(TmpA)
+      
       i=1;ii=1
       snnz=0
@@ -974 +983 @@
       else !}{
         ! the case of a single subdomain per processor:
-        call sum_with_interf(nnz, val, indi, indj, &
-                             nnz_interf, val_interf, indi_interf, indj_interf, &
-                             snnz, sval, sindi, sindj)
+        call sum_with_interf(nfreds, &
+             nnz, val, indi, indj, &
+             nnz_interf, val_interf, indi_interf, indj_interf, &
+             snnz, sval, sindi, sindj)
         nselind=nfreds
         selind(1:nselind)=(/ (i,i=1,nselind) /)
@@ -1361 +1371 @@
         else !-} {-
           ! the case of a single subdomain per processor:
-          call sum_with_interf(nnz, val, indi, indj, &
-                               nnz_interf, val_interf, indi_interf, indj_interf, &
-                               snnz, sval, sindi, sindj)
+          call sum_with_interf(nfreds, &
+               nnz, val, indi, indj, &
+               nnz_interf, val_interf, indi_interf, indj_interf, &
+               snnz, sval, sindi, sindj)
           nselind=nfreds
           selind(1:nselind)=(/ (i,i=1,nselind) /)