psblas3:

base/modules/Makefile
 base/modules/psb_gen_block_map_mod.f90
 base/modules/psb_hash_map_mod.f90
 docs/html/footnode.html
 docs/html/img1.png
 docs/html/img10.png
 docs/html/img100.png
 docs/html/img101.png
 docs/html/img102.png
 docs/html/img103.png
 docs/html/img104.png
 docs/html/img105.png
 docs/html/img106.png
 docs/html/img107.png
 docs/html/img108.png
 docs/html/img109.png
 docs/html/img11.png
 docs/html/img110.png
 docs/html/img111.png
 docs/html/img112.png
 docs/html/img113.png
 docs/html/img114.png
 docs/html/img115.png
 docs/html/img116.png
 docs/html/img117.png
 docs/html/img118.png
 docs/html/img119.png
 docs/html/img12.png
 docs/html/img120.png
 docs/html/img121.png
 docs/html/img122.png
 docs/html/img123.png
 docs/html/img124.png
 docs/html/img125.png
 docs/html/img126.png
 docs/html/img127.png
 docs/html/img128.png
 docs/html/img129.png
 docs/html/img13.png
 docs/html/img130.png
 docs/html/img131.png
 docs/html/img132.png
 docs/html/img133.png
 docs/html/img134.png
 docs/html/img135.png
 docs/html/img136.png
 docs/html/img137.png
 docs/html/img138.png
 docs/html/img139.png
 docs/html/img14.png
 docs/html/img140.png
 docs/html/img141.png
 docs/html/img142.png
 docs/html/img143.png
 docs/html/img144.png
 docs/html/img145.png
 docs/html/img146.png
 docs/html/img147.png
 docs/html/img148.png
 docs/html/img15.png
 docs/html/img16.png
 docs/html/img17.png
 docs/html/img18.png
 docs/html/img2.png
 docs/html/img20.png
 docs/html/img22.png
 docs/html/img23.png
 docs/html/img24.png
 docs/html/img25.png
 docs/html/img26.png
 docs/html/img27.png
 docs/html/img28.png
 docs/html/img29.png
 docs/html/img3.png
 docs/html/img30.png
 docs/html/img31.png
 docs/html/img32.png
 docs/html/img33.png
 docs/html/img34.png
 docs/html/img35.png
 docs/html/img36.png
 docs/html/img37.png
 docs/html/img38.png
 docs/html/img39.png
 docs/html/img4.png
 docs/html/img40.png
 docs/html/img41.png
 docs/html/img42.png
 docs/html/img43.png
 docs/html/img44.png
 docs/html/img45.png
 docs/html/img46.png
 docs/html/img47.png
 docs/html/img48.png
 docs/html/img49.png
 docs/html/img5.png
 docs/html/img50.png
 docs/html/img51.png
 docs/html/img52.png
 docs/html/img53.png
 docs/html/img54.png
 docs/html/img55.png
 docs/html/img56.png
 docs/html/img57.png
 docs/html/img58.png
 docs/html/img59.png
 docs/html/img6.png
 docs/html/img60.png
 docs/html/img61.png
 docs/html/img62.png
 docs/html/img63.png
 docs/html/img64.png
 docs/html/img65.png
 docs/html/img66.png
 docs/html/img67.png
 docs/html/img68.png
 docs/html/img69.png
 docs/html/img7.png
 docs/html/img70.png
 docs/html/img71.png
 docs/html/img72.png
 docs/html/img73.png
 docs/html/img74.png
 docs/html/img75.png
 docs/html/img76.png
 docs/html/img77.png
 docs/html/img78.png
 docs/html/img79.png
 docs/html/img8.png
 docs/html/img80.png
 docs/html/img81.png
 docs/html/img82.png
 docs/html/img83.png
 docs/html/img84.png
 docs/html/img85.png
 docs/html/img86.png
 docs/html/img87.png
 docs/html/img88.png
 docs/html/img89.png
 docs/html/img9.png
 docs/html/img90.png
 docs/html/img91.png
 docs/html/img92.png
 docs/html/img93.png
 docs/html/img94.png
 docs/html/img95.png
 docs/html/img96.png
 docs/html/img97.png
 docs/html/img98.png
 docs/html/img99.png
 docs/html/index.html
 docs/html/node1.html
 docs/html/node10.html
 docs/html/node100.html
 docs/html/node101.html
 docs/html/node102.html
 docs/html/node103.html
 docs/html/node104.html
 docs/html/node105.html
 docs/html/node106.html
 docs/html/node107.html
 docs/html/node108.html
 docs/html/node109.html
 docs/html/node11.html
 docs/html/node110.html
 docs/html/node111.html
 docs/html/node112.html
 docs/html/node113.html
 docs/html/node114.html
 docs/html/node115.html
 docs/html/node116.html
 docs/html/node117.html
 docs/html/node118.html
 docs/html/node119.html
 docs/html/node12.html
 docs/html/node13.html
 docs/html/node14.html
 docs/html/node15.html
 docs/html/node16.html
 docs/html/node17.html
 docs/html/node18.html
 docs/html/node19.html
 docs/html/node2.html
 docs/html/node20.html
 docs/html/node21.html
 docs/html/node22.html
 docs/html/node23.html
 docs/html/node24.html
 docs/html/node25.html
 docs/html/node26.html
 docs/html/node27.html
 docs/html/node28.html
 docs/html/node29.html
 docs/html/node3.html
 docs/html/node30.html
 docs/html/node31.html
 docs/html/node32.html
 docs/html/node33.html
 docs/html/node34.html
 docs/html/node35.html
 docs/html/node36.html
 docs/html/node37.html
 docs/html/node38.html
 docs/html/node39.html
 docs/html/node4.html
 docs/html/node40.html
 docs/html/node41.html
 docs/html/node42.html
 docs/html/node43.html
 docs/html/node44.html
 docs/html/node45.html
 docs/html/node46.html
 docs/html/node47.html
 docs/html/node48.html
 docs/html/node49.html
 docs/html/node5.html
 docs/html/node50.html
 docs/html/node51.html
 docs/html/node52.html
 docs/html/node53.html
 docs/html/node54.html
 docs/html/node55.html
 docs/html/node56.html
 docs/html/node57.html
 docs/html/node58.html
 docs/html/node59.html
 docs/html/node6.html
 docs/html/node60.html
 docs/html/node61.html
 docs/html/node62.html
 docs/html/node63.html
 docs/html/node64.html
 docs/html/node65.html
 docs/html/node66.html
 docs/html/node67.html
 docs/html/node68.html
 docs/html/node69.html
 docs/html/node7.html
 docs/html/node70.html
 docs/html/node71.html
 docs/html/node72.html
 docs/html/node73.html
 docs/html/node74.html
 docs/html/node75.html
 docs/html/node76.html
 docs/html/node77.html
 docs/html/node78.html
 docs/html/node79.html
 docs/html/node8.html
 docs/html/node80.html
 docs/html/node81.html
 docs/html/node82.html
 docs/html/node83.html
 docs/html/node84.html
 docs/html/node85.html
 docs/html/node86.html
 docs/html/node87.html
 docs/html/node88.html
 docs/html/node89.html
 docs/html/node9.html
 docs/html/node90.html
 docs/html/node91.html
 docs/html/node92.html
 docs/html/node93.html
 docs/html/node94.html
 docs/html/node95.html
 docs/html/node96.html
 docs/html/node97.html
 docs/html/node98.html
 docs/html/node99.html
 docs/html/userhtml.html
 docs/psblas-3.0.pdf
 docs/src/biblio.tex
 docs/src/datastruct.tex
 docs/src/intro.tex
 test/fileread/df_sample.f90
 test/fileread/runs/dfs.inp
 test/pargen/ppde.f90
 test/pargen/spde.f90

