Kludge: defined indx_map%cpy method, use same in %clone. To be reviewed

base/modules/desc/psb_gen_block_map_mod.F90

@@ -2094,8 +2094,8 @@ contains
 
     select type (outmap)
     type is (psb_gen_block_map) 
+      call idxmap%psb_indx_map%cpy(outmap%psb_indx_map,info)
       if (info == psb_success_) then 
-        outmap%psb_indx_map = idxmap%psb_indx_map
         outmap%min_glob_row = idxmap%min_glob_row
         outmap%max_glob_row = idxmap%max_glob_row
       end if

base/modules/desc/psb_glist_map_mod.f90

@@ -224,10 +224,8 @@ contains
     select type (outmap)
     type is (psb_glist_map) 
 
-      if (info == psb_success_) then 
+      call idxmap%psb_indx_map%cpy(outmap%psb_indx_map,info)
-        outmap%psb_indx_map = idxmap%psb_indx_map
+      if (info == psb_success_)  outmap%pnt_h = idxmap%pnt_h
-        outmap%pnt_h        = idxmap%pnt_h
-      end if
       if (info == psb_success_)&
            &  call psb_safe_ab_cpy(idxmap%loc_to_glob,outmap%loc_to_glob,info)
       if (info == psb_success_)&

base/modules/desc/psb_hash_map_mod.f90

@@ -1465,8 +1465,8 @@ contains
 
     select type (outmap)
     type is (psb_hash_map) 
+      call idxmap%psb_indx_map%cpy(outmap%psb_indx_map,info)
       if (info == psb_success_) then 
-        outmap%psb_indx_map = idxmap%psb_indx_map
         outmap%hashvsize    = idxmap%hashvsize
         outmap%hashvmask    = idxmap%hashvmask
       end if

base/modules/desc/psb_indx_map_mod.f90

@@ -168,6 +168,7 @@ module psb_indx_map_mod
     procedure, pass(idxmap)  :: asb   => base_asb
     procedure, pass(idxmap)  :: free  => base_free
     procedure, pass(idxmap)  :: clone => base_clone
+    procedure, pass(idxmap)  :: cpy   => base_cpy
     procedure, pass(idxmap)  :: reinit => base_reinit
 
 !!$    procedure, pass(idxmap)  :: l2gs1   => base_l2gs1
@@ -235,7 +236,7 @@ module psb_indx_map_mod
        & base_lg2ls1, base_lg2ls2, base_lg2lv1, base_lg2lv2,&
        & base_lg2ls1_ins, base_lg2ls2_ins, base_lg2lv1_ins,&
        & base_lg2lv2_ins, base_init_vl, base_is_null,&
-       & base_row_extendable, base_clone, base_reinit, &
+       & base_row_extendable, base_clone, base_cpy, base_reinit, &
        & base_set_halo_owner, base_get_halo_owner, &
        & base_fnd_halo_owner_s, base_fnd_halo_owner_v
   
@@ -1208,6 +1209,51 @@ contains
     return
   end subroutine base_clone
 
+  !
+  ! This is a kludge because we defined the outmap
+  ! in base_clone to be allocatable intent(out).
+  ! Should be revisited. 
+  !
+  subroutine base_cpy(idxmap,outmap,info)
+    use psb_penv_mod
+    use psb_error_mod
+    use psb_realloc_mod
+    implicit none 
+    class(psb_indx_map), intent(inout) :: idxmap
+    class(psb_indx_map), intent(out)   :: outmap
+    integer(psb_ipk_), intent(out)     :: info
+    integer(psb_ipk_) :: err_act
+    character(len=20)  :: name='base_clone'
+    logical, parameter :: debug=.false.
+
+    info = psb_success_
+
+    call psb_get_erraction(err_act)
+
+    outmap%state       = idxmap%state      
+    outmap%ictxt       = idxmap%ictxt      
+    outmap%mpic        = idxmap%mpic       
+    outmap%global_rows = idxmap%global_rows
+    outmap%global_cols = idxmap%global_cols
+    outmap%local_rows  = idxmap%local_rows 
+    outmap%local_cols  = idxmap%local_cols 
+    outmap%parts       => idxmap%parts 
+    if (info == psb_success_)&
+         &  call psb_safe_ab_cpy(idxmap%tempvg,outmap%tempvg,info)
+    if (info == psb_success_)&
+         &  call psb_safe_ab_cpy(idxmap%oracle,outmap%oracle,info)
+    if (info == psb_success_)&
+         &  call psb_safe_ab_cpy(idxmap%halo_owner,outmap%halo_owner,info)
+    
+    if (info /= 0) goto 9999
+
+    call psb_erractionrestore(err_act)
+    return
+9999 call psb_error_handler(err_act)
+
+    return
+  end subroutine base_cpy
+
 
   subroutine base_reinit(idxmap,info)
     use psb_penv_mod

base/modules/desc/psb_list_map_mod.f90

@@ -1200,8 +1200,8 @@ contains
 
     select type (outmap)
     type is (psb_list_map) 
+      call idxmap%psb_indx_map%cpy(outmap%psb_indx_map,info)
       if (info == psb_success_) then 
-        outmap%psb_indx_map = idxmap%psb_indx_map
         outmap%pnt_h        = idxmap%pnt_h
       end if
       if (info == psb_success_)&

base/modules/desc/psb_repl_map_mod.f90

@@ -818,7 +818,7 @@ contains
 
     select type (outmap)
     type is (psb_repl_map) 
-        outmap%psb_indx_map = idxmap%psb_indx_map
+      call idxmap%psb_indx_map%cpy(outmap%psb_indx_map,info)
     class default
       ! This should be impossible 
       info = -1