1. Worked on documentation.
2. Fixed performance problem with gen_block_map: changed to use a hash
internally. 
3. Changed ppde to implement a convection-diffusion problem with
centered differences.

base/modules/Makefile

@@ -93,6 +93,7 @@ psb_hash_map_mod.o psb_list_map_mod.o psb_repl_map_mod.o psb_gen_block_map_mod.o
 psb_glist_map_mod.o: psb_list_map_mod.o
 psb_hash_map_mod.o: psb_hash_mod.o psb_sort_mod.o
 psb_hash_mod.o: psb_realloc_mod.o psb_const_mod.o
+psb_gen_block_map_mod.o: psb_hash_mod.o
 psb_linmap_mod.o: psb_s_linmap_mod.o psb_d_linmap_mod.o psb_c_linmap_mod.o psb_z_linmap_mod.o 
 psb_s_linmap_mod.o: psb_base_linmap_mod.o psb_s_mat_mod.o psb_s_vect_mod.o
 psb_d_linmap_mod.o: psb_base_linmap_mod.o psb_d_mat_mod.o psb_d_vect_mod.o

base/modules/psb_gen_block_map_mod.f90

@@ -49,11 +49,13 @@ module psb_gen_block_map_mod
   use psb_const_mod
   use psb_desc_const_mod
   use psb_indx_map_mod
+  use psb_hash_mod
   
   type, extends(psb_indx_map) :: psb_gen_block_map
     integer(psb_ipk_) :: min_glob_row   = -1
     integer(psb_ipk_) :: max_glob_row   = -1
     integer(psb_ipk_), allocatable :: loc_to_glob(:), srt_l2g(:,:), vnl(:)
+    type(psb_hash_type)  :: hash
   contains
 
     procedure, pass(idxmap)  :: gen_block_map_init => block_init
@@ -106,14 +108,14 @@ contains
          & val = val + size(idxmap%srt_l2g)*psb_sizeof_int
     if (allocated(idxmap%vnl)) &
          & val = val + size(idxmap%vnl)*psb_sizeof_int
-
+    val = val + psb_sizeof(idxmap%hash)
   end function block_sizeof
 
 
   subroutine block_free(idxmap)
     implicit none 
     class(psb_gen_block_map), intent(inout) :: idxmap
-    
+    integer(psb_ipk_) :: info
     if (allocated(idxmap%loc_to_glob)) &
          & deallocate(idxmap%loc_to_glob)
     if (allocated(idxmap%srt_l2g)) &
@@ -121,7 +123,7 @@ contains
 
     if (allocated(idxmap%srt_l2g)) &
          & deallocate(idxmap%vnl)
-
+    call psb_free(idxmap%hash,info)
     call idxmap%psb_indx_map%free()
 
   end subroutine block_free
@@ -283,7 +285,7 @@ contains
     integer(psb_ipk_), intent(out)   :: info 
     logical, intent(in), optional :: mask(:)
     logical, intent(in), optional :: owned
-    integer(psb_ipk_) :: i, nv, is
+    integer(psb_ipk_) :: i, nv, is, ip, lip 
     integer(psb_ipk_) :: ictxt, iam, np
     logical :: owned_
 
@@ -329,9 +331,9 @@ contains
               idx(i) = idx(i) - idxmap%min_glob_row + 1
             else if ((1<= idx(i)).and.(idx(i) <= idxmap%global_rows)&
                  &.and.(.not.owned_)) then
-              nv  = idxmap%local_cols-idxmap%local_rows
+              ip = idx(i)
-              idx(i) = psb_issrch(idx(i),nv,idxmap%loc_to_glob)
+              call psb_hash_searchkey(ip,lip,idxmap%hash,info)
-              if (idx(i) > 0) idx(i) = idx(i) + idxmap%local_rows
+              if (lip > 0) idx(i) = lip + idxmap%local_rows
             else 
               idx(i) = -1
             end if
@@ -365,9 +367,9 @@ contains
             idx(i) = idx(i) - idxmap%min_glob_row + 1
           else if ((1<= idx(i)).and.(idx(i) <= idxmap%global_rows)&
                &.and.(.not.owned_)) then
-            nv  = idxmap%local_cols-idxmap%local_rows
+            ip = idx(i)
-            idx(i) = psb_issrch(idx(i),nv,idxmap%loc_to_glob)
+            call psb_hash_searchkey(ip,lip,idxmap%hash,info)
-            if (idx(i) > 0) idx(i) = idx(i) + idxmap%local_rows
+            if (lip > 0) idx(i) = lip + idxmap%local_rows
           else 
             idx(i) = -1
           end if
@@ -447,6 +449,8 @@ contains
     integer(psb_ipk_), intent(out)   :: info 
     logical, intent(in), optional :: mask(:)
     integer(psb_ipk_) :: i, nv, is, ix
+    integer(psb_ipk_) :: ip, lip, nxt
+
 
     info = 0
     is = size(idx)
@@ -473,20 +477,21 @@ contains
               idx(i) = idx(i) - idxmap%min_glob_row + 1
             else if ((1<= idx(i)).and.(idx(i) <= idxmap%global_rows)) then
               nv  = idxmap%local_cols-idxmap%local_rows
-              ix  = psb_issrch(idx(i),nv,idxmap%loc_to_glob)
+              nxt = nv + 1 
-              if (ix < 0) then 
+              ip = idx(i) 
-                ix = idxmap%local_cols + 1
+              call psb_hash_searchinskey(ip,lip,nxt,idxmap%hash,info)
-                call psb_ensure_size(ix,idxmap%loc_to_glob,info,addsz=500)
+              
+              if (lip == nxt) then 
+                ! We have added one item
+                call psb_ensure_size(nxt,idxmap%loc_to_glob,info,addsz=500)
                 if (info /= 0) then 
                   info = -4
                   return
                 end if
-                idxmap%local_cols      = ix
+                idxmap%local_cols       = nxt + idxmap%local_rows
-                ix                     = ix - idxmap%local_rows
+                idxmap%loc_to_glob(nxt) = idx(i)
-                idxmap%loc_to_glob(ix) = idx(i)
               end if
-              ix                       = ix + idxmap%local_rows
+              idx(i)  = lip + idxmap%local_rows
-              idx(i)                   = ix
             else 
               idx(i) = -1
               info = -1
@@ -502,20 +507,21 @@ contains
             idx(i) = idx(i) - idxmap%min_glob_row + 1
           else if ((1<= idx(i)).and.(idx(i) <= idxmap%global_rows)) then
             nv  = idxmap%local_cols-idxmap%local_rows
-            ix  = psb_issrch(idx(i),nv,idxmap%loc_to_glob)
+            nxt = nv + 1 
-            if (ix < 0) then 
+            ip = idx(i) 
-              ix = idxmap%local_cols + 1
+            call psb_hash_searchinskey(ip,lip,nxt,idxmap%hash,info)
-              call psb_ensure_size(ix,idxmap%loc_to_glob,info,addsz=500)
+            
+            if (lip == nxt) then 
+              ! We have added one item
+              call psb_ensure_size(nxt,idxmap%loc_to_glob,info,addsz=500)
               if (info /= 0) then 
                 info = -4
                 return
               end if
-              idxmap%local_cols      = ix
+              idxmap%local_cols       = nxt + idxmap%local_rows
-              ix                     = ix - idxmap%local_rows
+              idxmap%loc_to_glob(nxt) = idx(i)
-              idxmap%loc_to_glob(ix) = idx(i)
             end if
-            ix                       = ix + idxmap%local_rows
+            idx(i)  = lip + idxmap%local_rows
-            idx(i)                   = ix
           else 
             idx(i) = -1
             info = -1
@@ -629,9 +635,9 @@ contains
       info = -2
       return
     end if
+    call psb_hash_init(nl,idxmap%hash,info)
     call idxmap%set_state(psb_desc_bld_)
     
-    
   end subroutine block_init
 
 
@@ -659,8 +665,8 @@ contains
     call psb_msort(idxmap%srt_l2g(:,1),&
          & ix=idxmap%srt_l2g(:,2),dir=psb_sort_up_)
 
+    call psb_free(idxmap%hash,info)
     call idxmap%set_state(psb_desc_asb_)
-    
   end subroutine block_asb
 
   function block_get_fmt() result(res)
@@ -710,6 +716,9 @@ contains
            &  call psb_safe_ab_cpy(idxmap%vnl,outmap%vnl,info)
       if (info == psb_success_)&
            &  call psb_safe_ab_cpy(idxmap%srt_l2g,outmap%srt_l2g,info)
+      if (info == psb_success_)&
+           &  call psb_hash_copy(idxmap%hash,outmap%hash,info)
+
     class default
       ! This should be impossible 
       info = -1

docs/html/footnode.html

@@ -18,14 +18,14 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 
 <LINK REL="STYLESHEET" HREF="userhtml.css">
 
-<LINK REL="previous" HREF="node107.html">
+<LINK REL="previous" HREF="node118.html">
 <LINK REL="up" HREF="userhtml.html">
 </HEAD>
 
 <BODY >
 
 <DL>
-<DT><A NAME="foot167">...
+<DT><A NAME="foot166">...
 explicitly</A><A
  HREF="node3.html#tex2html2"><SUP>1</SUP></A></DT>
 <DD>In our prototype implementation  we provide 
@@ -63,7 +63,7 @@ sample scatter/gather routines.
 .
 </PRE>
 </DD>
-<DT><A NAME="foot176">... domain</A><A
+<DT><A NAME="foot175">... domain</A><A
  HREF="node4.html#tex2html3"><SUP>2</SUP></A></DT>
 <DD>This is
   the normal situation when the pattern of the sparse matrix is
@@ -104,8 +104,8 @@ sample scatter/gather routines.
 .
 </PRE>
 </DD>
-<DT><A NAME="foot6742">... follows</A><A
+<DT><A NAME="foot6820">... follows</A><A
- HREF="node101.html#tex2html28"><SUP>3</SUP></A></DT>
+ HREF="node112.html#tex2html29"><SUP>3</SUP></A></DT>
 <DD>The string is case-insensitive
 
 <PRE>.