Add .VERSION file

.VERSION

@@ -1,6 +1,6 @@
 $Format:%d%n%n$
 # Fall back version, probably last release:
-1.2.1
+1.2.0
 
 # AMG4PSBLAS version file.
 #

CMakeLists.txt

@@ -13,10 +13,15 @@ endif()
 
 
 # Check for the installation path for psblas
-message(STATUS "psblas directory is ${PSBLAS_INSTALL_DIR};")
+#if(NOT DEFINED PSBLAS_INSTALL_DIR)
+#    message(FATAL_ERROR "Please specify the path to the psblas installation directory using -DPSBLAS_INSTALL_DIR=<path>")
+#endif()
+message(STATUS "psblas directory is ${PSBLAS_INSTALL_DIR};;")
+
 
 message(STATUS "PSBLAS DIRECTORY INC ${INCDIR}; MOD ${MODDIR}; LIB ${LIBDIR};")
 
+
 #set(CMAKE_CXX_STANDARD 17) # Set cxx standard for the c++ part of the library
 
 
@@ -26,7 +31,7 @@ find_package(psblas REQUIRED PATHS ${PSBLAS_INSTALL_DIR})
 if(NOT psblas_FOUND)
     message(FATAL_ERROR "PSBLAS not found!")
 else()
-    message(STATUS "Found PSBLAS: ${PSBLAS_LIBRARIES}")
+    message(STATUS "Found PSBLAS: ${psblas_LIBRARIES}")
 endif()
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -37,9 +42,9 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     message(STATUS "Fortran and CXX debug flags added: -g")
 endif()
 
-string(APPEND CMAKE_Fortran_FLAGS " -O2")
-string(APPEND CMAKE_CXX_FLAGS " -O2")
-message(STATUS "Fortran and CXX optimization flags added: -O2")
+    string(APPEND CMAKE_Fortran_FLAGS " -O2")
+    string(APPEND CMAKE_CXX_FLAGS " -O2")
+    message(STATUS "Fortran and CXX optimization flags added: -O2")
 
 
 
@@ -425,9 +430,7 @@ target_include_directories(amgcbind PUBLIC ${INCDIR} ${MODDIR})
 target_link_libraries(amgcbind
   #PUBLIC ${LAPACK_LINKER_FLAGS} ${LAPACK_LIBRARIES} ${LAPACK95_LIBRARIES}
   #PUBLIC ${BLAS_LINKER_FLAGS} ${BLAS_LIBRARIES} ${BLAS95_LIBRARIES}
-  PUBLIC amgprec psblas::util psblas::linsolve psblas::prec
-  psblas::ext psblas::cbind psblas::base)
-  #TODO  check actual libraries needed
+  PUBLIC amgprec psblas::util psblas::linsolve psblas::prec psblas::ext psblas::cbind psblas::base)  #TODO  check actual libraries needed
 
 
 

LICENSE

@@ -7,7 +7,7 @@
     (C) Copyright 2025  Salvatore Filippone
     (C) Copyright 2025  Pasqua D'Ambra
     (C) Copyright 2025  Fabio Durastante
-    
+   
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
     are met:

Make.inc.in

@@ -71,7 +71,7 @@ EXTRALIBS=@EXTRA_LIBS@
 
 #
 AMGCDEFINES=$(SLUFLAGS) $(UMFFLAGS) $(SLUDISTFLAGS)
-#$(PSBCDEFINES) $(MUMPSFLAGS) 
+#$(PSBCDEFINES) $(MUMPSFLAGS)
 CDEFINES=$(AMGCDEFINES)
 AMGFDEFINES=@AMGFDEFINES@ $(PSBFDEFINES)
 FDEFINES=$(AMGFDEFINES)

Makefile

@@ -19,7 +19,7 @@ libdir:
 amgobjs: mods
 	cd amgprec && $(MAKE) objs
 
-cbnd: amgobjs
+cbnd: mods
 	cd cbind && $(MAKE)  objs
 
 install: all

amgprec/Makefile

@@ -58,8 +58,7 @@ MODOBJS=amg_base_prec_type.o amg_prec_type.o  amg_prec_mod.o \
 	$(SMODOBJS) $(DMODOBJS) $(CMODOBJS) $(ZMODOBJS)
 
 
-LOCAL_MODS=$(MODOBJS:.o=$(.mod)) amg_c_l1_diag_solver$(.mod) amg_s_l1_diag_solver$(.mod) \
-	amg_d_l1_diag_solver$(.mod) amg_z_l1_diag_solver$(.mod)
+LOCAL_MODS=$(MODOBJS:.o=$(.mod))
 LIBNAME=libamg_prec.a
 
 all: mods  objs impld
@@ -71,7 +70,7 @@ objs: mods impld
 impld: mods
 	cd impl && $(MAKE) 
 
-lib: objs
+lib: mods impld
 	cd impl && $(MAKE) lib
 	$(AR) $(HERE)/$(LIBNAME) $(MODOBJS)
 	$(RANLIB) $(HERE)/$(LIBNAME)
@@ -80,7 +79,7 @@ lib: objs
 
 $(MODOBJS): $(PSBLAS_MODDIR)/$(PSBBASEMODNAME)$(.mod)
 
-amg_base_prec_type.o: amg_config.h
+#amg_base_prec_type.o: amg_const.h
 amg_s_prec_type.o amg_d_prec_type.o amg_c_prec_type.o amg_z_prec_type.o	: amg_base_prec_type.o
 amg_prec_type.o: amg_s_prec_type.o amg_d_prec_type.o amg_c_prec_type.o amg_z_prec_type.o
 amg_prec_mod.o: amg_prec_type.o amg_s_prec_mod.o amg_d_prec_mod.o amg_c_prec_mod.o amg_z_prec_mod.o

amgprec/amg_base_prec_type.F90

@@ -84,7 +84,7 @@ module amg_base_prec_type
   character(len=*), parameter   :: amg_version_string_ = "1.2.0"
   integer(psb_ipk_), parameter  :: amg_version_major_  = 1
   integer(psb_ipk_), parameter  :: amg_version_minor_  = 2
-  integer(psb_ipk_), parameter  :: amg_patchlevel_     = 1
+  integer(psb_ipk_), parameter  :: amg_patchlevel_     = 0
 
   type amg_ml_parms
     integer(psb_ipk_) :: sweeps_pre, sweeps_post

amgprec/amg_c_ainv_solver.F90

@@ -103,7 +103,7 @@ module amg_c_ainv_solver
       Implicit None
 
       ! Arguments
-      type(psb_cspmat_type), intent(inout), target        :: a
+      type(psb_cspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_c_ainv_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                      :: info
@@ -225,7 +225,7 @@ module amg_c_ainv_solver
       import :: psb_desc_type, psb_cspmat_type,  psb_c_base_sparse_mat, &
            & psb_d_vect_type, psb_c_base_vect_type, psb_spk_, psb_ipk_
       implicit none
-      type(psb_cspmat_type), intent(inout), target  :: a
+      type(psb_cspmat_type), intent(in), target   :: a
       integer(psb_ipk_), intent(in)               :: fillin,alg
       real(psb_spk_), intent(in)                  :: thresh
       type(psb_cspmat_type), intent(inout)        :: wmat, zmat

amgprec/amg_c_as_smoother.f90

@@ -230,7 +230,7 @@ module amg_c_as_smoother
            & psb_desc_type, psb_c_base_sparse_mat, psb_ipk_,&
            & psb_i_base_vect_type
       implicit none 
-      type(psb_cspmat_type), intent(inout), target     :: a
+      type(psb_cspmat_type), intent(in), target        :: a
       Type(psb_desc_type), Intent(inout)                 :: desc_a 
       class(amg_c_as_smoother_type), intent(inout)       :: sm
       integer(psb_ipk_), intent(out)                     :: info

amgprec/amg_c_base_aggregator_mod.f90

@@ -89,7 +89,7 @@ module amg_c_base_aggregator_mod
     procedure, pass(ag) :: bld_tprol   => amg_c_base_aggregator_build_tprol
     procedure, pass(ag) :: mat_bld     => amg_c_base_aggregator_mat_bld
     procedure, pass(ag) :: mat_asb     => amg_c_base_aggregator_mat_asb
-    procedure, pass(ag) :: bld_linmap  => amg_c_base_aggregator_bld_linmap
+    procedure, pass(ag) :: bld_map     => amg_c_base_aggregator_bld_map
     procedure, pass(ag) :: update_next => amg_c_base_aggregator_update_next
     procedure, pass(ag) :: clone       => amg_c_base_aggregator_clone
     procedure, pass(ag) :: free        => amg_c_base_aggregator_free
@@ -458,7 +458,7 @@ contains
   end subroutine amg_c_base_aggregator_mat_asb
 
   !
-  !> Function   bld_linmap
+  !> Function   bld_map
   !! \memberof  amg_c_base_aggregator_type
   !! \brief     Build linear map between hierarchy levels 
   !!
@@ -473,7 +473,7 @@ contains
   !!  \param map       The output map
   !!  \param info    Return code
   !!  
-  subroutine  amg_c_base_aggregator_bld_linmap(ag,desc_a,desc_ac,ilaggr,nlaggr,&
+  subroutine  amg_c_base_aggregator_bld_map(ag,desc_a,desc_ac,ilaggr,nlaggr,&
        & op_restr,op_prol,map,info)
     use psb_base_mod
     implicit none
@@ -484,7 +484,7 @@ contains
     type(psb_clinmap_type), intent(out)    :: map
     integer(psb_ipk_), intent(out)       :: info
     integer(psb_ipk_) :: err_act
-    character(len=20) :: name='c_base_aggregator_bld_linmap'
+    character(len=20) :: name='c_base_aggregator_bld_map'
 
     info = psb_success_
     call psb_erractionsave(err_act)
@@ -508,6 +508,7 @@ contains
 9999 call psb_error_handler(err_act)
 
     return
-  end subroutine amg_c_base_aggregator_bld_linmap
+  end subroutine amg_c_base_aggregator_bld_map
+
 
 end module amg_c_base_aggregator_mod

amgprec/amg_c_base_smoother_mod.f90

@@ -237,7 +237,7 @@ module amg_c_base_smoother_mod
            & psb_c_vect_type, psb_c_base_vect_type, psb_spk_, &
            & amg_c_base_smoother_type, psb_ipk_, psb_i_base_vect_type
       ! Arguments
-      type(psb_cspmat_type), intent(inout), target  :: a
+      type(psb_cspmat_type), intent(in), target     :: a
       Type(psb_desc_type), Intent(inout)              :: desc_a 
       class(amg_c_base_smoother_type), intent(inout) :: sm 
       integer(psb_ipk_), intent(out)                  :: info

amgprec/amg_c_base_solver_mod.f90

@@ -170,7 +170,7 @@ module amg_c_base_solver_mod
       Implicit None
       
       ! Arguments
-      type(psb_cspmat_type), intent(inout), target          :: a
+      type(psb_cspmat_type), intent(in), target             :: a
       Type(psb_desc_type), Intent(inout)                    :: desc_a 
       class(amg_c_base_solver_type), intent(inout)          :: sv
       integer(psb_ipk_), intent(out)                        :: info

amgprec/amg_c_diag_solver.f90

@@ -119,7 +119,7 @@ module amg_c_diag_solver
       import :: psb_desc_type, psb_cspmat_type,  psb_c_base_sparse_mat, &
            & psb_c_vect_type, psb_c_base_vect_type, psb_spk_, &
            & amg_c_diag_solver_type, psb_ipk_, psb_i_base_vect_type      
-      type(psb_cspmat_type), intent(inout), target        :: a
+      type(psb_cspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                    :: desc_a 
       class(amg_c_diag_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                        :: info
@@ -331,7 +331,7 @@ module amg_c_l1_diag_solver
       import :: psb_desc_type, psb_cspmat_type,  psb_c_base_sparse_mat, &
            & psb_c_vect_type, psb_c_base_vect_type, psb_spk_, &
            & amg_c_l1_diag_solver_type, psb_ipk_, psb_i_base_vect_type      
-      type(psb_cspmat_type), intent(inout), target        :: a
+      type(psb_cspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                    :: desc_a 
       class(amg_c_l1_diag_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                        :: info

amgprec/amg_c_gs_solver.f90

@@ -181,7 +181,7 @@ module amg_c_gs_solver
            & psb_cspmat_type, psb_c_base_sparse_mat, psb_c_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_cspmat_type), intent(inout), target        :: a
+      type(psb_cspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_c_gs_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info
@@ -195,7 +195,7 @@ module amg_c_gs_solver
            & psb_cspmat_type, psb_c_base_sparse_mat, psb_c_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_cspmat_type), intent(inout), target        :: a
+      type(psb_cspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_c_bwgs_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_c_id_solver.f90

@@ -123,7 +123,7 @@ contains
     Implicit None
 
     ! Arguments
-    type(psb_cspmat_type), intent(inout), target        :: a
+    type(psb_cspmat_type), intent(in), target           :: a
     Type(psb_desc_type), Intent(inout)                  :: desc_a 
     class(amg_c_id_solver_type), intent(inout)          :: sv
     integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_c_ilu_solver.f90

@@ -144,7 +144,7 @@ module amg_c_ilu_solver
            & psb_cspmat_type, psb_c_base_sparse_mat, psb_c_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_cspmat_type), intent(inout), target        :: a
+      type(psb_cspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_c_ilu_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_c_inner_mod.f90

@@ -56,7 +56,7 @@ module amg_c_inner_mod
            & psb_spk_, psb_c_base_sparse_mat, psb_c_base_vect_type, psb_ipk_
       import :: amg_cprec_type
       implicit none
-      type(psb_cspmat_type), intent(inout), target       :: a
+      type(psb_cspmat_type), intent(in), target          :: a
       type(psb_desc_type), intent(inout), target           :: desc_a
       type(amg_cprec_type), intent(inout), target        :: prec
       integer(psb_ipk_), intent(out)                       :: info
@@ -67,7 +67,7 @@ module amg_c_inner_mod
   end interface amg_mlprec_bld
 
   interface amg_mlprec_aply
-    subroutine amg_cmlprec_aply_a(alpha,p,x,beta,y,desc_data,trans,work,info)
+    subroutine amg_cmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info)
       import :: psb_cspmat_type, psb_desc_type, psb_spk_, psb_ipk_
       import :: amg_cprec_type
       implicit none 
@@ -79,7 +79,7 @@ module amg_c_inner_mod
       character,intent(in)               :: trans
       complex(psb_spk_),target             :: work(:)
       integer(psb_ipk_), intent(out)     :: info
-    end subroutine amg_cmlprec_aply_a
+    end subroutine amg_cmlprec_aply
     subroutine amg_cmlprec_aply_vect(alpha,p,x,beta,y,desc_data,trans,work,info)
       import :: psb_cspmat_type, psb_desc_type, &
            & psb_spk_, psb_c_vect_type, psb_ipk_

amgprec/amg_c_invk_solver.f90

@@ -94,7 +94,7 @@ module amg_c_invk_solver
       Implicit None
 
       ! Arguments
-      type(psb_cspmat_type), intent(inout), target        :: a
+      type(psb_cspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_c_invk_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_c_invt_solver.f90

@@ -94,7 +94,7 @@ module amg_c_invt_solver
       Implicit None
 
       ! Arguments
-      type(psb_cspmat_type), intent(inout), target        :: a
+      type(psb_cspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_c_invt_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_c_jac_smoother.f90

@@ -151,7 +151,7 @@ module amg_c_jac_smoother
       import :: psb_desc_type, amg_c_jac_smoother_type, psb_c_vect_type, psb_spk_, &
            & psb_cspmat_type, psb_c_base_sparse_mat, psb_c_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
-      type(psb_cspmat_type), intent(inout), target        :: a
+      type(psb_cspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_c_jac_smoother_type), intent(inout)       :: sm
       integer(psb_ipk_), intent(out)                      :: info
@@ -274,7 +274,7 @@ module amg_c_jac_smoother
       import :: psb_desc_type, amg_c_l1_jac_smoother_type, psb_c_vect_type, &
            & psb_cspmat_type, psb_c_base_sparse_mat, psb_c_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
-      type(psb_cspmat_type), intent(inout), target        :: a
+      type(psb_cspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_c_l1_jac_smoother_type), intent(inout)       :: sm
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_c_jac_solver.f90

@@ -143,7 +143,7 @@ module amg_c_jac_solver
            & psb_cspmat_type, psb_c_base_sparse_mat, psb_c_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_cspmat_type), intent(inout), target        :: a
+      type(psb_cspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_c_jac_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info
@@ -160,7 +160,7 @@ module amg_c_jac_solver
            & psb_cspmat_type, psb_c_base_sparse_mat, psb_c_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_cspmat_type), intent(inout), target        :: a
+      type(psb_cspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_c_l1_jac_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_c_krm_solver.f90

@@ -174,7 +174,7 @@ module amg_c_krm_solver
            & psb_cspmat_type, psb_c_base_sparse_mat, psb_c_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none
-      type(psb_cspmat_type), intent(inout), target        :: a
+      type(psb_cspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_c_krm_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_c_mumps_solver.F90

@@ -163,7 +163,7 @@ module amg_c_mumps_solver
       Implicit None
 
       ! Arguments
-      type(psb_cspmat_type), intent(inout), target        :: a
+      type(psb_cspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_c_mumps_solver_type), intent(inout)       :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_c_onelev_mod.f90

@@ -154,35 +154,13 @@ module amg_c_onelev_mod
   private :: c_wrk_alloc, c_wrk_free, &
        & c_wrk_clone, c_wrk_move_alloc, c_wrk_cnv, c_wrk_sizeof
 
-  !
-  ! Remap.
-  !  This keeps track of remapping.
-  !  Logic here is as follows:
-  !  1. AC_PRE_REMAP  need to figure out if we
-  !                really need it.
-  !  2. DESC_AC_PRE_REMAP  contains the descriptor before
-  !                remapping. Meaning that it is possible
-  !                to implement the RESTRICTOR operator by
-  !                 a. Doing LINMAP_U2V onto this one
-  !                 b. For each process, send the data to
-  !                    IDEST.
-  !                This assumes that remapping goes by
-  !                a factor of 2.
-  !                For the PROLONGATOR operators, we first
-  !                use DESC_AC, then split and send onto
-  !                the processes in DESC_AC_PRE_REMAP.
-  !
-  ! To be fixed: what happens if NP the starting processes
-  ! is not an even number? Coordinate with _X_remap in PSBLAS
-  ! 
   type amg_c_remap_data_type
     type(psb_cspmat_type)          :: ac_pre_remap
     type(psb_desc_type)            :: desc_ac_pre_remap
     integer(psb_ipk_)              :: idest
     integer(psb_ipk_), allocatable :: isrc(:), nrsrc(:), naggr(:)
   contains
-    procedure, pass(rmp) :: clone      => c_remap_data_clone
-    procedure, pass(rmp) :: move_alloc => c_remap_move_alloc
+    procedure, pass(rmp) :: clone   => c_remap_data_clone
   end type amg_c_remap_data_type
 
   type amg_c_onelev_type
@@ -228,7 +206,7 @@ module amg_c_onelev_mod
     procedure, pass(lv) :: get_wrksz => c_base_onelev_get_wrksize
     procedure, pass(lv) :: allocate_wrk   => c_base_onelev_allocate_wrk
     procedure, pass(lv) :: free_wrk       => c_base_onelev_free_wrk
-    procedure, nopass   :: stringval  => amg_stringval
+    procedure, nopass   :: stringval => amg_stringval
     procedure, pass(lv) :: move_alloc => c_base_onelev_move_alloc
 
 
@@ -252,7 +230,9 @@ module amg_c_onelev_mod
        & c_base_onelev_free_wrk
 
   interface
-    module subroutine amg_c_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,t_prol,info)
+    subroutine amg_c_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,t_prol,info)
+      import :: psb_cspmat_type, psb_desc_type, psb_spk_, psb_ipk_, psb_lcspmat_type, psb_lpk_
+      import :: amg_c_onelev_type
       implicit none
       class(amg_c_onelev_type), intent(inout), target :: lv
       type(psb_cspmat_type), intent(in) :: a
@@ -264,7 +244,10 @@ module amg_c_onelev_mod
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_build(lv,info,amold,vmold,imold,ilv)
+    subroutine amg_c_base_onelev_build(lv,info,amold,vmold,imold,ilv)
+      import :: psb_c_base_sparse_mat, psb_c_base_vect_type, &
+           & psb_i_base_vect_type, psb_spk_, amg_c_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
       class(amg_c_onelev_type), target, intent(inout) :: lv
       integer(psb_ipk_), intent(out) :: info
@@ -276,7 +259,10 @@ module amg_c_onelev_mod
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_descr(lv,il,nl,ilmin,info,iout, verbosity,prefix)
+    subroutine amg_c_base_onelev_descr(lv,il,nl,ilmin,info,iout, verbosity,prefix)
+      import :: psb_cspmat_type, psb_c_vect_type, psb_c_base_vect_type, &
+           & psb_clinmap_type, psb_spk_, amg_c_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
       ! Arguments
       class(amg_c_onelev_type), intent(in)    :: lv
@@ -289,8 +275,10 @@ module amg_c_onelev_mod
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_memory_use(lv,il,nl,ilmin,info,&
-         & iout,verbosity, prefix,global) 
+    subroutine amg_c_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity, prefix,global)
+      import :: psb_cspmat_type, psb_c_vect_type, psb_c_base_vect_type, &
+           & psb_clinmap_type, psb_spk_, amg_c_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
       ! Arguments
       class(amg_c_onelev_type), intent(in)    :: lv
@@ -304,7 +292,10 @@ module amg_c_onelev_mod
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_cnv(lv,info,amold,vmold,imold)
+    subroutine amg_c_base_onelev_cnv(lv,info,amold,vmold,imold)
+      import :: amg_c_onelev_type, psb_c_base_vect_type, psb_spk_, &
+           & psb_c_base_sparse_mat, psb_ipk_, psb_i_base_vect_type
+      ! Arguments
       class(amg_c_onelev_type), intent(inout)            :: lv
       integer(psb_ipk_), intent(out)                     :: info
       class(psb_c_base_sparse_mat), intent(in), optional :: amold
@@ -314,32 +305,48 @@ module amg_c_onelev_mod
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_free(lv,info)
+    subroutine amg_c_base_onelev_free(lv,info)
+      import :: psb_cspmat_type, psb_c_vect_type, psb_c_base_vect_type, &
+           & psb_clinmap_type, psb_spk_, amg_c_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
+
       class(amg_c_onelev_type), intent(inout) :: lv
       integer(psb_ipk_), intent(out)                :: info
     end subroutine amg_c_base_onelev_free
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_free_smoothers(lv,info)
+    subroutine amg_c_base_onelev_free_smoothers(lv,info)
+      import :: psb_cspmat_type, psb_c_vect_type, psb_c_base_vect_type, &
+           & psb_clinmap_type, psb_spk_, amg_c_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
+
       class(amg_c_onelev_type), intent(inout) :: lv
       integer(psb_ipk_), intent(out)                :: info
     end subroutine amg_c_base_onelev_free_smoothers
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_check(lv,info)
+    subroutine amg_c_base_onelev_check(lv,info)
+      import :: psb_cspmat_type, psb_c_vect_type, psb_c_base_vect_type, &
+           & psb_clinmap_type, psb_spk_, amg_c_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+      ! Arguments
       class(amg_c_onelev_type), intent(inout) :: lv
       integer(psb_ipk_), intent(out)            :: info
     end subroutine amg_c_base_onelev_check
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_setsm(lv,val,info,pos)
+    subroutine amg_c_base_onelev_setsm(lv,val,info,pos)
+      import :: psb_spk_, amg_c_onelev_type, amg_c_base_smoother_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_c_onelev_type), target, intent(inout) :: lv
       class(amg_c_base_smoother_type), intent(in)     :: val
       integer(psb_ipk_), intent(out)                  :: info
@@ -348,8 +355,12 @@ module amg_c_onelev_mod
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_setsv(lv,val,info,pos)
+    subroutine amg_c_base_onelev_setsv(lv,val,info,pos)
+      import :: psb_spk_, amg_c_onelev_type, amg_c_base_solver_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_c_onelev_type), target, intent(inout) :: lv
       class(amg_c_base_solver_type), intent(in)       :: val
       integer(psb_ipk_), intent(out)                  :: info
@@ -358,8 +369,12 @@ module amg_c_onelev_mod
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_setag(lv,val,info,pos)
+    subroutine amg_c_base_onelev_setag(lv,val,info,pos)
+      import :: psb_spk_, amg_c_onelev_type, amg_c_base_aggregator_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_c_onelev_type), target, intent(inout) :: lv
       class(amg_c_base_aggregator_type), intent(in)       :: val
       integer(psb_ipk_), intent(out)                  :: info
@@ -368,8 +383,13 @@ module amg_c_onelev_mod
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_cseti(lv,what,val,info,pos,idx)
+    subroutine amg_c_base_onelev_cseti(lv,what,val,info,pos,idx)
+      import :: psb_cspmat_type, psb_c_vect_type, psb_c_base_vect_type, &
+           & psb_clinmap_type, psb_spk_, amg_c_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_c_onelev_type), intent(inout) :: lv
       character(len=*), intent(in)              :: what
       integer(psb_ipk_), intent(in)             :: val
@@ -380,8 +400,12 @@ module amg_c_onelev_mod
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_csetc(lv,what,val,info,pos,idx)
+    subroutine amg_c_base_onelev_csetc(lv,what,val,info,pos,idx)
+      import :: psb_cspmat_type, psb_c_vect_type, psb_c_base_vect_type, &
+           & psb_clinmap_type, psb_spk_, amg_c_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+      ! Arguments
       class(amg_c_onelev_type), intent(inout) :: lv
       character(len=*), intent(in)              :: what
       character(len=*), intent(in)              :: val
@@ -392,8 +416,12 @@ module amg_c_onelev_mod
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_csetr(lv,what,val,info,pos,idx)
+    subroutine amg_c_base_onelev_csetr(lv,what,val,info,pos,idx)
+      import :: psb_cspmat_type, psb_c_vect_type, psb_c_base_vect_type, &
+           & psb_clinmap_type, psb_spk_, amg_c_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
       class(amg_c_onelev_type), intent(inout) :: lv
       character(len=*), intent(in)              :: what
       real(psb_spk_), intent(in)                 :: val
@@ -404,8 +432,11 @@ module amg_c_onelev_mod
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_dump(lv,level,info,prefix,head,ac,rp,smoother,&
+    subroutine amg_c_base_onelev_dump(lv,level,info,prefix,head,ac,rp,smoother,&
          & solver,tprol,global_num)
+      import :: psb_cspmat_type, psb_c_vect_type, psb_c_base_vect_type, &
+           & psb_clinmap_type, psb_spk_, amg_c_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
       class(amg_c_onelev_type), intent(in) :: lv
       integer(psb_ipk_), intent(in)          :: level
@@ -416,7 +447,8 @@ module amg_c_onelev_mod
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_map_rstr_a(lv,alpha,u,beta,v,info,work)
+    subroutine amg_c_base_onelev_map_rstr_a(lv,alpha,u,beta,v,info,work)
+      import
       implicit none
       class(amg_c_onelev_type), target, intent(inout) :: lv
       complex(psb_spk_), intent(in)     :: alpha, beta
@@ -425,8 +457,8 @@ module amg_c_onelev_mod
       integer(psb_ipk_), intent(out) :: info
       complex(psb_spk_), optional       :: work(:)
     end subroutine amg_c_base_onelev_map_rstr_a
-    module subroutine amg_c_base_onelev_map_rstr_v(lv,alpha,vect_u,beta,vect_v,info,&
-         & work,vtx,vty)
+    subroutine amg_c_base_onelev_map_rstr_v(lv,alpha,vect_u,beta,vect_v,info,work,vtx,vty)
+      import
       implicit none
       class(amg_c_onelev_type), target, intent(inout) :: lv
       complex(psb_spk_), intent(in)           :: alpha, beta
@@ -438,7 +470,8 @@ module amg_c_onelev_mod
   end interface
 
   interface
-    module subroutine amg_c_base_onelev_map_prol_a(lv,alpha,v,beta,u,info,work)
+    subroutine amg_c_base_onelev_map_prol_a(lv,alpha,v,beta,u,info,work)
+      import
       implicit none
       class(amg_c_onelev_type), target, intent(inout) :: lv
       complex(psb_spk_), intent(in)     :: alpha, beta
@@ -448,8 +481,8 @@ module amg_c_onelev_mod
       complex(psb_spk_), optional          :: work(:)
 
     end subroutine amg_c_base_onelev_map_prol_a
-    module subroutine amg_c_base_onelev_map_prol_v(lv,alpha,vect_v,beta,vect_u,info,&
-         & work,vtx,vty)
+    subroutine amg_c_base_onelev_map_prol_v(lv,alpha,vect_v,beta,vect_u,info,work,vtx,vty)
+      import
       implicit none
       class(amg_c_onelev_type), target, intent(inout) :: lv
       complex(psb_spk_), intent(in)           :: alpha, beta
@@ -460,118 +493,6 @@ module amg_c_onelev_mod
     end subroutine amg_c_base_onelev_map_prol_v
   end interface
 
-  interface 
-    module subroutine c_base_onelev_move_alloc(lv, b,info)
-      implicit none
-      class(amg_c_onelev_type), target, intent(inout) :: lv, b
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine c_base_onelev_move_alloc
-  end interface
-
-  interface 
-    module subroutine c_base_onelev_allocate_wrk(lv,info,vmold)
-      implicit none
-      class(amg_c_onelev_type), target, intent(inout) :: lv
-      integer(psb_ipk_), intent(out) :: info
-      class(psb_c_base_vect_type), intent(in), optional  :: vmold
-    end subroutine c_base_onelev_allocate_wrk
-  end interface
-  
-  interface 
-    module subroutine c_base_onelev_free_wrk(lv,info)
-      implicit none
-      class(amg_c_onelev_type), target, intent(inout) :: lv
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine c_base_onelev_free_wrk
-  end interface
-
-  interface 
-    module  subroutine c_wrk_alloc(wk,nwv,desc,info,vmold, desc2)
-      Implicit None
-      ! Arguments
-      class(amg_cmlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(in)                     :: nwv
-      type(psb_desc_type), intent(in)                   :: desc
-      integer(psb_ipk_), intent(out)                    :: info
-      class(psb_c_base_vect_type), intent(in), optional  :: vmold
-      type(psb_desc_type), intent(in), optional          :: desc2
-    end subroutine c_wrk_alloc
-  end interface
-
-  interface 
-    module subroutine c_inner_do_wrk_alloc(wk,nwv,desc,vmold)
-      class(amg_cmlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(in)                     :: nwv
-      type(psb_desc_type), intent(in)                   :: desc
-      class(psb_c_base_vect_type), intent(in), optional  :: vmold
-    end subroutine c_inner_do_wrk_alloc
-  end interface
-
-  interface 
-    module  subroutine c_wrk_free(wk,info)
-      Implicit None
-      ! Arguments
-      class(amg_cmlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine c_wrk_free
-  end interface
-
-  interface 
-    module  subroutine c_wrk_clone(wk,wkout,info)
-      Implicit None
-      ! Arguments
-      class(amg_cmlprec_wrk_type), target, intent(inout) :: wk
-      class(amg_cmlprec_wrk_type), target, intent(inout) :: wkout
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine c_wrk_clone
-  end interface
-
-  interface 
-    module subroutine c_wrk_move_alloc(wk, b,info)
-      implicit none
-      class(amg_cmlprec_wrk_type), target, intent(inout) :: wk, b
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine c_wrk_move_alloc
-  end interface
-
-  interface
-    module subroutine c_wrk_cnv(wk,info,vmold)
-      Implicit None
-      class(amg_cmlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(out)                    :: info
-      class(psb_c_base_vect_type), intent(in), optional  :: vmold
-    end subroutine c_wrk_cnv
-  end interface
-
-  interface
-    module function c_wrk_sizeof(wk) result(val)
-      implicit none
-      class(amg_cmlprec_wrk_type), intent(in) :: wk
-      integer(psb_epk_) :: val
-    end  function c_wrk_sizeof
-  end interface
-
-  interface 
-    module subroutine c_remap_data_clone(rmp, remap_out, info)
-      implicit none
-      ! Arguments
-      class(amg_c_remap_data_type), target, intent(inout) :: rmp
-      class(amg_c_remap_data_type), target, intent(inout) :: remap_out
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine c_remap_data_clone
-  end interface
-
-  interface 
-    module subroutine c_remap_move_alloc(rmp, remap_out, info)
-      implicit none
-      ! Arguments
-      class(amg_c_remap_data_type), target, intent(inout) :: rmp
-      class(amg_c_remap_data_type), target, intent(inout) :: remap_out
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine c_remap_move_alloc
-  end interface
-  
-
 contains
   !
   ! Function returning the size of the amg_prec_type data structure
@@ -697,7 +618,7 @@ contains
     ! Arguments
     class(amg_c_onelev_type), target, intent(inout) :: lv
     class(amg_c_onelev_type), target, intent(inout) :: lvout
-    integer(psb_ipk_), intent(out)                  :: info
+    integer(psb_ipk_), intent(out)                    :: info
 
     info = psb_success_
     if (allocated(lv%sm)) then
@@ -739,6 +660,36 @@ contains
 
   end subroutine c_base_onelev_clone
 
+  subroutine c_base_onelev_move_alloc(lv, b,info)
+    use psb_base_mod
+    implicit none
+    class(amg_c_onelev_type), target, intent(inout) :: lv, b
+    integer(psb_ipk_), intent(out) :: info
+
+    call b%free(info)
+    b%parms  = lv%parms
+    b%szratio = lv%szratio
+    if (associated(lv%sm2,lv%sm2a)) then
+      call move_alloc(lv%sm,b%sm)
+      call move_alloc(lv%sm2a,b%sm2a)
+      b%sm2 =>b%sm2a
+    else
+      call move_alloc(lv%sm,b%sm)
+      call move_alloc(lv%sm2a,b%sm2a)
+      b%sm2 =>b%sm
+    end if
+
+    call move_alloc(lv%aggr,b%aggr)
+    if (info == psb_success_) call psb_move_alloc(lv%ac,b%ac,info)
+    if (info == psb_success_) call psb_move_alloc(lv%tprol,b%tprol,info)
+    if (info == psb_success_) call psb_move_alloc(lv%desc_ac,b%desc_ac,info)
+    if (info == psb_success_) call psb_move_alloc(lv%linmap,b%linmap,info)
+    b%base_a    => lv%base_a
+    b%base_desc => lv%base_desc
+
+  end subroutine c_base_onelev_move_alloc
+
+
   function c_base_onelev_get_wrksize(lv) result(val)
     implicit none
     class(amg_c_onelev_type), intent(inout) :: lv
@@ -776,5 +727,269 @@ contains
 
   end function c_base_onelev_get_wrksize
 
-  
+  subroutine c_base_onelev_allocate_wrk(lv,info,vmold)
+    use psb_base_mod
+    implicit none
+    class(amg_c_onelev_type), target, intent(inout) :: lv
+    integer(psb_ipk_), intent(out) :: info
+    class(psb_c_base_vect_type), intent(in), optional  :: vmold
+    !
+    integer(psb_ipk_) :: nwv, i
+    info = psb_success_
+    nwv = lv%get_wrksz()
+    if (.not.allocated(lv%wrk)) allocate(lv%wrk,stat=info)
+    if (info == 0) then
+      if (lv%remap_data%desc_ac_pre_remap%is_asb()) then
+        !
+        !  Need to fix this, we need two different allocations
+        !
+        call lv%wrk%alloc(nwv,lv%base_desc,info,vmold=vmold,&
+             & desc2=lv%remap_data%desc_ac_pre_remap)
+      else
+        call lv%wrk%alloc(nwv,lv%base_desc,info,vmold=vmold)
+      end if
+    end if
+
+  end subroutine c_base_onelev_allocate_wrk
+
+
+  subroutine c_base_onelev_free_wrk(lv,info)
+    use psb_base_mod
+    implicit none
+    class(amg_c_onelev_type), target, intent(inout) :: lv
+    integer(psb_ipk_), intent(out) :: info
+    !
+    integer(psb_ipk_) :: nwv,i
+    info = psb_success_
+
+    if (allocated(lv%wrk)) then
+      call lv%wrk%free(info)
+      if (info == 0) deallocate(lv%wrk,stat=info)
+    end if
+  end subroutine c_base_onelev_free_wrk
+
+  subroutine c_wrk_alloc(wk,nwv,desc,info,vmold, desc2)
+    use psb_base_mod
+
+    Implicit None
+
+    ! Arguments
+    class(amg_cmlprec_wrk_type), target, intent(inout) :: wk
+    integer(psb_ipk_), intent(in)                     :: nwv
+    type(psb_desc_type), intent(in)                   :: desc
+    integer(psb_ipk_), intent(out)                    :: info
+    class(psb_c_base_vect_type), intent(in), optional  :: vmold
+    type(psb_desc_type), intent(in), optional          :: desc2
+    !
+    integer(psb_ipk_) :: i
+
+    info = psb_success_
+    call wk%free(info)
+    if  (present(desc2)) then
+!!$      write(0,*) 'Check on wrk_alloc 2',&
+!!$           & desc2%get_local_rows(), desc%get_local_rows(),&
+!!$           & desc2%get_local_cols(),desc%get_local_cols()
+!!$      flush(0)
+      if (desc2%get_local_cols()>desc%get_local_cols()) then
+        call psb_geasb(wk%vx2l,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vy2l,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vtx,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vty,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        allocate(wk%wv(nwv),stat=info)
+        do i=1,nwv
+          call psb_geasb(wk%wv(i),desc2,info,&
+               & scratch=.true.,mold=vmold)
+        end do
+      else
+!!$        write(0,*) 'Check on wrk_alloc 1.5 ',&
+!!$             & desc%get_local_rows(),&
+!!$             & desc%get_local_cols()
+        call psb_geasb(wk%vx2l,desc,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vy2l,desc,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vtx,desc,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vty,desc,info,&
+             & scratch=.true.,mold=vmold)
+        allocate(wk%wv(nwv),stat=info)
+        do i=1,nwv
+          call psb_geasb(wk%wv(i),desc,info,&
+               & scratch=.true.,mold=vmold)
+        end do
+      end if
+    else
+!!$      write(0,*) 'Check on wrk_alloc 1 ',&
+!!$           & desc%get_local_rows(),&
+!!$           & desc%get_local_cols()
+      call psb_geasb(wk%vx2l,desc,info,&
+           & scratch=.true.,mold=vmold)
+      call psb_geasb(wk%vy2l,desc,info,&
+           & scratch=.true.,mold=vmold)
+      call psb_geasb(wk%vtx,desc,info,&
+           & scratch=.true.,mold=vmold)
+      call psb_geasb(wk%vty,desc,info,&
+           & scratch=.true.,mold=vmold)
+      allocate(wk%wv(nwv),stat=info)
+      do i=1,nwv
+        call psb_geasb(wk%wv(i),desc,info,&
+             & scratch=.true.,mold=vmold)
+      end do
+    end if
+  end subroutine c_wrk_alloc
+
+  subroutine c_wrk_free(wk,info)
+
+    Implicit None
+
+    ! Arguments
+    class(amg_cmlprec_wrk_type), target, intent(inout) :: wk
+    integer(psb_ipk_), intent(out)                    :: info
+    !
+    integer(psb_ipk_) :: i
+    info = psb_success_
+
+    if (allocated(wk%tx)) deallocate(wk%tx, stat=info)
+    if (allocated(wk%ty)) deallocate(wk%ty, stat=info)
+    if (allocated(wk%x2l)) deallocate(wk%x2l, stat=info)
+    if (allocated(wk%y2l)) deallocate(wk%y2l, stat=info)
+    call wk%vtx%free(info)
+    call wk%vty%free(info)
+    call wk%vx2l%free(info)
+    call wk%vy2l%free(info)
+    if (allocated(wk%wv)) then
+      do i=1,size(wk%wv)
+        call wk%wv(i)%free(info)
+      end do
+      deallocate(wk%wv, stat=info)
+    end if
+
+  end subroutine c_wrk_free
+
+  subroutine c_wrk_clone(wk,wkout,info)
+    use psb_base_mod
+    Implicit None
+
+    ! Arguments
+    class(amg_cmlprec_wrk_type), target, intent(inout) :: wk
+    class(amg_cmlprec_wrk_type), target, intent(inout) :: wkout
+    integer(psb_ipk_), intent(out)                    :: info
+    !
+    integer(psb_ipk_) :: i
+    info = psb_success_
+
+    call psb_safe_ab_cpy(wk%tx,wkout%tx,info)
+    call psb_safe_ab_cpy(wk%ty,wkout%ty,info)
+    call psb_safe_ab_cpy(wk%x2l,wkout%x2l,info)
+    call psb_safe_ab_cpy(wk%y2l,wkout%y2l,info)
+    call wk%vtx%clone(wkout%vtx,info)
+    call wk%vty%clone(wkout%vty,info)
+    call wk%vx2l%clone(wkout%vx2l,info)
+    call wk%vy2l%clone(wkout%vy2l,info)
+    if (allocated(wkout%wv)) then
+      do i=1,size(wkout%wv)
+        call wkout%wv(i)%free(info)
+      end do
+      deallocate( wkout%wv)
+    end if
+    allocate(wkout%wv(size(wk%wv)),stat=info)
+    do i=1,size(wk%wv)
+      call wk%wv(i)%clone(wkout%wv(i),info)
+    end do
+    return
+
+  end subroutine c_wrk_clone
+
+  subroutine c_wrk_move_alloc(wk, b,info)
+    implicit none
+    class(amg_cmlprec_wrk_type), target, intent(inout) :: wk, b
+    integer(psb_ipk_), intent(out) :: info
+
+    call b%free(info)
+    call move_alloc(wk%tx,b%tx)
+    call move_alloc(wk%ty,b%ty)
+    call move_alloc(wk%x2l,b%x2l)
+    call move_alloc(wk%y2l,b%y2l)
+    !
+    ! Should define V%move_alloc....
+    call move_alloc(wk%vtx%v,b%vtx%v)
+    call move_alloc(wk%vty%v,b%vty%v)
+    call move_alloc(wk%vx2l%v,b%vx2l%v)
+    call move_alloc(wk%vy2l%v,b%vy2l%v)
+    call move_alloc(wk%wv,b%wv)
+
+  end subroutine c_wrk_move_alloc
+
+  subroutine c_wrk_cnv(wk,info,vmold)
+    use psb_base_mod
+
+    Implicit None
+
+    ! Arguments
+    class(amg_cmlprec_wrk_type), target, intent(inout) :: wk
+    integer(psb_ipk_), intent(out)                    :: info
+    class(psb_c_base_vect_type), intent(in), optional  :: vmold
+    !
+    integer(psb_ipk_) :: i
+
+    info = psb_success_
+    if (present(vmold)) then
+      call wk%vtx%cnv(vmold)
+      call wk%vty%cnv(vmold)
+      call wk%vx2l%cnv(vmold)
+      call wk%vy2l%cnv(vmold)
+      if (allocated(wk%wv)) then
+        do i=1,size(wk%wv)
+          call wk%wv(i)%cnv(vmold)
+        end do
+      end if
+    end if
+  end subroutine c_wrk_cnv
+
+  function c_wrk_sizeof(wk) result(val)
+    use psb_realloc_mod
+    implicit none
+    class(amg_cmlprec_wrk_type), intent(in) :: wk
+    integer(psb_epk_) :: val
+    integer :: i
+    val = 0
+    val = val + (1_psb_epk_ * (2*psb_sizeof_sp)) * psb_size(wk%tx)
+    val = val + (1_psb_epk_ * (2*psb_sizeof_sp)) * psb_size(wk%ty)
+    val = val + (1_psb_epk_ * (2*psb_sizeof_sp)) * psb_size(wk%x2l)
+    val = val + (1_psb_epk_ * (2*psb_sizeof_sp)) * psb_size(wk%y2l)
+    val = val + wk%vtx%sizeof()
+    val = val + wk%vty%sizeof()
+    val = val + wk%vx2l%sizeof()
+    val = val + wk%vy2l%sizeof()
+    if (allocated(wk%wv)) then
+      do i=1, size(wk%wv)
+        val = val + wk%wv(i)%sizeof()
+      end do
+    end if
+  end function c_wrk_sizeof
+
+  subroutine c_remap_data_clone(rmp, remap_out, info)
+    use psb_base_mod
+    implicit none
+    ! Arguments
+    class(amg_c_remap_data_type), target, intent(inout) :: rmp
+    class(amg_c_remap_data_type), target, intent(inout) :: remap_out
+    integer(psb_ipk_), intent(out)                    :: info
+    !
+    integer(psb_ipk_) :: i
+
+    info = psb_success_
+
+    call rmp%ac_pre_remap%clone(remap_out%ac_pre_remap,info)
+    if (info == psb_success_) &
+         & call rmp%desc_ac_pre_remap%clone(remap_out%desc_ac_pre_remap,info)
+    remap_out%idest = rmp%idest
+    call psb_safe_ab_cpy(rmp%isrc,remap_out%isrc,info)
+    call psb_safe_ab_cpy(rmp%nrsrc,remap_out%nrsrc,info)
+  end subroutine c_remap_data_clone
+
 end module amg_c_onelev_mod

amgprec/amg_c_prec_type.f90

@@ -102,7 +102,6 @@ module amg_c_prec_type
     ! The multilevel hierarchy
     !
     type(amg_c_onelev_type), allocatable :: precv(:)
-    integer(psb_ipk_)                    :: nlevs
   contains
     procedure, pass(prec)               :: psb_c_apply2_vect => amg_c_apply2_vect
     procedure, pass(prec)               :: psb_c_apply1_vect => amg_c_apply1_vect
@@ -120,7 +119,6 @@ module amg_c_prec_type
     procedure, pass(prec)               :: cmp_complexity => amg_c_cmp_compl
     procedure, pass(prec)               :: get_avg_cr => amg_c_get_avg_cr
     procedure, pass(prec)               :: cmp_avg_cr => amg_c_cmp_avg_cr
-    procedure, pass(prec)               :: set_nlevs  => amg_c_set_nlevs
     procedure, pass(prec)               :: get_nlevs  => amg_c_get_nlevs
     procedure, pass(prec)               :: get_nzeros => amg_c_get_nzeros
     procedure, pass(prec)               :: sizeof => amg_cprec_sizeof
@@ -313,7 +311,7 @@ module amg_c_prec_type
            & psb_c_base_sparse_mat, psb_c_base_vect_type, &
            & psb_i_base_vect_type, amg_cprec_type, psb_ipk_
       implicit none
-      type(psb_cspmat_type), intent(inout), target       :: a
+      type(psb_cspmat_type), intent(in), target          :: a
       type(psb_desc_type), intent(inout), target           :: desc_a
       class(amg_cprec_type), intent(inout), target       :: prec
       integer(psb_ipk_), intent(out)                       :: info
@@ -325,15 +323,14 @@ module amg_c_prec_type
   end interface amg_precbld
 
   interface amg_hierarchy_bld
-    subroutine amg_c_hierarchy_bld(a,desc_a,prec,info,cpymat)
+    subroutine amg_c_hierarchy_bld(a,desc_a,prec,info)
       import :: psb_cspmat_type, psb_desc_type, psb_spk_, &
            & amg_cprec_type, psb_ipk_
       implicit none
-      type(psb_cspmat_type), intent(inout), target       :: a
+      type(psb_cspmat_type), intent(in), target          :: a
       type(psb_desc_type), intent(inout), target           :: desc_a
       class(amg_cprec_type), intent(inout), target        :: prec
       integer(psb_ipk_), intent(out)                       :: info
-      logical, intent(in), optional                        :: cpymat
       !      character, intent(in),optional             :: upd
     end subroutine amg_c_hierarchy_bld
   end interface amg_hierarchy_bld
@@ -437,19 +434,10 @@ contains
     class(amg_cprec_type), intent(in) :: prec
     integer(psb_ipk_) :: val
     val = 0
-!!$    if (allocated(prec%precv)) then
-!!$      val = size(prec%precv)
-!!$    end if
-    val = prec%nlevs
-!!$    write(0,*) ' NLEVS: ',prec%nlevs, val,size(prec%precv)
+    if (allocated(prec%precv)) then
+      val = size(prec%precv)
+    end if
   end function amg_c_get_nlevs
-
-  subroutine amg_c_set_nlevs(prec,nl) 
-    implicit none
-    class(amg_cprec_type), intent(inout) :: prec
-    integer(psb_ipk_) :: nl
-    prec%nlevs = nl
-  end subroutine amg_c_set_nlevs
   !
   ! Function returning the size of the amg_prec_type data structure
   ! in bytes or in number of nonzeros of the operator(s) involved.
@@ -520,7 +508,7 @@ contains
 
     real(psb_spk_) :: num, den, nmin
     type(psb_ctxt_type) :: ctxt
-    integer(psb_ipk_)   :: il,nl
+    integer(psb_ipk_)   :: il
 
     num = -sone
     den = sone
@@ -530,10 +518,7 @@ contains
       num = prec%precv(il)%base_a%get_nzeros()
       if (num >= szero) then
         den = num
-        nl = prec%get_nlevs()
-!!$        write(0,*) 'Inside cmp_compl ',nl,size(prec%precv)
-        do il=2, nl
-!!$          write(0,*) '                 ',il,associated(prec%precv(il)%base_a)
+        do il=2,size(prec%precv)
           num = num + max(0,prec%precv(il)%base_a%get_nzeros())
         end do
       end if
@@ -564,6 +549,7 @@ contains
   end function amg_c_get_avg_cr
 
   subroutine amg_c_cmp_avg_cr(prec)
+
     implicit none
     class(amg_cprec_type), intent(inout) :: prec
 
@@ -571,18 +557,17 @@ contains
     type(psb_ctxt_type) :: ctxt
     integer(psb_ipk_)   :: il, nl, iam, np
 
+
     avgcr = szero
-    nl = prec%get_nlevs()
-    do il=2,nl
-      if (prec%precv(il)%base_desc%is_ok()) then 
-        ctxt = prec%precv(il)%base_desc%get_ctxt()
-        call psb_info(ctxt,iam,np)
-        if (iam >=0)  avgcr = avgcr + max(szero,prec%precv(il)%szratio)
-      end if
-    end do
-    avgcr = avgcr / (nl-1)
     ctxt = prec%ctxt
     call psb_info(ctxt,iam,np)
+    if (allocated(prec%precv)) then
+      nl = size(prec%precv)
+      do il=2,nl
+        avgcr = avgcr + max(szero,prec%precv(il)%szratio)
+      end do
+      avgcr = avgcr / (nl-1)
+    end if
     call psb_sum(ctxt,avgcr)
     prec%ag_data%avg_cr = avgcr/np
   end subroutine amg_c_cmp_avg_cr
@@ -600,7 +585,9 @@ contains
   !             error code.
   !
   subroutine amg_cprecfree(p,info)
+
     implicit none
+
     ! Arguments
     type(amg_cprec_type), intent(inout) :: p
     integer(psb_ipk_), intent(out)        :: info
@@ -626,7 +613,9 @@ contains
   end subroutine amg_cprecfree
 
   subroutine amg_c_prec_free(prec,info)
+
     implicit none
+
     ! Arguments
     class(amg_cprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -646,11 +635,6 @@ contains
     if (allocated(prec%precv)) then
       do i=1,size(prec%precv)
         call prec%precv(i)%free(info)
-        if (psb_errstatus_fatal()) then
-          info=psb_err_internal_error_
-          call psb_errpush(info,name)
-          goto 9999
-        end if
       end do
       deallocate(prec%precv,stat=info)
     end if
@@ -663,7 +647,9 @@ contains
   end subroutine amg_c_prec_free
 
   subroutine amg_c_smoothers_free(prec,info)
+
     implicit none
+
     ! Arguments
     class(amg_cprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -680,7 +666,7 @@ contains
     end if
 
     if (allocated(prec%precv)) then
-      do i=1,prec%get_nlevs()
+      do i=1,size(prec%precv)
         call prec%precv(i)%free_smoothers(info)
       end do
     end if
@@ -694,7 +680,9 @@ contains
   end subroutine amg_c_smoothers_free
 
   subroutine amg_c_hierarchy_free(prec,info)
+
     implicit none
+
     ! Arguments
     class(amg_cprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -721,6 +709,7 @@ contains
 
   end subroutine amg_c_hierarchy_free
 
+
   !
   ! Top level methods.
   !
@@ -785,6 +774,7 @@ contains
 
   end subroutine amg_c_apply1_vect
 
+
   subroutine amg_c_apply2v(prec,x,y,desc_data,info,trans,work)
     implicit none
     type(psb_desc_type),intent(in)    :: desc_data
@@ -849,6 +839,7 @@ contains
   subroutine amg_c_dump(prec,info,istart,iend,iproc,prefix,head,&
        & ac,rp,smoother,solver,tprol,&
        & global_num)
+
     implicit none
     class(amg_cprec_type), intent(in)     :: prec
     integer(psb_ipk_), intent(out)          :: info
@@ -865,7 +856,7 @@ contains
     info = 0
     ctxt = prec%ctxt
     call psb_info(ctxt,iam,np)
-    iln = prec%get_nlevs()
+    iln = size(prec%precv)
     if (present(istart)) then
       il1 = max(1,istart)
     else
@@ -889,6 +880,7 @@ contains
   end subroutine amg_c_dump
 
   subroutine amg_c_cnv(prec,info,amold,vmold,imold)
+
     implicit none
     class(amg_cprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)       :: info
@@ -900,7 +892,7 @@ contains
 
     info = psb_success_
     if (allocated(prec%precv)) then
-      do i=1,prec%get_nlevs()
+      do i=1,size(prec%precv)
         if (info == psb_success_ ) &
              & call prec%precv(i)%cnv(info,amold=amold,vmold=vmold,imold=imold)
       end do
@@ -909,6 +901,7 @@ contains
   end subroutine amg_c_cnv
 
   subroutine amg_c_clone(prec,precout,info)
+
     implicit none
     class(amg_cprec_type), intent(inout) :: prec
     class(psb_cprec_type), intent(inout) :: precout
@@ -920,6 +913,7 @@ contains
   end subroutine amg_c_clone
 
   subroutine amg_c_inner_clone(prec,precout,info)
+
     implicit none
     class(amg_cprec_type), intent(inout)         :: prec
     class(psb_cprec_type), target, intent(inout) :: precout
@@ -935,9 +929,8 @@ contains
       pout%ctxt          = prec%ctxt
       pout%ag_data       = prec%ag_data
       pout%outer_sweeps  = prec%outer_sweeps
-      pout%nlevs         = prec%nlevs
       if (allocated(prec%precv)) then
-        ln = prec%get_nlevs()
+        ln = size(prec%precv)
         allocate(pout%precv(ln),stat=info)
         if (info /= psb_success_) goto 9999
         if (ln >= 1) then
@@ -945,7 +938,6 @@ contains
         end if
         do lev=2, ln
           if (info /= psb_success_) exit
-!!$          write(0,*) 'Inner_clone must be checked and reimplemented! '
           call prec%precv(lev)%clone(pout%precv(lev),info)
           if (info == psb_success_) then
             pout%precv(lev)%base_a       => pout%precv(lev)%ac
@@ -1010,7 +1002,7 @@ contains
     integer(psb_ipk_), intent(out)        :: info
     class(psb_c_base_vect_type), intent(in), optional  :: vmold
     !
-    ! In AMG the DESC optional argument is ignored, since
+    ! In MLD the DESC optional argument is ignored, since
     ! the necessary info is contained in the various entries of the
     ! PRECV component.
     type(psb_desc_type), intent(in), optional  :: desc
@@ -1025,7 +1017,7 @@ contains
     if (psb_errstatus_fatal()) then
       info = psb_err_internal_error_; goto 9999
     end if
-    nlev   = prec%get_nlevs()
+    nlev   = size(prec%precv)
     level = 1
     do level = 1, nlev
       call prec%precv(level)%allocate_wrk(info,vmold=vmold)
@@ -1048,6 +1040,7 @@ contains
   subroutine amg_c_free_wrk(prec,info)
     use psb_base_mod
     implicit none
+
     ! Arguments
     class(amg_cprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -1064,7 +1057,7 @@ contains
     end if
 
     if (allocated(prec%precv)) then
-      nlev   = prec%get_nlevs()
+      nlev   = size(prec%precv)
       do level = 1, nlev
         call prec%precv(level)%free_wrk(info)
       end do

amgprec/amg_c_slu_solver.F90

@@ -124,7 +124,7 @@ module amg_c_slu_solver
       Implicit None
 
       ! Arguments
-      type(psb_cspmat_type), intent(inout), target        :: a
+      type(psb_cspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_c_slu_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_d_ainv_solver.F90

@@ -103,7 +103,7 @@ module amg_d_ainv_solver
       Implicit None
 
       ! Arguments
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_d_ainv_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                      :: info
@@ -225,7 +225,7 @@ module amg_d_ainv_solver
       import :: psb_desc_type, psb_dspmat_type,  psb_d_base_sparse_mat, &
            & psb_d_vect_type, psb_d_base_vect_type, psb_dpk_, psb_ipk_
       implicit none
-      type(psb_dspmat_type), intent(inout), target  :: a
+      type(psb_dspmat_type), intent(in), target   :: a
       integer(psb_ipk_), intent(in)               :: fillin,alg
       real(psb_dpk_), intent(in)                  :: thresh
       type(psb_dspmat_type), intent(inout)        :: wmat, zmat

amgprec/amg_d_as_smoother.f90

@@ -230,7 +230,7 @@ module amg_d_as_smoother
            & psb_desc_type, psb_d_base_sparse_mat, psb_ipk_,&
            & psb_i_base_vect_type
       implicit none 
-      type(psb_dspmat_type), intent(inout), target     :: a
+      type(psb_dspmat_type), intent(in), target        :: a
       Type(psb_desc_type), Intent(inout)                 :: desc_a 
       class(amg_d_as_smoother_type), intent(inout)       :: sm
       integer(psb_ipk_), intent(out)                     :: info

amgprec/amg_d_base_aggregator_mod.f90

@@ -89,7 +89,7 @@ module amg_d_base_aggregator_mod
     procedure, pass(ag) :: bld_tprol   => amg_d_base_aggregator_build_tprol
     procedure, pass(ag) :: mat_bld     => amg_d_base_aggregator_mat_bld
     procedure, pass(ag) :: mat_asb     => amg_d_base_aggregator_mat_asb
-    procedure, pass(ag) :: bld_linmap  => amg_d_base_aggregator_bld_linmap
+    procedure, pass(ag) :: bld_map     => amg_d_base_aggregator_bld_map
     procedure, pass(ag) :: update_next => amg_d_base_aggregator_update_next
     procedure, pass(ag) :: clone       => amg_d_base_aggregator_clone
     procedure, pass(ag) :: free        => amg_d_base_aggregator_free
@@ -458,7 +458,7 @@ contains
   end subroutine amg_d_base_aggregator_mat_asb
 
   !
-  !> Function   bld_linmap
+  !> Function   bld_map
   !! \memberof  amg_d_base_aggregator_type
   !! \brief     Build linear map between hierarchy levels 
   !!
@@ -473,7 +473,7 @@ contains
   !!  \param map       The output map
   !!  \param info    Return code
   !!  
-  subroutine  amg_d_base_aggregator_bld_linmap(ag,desc_a,desc_ac,ilaggr,nlaggr,&
+  subroutine  amg_d_base_aggregator_bld_map(ag,desc_a,desc_ac,ilaggr,nlaggr,&
        & op_restr,op_prol,map,info)
     use psb_base_mod
     implicit none
@@ -484,7 +484,7 @@ contains
     type(psb_dlinmap_type), intent(out)    :: map
     integer(psb_ipk_), intent(out)       :: info
     integer(psb_ipk_) :: err_act
-    character(len=20) :: name='d_base_aggregator_bld_linmap'
+    character(len=20) :: name='d_base_aggregator_bld_map'
 
     info = psb_success_
     call psb_erractionsave(err_act)
@@ -508,6 +508,7 @@ contains
 9999 call psb_error_handler(err_act)
 
     return
-  end subroutine amg_d_base_aggregator_bld_linmap
+  end subroutine amg_d_base_aggregator_bld_map
+
 
 end module amg_d_base_aggregator_mod

amgprec/amg_d_base_smoother_mod.f90

@@ -237,7 +237,7 @@ module amg_d_base_smoother_mod
            & psb_d_vect_type, psb_d_base_vect_type, psb_dpk_, &
            & amg_d_base_smoother_type, psb_ipk_, psb_i_base_vect_type
       ! Arguments
-      type(psb_dspmat_type), intent(inout), target  :: a
+      type(psb_dspmat_type), intent(in), target     :: a
       Type(psb_desc_type), Intent(inout)              :: desc_a 
       class(amg_d_base_smoother_type), intent(inout) :: sm 
       integer(psb_ipk_), intent(out)                  :: info

amgprec/amg_d_base_solver_mod.f90

@@ -170,7 +170,7 @@ module amg_d_base_solver_mod
       Implicit None
       
       ! Arguments
-      type(psb_dspmat_type), intent(inout), target          :: a
+      type(psb_dspmat_type), intent(in), target             :: a
       Type(psb_desc_type), Intent(inout)                    :: desc_a 
       class(amg_d_base_solver_type), intent(inout)          :: sv
       integer(psb_ipk_), intent(out)                        :: info

amgprec/amg_d_diag_solver.f90

@@ -119,7 +119,7 @@ module amg_d_diag_solver
       import :: psb_desc_type, psb_dspmat_type,  psb_d_base_sparse_mat, &
            & psb_d_vect_type, psb_d_base_vect_type, psb_dpk_, &
            & amg_d_diag_solver_type, psb_ipk_, psb_i_base_vect_type      
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                    :: desc_a 
       class(amg_d_diag_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                        :: info
@@ -331,7 +331,7 @@ module amg_d_l1_diag_solver
       import :: psb_desc_type, psb_dspmat_type,  psb_d_base_sparse_mat, &
            & psb_d_vect_type, psb_d_base_vect_type, psb_dpk_, &
            & amg_d_l1_diag_solver_type, psb_ipk_, psb_i_base_vect_type      
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                    :: desc_a 
       class(amg_d_l1_diag_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                        :: info

amgprec/amg_d_gs_solver.f90

@@ -181,7 +181,7 @@ module amg_d_gs_solver
            & psb_dspmat_type, psb_d_base_sparse_mat, psb_d_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_d_gs_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info
@@ -195,7 +195,7 @@ module amg_d_gs_solver
            & psb_dspmat_type, psb_d_base_sparse_mat, psb_d_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_d_bwgs_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_d_id_solver.f90

@@ -123,7 +123,7 @@ contains
     Implicit None
 
     ! Arguments
-    type(psb_dspmat_type), intent(inout), target        :: a
+    type(psb_dspmat_type), intent(in), target           :: a
     Type(psb_desc_type), Intent(inout)                  :: desc_a 
     class(amg_d_id_solver_type), intent(inout)          :: sv
     integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_d_ilu_solver.f90

@@ -144,7 +144,7 @@ module amg_d_ilu_solver
            & psb_dspmat_type, psb_d_base_sparse_mat, psb_d_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_d_ilu_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_d_inner_mod.f90

@@ -56,7 +56,7 @@ module amg_d_inner_mod
            & psb_dpk_, psb_d_base_sparse_mat, psb_d_base_vect_type, psb_ipk_
       import :: amg_dprec_type
       implicit none
-      type(psb_dspmat_type), intent(inout), target       :: a
+      type(psb_dspmat_type), intent(in), target          :: a
       type(psb_desc_type), intent(inout), target           :: desc_a
       type(amg_dprec_type), intent(inout), target        :: prec
       integer(psb_ipk_), intent(out)                       :: info
@@ -67,7 +67,7 @@ module amg_d_inner_mod
   end interface amg_mlprec_bld
 
   interface amg_mlprec_aply
-    subroutine amg_dmlprec_aply_a(alpha,p,x,beta,y,desc_data,trans,work,info)
+    subroutine amg_dmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info)
       import :: psb_dspmat_type, psb_desc_type, psb_dpk_, psb_ipk_
       import :: amg_dprec_type
       implicit none 
@@ -79,7 +79,7 @@ module amg_d_inner_mod
       character,intent(in)               :: trans
       real(psb_dpk_),target             :: work(:)
       integer(psb_ipk_), intent(out)     :: info
-    end subroutine amg_dmlprec_aply_a
+    end subroutine amg_dmlprec_aply
     subroutine amg_dmlprec_aply_vect(alpha,p,x,beta,y,desc_data,trans,work,info)
       import :: psb_dspmat_type, psb_desc_type, &
            & psb_dpk_, psb_d_vect_type, psb_ipk_

amgprec/amg_d_invk_solver.f90

@@ -94,7 +94,7 @@ module amg_d_invk_solver
       Implicit None
 
       ! Arguments
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_d_invk_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_d_invt_solver.f90

@@ -94,7 +94,7 @@ module amg_d_invt_solver
       Implicit None
 
       ! Arguments
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_d_invt_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_d_jac_smoother.f90

@@ -151,7 +151,7 @@ module amg_d_jac_smoother
       import :: psb_desc_type, amg_d_jac_smoother_type, psb_d_vect_type, psb_dpk_, &
            & psb_dspmat_type, psb_d_base_sparse_mat, psb_d_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_d_jac_smoother_type), intent(inout)       :: sm
       integer(psb_ipk_), intent(out)                      :: info
@@ -274,7 +274,7 @@ module amg_d_jac_smoother
       import :: psb_desc_type, amg_d_l1_jac_smoother_type, psb_d_vect_type, &
            & psb_dspmat_type, psb_d_base_sparse_mat, psb_d_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_d_l1_jac_smoother_type), intent(inout)       :: sm
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_d_jac_solver.f90

@@ -143,7 +143,7 @@ module amg_d_jac_solver
            & psb_dspmat_type, psb_d_base_sparse_mat, psb_d_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_d_jac_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info
@@ -160,7 +160,7 @@ module amg_d_jac_solver
            & psb_dspmat_type, psb_d_base_sparse_mat, psb_d_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_d_l1_jac_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_d_krm_solver.f90

@@ -174,7 +174,7 @@ module amg_d_krm_solver
            & psb_dspmat_type, psb_d_base_sparse_mat, psb_d_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_d_krm_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_d_mumps_solver.F90

@@ -163,7 +163,7 @@ module amg_d_mumps_solver
       Implicit None
 
       ! Arguments
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_d_mumps_solver_type), intent(inout)       :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_d_onelev_mod.f90

@@ -155,35 +155,13 @@ module amg_d_onelev_mod
   private :: d_wrk_alloc, d_wrk_free, &
        & d_wrk_clone, d_wrk_move_alloc, d_wrk_cnv, d_wrk_sizeof
 
-  !
-  ! Remap.
-  !  This keeps track of remapping.
-  !  Logic here is as follows:
-  !  1. AC_PRE_REMAP  need to figure out if we
-  !                really need it.
-  !  2. DESC_AC_PRE_REMAP  contains the descriptor before
-  !                remapping. Meaning that it is possible
-  !                to implement the RESTRICTOR operator by
-  !                 a. Doing LINMAP_U2V onto this one
-  !                 b. For each process, send the data to
-  !                    IDEST.
-  !                This assumes that remapping goes by
-  !                a factor of 2.
-  !                For the PROLONGATOR operators, we first
-  !                use DESC_AC, then split and send onto
-  !                the processes in DESC_AC_PRE_REMAP.
-  !
-  ! To be fixed: what happens if NP the starting processes
-  ! is not an even number? Coordinate with _X_remap in PSBLAS
-  ! 
   type amg_d_remap_data_type
     type(psb_dspmat_type)          :: ac_pre_remap
     type(psb_desc_type)            :: desc_ac_pre_remap
     integer(psb_ipk_)              :: idest
     integer(psb_ipk_), allocatable :: isrc(:), nrsrc(:), naggr(:)
   contains
-    procedure, pass(rmp) :: clone      => d_remap_data_clone
-    procedure, pass(rmp) :: move_alloc => d_remap_move_alloc
+    procedure, pass(rmp) :: clone   => d_remap_data_clone
   end type amg_d_remap_data_type
 
   type amg_d_onelev_type
@@ -229,7 +207,7 @@ module amg_d_onelev_mod
     procedure, pass(lv) :: get_wrksz => d_base_onelev_get_wrksize
     procedure, pass(lv) :: allocate_wrk   => d_base_onelev_allocate_wrk
     procedure, pass(lv) :: free_wrk       => d_base_onelev_free_wrk
-    procedure, nopass   :: stringval  => amg_stringval
+    procedure, nopass   :: stringval => amg_stringval
     procedure, pass(lv) :: move_alloc => d_base_onelev_move_alloc
 
 
@@ -253,7 +231,9 @@ module amg_d_onelev_mod
        & d_base_onelev_free_wrk
 
   interface
-    module subroutine amg_d_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,t_prol,info)
+    subroutine amg_d_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,t_prol,info)
+      import :: psb_dspmat_type, psb_desc_type, psb_dpk_, psb_ipk_, psb_ldspmat_type, psb_lpk_
+      import :: amg_d_onelev_type
       implicit none
       class(amg_d_onelev_type), intent(inout), target :: lv
       type(psb_dspmat_type), intent(in) :: a
@@ -265,7 +245,10 @@ module amg_d_onelev_mod
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_build(lv,info,amold,vmold,imold,ilv)
+    subroutine amg_d_base_onelev_build(lv,info,amold,vmold,imold,ilv)
+      import :: psb_d_base_sparse_mat, psb_d_base_vect_type, &
+           & psb_i_base_vect_type, psb_dpk_, amg_d_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
       class(amg_d_onelev_type), target, intent(inout) :: lv
       integer(psb_ipk_), intent(out) :: info
@@ -277,7 +260,10 @@ module amg_d_onelev_mod
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_descr(lv,il,nl,ilmin,info,iout, verbosity,prefix)
+    subroutine amg_d_base_onelev_descr(lv,il,nl,ilmin,info,iout, verbosity,prefix)
+      import :: psb_dspmat_type, psb_d_vect_type, psb_d_base_vect_type, &
+           & psb_dlinmap_type, psb_dpk_, amg_d_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
       ! Arguments
       class(amg_d_onelev_type), intent(in)    :: lv
@@ -290,8 +276,10 @@ module amg_d_onelev_mod
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_memory_use(lv,il,nl,ilmin,info,&
-         & iout,verbosity, prefix,global) 
+    subroutine amg_d_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity, prefix,global)
+      import :: psb_dspmat_type, psb_d_vect_type, psb_d_base_vect_type, &
+           & psb_dlinmap_type, psb_dpk_, amg_d_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
       ! Arguments
       class(amg_d_onelev_type), intent(in)    :: lv
@@ -305,7 +293,10 @@ module amg_d_onelev_mod
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_cnv(lv,info,amold,vmold,imold)
+    subroutine amg_d_base_onelev_cnv(lv,info,amold,vmold,imold)
+      import :: amg_d_onelev_type, psb_d_base_vect_type, psb_dpk_, &
+           & psb_d_base_sparse_mat, psb_ipk_, psb_i_base_vect_type
+      ! Arguments
       class(amg_d_onelev_type), intent(inout)            :: lv
       integer(psb_ipk_), intent(out)                     :: info
       class(psb_d_base_sparse_mat), intent(in), optional :: amold
@@ -315,32 +306,48 @@ module amg_d_onelev_mod
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_free(lv,info)
+    subroutine amg_d_base_onelev_free(lv,info)
+      import :: psb_dspmat_type, psb_d_vect_type, psb_d_base_vect_type, &
+           & psb_dlinmap_type, psb_dpk_, amg_d_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
+
       class(amg_d_onelev_type), intent(inout) :: lv
       integer(psb_ipk_), intent(out)                :: info
     end subroutine amg_d_base_onelev_free
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_free_smoothers(lv,info)
+    subroutine amg_d_base_onelev_free_smoothers(lv,info)
+      import :: psb_dspmat_type, psb_d_vect_type, psb_d_base_vect_type, &
+           & psb_dlinmap_type, psb_dpk_, amg_d_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
+
       class(amg_d_onelev_type), intent(inout) :: lv
       integer(psb_ipk_), intent(out)                :: info
     end subroutine amg_d_base_onelev_free_smoothers
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_check(lv,info)
+    subroutine amg_d_base_onelev_check(lv,info)
+      import :: psb_dspmat_type, psb_d_vect_type, psb_d_base_vect_type, &
+           & psb_dlinmap_type, psb_dpk_, amg_d_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+      ! Arguments
       class(amg_d_onelev_type), intent(inout) :: lv
       integer(psb_ipk_), intent(out)            :: info
     end subroutine amg_d_base_onelev_check
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_setsm(lv,val,info,pos)
+    subroutine amg_d_base_onelev_setsm(lv,val,info,pos)
+      import :: psb_dpk_, amg_d_onelev_type, amg_d_base_smoother_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_d_onelev_type), target, intent(inout) :: lv
       class(amg_d_base_smoother_type), intent(in)     :: val
       integer(psb_ipk_), intent(out)                  :: info
@@ -349,8 +356,12 @@ module amg_d_onelev_mod
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_setsv(lv,val,info,pos)
+    subroutine amg_d_base_onelev_setsv(lv,val,info,pos)
+      import :: psb_dpk_, amg_d_onelev_type, amg_d_base_solver_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_d_onelev_type), target, intent(inout) :: lv
       class(amg_d_base_solver_type), intent(in)       :: val
       integer(psb_ipk_), intent(out)                  :: info
@@ -359,8 +370,12 @@ module amg_d_onelev_mod
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_setag(lv,val,info,pos)
+    subroutine amg_d_base_onelev_setag(lv,val,info,pos)
+      import :: psb_dpk_, amg_d_onelev_type, amg_d_base_aggregator_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_d_onelev_type), target, intent(inout) :: lv
       class(amg_d_base_aggregator_type), intent(in)       :: val
       integer(psb_ipk_), intent(out)                  :: info
@@ -369,8 +384,13 @@ module amg_d_onelev_mod
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_cseti(lv,what,val,info,pos,idx)
+    subroutine amg_d_base_onelev_cseti(lv,what,val,info,pos,idx)
+      import :: psb_dspmat_type, psb_d_vect_type, psb_d_base_vect_type, &
+           & psb_dlinmap_type, psb_dpk_, amg_d_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_d_onelev_type), intent(inout) :: lv
       character(len=*), intent(in)              :: what
       integer(psb_ipk_), intent(in)             :: val
@@ -381,8 +401,12 @@ module amg_d_onelev_mod
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_csetc(lv,what,val,info,pos,idx)
+    subroutine amg_d_base_onelev_csetc(lv,what,val,info,pos,idx)
+      import :: psb_dspmat_type, psb_d_vect_type, psb_d_base_vect_type, &
+           & psb_dlinmap_type, psb_dpk_, amg_d_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+      ! Arguments
       class(amg_d_onelev_type), intent(inout) :: lv
       character(len=*), intent(in)              :: what
       character(len=*), intent(in)              :: val
@@ -393,8 +417,12 @@ module amg_d_onelev_mod
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_csetr(lv,what,val,info,pos,idx)
+    subroutine amg_d_base_onelev_csetr(lv,what,val,info,pos,idx)
+      import :: psb_dspmat_type, psb_d_vect_type, psb_d_base_vect_type, &
+           & psb_dlinmap_type, psb_dpk_, amg_d_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
       class(amg_d_onelev_type), intent(inout) :: lv
       character(len=*), intent(in)              :: what
       real(psb_dpk_), intent(in)                 :: val
@@ -405,8 +433,11 @@ module amg_d_onelev_mod
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_dump(lv,level,info,prefix,head,ac,rp,smoother,&
+    subroutine amg_d_base_onelev_dump(lv,level,info,prefix,head,ac,rp,smoother,&
          & solver,tprol,global_num)
+      import :: psb_dspmat_type, psb_d_vect_type, psb_d_base_vect_type, &
+           & psb_dlinmap_type, psb_dpk_, amg_d_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
       class(amg_d_onelev_type), intent(in) :: lv
       integer(psb_ipk_), intent(in)          :: level
@@ -417,7 +448,8 @@ module amg_d_onelev_mod
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_map_rstr_a(lv,alpha,u,beta,v,info,work)
+    subroutine amg_d_base_onelev_map_rstr_a(lv,alpha,u,beta,v,info,work)
+      import
       implicit none
       class(amg_d_onelev_type), target, intent(inout) :: lv
       real(psb_dpk_), intent(in)     :: alpha, beta
@@ -426,8 +458,8 @@ module amg_d_onelev_mod
       integer(psb_ipk_), intent(out) :: info
       real(psb_dpk_), optional       :: work(:)
     end subroutine amg_d_base_onelev_map_rstr_a
-    module subroutine amg_d_base_onelev_map_rstr_v(lv,alpha,vect_u,beta,vect_v,info,&
-         & work,vtx,vty)
+    subroutine amg_d_base_onelev_map_rstr_v(lv,alpha,vect_u,beta,vect_v,info,work,vtx,vty)
+      import
       implicit none
       class(amg_d_onelev_type), target, intent(inout) :: lv
       real(psb_dpk_), intent(in)           :: alpha, beta
@@ -439,7 +471,8 @@ module amg_d_onelev_mod
   end interface
 
   interface
-    module subroutine amg_d_base_onelev_map_prol_a(lv,alpha,v,beta,u,info,work)
+    subroutine amg_d_base_onelev_map_prol_a(lv,alpha,v,beta,u,info,work)
+      import
       implicit none
       class(amg_d_onelev_type), target, intent(inout) :: lv
       real(psb_dpk_), intent(in)     :: alpha, beta
@@ -449,8 +482,8 @@ module amg_d_onelev_mod
       real(psb_dpk_), optional          :: work(:)
 
     end subroutine amg_d_base_onelev_map_prol_a
-    module subroutine amg_d_base_onelev_map_prol_v(lv,alpha,vect_v,beta,vect_u,info,&
-         & work,vtx,vty)
+    subroutine amg_d_base_onelev_map_prol_v(lv,alpha,vect_v,beta,vect_u,info,work,vtx,vty)
+      import
       implicit none
       class(amg_d_onelev_type), target, intent(inout) :: lv
       real(psb_dpk_), intent(in)           :: alpha, beta
@@ -461,118 +494,6 @@ module amg_d_onelev_mod
     end subroutine amg_d_base_onelev_map_prol_v
   end interface
 
-  interface 
-    module subroutine d_base_onelev_move_alloc(lv, b,info)
-      implicit none
-      class(amg_d_onelev_type), target, intent(inout) :: lv, b
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine d_base_onelev_move_alloc
-  end interface
-
-  interface 
-    module subroutine d_base_onelev_allocate_wrk(lv,info,vmold)
-      implicit none
-      class(amg_d_onelev_type), target, intent(inout) :: lv
-      integer(psb_ipk_), intent(out) :: info
-      class(psb_d_base_vect_type), intent(in), optional  :: vmold
-    end subroutine d_base_onelev_allocate_wrk
-  end interface
-  
-  interface 
-    module subroutine d_base_onelev_free_wrk(lv,info)
-      implicit none
-      class(amg_d_onelev_type), target, intent(inout) :: lv
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine d_base_onelev_free_wrk
-  end interface
-
-  interface 
-    module  subroutine d_wrk_alloc(wk,nwv,desc,info,vmold, desc2)
-      Implicit None
-      ! Arguments
-      class(amg_dmlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(in)                     :: nwv
-      type(psb_desc_type), intent(in)                   :: desc
-      integer(psb_ipk_), intent(out)                    :: info
-      class(psb_d_base_vect_type), intent(in), optional  :: vmold
-      type(psb_desc_type), intent(in), optional          :: desc2
-    end subroutine d_wrk_alloc
-  end interface
-
-  interface 
-    module subroutine d_inner_do_wrk_alloc(wk,nwv,desc,vmold)
-      class(amg_dmlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(in)                     :: nwv
-      type(psb_desc_type), intent(in)                   :: desc
-      class(psb_d_base_vect_type), intent(in), optional  :: vmold
-    end subroutine d_inner_do_wrk_alloc
-  end interface
-
-  interface 
-    module  subroutine d_wrk_free(wk,info)
-      Implicit None
-      ! Arguments
-      class(amg_dmlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine d_wrk_free
-  end interface
-
-  interface 
-    module  subroutine d_wrk_clone(wk,wkout,info)
-      Implicit None
-      ! Arguments
-      class(amg_dmlprec_wrk_type), target, intent(inout) :: wk
-      class(amg_dmlprec_wrk_type), target, intent(inout) :: wkout
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine d_wrk_clone
-  end interface
-
-  interface 
-    module subroutine d_wrk_move_alloc(wk, b,info)
-      implicit none
-      class(amg_dmlprec_wrk_type), target, intent(inout) :: wk, b
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine d_wrk_move_alloc
-  end interface
-
-  interface
-    module subroutine d_wrk_cnv(wk,info,vmold)
-      Implicit None
-      class(amg_dmlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(out)                    :: info
-      class(psb_d_base_vect_type), intent(in), optional  :: vmold
-    end subroutine d_wrk_cnv
-  end interface
-
-  interface
-    module function d_wrk_sizeof(wk) result(val)
-      implicit none
-      class(amg_dmlprec_wrk_type), intent(in) :: wk
-      integer(psb_epk_) :: val
-    end  function d_wrk_sizeof
-  end interface
-
-  interface 
-    module subroutine d_remap_data_clone(rmp, remap_out, info)
-      implicit none
-      ! Arguments
-      class(amg_d_remap_data_type), target, intent(inout) :: rmp
-      class(amg_d_remap_data_type), target, intent(inout) :: remap_out
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine d_remap_data_clone
-  end interface
-
-  interface 
-    module subroutine d_remap_move_alloc(rmp, remap_out, info)
-      implicit none
-      ! Arguments
-      class(amg_d_remap_data_type), target, intent(inout) :: rmp
-      class(amg_d_remap_data_type), target, intent(inout) :: remap_out
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine d_remap_move_alloc
-  end interface
-  
-
 contains
   !
   ! Function returning the size of the amg_prec_type data structure
@@ -698,7 +619,7 @@ contains
     ! Arguments
     class(amg_d_onelev_type), target, intent(inout) :: lv
     class(amg_d_onelev_type), target, intent(inout) :: lvout
-    integer(psb_ipk_), intent(out)                  :: info
+    integer(psb_ipk_), intent(out)                    :: info
 
     info = psb_success_
     if (allocated(lv%sm)) then
@@ -740,6 +661,36 @@ contains
 
   end subroutine d_base_onelev_clone
 
+  subroutine d_base_onelev_move_alloc(lv, b,info)
+    use psb_base_mod
+    implicit none
+    class(amg_d_onelev_type), target, intent(inout) :: lv, b
+    integer(psb_ipk_), intent(out) :: info
+
+    call b%free(info)
+    b%parms  = lv%parms
+    b%szratio = lv%szratio
+    if (associated(lv%sm2,lv%sm2a)) then
+      call move_alloc(lv%sm,b%sm)
+      call move_alloc(lv%sm2a,b%sm2a)
+      b%sm2 =>b%sm2a
+    else
+      call move_alloc(lv%sm,b%sm)
+      call move_alloc(lv%sm2a,b%sm2a)
+      b%sm2 =>b%sm
+    end if
+
+    call move_alloc(lv%aggr,b%aggr)
+    if (info == psb_success_) call psb_move_alloc(lv%ac,b%ac,info)
+    if (info == psb_success_) call psb_move_alloc(lv%tprol,b%tprol,info)
+    if (info == psb_success_) call psb_move_alloc(lv%desc_ac,b%desc_ac,info)
+    if (info == psb_success_) call psb_move_alloc(lv%linmap,b%linmap,info)
+    b%base_a    => lv%base_a
+    b%base_desc => lv%base_desc
+
+  end subroutine d_base_onelev_move_alloc
+
+
   function d_base_onelev_get_wrksize(lv) result(val)
     implicit none
     class(amg_d_onelev_type), intent(inout) :: lv
@@ -777,5 +728,269 @@ contains
 
   end function d_base_onelev_get_wrksize
 
-  
+  subroutine d_base_onelev_allocate_wrk(lv,info,vmold)
+    use psb_base_mod
+    implicit none
+    class(amg_d_onelev_type), target, intent(inout) :: lv
+    integer(psb_ipk_), intent(out) :: info
+    class(psb_d_base_vect_type), intent(in), optional  :: vmold
+    !
+    integer(psb_ipk_) :: nwv, i
+    info = psb_success_
+    nwv = lv%get_wrksz()
+    if (.not.allocated(lv%wrk)) allocate(lv%wrk,stat=info)
+    if (info == 0) then
+      if (lv%remap_data%desc_ac_pre_remap%is_asb()) then
+        !
+        !  Need to fix this, we need two different allocations
+        !
+        call lv%wrk%alloc(nwv,lv%base_desc,info,vmold=vmold,&
+             & desc2=lv%remap_data%desc_ac_pre_remap)
+      else
+        call lv%wrk%alloc(nwv,lv%base_desc,info,vmold=vmold)
+      end if
+    end if
+
+  end subroutine d_base_onelev_allocate_wrk
+
+
+  subroutine d_base_onelev_free_wrk(lv,info)
+    use psb_base_mod
+    implicit none
+    class(amg_d_onelev_type), target, intent(inout) :: lv
+    integer(psb_ipk_), intent(out) :: info
+    !
+    integer(psb_ipk_) :: nwv,i
+    info = psb_success_
+
+    if (allocated(lv%wrk)) then
+      call lv%wrk%free(info)
+      if (info == 0) deallocate(lv%wrk,stat=info)
+    end if
+  end subroutine d_base_onelev_free_wrk
+
+  subroutine d_wrk_alloc(wk,nwv,desc,info,vmold, desc2)
+    use psb_base_mod
+
+    Implicit None
+
+    ! Arguments
+    class(amg_dmlprec_wrk_type), target, intent(inout) :: wk
+    integer(psb_ipk_), intent(in)                     :: nwv
+    type(psb_desc_type), intent(in)                   :: desc
+    integer(psb_ipk_), intent(out)                    :: info
+    class(psb_d_base_vect_type), intent(in), optional  :: vmold
+    type(psb_desc_type), intent(in), optional          :: desc2
+    !
+    integer(psb_ipk_) :: i
+
+    info = psb_success_
+    call wk%free(info)
+    if  (present(desc2)) then
+!!$      write(0,*) 'Check on wrk_alloc 2',&
+!!$           & desc2%get_local_rows(), desc%get_local_rows(),&
+!!$           & desc2%get_local_cols(),desc%get_local_cols()
+!!$      flush(0)
+      if (desc2%get_local_cols()>desc%get_local_cols()) then
+        call psb_geasb(wk%vx2l,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vy2l,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vtx,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vty,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        allocate(wk%wv(nwv),stat=info)
+        do i=1,nwv
+          call psb_geasb(wk%wv(i),desc2,info,&
+               & scratch=.true.,mold=vmold)
+        end do
+      else
+!!$        write(0,*) 'Check on wrk_alloc 1.5 ',&
+!!$             & desc%get_local_rows(),&
+!!$             & desc%get_local_cols()
+        call psb_geasb(wk%vx2l,desc,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vy2l,desc,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vtx,desc,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vty,desc,info,&
+             & scratch=.true.,mold=vmold)
+        allocate(wk%wv(nwv),stat=info)
+        do i=1,nwv
+          call psb_geasb(wk%wv(i),desc,info,&
+               & scratch=.true.,mold=vmold)
+        end do
+      end if
+    else
+!!$      write(0,*) 'Check on wrk_alloc 1 ',&
+!!$           & desc%get_local_rows(),&
+!!$           & desc%get_local_cols()
+      call psb_geasb(wk%vx2l,desc,info,&
+           & scratch=.true.,mold=vmold)
+      call psb_geasb(wk%vy2l,desc,info,&
+           & scratch=.true.,mold=vmold)
+      call psb_geasb(wk%vtx,desc,info,&
+           & scratch=.true.,mold=vmold)
+      call psb_geasb(wk%vty,desc,info,&
+           & scratch=.true.,mold=vmold)
+      allocate(wk%wv(nwv),stat=info)
+      do i=1,nwv
+        call psb_geasb(wk%wv(i),desc,info,&
+             & scratch=.true.,mold=vmold)
+      end do
+    end if
+  end subroutine d_wrk_alloc
+
+  subroutine d_wrk_free(wk,info)
+
+    Implicit None
+
+    ! Arguments
+    class(amg_dmlprec_wrk_type), target, intent(inout) :: wk
+    integer(psb_ipk_), intent(out)                    :: info
+    !
+    integer(psb_ipk_) :: i
+    info = psb_success_
+
+    if (allocated(wk%tx)) deallocate(wk%tx, stat=info)
+    if (allocated(wk%ty)) deallocate(wk%ty, stat=info)
+    if (allocated(wk%x2l)) deallocate(wk%x2l, stat=info)
+    if (allocated(wk%y2l)) deallocate(wk%y2l, stat=info)
+    call wk%vtx%free(info)
+    call wk%vty%free(info)
+    call wk%vx2l%free(info)
+    call wk%vy2l%free(info)
+    if (allocated(wk%wv)) then
+      do i=1,size(wk%wv)
+        call wk%wv(i)%free(info)
+      end do
+      deallocate(wk%wv, stat=info)
+    end if
+
+  end subroutine d_wrk_free
+
+  subroutine d_wrk_clone(wk,wkout,info)
+    use psb_base_mod
+    Implicit None
+
+    ! Arguments
+    class(amg_dmlprec_wrk_type), target, intent(inout) :: wk
+    class(amg_dmlprec_wrk_type), target, intent(inout) :: wkout
+    integer(psb_ipk_), intent(out)                    :: info
+    !
+    integer(psb_ipk_) :: i
+    info = psb_success_
+
+    call psb_safe_ab_cpy(wk%tx,wkout%tx,info)
+    call psb_safe_ab_cpy(wk%ty,wkout%ty,info)
+    call psb_safe_ab_cpy(wk%x2l,wkout%x2l,info)
+    call psb_safe_ab_cpy(wk%y2l,wkout%y2l,info)
+    call wk%vtx%clone(wkout%vtx,info)
+    call wk%vty%clone(wkout%vty,info)
+    call wk%vx2l%clone(wkout%vx2l,info)
+    call wk%vy2l%clone(wkout%vy2l,info)
+    if (allocated(wkout%wv)) then
+      do i=1,size(wkout%wv)
+        call wkout%wv(i)%free(info)
+      end do
+      deallocate( wkout%wv)
+    end if
+    allocate(wkout%wv(size(wk%wv)),stat=info)
+    do i=1,size(wk%wv)
+      call wk%wv(i)%clone(wkout%wv(i),info)
+    end do
+    return
+
+  end subroutine d_wrk_clone
+
+  subroutine d_wrk_move_alloc(wk, b,info)
+    implicit none
+    class(amg_dmlprec_wrk_type), target, intent(inout) :: wk, b
+    integer(psb_ipk_), intent(out) :: info
+
+    call b%free(info)
+    call move_alloc(wk%tx,b%tx)
+    call move_alloc(wk%ty,b%ty)
+    call move_alloc(wk%x2l,b%x2l)
+    call move_alloc(wk%y2l,b%y2l)
+    !
+    ! Should define V%move_alloc....
+    call move_alloc(wk%vtx%v,b%vtx%v)
+    call move_alloc(wk%vty%v,b%vty%v)
+    call move_alloc(wk%vx2l%v,b%vx2l%v)
+    call move_alloc(wk%vy2l%v,b%vy2l%v)
+    call move_alloc(wk%wv,b%wv)
+
+  end subroutine d_wrk_move_alloc
+
+  subroutine d_wrk_cnv(wk,info,vmold)
+    use psb_base_mod
+
+    Implicit None
+
+    ! Arguments
+    class(amg_dmlprec_wrk_type), target, intent(inout) :: wk
+    integer(psb_ipk_), intent(out)                    :: info
+    class(psb_d_base_vect_type), intent(in), optional  :: vmold
+    !
+    integer(psb_ipk_) :: i
+
+    info = psb_success_
+    if (present(vmold)) then
+      call wk%vtx%cnv(vmold)
+      call wk%vty%cnv(vmold)
+      call wk%vx2l%cnv(vmold)
+      call wk%vy2l%cnv(vmold)
+      if (allocated(wk%wv)) then
+        do i=1,size(wk%wv)
+          call wk%wv(i)%cnv(vmold)
+        end do
+      end if
+    end if
+  end subroutine d_wrk_cnv
+
+  function d_wrk_sizeof(wk) result(val)
+    use psb_realloc_mod
+    implicit none
+    class(amg_dmlprec_wrk_type), intent(in) :: wk
+    integer(psb_epk_) :: val
+    integer :: i
+    val = 0
+    val = val + (1_psb_epk_ * psb_sizeof_dp) * psb_size(wk%tx)
+    val = val + (1_psb_epk_ * psb_sizeof_dp) * psb_size(wk%ty)
+    val = val + (1_psb_epk_ * psb_sizeof_dp) * psb_size(wk%x2l)
+    val = val + (1_psb_epk_ * psb_sizeof_dp) * psb_size(wk%y2l)
+    val = val + wk%vtx%sizeof()
+    val = val + wk%vty%sizeof()
+    val = val + wk%vx2l%sizeof()
+    val = val + wk%vy2l%sizeof()
+    if (allocated(wk%wv)) then
+      do i=1, size(wk%wv)
+        val = val + wk%wv(i)%sizeof()
+      end do
+    end if
+  end function d_wrk_sizeof
+
+  subroutine d_remap_data_clone(rmp, remap_out, info)
+    use psb_base_mod
+    implicit none
+    ! Arguments
+    class(amg_d_remap_data_type), target, intent(inout) :: rmp
+    class(amg_d_remap_data_type), target, intent(inout) :: remap_out
+    integer(psb_ipk_), intent(out)                    :: info
+    !
+    integer(psb_ipk_) :: i
+
+    info = psb_success_
+
+    call rmp%ac_pre_remap%clone(remap_out%ac_pre_remap,info)
+    if (info == psb_success_) &
+         & call rmp%desc_ac_pre_remap%clone(remap_out%desc_ac_pre_remap,info)
+    remap_out%idest = rmp%idest
+    call psb_safe_ab_cpy(rmp%isrc,remap_out%isrc,info)
+    call psb_safe_ab_cpy(rmp%nrsrc,remap_out%nrsrc,info)
+  end subroutine d_remap_data_clone
+
 end module amg_d_onelev_mod

amgprec/amg_d_parmatch_aggregator_mod.F90

@@ -136,7 +136,7 @@ module amg_d_parmatch_aggregator_mod
     procedure, pass(ag) :: mat_bld      => amg_d_parmatch_aggregator_mat_bld
     procedure, pass(ag) :: mat_asb      => amg_d_parmatch_aggregator_mat_asb
     procedure, pass(ag) :: inner_mat_asb      => amg_d_parmatch_aggregator_inner_mat_asb
-    procedure, pass(ag) :: bld_linmap   => amg_d_parmatch_aggregator_bld_linmap
+    procedure, pass(ag) :: bld_map      => amg_d_parmatch_aggregator_bld_map
     procedure, pass(ag) :: csetc        => amg_d_parmatch_aggr_csetc
     procedure, pass(ag) :: cseti        => amg_d_parmatch_aggr_cseti
     procedure, pass(ag) :: default      => amg_d_parmatch_aggr_set_default
@@ -643,7 +643,7 @@ contains
     end select
   end subroutine amg_d_parmatch_aggregator_clone
 
-  subroutine  amg_d_parmatch_aggregator_bld_linmap(ag,desc_a,desc_ac,ilaggr,nlaggr,&
+  subroutine  amg_d_parmatch_aggregator_bld_map(ag,desc_a,desc_ac,ilaggr,nlaggr,&
        & op_restr,op_prol,map,info)
     use psb_base_mod
     implicit none
@@ -654,7 +654,7 @@ contains
     type(psb_dlinmap_type), intent(out)     :: map
     integer(psb_ipk_), intent(out)          :: info
     integer(psb_ipk_) :: err_act
-    character(len=20) :: name='d_parmatch_aggregator_bld_linmap'
+    character(len=20) :: name='d_parmatch_aggregator_bld_map'
 
     info = psb_success_
     call psb_erractionsave(err_act)
@@ -680,5 +680,5 @@ contains
 9999 call psb_error_handler(err_act)
 
     return
-  end subroutine amg_d_parmatch_aggregator_bld_linmap
+  end subroutine amg_d_parmatch_aggregator_bld_map
 end module amg_d_parmatch_aggregator_mod

amgprec/amg_d_poly_smoother.f90

@@ -140,7 +140,7 @@ module amg_d_poly_smoother
       import :: psb_desc_type, amg_d_poly_smoother_type, psb_d_vect_type, psb_dpk_, &
            & psb_dspmat_type, psb_d_base_sparse_mat, psb_d_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_d_poly_smoother_type), intent(inout)       :: sm
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_d_prec_type.f90

@@ -102,7 +102,6 @@ module amg_d_prec_type
     ! The multilevel hierarchy
     !
     type(amg_d_onelev_type), allocatable :: precv(:)
-    integer(psb_ipk_)                    :: nlevs
   contains
     procedure, pass(prec)               :: psb_d_apply2_vect => amg_d_apply2_vect
     procedure, pass(prec)               :: psb_d_apply1_vect => amg_d_apply1_vect
@@ -120,7 +119,6 @@ module amg_d_prec_type
     procedure, pass(prec)               :: cmp_complexity => amg_d_cmp_compl
     procedure, pass(prec)               :: get_avg_cr => amg_d_get_avg_cr
     procedure, pass(prec)               :: cmp_avg_cr => amg_d_cmp_avg_cr
-    procedure, pass(prec)               :: set_nlevs  => amg_d_set_nlevs
     procedure, pass(prec)               :: get_nlevs  => amg_d_get_nlevs
     procedure, pass(prec)               :: get_nzeros => amg_d_get_nzeros
     procedure, pass(prec)               :: sizeof => amg_dprec_sizeof
@@ -313,7 +311,7 @@ module amg_d_prec_type
            & psb_d_base_sparse_mat, psb_d_base_vect_type, &
            & psb_i_base_vect_type, amg_dprec_type, psb_ipk_
       implicit none
-      type(psb_dspmat_type), intent(inout), target       :: a
+      type(psb_dspmat_type), intent(in), target          :: a
       type(psb_desc_type), intent(inout), target           :: desc_a
       class(amg_dprec_type), intent(inout), target       :: prec
       integer(psb_ipk_), intent(out)                       :: info
@@ -325,15 +323,14 @@ module amg_d_prec_type
   end interface amg_precbld
 
   interface amg_hierarchy_bld
-    subroutine amg_d_hierarchy_bld(a,desc_a,prec,info,cpymat)
+    subroutine amg_d_hierarchy_bld(a,desc_a,prec,info)
       import :: psb_dspmat_type, psb_desc_type, psb_dpk_, &
            & amg_dprec_type, psb_ipk_
       implicit none
-      type(psb_dspmat_type), intent(inout), target       :: a
+      type(psb_dspmat_type), intent(in), target          :: a
       type(psb_desc_type), intent(inout), target           :: desc_a
       class(amg_dprec_type), intent(inout), target        :: prec
       integer(psb_ipk_), intent(out)                       :: info
-      logical, intent(in), optional                        :: cpymat
       !      character, intent(in),optional             :: upd
     end subroutine amg_d_hierarchy_bld
   end interface amg_hierarchy_bld
@@ -437,19 +434,10 @@ contains
     class(amg_dprec_type), intent(in) :: prec
     integer(psb_ipk_) :: val
     val = 0
-!!$    if (allocated(prec%precv)) then
-!!$      val = size(prec%precv)
-!!$    end if
-    val = prec%nlevs
-!!$    write(0,*) ' NLEVS: ',prec%nlevs, val,size(prec%precv)
+    if (allocated(prec%precv)) then
+      val = size(prec%precv)
+    end if
   end function amg_d_get_nlevs
-
-  subroutine amg_d_set_nlevs(prec,nl) 
-    implicit none
-    class(amg_dprec_type), intent(inout) :: prec
-    integer(psb_ipk_) :: nl
-    prec%nlevs = nl
-  end subroutine amg_d_set_nlevs
   !
   ! Function returning the size of the amg_prec_type data structure
   ! in bytes or in number of nonzeros of the operator(s) involved.
@@ -520,7 +508,7 @@ contains
 
     real(psb_dpk_) :: num, den, nmin
     type(psb_ctxt_type) :: ctxt
-    integer(psb_ipk_)   :: il,nl
+    integer(psb_ipk_)   :: il
 
     num = -done
     den = done
@@ -530,10 +518,7 @@ contains
       num = prec%precv(il)%base_a%get_nzeros()
       if (num >= dzero) then
         den = num
-        nl = prec%get_nlevs()
-!!$        write(0,*) 'Inside cmp_compl ',nl,size(prec%precv)
-        do il=2, nl
-!!$          write(0,*) '                 ',il,associated(prec%precv(il)%base_a)
+        do il=2,size(prec%precv)
           num = num + max(0,prec%precv(il)%base_a%get_nzeros())
         end do
       end if
@@ -564,6 +549,7 @@ contains
   end function amg_d_get_avg_cr
 
   subroutine amg_d_cmp_avg_cr(prec)
+
     implicit none
     class(amg_dprec_type), intent(inout) :: prec
 
@@ -571,18 +557,17 @@ contains
     type(psb_ctxt_type) :: ctxt
     integer(psb_ipk_)   :: il, nl, iam, np
 
+
     avgcr = dzero
-    nl = prec%get_nlevs()
-    do il=2,nl
-      if (prec%precv(il)%base_desc%is_ok()) then 
-        ctxt = prec%precv(il)%base_desc%get_ctxt()
-        call psb_info(ctxt,iam,np)
-        if (iam >=0)  avgcr = avgcr + max(dzero,prec%precv(il)%szratio)
-      end if
-    end do
-    avgcr = avgcr / (nl-1)
     ctxt = prec%ctxt
     call psb_info(ctxt,iam,np)
+    if (allocated(prec%precv)) then
+      nl = size(prec%precv)
+      do il=2,nl
+        avgcr = avgcr + max(dzero,prec%precv(il)%szratio)
+      end do
+      avgcr = avgcr / (nl-1)
+    end if
     call psb_sum(ctxt,avgcr)
     prec%ag_data%avg_cr = avgcr/np
   end subroutine amg_d_cmp_avg_cr
@@ -600,7 +585,9 @@ contains
   !             error code.
   !
   subroutine amg_dprecfree(p,info)
+
     implicit none
+
     ! Arguments
     type(amg_dprec_type), intent(inout) :: p
     integer(psb_ipk_), intent(out)        :: info
@@ -626,7 +613,9 @@ contains
   end subroutine amg_dprecfree
 
   subroutine amg_d_prec_free(prec,info)
+
     implicit none
+
     ! Arguments
     class(amg_dprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -646,11 +635,6 @@ contains
     if (allocated(prec%precv)) then
       do i=1,size(prec%precv)
         call prec%precv(i)%free(info)
-        if (psb_errstatus_fatal()) then
-          info=psb_err_internal_error_
-          call psb_errpush(info,name)
-          goto 9999
-        end if
       end do
       deallocate(prec%precv,stat=info)
     end if
@@ -663,7 +647,9 @@ contains
   end subroutine amg_d_prec_free
 
   subroutine amg_d_smoothers_free(prec,info)
+
     implicit none
+
     ! Arguments
     class(amg_dprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -680,7 +666,7 @@ contains
     end if
 
     if (allocated(prec%precv)) then
-      do i=1,prec%get_nlevs()
+      do i=1,size(prec%precv)
         call prec%precv(i)%free_smoothers(info)
       end do
     end if
@@ -694,7 +680,9 @@ contains
   end subroutine amg_d_smoothers_free
 
   subroutine amg_d_hierarchy_free(prec,info)
+
     implicit none
+
     ! Arguments
     class(amg_dprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -721,6 +709,7 @@ contains
 
   end subroutine amg_d_hierarchy_free
 
+
   !
   ! Top level methods.
   !
@@ -785,6 +774,7 @@ contains
 
   end subroutine amg_d_apply1_vect
 
+
   subroutine amg_d_apply2v(prec,x,y,desc_data,info,trans,work)
     implicit none
     type(psb_desc_type),intent(in)    :: desc_data
@@ -849,6 +839,7 @@ contains
   subroutine amg_d_dump(prec,info,istart,iend,iproc,prefix,head,&
        & ac,rp,smoother,solver,tprol,&
        & global_num)
+
     implicit none
     class(amg_dprec_type), intent(in)     :: prec
     integer(psb_ipk_), intent(out)          :: info
@@ -865,7 +856,7 @@ contains
     info = 0
     ctxt = prec%ctxt
     call psb_info(ctxt,iam,np)
-    iln = prec%get_nlevs()
+    iln = size(prec%precv)
     if (present(istart)) then
       il1 = max(1,istart)
     else
@@ -889,6 +880,7 @@ contains
   end subroutine amg_d_dump
 
   subroutine amg_d_cnv(prec,info,amold,vmold,imold)
+
     implicit none
     class(amg_dprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)       :: info
@@ -900,7 +892,7 @@ contains
 
     info = psb_success_
     if (allocated(prec%precv)) then
-      do i=1,prec%get_nlevs()
+      do i=1,size(prec%precv)
         if (info == psb_success_ ) &
              & call prec%precv(i)%cnv(info,amold=amold,vmold=vmold,imold=imold)
       end do
@@ -909,6 +901,7 @@ contains
   end subroutine amg_d_cnv
 
   subroutine amg_d_clone(prec,precout,info)
+
     implicit none
     class(amg_dprec_type), intent(inout) :: prec
     class(psb_dprec_type), intent(inout) :: precout
@@ -920,6 +913,7 @@ contains
   end subroutine amg_d_clone
 
   subroutine amg_d_inner_clone(prec,precout,info)
+
     implicit none
     class(amg_dprec_type), intent(inout)         :: prec
     class(psb_dprec_type), target, intent(inout) :: precout
@@ -935,9 +929,8 @@ contains
       pout%ctxt          = prec%ctxt
       pout%ag_data       = prec%ag_data
       pout%outer_sweeps  = prec%outer_sweeps
-      pout%nlevs         = prec%nlevs
       if (allocated(prec%precv)) then
-        ln = prec%get_nlevs()
+        ln = size(prec%precv)
         allocate(pout%precv(ln),stat=info)
         if (info /= psb_success_) goto 9999
         if (ln >= 1) then
@@ -945,7 +938,6 @@ contains
         end if
         do lev=2, ln
           if (info /= psb_success_) exit
-!!$          write(0,*) 'Inner_clone must be checked and reimplemented! '
           call prec%precv(lev)%clone(pout%precv(lev),info)
           if (info == psb_success_) then
             pout%precv(lev)%base_a       => pout%precv(lev)%ac
@@ -1010,7 +1002,7 @@ contains
     integer(psb_ipk_), intent(out)        :: info
     class(psb_d_base_vect_type), intent(in), optional  :: vmold
     !
-    ! In AMG the DESC optional argument is ignored, since
+    ! In MLD the DESC optional argument is ignored, since
     ! the necessary info is contained in the various entries of the
     ! PRECV component.
     type(psb_desc_type), intent(in), optional  :: desc
@@ -1025,7 +1017,7 @@ contains
     if (psb_errstatus_fatal()) then
       info = psb_err_internal_error_; goto 9999
     end if
-    nlev   = prec%get_nlevs()
+    nlev   = size(prec%precv)
     level = 1
     do level = 1, nlev
       call prec%precv(level)%allocate_wrk(info,vmold=vmold)
@@ -1048,6 +1040,7 @@ contains
   subroutine amg_d_free_wrk(prec,info)
     use psb_base_mod
     implicit none
+
     ! Arguments
     class(amg_dprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -1064,7 +1057,7 @@ contains
     end if
 
     if (allocated(prec%precv)) then
-      nlev   = prec%get_nlevs()
+      nlev   = size(prec%precv)
       do level = 1, nlev
         call prec%precv(level)%free_wrk(info)
       end do

amgprec/amg_d_slu_solver.F90

@@ -124,7 +124,7 @@ module amg_d_slu_solver
       Implicit None
 
       ! Arguments
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_d_slu_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_d_sludist_solver.F90

@@ -259,7 +259,7 @@ contains
     Implicit None
 
     ! Arguments
-    type(psb_dspmat_type), intent(inout), target        :: a
+    type(psb_dspmat_type), intent(in), target           :: a
     Type(psb_desc_type), Intent(inout)                  :: desc_a 
     class(amg_d_sludist_solver_type), intent(inout)     :: sv
     integer, intent(out)                                :: info

amgprec/amg_d_umf_solver.F90

@@ -163,7 +163,7 @@ module amg_d_umf_solver
       Implicit None
       
       ! Arguments
-      type(psb_dspmat_type), intent(inout), target        :: a
+      type(psb_dspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_d_umf_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                        :: info

amgprec/amg_s_ainv_solver.F90

@@ -103,7 +103,7 @@ module amg_s_ainv_solver
       Implicit None
 
       ! Arguments
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_s_ainv_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                      :: info
@@ -225,7 +225,7 @@ module amg_s_ainv_solver
       import :: psb_desc_type, psb_sspmat_type,  psb_s_base_sparse_mat, &
            & psb_d_vect_type, psb_s_base_vect_type, psb_spk_, psb_ipk_
       implicit none
-      type(psb_sspmat_type), intent(inout), target  :: a
+      type(psb_sspmat_type), intent(in), target   :: a
       integer(psb_ipk_), intent(in)               :: fillin,alg
       real(psb_spk_), intent(in)                  :: thresh
       type(psb_sspmat_type), intent(inout)        :: wmat, zmat

amgprec/amg_s_as_smoother.f90

@@ -230,7 +230,7 @@ module amg_s_as_smoother
            & psb_desc_type, psb_s_base_sparse_mat, psb_ipk_,&
            & psb_i_base_vect_type
       implicit none 
-      type(psb_sspmat_type), intent(inout), target     :: a
+      type(psb_sspmat_type), intent(in), target        :: a
       Type(psb_desc_type), Intent(inout)                 :: desc_a 
       class(amg_s_as_smoother_type), intent(inout)       :: sm
       integer(psb_ipk_), intent(out)                     :: info

amgprec/amg_s_base_aggregator_mod.f90

@@ -89,7 +89,7 @@ module amg_s_base_aggregator_mod
     procedure, pass(ag) :: bld_tprol   => amg_s_base_aggregator_build_tprol
     procedure, pass(ag) :: mat_bld     => amg_s_base_aggregator_mat_bld
     procedure, pass(ag) :: mat_asb     => amg_s_base_aggregator_mat_asb
-    procedure, pass(ag) :: bld_linmap  => amg_s_base_aggregator_bld_linmap
+    procedure, pass(ag) :: bld_map     => amg_s_base_aggregator_bld_map
     procedure, pass(ag) :: update_next => amg_s_base_aggregator_update_next
     procedure, pass(ag) :: clone       => amg_s_base_aggregator_clone
     procedure, pass(ag) :: free        => amg_s_base_aggregator_free
@@ -458,7 +458,7 @@ contains
   end subroutine amg_s_base_aggregator_mat_asb
 
   !
-  !> Function   bld_linmap
+  !> Function   bld_map
   !! \memberof  amg_s_base_aggregator_type
   !! \brief     Build linear map between hierarchy levels 
   !!
@@ -473,7 +473,7 @@ contains
   !!  \param map       The output map
   !!  \param info    Return code
   !!  
-  subroutine  amg_s_base_aggregator_bld_linmap(ag,desc_a,desc_ac,ilaggr,nlaggr,&
+  subroutine  amg_s_base_aggregator_bld_map(ag,desc_a,desc_ac,ilaggr,nlaggr,&
        & op_restr,op_prol,map,info)
     use psb_base_mod
     implicit none
@@ -484,7 +484,7 @@ contains
     type(psb_slinmap_type), intent(out)    :: map
     integer(psb_ipk_), intent(out)       :: info
     integer(psb_ipk_) :: err_act
-    character(len=20) :: name='s_base_aggregator_bld_linmap'
+    character(len=20) :: name='s_base_aggregator_bld_map'
 
     info = psb_success_
     call psb_erractionsave(err_act)
@@ -508,6 +508,7 @@ contains
 9999 call psb_error_handler(err_act)
 
     return
-  end subroutine amg_s_base_aggregator_bld_linmap
+  end subroutine amg_s_base_aggregator_bld_map
+
 
 end module amg_s_base_aggregator_mod

amgprec/amg_s_base_smoother_mod.f90

@@ -237,7 +237,7 @@ module amg_s_base_smoother_mod
            & psb_s_vect_type, psb_s_base_vect_type, psb_spk_, &
            & amg_s_base_smoother_type, psb_ipk_, psb_i_base_vect_type
       ! Arguments
-      type(psb_sspmat_type), intent(inout), target  :: a
+      type(psb_sspmat_type), intent(in), target     :: a
       Type(psb_desc_type), Intent(inout)              :: desc_a 
       class(amg_s_base_smoother_type), intent(inout) :: sm 
       integer(psb_ipk_), intent(out)                  :: info

amgprec/amg_s_base_solver_mod.f90

@@ -170,7 +170,7 @@ module amg_s_base_solver_mod
       Implicit None
       
       ! Arguments
-      type(psb_sspmat_type), intent(inout), target          :: a
+      type(psb_sspmat_type), intent(in), target             :: a
       Type(psb_desc_type), Intent(inout)                    :: desc_a 
       class(amg_s_base_solver_type), intent(inout)          :: sv
       integer(psb_ipk_), intent(out)                        :: info

amgprec/amg_s_diag_solver.f90

@@ -119,7 +119,7 @@ module amg_s_diag_solver
       import :: psb_desc_type, psb_sspmat_type,  psb_s_base_sparse_mat, &
            & psb_s_vect_type, psb_s_base_vect_type, psb_spk_, &
            & amg_s_diag_solver_type, psb_ipk_, psb_i_base_vect_type      
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                    :: desc_a 
       class(amg_s_diag_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                        :: info
@@ -331,7 +331,7 @@ module amg_s_l1_diag_solver
       import :: psb_desc_type, psb_sspmat_type,  psb_s_base_sparse_mat, &
            & psb_s_vect_type, psb_s_base_vect_type, psb_spk_, &
            & amg_s_l1_diag_solver_type, psb_ipk_, psb_i_base_vect_type      
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                    :: desc_a 
       class(amg_s_l1_diag_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                        :: info

amgprec/amg_s_gs_solver.f90

@@ -181,7 +181,7 @@ module amg_s_gs_solver
            & psb_sspmat_type, psb_s_base_sparse_mat, psb_s_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_s_gs_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info
@@ -195,7 +195,7 @@ module amg_s_gs_solver
            & psb_sspmat_type, psb_s_base_sparse_mat, psb_s_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_s_bwgs_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_s_id_solver.f90

@@ -123,7 +123,7 @@ contains
     Implicit None
 
     ! Arguments
-    type(psb_sspmat_type), intent(inout), target        :: a
+    type(psb_sspmat_type), intent(in), target           :: a
     Type(psb_desc_type), Intent(inout)                  :: desc_a 
     class(amg_s_id_solver_type), intent(inout)          :: sv
     integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_s_ilu_solver.f90

@@ -144,7 +144,7 @@ module amg_s_ilu_solver
            & psb_sspmat_type, psb_s_base_sparse_mat, psb_s_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_s_ilu_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_s_inner_mod.f90

@@ -56,7 +56,7 @@ module amg_s_inner_mod
            & psb_spk_, psb_s_base_sparse_mat, psb_s_base_vect_type, psb_ipk_
       import :: amg_sprec_type
       implicit none
-      type(psb_sspmat_type), intent(inout), target       :: a
+      type(psb_sspmat_type), intent(in), target          :: a
       type(psb_desc_type), intent(inout), target           :: desc_a
       type(amg_sprec_type), intent(inout), target        :: prec
       integer(psb_ipk_), intent(out)                       :: info
@@ -67,7 +67,7 @@ module amg_s_inner_mod
   end interface amg_mlprec_bld
 
   interface amg_mlprec_aply
-    subroutine amg_smlprec_aply_a(alpha,p,x,beta,y,desc_data,trans,work,info)
+    subroutine amg_smlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info)
       import :: psb_sspmat_type, psb_desc_type, psb_spk_, psb_ipk_
       import :: amg_sprec_type
       implicit none 
@@ -79,7 +79,7 @@ module amg_s_inner_mod
       character,intent(in)               :: trans
       real(psb_spk_),target             :: work(:)
       integer(psb_ipk_), intent(out)     :: info
-    end subroutine amg_smlprec_aply_a
+    end subroutine amg_smlprec_aply
     subroutine amg_smlprec_aply_vect(alpha,p,x,beta,y,desc_data,trans,work,info)
       import :: psb_sspmat_type, psb_desc_type, &
            & psb_spk_, psb_s_vect_type, psb_ipk_

amgprec/amg_s_invk_solver.f90

@@ -94,7 +94,7 @@ module amg_s_invk_solver
       Implicit None
 
       ! Arguments
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_s_invk_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_s_invt_solver.f90

@@ -94,7 +94,7 @@ module amg_s_invt_solver
       Implicit None
 
       ! Arguments
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_s_invt_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_s_jac_smoother.f90

@@ -151,7 +151,7 @@ module amg_s_jac_smoother
       import :: psb_desc_type, amg_s_jac_smoother_type, psb_s_vect_type, psb_spk_, &
            & psb_sspmat_type, psb_s_base_sparse_mat, psb_s_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_s_jac_smoother_type), intent(inout)       :: sm
       integer(psb_ipk_), intent(out)                      :: info
@@ -274,7 +274,7 @@ module amg_s_jac_smoother
       import :: psb_desc_type, amg_s_l1_jac_smoother_type, psb_s_vect_type, &
            & psb_sspmat_type, psb_s_base_sparse_mat, psb_s_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_s_l1_jac_smoother_type), intent(inout)       :: sm
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_s_jac_solver.f90

@@ -143,7 +143,7 @@ module amg_s_jac_solver
            & psb_sspmat_type, psb_s_base_sparse_mat, psb_s_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_s_jac_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info
@@ -160,7 +160,7 @@ module amg_s_jac_solver
            & psb_sspmat_type, psb_s_base_sparse_mat, psb_s_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_s_l1_jac_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_s_krm_solver.f90

@@ -174,7 +174,7 @@ module amg_s_krm_solver
            & psb_sspmat_type, psb_s_base_sparse_mat, psb_s_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_s_krm_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_s_mumps_solver.F90

@@ -163,7 +163,7 @@ module amg_s_mumps_solver
       Implicit None
 
       ! Arguments
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_s_mumps_solver_type), intent(inout)       :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_s_onelev_mod.f90

@@ -155,35 +155,13 @@ module amg_s_onelev_mod
   private :: s_wrk_alloc, s_wrk_free, &
        & s_wrk_clone, s_wrk_move_alloc, s_wrk_cnv, s_wrk_sizeof
 
-  !
-  ! Remap.
-  !  This keeps track of remapping.
-  !  Logic here is as follows:
-  !  1. AC_PRE_REMAP  need to figure out if we
-  !                really need it.
-  !  2. DESC_AC_PRE_REMAP  contains the descriptor before
-  !                remapping. Meaning that it is possible
-  !                to implement the RESTRICTOR operator by
-  !                 a. Doing LINMAP_U2V onto this one
-  !                 b. For each process, send the data to
-  !                    IDEST.
-  !                This assumes that remapping goes by
-  !                a factor of 2.
-  !                For the PROLONGATOR operators, we first
-  !                use DESC_AC, then split and send onto
-  !                the processes in DESC_AC_PRE_REMAP.
-  !
-  ! To be fixed: what happens if NP the starting processes
-  ! is not an even number? Coordinate with _X_remap in PSBLAS
-  ! 
   type amg_s_remap_data_type
     type(psb_sspmat_type)          :: ac_pre_remap
     type(psb_desc_type)            :: desc_ac_pre_remap
     integer(psb_ipk_)              :: idest
     integer(psb_ipk_), allocatable :: isrc(:), nrsrc(:), naggr(:)
   contains
-    procedure, pass(rmp) :: clone      => s_remap_data_clone
-    procedure, pass(rmp) :: move_alloc => s_remap_move_alloc
+    procedure, pass(rmp) :: clone   => s_remap_data_clone
   end type amg_s_remap_data_type
 
   type amg_s_onelev_type
@@ -229,7 +207,7 @@ module amg_s_onelev_mod
     procedure, pass(lv) :: get_wrksz => s_base_onelev_get_wrksize
     procedure, pass(lv) :: allocate_wrk   => s_base_onelev_allocate_wrk
     procedure, pass(lv) :: free_wrk       => s_base_onelev_free_wrk
-    procedure, nopass   :: stringval  => amg_stringval
+    procedure, nopass   :: stringval => amg_stringval
     procedure, pass(lv) :: move_alloc => s_base_onelev_move_alloc
 
 
@@ -253,7 +231,9 @@ module amg_s_onelev_mod
        & s_base_onelev_free_wrk
 
   interface
-    module subroutine amg_s_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,t_prol,info)
+    subroutine amg_s_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,t_prol,info)
+      import :: psb_sspmat_type, psb_desc_type, psb_spk_, psb_ipk_, psb_lsspmat_type, psb_lpk_
+      import :: amg_s_onelev_type
       implicit none
       class(amg_s_onelev_type), intent(inout), target :: lv
       type(psb_sspmat_type), intent(in) :: a
@@ -265,7 +245,10 @@ module amg_s_onelev_mod
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_build(lv,info,amold,vmold,imold,ilv)
+    subroutine amg_s_base_onelev_build(lv,info,amold,vmold,imold,ilv)
+      import :: psb_s_base_sparse_mat, psb_s_base_vect_type, &
+           & psb_i_base_vect_type, psb_spk_, amg_s_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
       class(amg_s_onelev_type), target, intent(inout) :: lv
       integer(psb_ipk_), intent(out) :: info
@@ -277,7 +260,10 @@ module amg_s_onelev_mod
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_descr(lv,il,nl,ilmin,info,iout, verbosity,prefix)
+    subroutine amg_s_base_onelev_descr(lv,il,nl,ilmin,info,iout, verbosity,prefix)
+      import :: psb_sspmat_type, psb_s_vect_type, psb_s_base_vect_type, &
+           & psb_slinmap_type, psb_spk_, amg_s_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
       ! Arguments
       class(amg_s_onelev_type), intent(in)    :: lv
@@ -290,8 +276,10 @@ module amg_s_onelev_mod
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_memory_use(lv,il,nl,ilmin,info,&
-         & iout,verbosity, prefix,global) 
+    subroutine amg_s_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity, prefix,global)
+      import :: psb_sspmat_type, psb_s_vect_type, psb_s_base_vect_type, &
+           & psb_slinmap_type, psb_spk_, amg_s_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
       ! Arguments
       class(amg_s_onelev_type), intent(in)    :: lv
@@ -305,7 +293,10 @@ module amg_s_onelev_mod
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_cnv(lv,info,amold,vmold,imold)
+    subroutine amg_s_base_onelev_cnv(lv,info,amold,vmold,imold)
+      import :: amg_s_onelev_type, psb_s_base_vect_type, psb_spk_, &
+           & psb_s_base_sparse_mat, psb_ipk_, psb_i_base_vect_type
+      ! Arguments
       class(amg_s_onelev_type), intent(inout)            :: lv
       integer(psb_ipk_), intent(out)                     :: info
       class(psb_s_base_sparse_mat), intent(in), optional :: amold
@@ -315,32 +306,48 @@ module amg_s_onelev_mod
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_free(lv,info)
+    subroutine amg_s_base_onelev_free(lv,info)
+      import :: psb_sspmat_type, psb_s_vect_type, psb_s_base_vect_type, &
+           & psb_slinmap_type, psb_spk_, amg_s_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
+
       class(amg_s_onelev_type), intent(inout) :: lv
       integer(psb_ipk_), intent(out)                :: info
     end subroutine amg_s_base_onelev_free
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_free_smoothers(lv,info)
+    subroutine amg_s_base_onelev_free_smoothers(lv,info)
+      import :: psb_sspmat_type, psb_s_vect_type, psb_s_base_vect_type, &
+           & psb_slinmap_type, psb_spk_, amg_s_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
+
       class(amg_s_onelev_type), intent(inout) :: lv
       integer(psb_ipk_), intent(out)                :: info
     end subroutine amg_s_base_onelev_free_smoothers
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_check(lv,info)
+    subroutine amg_s_base_onelev_check(lv,info)
+      import :: psb_sspmat_type, psb_s_vect_type, psb_s_base_vect_type, &
+           & psb_slinmap_type, psb_spk_, amg_s_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+      ! Arguments
       class(amg_s_onelev_type), intent(inout) :: lv
       integer(psb_ipk_), intent(out)            :: info
     end subroutine amg_s_base_onelev_check
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_setsm(lv,val,info,pos)
+    subroutine amg_s_base_onelev_setsm(lv,val,info,pos)
+      import :: psb_spk_, amg_s_onelev_type, amg_s_base_smoother_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_s_onelev_type), target, intent(inout) :: lv
       class(amg_s_base_smoother_type), intent(in)     :: val
       integer(psb_ipk_), intent(out)                  :: info
@@ -349,8 +356,12 @@ module amg_s_onelev_mod
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_setsv(lv,val,info,pos)
+    subroutine amg_s_base_onelev_setsv(lv,val,info,pos)
+      import :: psb_spk_, amg_s_onelev_type, amg_s_base_solver_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_s_onelev_type), target, intent(inout) :: lv
       class(amg_s_base_solver_type), intent(in)       :: val
       integer(psb_ipk_), intent(out)                  :: info
@@ -359,8 +370,12 @@ module amg_s_onelev_mod
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_setag(lv,val,info,pos)
+    subroutine amg_s_base_onelev_setag(lv,val,info,pos)
+      import :: psb_spk_, amg_s_onelev_type, amg_s_base_aggregator_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_s_onelev_type), target, intent(inout) :: lv
       class(amg_s_base_aggregator_type), intent(in)       :: val
       integer(psb_ipk_), intent(out)                  :: info
@@ -369,8 +384,13 @@ module amg_s_onelev_mod
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_cseti(lv,what,val,info,pos,idx)
+    subroutine amg_s_base_onelev_cseti(lv,what,val,info,pos,idx)
+      import :: psb_sspmat_type, psb_s_vect_type, psb_s_base_vect_type, &
+           & psb_slinmap_type, psb_spk_, amg_s_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_s_onelev_type), intent(inout) :: lv
       character(len=*), intent(in)              :: what
       integer(psb_ipk_), intent(in)             :: val
@@ -381,8 +401,12 @@ module amg_s_onelev_mod
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_csetc(lv,what,val,info,pos,idx)
+    subroutine amg_s_base_onelev_csetc(lv,what,val,info,pos,idx)
+      import :: psb_sspmat_type, psb_s_vect_type, psb_s_base_vect_type, &
+           & psb_slinmap_type, psb_spk_, amg_s_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+      ! Arguments
       class(amg_s_onelev_type), intent(inout) :: lv
       character(len=*), intent(in)              :: what
       character(len=*), intent(in)              :: val
@@ -393,8 +417,12 @@ module amg_s_onelev_mod
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_csetr(lv,what,val,info,pos,idx)
+    subroutine amg_s_base_onelev_csetr(lv,what,val,info,pos,idx)
+      import :: psb_sspmat_type, psb_s_vect_type, psb_s_base_vect_type, &
+           & psb_slinmap_type, psb_spk_, amg_s_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
       class(amg_s_onelev_type), intent(inout) :: lv
       character(len=*), intent(in)              :: what
       real(psb_spk_), intent(in)                 :: val
@@ -405,8 +433,11 @@ module amg_s_onelev_mod
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_dump(lv,level,info,prefix,head,ac,rp,smoother,&
+    subroutine amg_s_base_onelev_dump(lv,level,info,prefix,head,ac,rp,smoother,&
          & solver,tprol,global_num)
+      import :: psb_sspmat_type, psb_s_vect_type, psb_s_base_vect_type, &
+           & psb_slinmap_type, psb_spk_, amg_s_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
       class(amg_s_onelev_type), intent(in) :: lv
       integer(psb_ipk_), intent(in)          :: level
@@ -417,7 +448,8 @@ module amg_s_onelev_mod
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_map_rstr_a(lv,alpha,u,beta,v,info,work)
+    subroutine amg_s_base_onelev_map_rstr_a(lv,alpha,u,beta,v,info,work)
+      import
       implicit none
       class(amg_s_onelev_type), target, intent(inout) :: lv
       real(psb_spk_), intent(in)     :: alpha, beta
@@ -426,8 +458,8 @@ module amg_s_onelev_mod
       integer(psb_ipk_), intent(out) :: info
       real(psb_spk_), optional       :: work(:)
     end subroutine amg_s_base_onelev_map_rstr_a
-    module subroutine amg_s_base_onelev_map_rstr_v(lv,alpha,vect_u,beta,vect_v,info,&
-         & work,vtx,vty)
+    subroutine amg_s_base_onelev_map_rstr_v(lv,alpha,vect_u,beta,vect_v,info,work,vtx,vty)
+      import
       implicit none
       class(amg_s_onelev_type), target, intent(inout) :: lv
       real(psb_spk_), intent(in)           :: alpha, beta
@@ -439,7 +471,8 @@ module amg_s_onelev_mod
   end interface
 
   interface
-    module subroutine amg_s_base_onelev_map_prol_a(lv,alpha,v,beta,u,info,work)
+    subroutine amg_s_base_onelev_map_prol_a(lv,alpha,v,beta,u,info,work)
+      import
       implicit none
       class(amg_s_onelev_type), target, intent(inout) :: lv
       real(psb_spk_), intent(in)     :: alpha, beta
@@ -449,8 +482,8 @@ module amg_s_onelev_mod
       real(psb_spk_), optional          :: work(:)
 
     end subroutine amg_s_base_onelev_map_prol_a
-    module subroutine amg_s_base_onelev_map_prol_v(lv,alpha,vect_v,beta,vect_u,info,&
-         & work,vtx,vty)
+    subroutine amg_s_base_onelev_map_prol_v(lv,alpha,vect_v,beta,vect_u,info,work,vtx,vty)
+      import
       implicit none
       class(amg_s_onelev_type), target, intent(inout) :: lv
       real(psb_spk_), intent(in)           :: alpha, beta
@@ -461,118 +494,6 @@ module amg_s_onelev_mod
     end subroutine amg_s_base_onelev_map_prol_v
   end interface
 
-  interface 
-    module subroutine s_base_onelev_move_alloc(lv, b,info)
-      implicit none
-      class(amg_s_onelev_type), target, intent(inout) :: lv, b
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine s_base_onelev_move_alloc
-  end interface
-
-  interface 
-    module subroutine s_base_onelev_allocate_wrk(lv,info,vmold)
-      implicit none
-      class(amg_s_onelev_type), target, intent(inout) :: lv
-      integer(psb_ipk_), intent(out) :: info
-      class(psb_s_base_vect_type), intent(in), optional  :: vmold
-    end subroutine s_base_onelev_allocate_wrk
-  end interface
-  
-  interface 
-    module subroutine s_base_onelev_free_wrk(lv,info)
-      implicit none
-      class(amg_s_onelev_type), target, intent(inout) :: lv
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine s_base_onelev_free_wrk
-  end interface
-
-  interface 
-    module  subroutine s_wrk_alloc(wk,nwv,desc,info,vmold, desc2)
-      Implicit None
-      ! Arguments
-      class(amg_smlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(in)                     :: nwv
-      type(psb_desc_type), intent(in)                   :: desc
-      integer(psb_ipk_), intent(out)                    :: info
-      class(psb_s_base_vect_type), intent(in), optional  :: vmold
-      type(psb_desc_type), intent(in), optional          :: desc2
-    end subroutine s_wrk_alloc
-  end interface
-
-  interface 
-    module subroutine s_inner_do_wrk_alloc(wk,nwv,desc,vmold)
-      class(amg_smlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(in)                     :: nwv
-      type(psb_desc_type), intent(in)                   :: desc
-      class(psb_s_base_vect_type), intent(in), optional  :: vmold
-    end subroutine s_inner_do_wrk_alloc
-  end interface
-
-  interface 
-    module  subroutine s_wrk_free(wk,info)
-      Implicit None
-      ! Arguments
-      class(amg_smlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine s_wrk_free
-  end interface
-
-  interface 
-    module  subroutine s_wrk_clone(wk,wkout,info)
-      Implicit None
-      ! Arguments
-      class(amg_smlprec_wrk_type), target, intent(inout) :: wk
-      class(amg_smlprec_wrk_type), target, intent(inout) :: wkout
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine s_wrk_clone
-  end interface
-
-  interface 
-    module subroutine s_wrk_move_alloc(wk, b,info)
-      implicit none
-      class(amg_smlprec_wrk_type), target, intent(inout) :: wk, b
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine s_wrk_move_alloc
-  end interface
-
-  interface
-    module subroutine s_wrk_cnv(wk,info,vmold)
-      Implicit None
-      class(amg_smlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(out)                    :: info
-      class(psb_s_base_vect_type), intent(in), optional  :: vmold
-    end subroutine s_wrk_cnv
-  end interface
-
-  interface
-    module function s_wrk_sizeof(wk) result(val)
-      implicit none
-      class(amg_smlprec_wrk_type), intent(in) :: wk
-      integer(psb_epk_) :: val
-    end  function s_wrk_sizeof
-  end interface
-
-  interface 
-    module subroutine s_remap_data_clone(rmp, remap_out, info)
-      implicit none
-      ! Arguments
-      class(amg_s_remap_data_type), target, intent(inout) :: rmp
-      class(amg_s_remap_data_type), target, intent(inout) :: remap_out
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine s_remap_data_clone
-  end interface
-
-  interface 
-    module subroutine s_remap_move_alloc(rmp, remap_out, info)
-      implicit none
-      ! Arguments
-      class(amg_s_remap_data_type), target, intent(inout) :: rmp
-      class(amg_s_remap_data_type), target, intent(inout) :: remap_out
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine s_remap_move_alloc
-  end interface
-  
-
 contains
   !
   ! Function returning the size of the amg_prec_type data structure
@@ -698,7 +619,7 @@ contains
     ! Arguments
     class(amg_s_onelev_type), target, intent(inout) :: lv
     class(amg_s_onelev_type), target, intent(inout) :: lvout
-    integer(psb_ipk_), intent(out)                  :: info
+    integer(psb_ipk_), intent(out)                    :: info
 
     info = psb_success_
     if (allocated(lv%sm)) then
@@ -740,6 +661,36 @@ contains
 
   end subroutine s_base_onelev_clone
 
+  subroutine s_base_onelev_move_alloc(lv, b,info)
+    use psb_base_mod
+    implicit none
+    class(amg_s_onelev_type), target, intent(inout) :: lv, b
+    integer(psb_ipk_), intent(out) :: info
+
+    call b%free(info)
+    b%parms  = lv%parms
+    b%szratio = lv%szratio
+    if (associated(lv%sm2,lv%sm2a)) then
+      call move_alloc(lv%sm,b%sm)
+      call move_alloc(lv%sm2a,b%sm2a)
+      b%sm2 =>b%sm2a
+    else
+      call move_alloc(lv%sm,b%sm)
+      call move_alloc(lv%sm2a,b%sm2a)
+      b%sm2 =>b%sm
+    end if
+
+    call move_alloc(lv%aggr,b%aggr)
+    if (info == psb_success_) call psb_move_alloc(lv%ac,b%ac,info)
+    if (info == psb_success_) call psb_move_alloc(lv%tprol,b%tprol,info)
+    if (info == psb_success_) call psb_move_alloc(lv%desc_ac,b%desc_ac,info)
+    if (info == psb_success_) call psb_move_alloc(lv%linmap,b%linmap,info)
+    b%base_a    => lv%base_a
+    b%base_desc => lv%base_desc
+
+  end subroutine s_base_onelev_move_alloc
+
+
   function s_base_onelev_get_wrksize(lv) result(val)
     implicit none
     class(amg_s_onelev_type), intent(inout) :: lv
@@ -777,5 +728,269 @@ contains
 
   end function s_base_onelev_get_wrksize
 
-  
+  subroutine s_base_onelev_allocate_wrk(lv,info,vmold)
+    use psb_base_mod
+    implicit none
+    class(amg_s_onelev_type), target, intent(inout) :: lv
+    integer(psb_ipk_), intent(out) :: info
+    class(psb_s_base_vect_type), intent(in), optional  :: vmold
+    !
+    integer(psb_ipk_) :: nwv, i
+    info = psb_success_
+    nwv = lv%get_wrksz()
+    if (.not.allocated(lv%wrk)) allocate(lv%wrk,stat=info)
+    if (info == 0) then
+      if (lv%remap_data%desc_ac_pre_remap%is_asb()) then
+        !
+        !  Need to fix this, we need two different allocations
+        !
+        call lv%wrk%alloc(nwv,lv%base_desc,info,vmold=vmold,&
+             & desc2=lv%remap_data%desc_ac_pre_remap)
+      else
+        call lv%wrk%alloc(nwv,lv%base_desc,info,vmold=vmold)
+      end if
+    end if
+
+  end subroutine s_base_onelev_allocate_wrk
+
+
+  subroutine s_base_onelev_free_wrk(lv,info)
+    use psb_base_mod
+    implicit none
+    class(amg_s_onelev_type), target, intent(inout) :: lv
+    integer(psb_ipk_), intent(out) :: info
+    !
+    integer(psb_ipk_) :: nwv,i
+    info = psb_success_
+
+    if (allocated(lv%wrk)) then
+      call lv%wrk%free(info)
+      if (info == 0) deallocate(lv%wrk,stat=info)
+    end if
+  end subroutine s_base_onelev_free_wrk
+
+  subroutine s_wrk_alloc(wk,nwv,desc,info,vmold, desc2)
+    use psb_base_mod
+
+    Implicit None
+
+    ! Arguments
+    class(amg_smlprec_wrk_type), target, intent(inout) :: wk
+    integer(psb_ipk_), intent(in)                     :: nwv
+    type(psb_desc_type), intent(in)                   :: desc
+    integer(psb_ipk_), intent(out)                    :: info
+    class(psb_s_base_vect_type), intent(in), optional  :: vmold
+    type(psb_desc_type), intent(in), optional          :: desc2
+    !
+    integer(psb_ipk_) :: i
+
+    info = psb_success_
+    call wk%free(info)
+    if  (present(desc2)) then
+!!$      write(0,*) 'Check on wrk_alloc 2',&
+!!$           & desc2%get_local_rows(), desc%get_local_rows(),&
+!!$           & desc2%get_local_cols(),desc%get_local_cols()
+!!$      flush(0)
+      if (desc2%get_local_cols()>desc%get_local_cols()) then
+        call psb_geasb(wk%vx2l,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vy2l,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vtx,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vty,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        allocate(wk%wv(nwv),stat=info)
+        do i=1,nwv
+          call psb_geasb(wk%wv(i),desc2,info,&
+               & scratch=.true.,mold=vmold)
+        end do
+      else
+!!$        write(0,*) 'Check on wrk_alloc 1.5 ',&
+!!$             & desc%get_local_rows(),&
+!!$             & desc%get_local_cols()
+        call psb_geasb(wk%vx2l,desc,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vy2l,desc,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vtx,desc,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vty,desc,info,&
+             & scratch=.true.,mold=vmold)
+        allocate(wk%wv(nwv),stat=info)
+        do i=1,nwv
+          call psb_geasb(wk%wv(i),desc,info,&
+               & scratch=.true.,mold=vmold)
+        end do
+      end if
+    else
+!!$      write(0,*) 'Check on wrk_alloc 1 ',&
+!!$           & desc%get_local_rows(),&
+!!$           & desc%get_local_cols()
+      call psb_geasb(wk%vx2l,desc,info,&
+           & scratch=.true.,mold=vmold)
+      call psb_geasb(wk%vy2l,desc,info,&
+           & scratch=.true.,mold=vmold)
+      call psb_geasb(wk%vtx,desc,info,&
+           & scratch=.true.,mold=vmold)
+      call psb_geasb(wk%vty,desc,info,&
+           & scratch=.true.,mold=vmold)
+      allocate(wk%wv(nwv),stat=info)
+      do i=1,nwv
+        call psb_geasb(wk%wv(i),desc,info,&
+             & scratch=.true.,mold=vmold)
+      end do
+    end if
+  end subroutine s_wrk_alloc
+
+  subroutine s_wrk_free(wk,info)
+
+    Implicit None
+
+    ! Arguments
+    class(amg_smlprec_wrk_type), target, intent(inout) :: wk
+    integer(psb_ipk_), intent(out)                    :: info
+    !
+    integer(psb_ipk_) :: i
+    info = psb_success_
+
+    if (allocated(wk%tx)) deallocate(wk%tx, stat=info)
+    if (allocated(wk%ty)) deallocate(wk%ty, stat=info)
+    if (allocated(wk%x2l)) deallocate(wk%x2l, stat=info)
+    if (allocated(wk%y2l)) deallocate(wk%y2l, stat=info)
+    call wk%vtx%free(info)
+    call wk%vty%free(info)
+    call wk%vx2l%free(info)
+    call wk%vy2l%free(info)
+    if (allocated(wk%wv)) then
+      do i=1,size(wk%wv)
+        call wk%wv(i)%free(info)
+      end do
+      deallocate(wk%wv, stat=info)
+    end if
+
+  end subroutine s_wrk_free
+
+  subroutine s_wrk_clone(wk,wkout,info)
+    use psb_base_mod
+    Implicit None
+
+    ! Arguments
+    class(amg_smlprec_wrk_type), target, intent(inout) :: wk
+    class(amg_smlprec_wrk_type), target, intent(inout) :: wkout
+    integer(psb_ipk_), intent(out)                    :: info
+    !
+    integer(psb_ipk_) :: i
+    info = psb_success_
+
+    call psb_safe_ab_cpy(wk%tx,wkout%tx,info)
+    call psb_safe_ab_cpy(wk%ty,wkout%ty,info)
+    call psb_safe_ab_cpy(wk%x2l,wkout%x2l,info)
+    call psb_safe_ab_cpy(wk%y2l,wkout%y2l,info)
+    call wk%vtx%clone(wkout%vtx,info)
+    call wk%vty%clone(wkout%vty,info)
+    call wk%vx2l%clone(wkout%vx2l,info)
+    call wk%vy2l%clone(wkout%vy2l,info)
+    if (allocated(wkout%wv)) then
+      do i=1,size(wkout%wv)
+        call wkout%wv(i)%free(info)
+      end do
+      deallocate( wkout%wv)
+    end if
+    allocate(wkout%wv(size(wk%wv)),stat=info)
+    do i=1,size(wk%wv)
+      call wk%wv(i)%clone(wkout%wv(i),info)
+    end do
+    return
+
+  end subroutine s_wrk_clone
+
+  subroutine s_wrk_move_alloc(wk, b,info)
+    implicit none
+    class(amg_smlprec_wrk_type), target, intent(inout) :: wk, b
+    integer(psb_ipk_), intent(out) :: info
+
+    call b%free(info)
+    call move_alloc(wk%tx,b%tx)
+    call move_alloc(wk%ty,b%ty)
+    call move_alloc(wk%x2l,b%x2l)
+    call move_alloc(wk%y2l,b%y2l)
+    !
+    ! Should define V%move_alloc....
+    call move_alloc(wk%vtx%v,b%vtx%v)
+    call move_alloc(wk%vty%v,b%vty%v)
+    call move_alloc(wk%vx2l%v,b%vx2l%v)
+    call move_alloc(wk%vy2l%v,b%vy2l%v)
+    call move_alloc(wk%wv,b%wv)
+
+  end subroutine s_wrk_move_alloc
+
+  subroutine s_wrk_cnv(wk,info,vmold)
+    use psb_base_mod
+
+    Implicit None
+
+    ! Arguments
+    class(amg_smlprec_wrk_type), target, intent(inout) :: wk
+    integer(psb_ipk_), intent(out)                    :: info
+    class(psb_s_base_vect_type), intent(in), optional  :: vmold
+    !
+    integer(psb_ipk_) :: i
+
+    info = psb_success_
+    if (present(vmold)) then
+      call wk%vtx%cnv(vmold)
+      call wk%vty%cnv(vmold)
+      call wk%vx2l%cnv(vmold)
+      call wk%vy2l%cnv(vmold)
+      if (allocated(wk%wv)) then
+        do i=1,size(wk%wv)
+          call wk%wv(i)%cnv(vmold)
+        end do
+      end if
+    end if
+  end subroutine s_wrk_cnv
+
+  function s_wrk_sizeof(wk) result(val)
+    use psb_realloc_mod
+    implicit none
+    class(amg_smlprec_wrk_type), intent(in) :: wk
+    integer(psb_epk_) :: val
+    integer :: i
+    val = 0
+    val = val + (1_psb_epk_ * psb_sizeof_sp) * psb_size(wk%tx)
+    val = val + (1_psb_epk_ * psb_sizeof_sp) * psb_size(wk%ty)
+    val = val + (1_psb_epk_ * psb_sizeof_sp) * psb_size(wk%x2l)
+    val = val + (1_psb_epk_ * psb_sizeof_sp) * psb_size(wk%y2l)
+    val = val + wk%vtx%sizeof()
+    val = val + wk%vty%sizeof()
+    val = val + wk%vx2l%sizeof()
+    val = val + wk%vy2l%sizeof()
+    if (allocated(wk%wv)) then
+      do i=1, size(wk%wv)
+        val = val + wk%wv(i)%sizeof()
+      end do
+    end if
+  end function s_wrk_sizeof
+
+  subroutine s_remap_data_clone(rmp, remap_out, info)
+    use psb_base_mod
+    implicit none
+    ! Arguments
+    class(amg_s_remap_data_type), target, intent(inout) :: rmp
+    class(amg_s_remap_data_type), target, intent(inout) :: remap_out
+    integer(psb_ipk_), intent(out)                    :: info
+    !
+    integer(psb_ipk_) :: i
+
+    info = psb_success_
+
+    call rmp%ac_pre_remap%clone(remap_out%ac_pre_remap,info)
+    if (info == psb_success_) &
+         & call rmp%desc_ac_pre_remap%clone(remap_out%desc_ac_pre_remap,info)
+    remap_out%idest = rmp%idest
+    call psb_safe_ab_cpy(rmp%isrc,remap_out%isrc,info)
+    call psb_safe_ab_cpy(rmp%nrsrc,remap_out%nrsrc,info)
+  end subroutine s_remap_data_clone
+
 end module amg_s_onelev_mod

amgprec/amg_s_parmatch_aggregator_mod.F90

@@ -136,7 +136,7 @@ module amg_s_parmatch_aggregator_mod
     procedure, pass(ag) :: mat_bld      => amg_s_parmatch_aggregator_mat_bld
     procedure, pass(ag) :: mat_asb      => amg_s_parmatch_aggregator_mat_asb
     procedure, pass(ag) :: inner_mat_asb      => amg_s_parmatch_aggregator_inner_mat_asb
-    procedure, pass(ag) :: bld_linmap   => amg_s_parmatch_aggregator_bld_linmap
+    procedure, pass(ag) :: bld_map      => amg_s_parmatch_aggregator_bld_map
     procedure, pass(ag) :: csetc        => amg_s_parmatch_aggr_csetc
     procedure, pass(ag) :: cseti        => amg_s_parmatch_aggr_cseti
     procedure, pass(ag) :: default      => amg_s_parmatch_aggr_set_default
@@ -643,7 +643,7 @@ contains
     end select
   end subroutine amg_s_parmatch_aggregator_clone
 
-  subroutine  amg_s_parmatch_aggregator_bld_linmap(ag,desc_a,desc_ac,ilaggr,nlaggr,&
+  subroutine  amg_s_parmatch_aggregator_bld_map(ag,desc_a,desc_ac,ilaggr,nlaggr,&
        & op_restr,op_prol,map,info)
     use psb_base_mod
     implicit none
@@ -654,7 +654,7 @@ contains
     type(psb_slinmap_type), intent(out)     :: map
     integer(psb_ipk_), intent(out)          :: info
     integer(psb_ipk_) :: err_act
-    character(len=20) :: name='s_parmatch_aggregator_bld_linmap'
+    character(len=20) :: name='s_parmatch_aggregator_bld_map'
 
     info = psb_success_
     call psb_erractionsave(err_act)
@@ -680,5 +680,5 @@ contains
 9999 call psb_error_handler(err_act)
 
     return
-  end subroutine amg_s_parmatch_aggregator_bld_linmap
+  end subroutine amg_s_parmatch_aggregator_bld_map
 end module amg_s_parmatch_aggregator_mod

amgprec/amg_s_poly_smoother.f90

@@ -140,7 +140,7 @@ module amg_s_poly_smoother
       import :: psb_desc_type, amg_s_poly_smoother_type, psb_s_vect_type, psb_spk_, &
            & psb_sspmat_type, psb_s_base_sparse_mat, psb_s_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_s_poly_smoother_type), intent(inout)       :: sm
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_s_prec_type.f90

@@ -102,7 +102,6 @@ module amg_s_prec_type
     ! The multilevel hierarchy
     !
     type(amg_s_onelev_type), allocatable :: precv(:)
-    integer(psb_ipk_)                    :: nlevs
   contains
     procedure, pass(prec)               :: psb_s_apply2_vect => amg_s_apply2_vect
     procedure, pass(prec)               :: psb_s_apply1_vect => amg_s_apply1_vect
@@ -120,7 +119,6 @@ module amg_s_prec_type
     procedure, pass(prec)               :: cmp_complexity => amg_s_cmp_compl
     procedure, pass(prec)               :: get_avg_cr => amg_s_get_avg_cr
     procedure, pass(prec)               :: cmp_avg_cr => amg_s_cmp_avg_cr
-    procedure, pass(prec)               :: set_nlevs  => amg_s_set_nlevs
     procedure, pass(prec)               :: get_nlevs  => amg_s_get_nlevs
     procedure, pass(prec)               :: get_nzeros => amg_s_get_nzeros
     procedure, pass(prec)               :: sizeof => amg_sprec_sizeof
@@ -313,7 +311,7 @@ module amg_s_prec_type
            & psb_s_base_sparse_mat, psb_s_base_vect_type, &
            & psb_i_base_vect_type, amg_sprec_type, psb_ipk_
       implicit none
-      type(psb_sspmat_type), intent(inout), target       :: a
+      type(psb_sspmat_type), intent(in), target          :: a
       type(psb_desc_type), intent(inout), target           :: desc_a
       class(amg_sprec_type), intent(inout), target       :: prec
       integer(psb_ipk_), intent(out)                       :: info
@@ -325,15 +323,14 @@ module amg_s_prec_type
   end interface amg_precbld
 
   interface amg_hierarchy_bld
-    subroutine amg_s_hierarchy_bld(a,desc_a,prec,info,cpymat)
+    subroutine amg_s_hierarchy_bld(a,desc_a,prec,info)
       import :: psb_sspmat_type, psb_desc_type, psb_spk_, &
            & amg_sprec_type, psb_ipk_
       implicit none
-      type(psb_sspmat_type), intent(inout), target       :: a
+      type(psb_sspmat_type), intent(in), target          :: a
       type(psb_desc_type), intent(inout), target           :: desc_a
       class(amg_sprec_type), intent(inout), target        :: prec
       integer(psb_ipk_), intent(out)                       :: info
-      logical, intent(in), optional                        :: cpymat
       !      character, intent(in),optional             :: upd
     end subroutine amg_s_hierarchy_bld
   end interface amg_hierarchy_bld
@@ -437,19 +434,10 @@ contains
     class(amg_sprec_type), intent(in) :: prec
     integer(psb_ipk_) :: val
     val = 0
-!!$    if (allocated(prec%precv)) then
-!!$      val = size(prec%precv)
-!!$    end if
-    val = prec%nlevs
-!!$    write(0,*) ' NLEVS: ',prec%nlevs, val,size(prec%precv)
+    if (allocated(prec%precv)) then
+      val = size(prec%precv)
+    end if
   end function amg_s_get_nlevs
-
-  subroutine amg_s_set_nlevs(prec,nl) 
-    implicit none
-    class(amg_sprec_type), intent(inout) :: prec
-    integer(psb_ipk_) :: nl
-    prec%nlevs = nl
-  end subroutine amg_s_set_nlevs
   !
   ! Function returning the size of the amg_prec_type data structure
   ! in bytes or in number of nonzeros of the operator(s) involved.
@@ -520,7 +508,7 @@ contains
 
     real(psb_spk_) :: num, den, nmin
     type(psb_ctxt_type) :: ctxt
-    integer(psb_ipk_)   :: il,nl
+    integer(psb_ipk_)   :: il
 
     num = -sone
     den = sone
@@ -530,10 +518,7 @@ contains
       num = prec%precv(il)%base_a%get_nzeros()
       if (num >= szero) then
         den = num
-        nl = prec%get_nlevs()
-!!$        write(0,*) 'Inside cmp_compl ',nl,size(prec%precv)
-        do il=2, nl
-!!$          write(0,*) '                 ',il,associated(prec%precv(il)%base_a)
+        do il=2,size(prec%precv)
           num = num + max(0,prec%precv(il)%base_a%get_nzeros())
         end do
       end if
@@ -564,6 +549,7 @@ contains
   end function amg_s_get_avg_cr
 
   subroutine amg_s_cmp_avg_cr(prec)
+
     implicit none
     class(amg_sprec_type), intent(inout) :: prec
 
@@ -571,18 +557,17 @@ contains
     type(psb_ctxt_type) :: ctxt
     integer(psb_ipk_)   :: il, nl, iam, np
 
+
     avgcr = szero
-    nl = prec%get_nlevs()
-    do il=2,nl
-      if (prec%precv(il)%base_desc%is_ok()) then 
-        ctxt = prec%precv(il)%base_desc%get_ctxt()
-        call psb_info(ctxt,iam,np)
-        if (iam >=0)  avgcr = avgcr + max(szero,prec%precv(il)%szratio)
-      end if
-    end do
-    avgcr = avgcr / (nl-1)
     ctxt = prec%ctxt
     call psb_info(ctxt,iam,np)
+    if (allocated(prec%precv)) then
+      nl = size(prec%precv)
+      do il=2,nl
+        avgcr = avgcr + max(szero,prec%precv(il)%szratio)
+      end do
+      avgcr = avgcr / (nl-1)
+    end if
     call psb_sum(ctxt,avgcr)
     prec%ag_data%avg_cr = avgcr/np
   end subroutine amg_s_cmp_avg_cr
@@ -600,7 +585,9 @@ contains
   !             error code.
   !
   subroutine amg_sprecfree(p,info)
+
     implicit none
+
     ! Arguments
     type(amg_sprec_type), intent(inout) :: p
     integer(psb_ipk_), intent(out)        :: info
@@ -626,7 +613,9 @@ contains
   end subroutine amg_sprecfree
 
   subroutine amg_s_prec_free(prec,info)
+
     implicit none
+
     ! Arguments
     class(amg_sprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -646,11 +635,6 @@ contains
     if (allocated(prec%precv)) then
       do i=1,size(prec%precv)
         call prec%precv(i)%free(info)
-        if (psb_errstatus_fatal()) then
-          info=psb_err_internal_error_
-          call psb_errpush(info,name)
-          goto 9999
-        end if
       end do
       deallocate(prec%precv,stat=info)
     end if
@@ -663,7 +647,9 @@ contains
   end subroutine amg_s_prec_free
 
   subroutine amg_s_smoothers_free(prec,info)
+
     implicit none
+
     ! Arguments
     class(amg_sprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -680,7 +666,7 @@ contains
     end if
 
     if (allocated(prec%precv)) then
-      do i=1,prec%get_nlevs()
+      do i=1,size(prec%precv)
         call prec%precv(i)%free_smoothers(info)
       end do
     end if
@@ -694,7 +680,9 @@ contains
   end subroutine amg_s_smoothers_free
 
   subroutine amg_s_hierarchy_free(prec,info)
+
     implicit none
+
     ! Arguments
     class(amg_sprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -721,6 +709,7 @@ contains
 
   end subroutine amg_s_hierarchy_free
 
+
   !
   ! Top level methods.
   !
@@ -785,6 +774,7 @@ contains
 
   end subroutine amg_s_apply1_vect
 
+
   subroutine amg_s_apply2v(prec,x,y,desc_data,info,trans,work)
     implicit none
     type(psb_desc_type),intent(in)    :: desc_data
@@ -849,6 +839,7 @@ contains
   subroutine amg_s_dump(prec,info,istart,iend,iproc,prefix,head,&
        & ac,rp,smoother,solver,tprol,&
        & global_num)
+
     implicit none
     class(amg_sprec_type), intent(in)     :: prec
     integer(psb_ipk_), intent(out)          :: info
@@ -865,7 +856,7 @@ contains
     info = 0
     ctxt = prec%ctxt
     call psb_info(ctxt,iam,np)
-    iln = prec%get_nlevs()
+    iln = size(prec%precv)
     if (present(istart)) then
       il1 = max(1,istart)
     else
@@ -889,6 +880,7 @@ contains
   end subroutine amg_s_dump
 
   subroutine amg_s_cnv(prec,info,amold,vmold,imold)
+
     implicit none
     class(amg_sprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)       :: info
@@ -900,7 +892,7 @@ contains
 
     info = psb_success_
     if (allocated(prec%precv)) then
-      do i=1,prec%get_nlevs()
+      do i=1,size(prec%precv)
         if (info == psb_success_ ) &
              & call prec%precv(i)%cnv(info,amold=amold,vmold=vmold,imold=imold)
       end do
@@ -909,6 +901,7 @@ contains
   end subroutine amg_s_cnv
 
   subroutine amg_s_clone(prec,precout,info)
+
     implicit none
     class(amg_sprec_type), intent(inout) :: prec
     class(psb_sprec_type), intent(inout) :: precout
@@ -920,6 +913,7 @@ contains
   end subroutine amg_s_clone
 
   subroutine amg_s_inner_clone(prec,precout,info)
+
     implicit none
     class(amg_sprec_type), intent(inout)         :: prec
     class(psb_sprec_type), target, intent(inout) :: precout
@@ -935,9 +929,8 @@ contains
       pout%ctxt          = prec%ctxt
       pout%ag_data       = prec%ag_data
       pout%outer_sweeps  = prec%outer_sweeps
-      pout%nlevs         = prec%nlevs
       if (allocated(prec%precv)) then
-        ln = prec%get_nlevs()
+        ln = size(prec%precv)
         allocate(pout%precv(ln),stat=info)
         if (info /= psb_success_) goto 9999
         if (ln >= 1) then
@@ -945,7 +938,6 @@ contains
         end if
         do lev=2, ln
           if (info /= psb_success_) exit
-!!$          write(0,*) 'Inner_clone must be checked and reimplemented! '
           call prec%precv(lev)%clone(pout%precv(lev),info)
           if (info == psb_success_) then
             pout%precv(lev)%base_a       => pout%precv(lev)%ac
@@ -1010,7 +1002,7 @@ contains
     integer(psb_ipk_), intent(out)        :: info
     class(psb_s_base_vect_type), intent(in), optional  :: vmold
     !
-    ! In AMG the DESC optional argument is ignored, since
+    ! In MLD the DESC optional argument is ignored, since
     ! the necessary info is contained in the various entries of the
     ! PRECV component.
     type(psb_desc_type), intent(in), optional  :: desc
@@ -1025,7 +1017,7 @@ contains
     if (psb_errstatus_fatal()) then
       info = psb_err_internal_error_; goto 9999
     end if
-    nlev   = prec%get_nlevs()
+    nlev   = size(prec%precv)
     level = 1
     do level = 1, nlev
       call prec%precv(level)%allocate_wrk(info,vmold=vmold)
@@ -1048,6 +1040,7 @@ contains
   subroutine amg_s_free_wrk(prec,info)
     use psb_base_mod
     implicit none
+
     ! Arguments
     class(amg_sprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -1064,7 +1057,7 @@ contains
     end if
 
     if (allocated(prec%precv)) then
-      nlev   = prec%get_nlevs()
+      nlev   = size(prec%precv)
       do level = 1, nlev
         call prec%precv(level)%free_wrk(info)
       end do

amgprec/amg_s_slu_solver.F90

@@ -124,7 +124,7 @@ module amg_s_slu_solver
       Implicit None
 
       ! Arguments
-      type(psb_sspmat_type), intent(inout), target        :: a
+      type(psb_sspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_s_slu_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_z_ainv_solver.F90

@@ -103,7 +103,7 @@ module amg_z_ainv_solver
       Implicit None
 
       ! Arguments
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_z_ainv_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                      :: info
@@ -225,7 +225,7 @@ module amg_z_ainv_solver
       import :: psb_desc_type, psb_zspmat_type,  psb_z_base_sparse_mat, &
            & psb_d_vect_type, psb_z_base_vect_type, psb_dpk_, psb_ipk_
       implicit none
-      type(psb_zspmat_type), intent(inout), target  :: a
+      type(psb_zspmat_type), intent(in), target   :: a
       integer(psb_ipk_), intent(in)               :: fillin,alg
       real(psb_dpk_), intent(in)                  :: thresh
       type(psb_zspmat_type), intent(inout)        :: wmat, zmat

amgprec/amg_z_as_smoother.f90

@@ -230,7 +230,7 @@ module amg_z_as_smoother
            & psb_desc_type, psb_z_base_sparse_mat, psb_ipk_,&
            & psb_i_base_vect_type
       implicit none 
-      type(psb_zspmat_type), intent(inout), target     :: a
+      type(psb_zspmat_type), intent(in), target        :: a
       Type(psb_desc_type), Intent(inout)                 :: desc_a 
       class(amg_z_as_smoother_type), intent(inout)       :: sm
       integer(psb_ipk_), intent(out)                     :: info

amgprec/amg_z_base_aggregator_mod.f90

@@ -89,7 +89,7 @@ module amg_z_base_aggregator_mod
     procedure, pass(ag) :: bld_tprol   => amg_z_base_aggregator_build_tprol
     procedure, pass(ag) :: mat_bld     => amg_z_base_aggregator_mat_bld
     procedure, pass(ag) :: mat_asb     => amg_z_base_aggregator_mat_asb
-    procedure, pass(ag) :: bld_linmap  => amg_z_base_aggregator_bld_linmap
+    procedure, pass(ag) :: bld_map     => amg_z_base_aggregator_bld_map
     procedure, pass(ag) :: update_next => amg_z_base_aggregator_update_next
     procedure, pass(ag) :: clone       => amg_z_base_aggregator_clone
     procedure, pass(ag) :: free        => amg_z_base_aggregator_free
@@ -458,7 +458,7 @@ contains
   end subroutine amg_z_base_aggregator_mat_asb
 
   !
-  !> Function   bld_linmap
+  !> Function   bld_map
   !! \memberof  amg_z_base_aggregator_type
   !! \brief     Build linear map between hierarchy levels 
   !!
@@ -473,7 +473,7 @@ contains
   !!  \param map       The output map
   !!  \param info    Return code
   !!  
-  subroutine  amg_z_base_aggregator_bld_linmap(ag,desc_a,desc_ac,ilaggr,nlaggr,&
+  subroutine  amg_z_base_aggregator_bld_map(ag,desc_a,desc_ac,ilaggr,nlaggr,&
        & op_restr,op_prol,map,info)
     use psb_base_mod
     implicit none
@@ -484,7 +484,7 @@ contains
     type(psb_zlinmap_type), intent(out)    :: map
     integer(psb_ipk_), intent(out)       :: info
     integer(psb_ipk_) :: err_act
-    character(len=20) :: name='z_base_aggregator_bld_linmap'
+    character(len=20) :: name='z_base_aggregator_bld_map'
 
     info = psb_success_
     call psb_erractionsave(err_act)
@@ -508,6 +508,7 @@ contains
 9999 call psb_error_handler(err_act)
 
     return
-  end subroutine amg_z_base_aggregator_bld_linmap
+  end subroutine amg_z_base_aggregator_bld_map
+
 
 end module amg_z_base_aggregator_mod

amgprec/amg_z_base_smoother_mod.f90

@@ -237,7 +237,7 @@ module amg_z_base_smoother_mod
            & psb_z_vect_type, psb_z_base_vect_type, psb_dpk_, &
            & amg_z_base_smoother_type, psb_ipk_, psb_i_base_vect_type
       ! Arguments
-      type(psb_zspmat_type), intent(inout), target  :: a
+      type(psb_zspmat_type), intent(in), target     :: a
       Type(psb_desc_type), Intent(inout)              :: desc_a 
       class(amg_z_base_smoother_type), intent(inout) :: sm 
       integer(psb_ipk_), intent(out)                  :: info

amgprec/amg_z_base_solver_mod.f90

@@ -170,7 +170,7 @@ module amg_z_base_solver_mod
       Implicit None
       
       ! Arguments
-      type(psb_zspmat_type), intent(inout), target          :: a
+      type(psb_zspmat_type), intent(in), target             :: a
       Type(psb_desc_type), Intent(inout)                    :: desc_a 
       class(amg_z_base_solver_type), intent(inout)          :: sv
       integer(psb_ipk_), intent(out)                        :: info

amgprec/amg_z_diag_solver.f90

@@ -119,7 +119,7 @@ module amg_z_diag_solver
       import :: psb_desc_type, psb_zspmat_type,  psb_z_base_sparse_mat, &
            & psb_z_vect_type, psb_z_base_vect_type, psb_dpk_, &
            & amg_z_diag_solver_type, psb_ipk_, psb_i_base_vect_type      
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                    :: desc_a 
       class(amg_z_diag_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                        :: info
@@ -331,7 +331,7 @@ module amg_z_l1_diag_solver
       import :: psb_desc_type, psb_zspmat_type,  psb_z_base_sparse_mat, &
            & psb_z_vect_type, psb_z_base_vect_type, psb_dpk_, &
            & amg_z_l1_diag_solver_type, psb_ipk_, psb_i_base_vect_type      
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                    :: desc_a 
       class(amg_z_l1_diag_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                        :: info

amgprec/amg_z_gs_solver.f90

@@ -181,7 +181,7 @@ module amg_z_gs_solver
            & psb_zspmat_type, psb_z_base_sparse_mat, psb_z_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_z_gs_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info
@@ -195,7 +195,7 @@ module amg_z_gs_solver
            & psb_zspmat_type, psb_z_base_sparse_mat, psb_z_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_z_bwgs_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_z_id_solver.f90

@@ -123,7 +123,7 @@ contains
     Implicit None
 
     ! Arguments
-    type(psb_zspmat_type), intent(inout), target        :: a
+    type(psb_zspmat_type), intent(in), target           :: a
     Type(psb_desc_type), Intent(inout)                  :: desc_a 
     class(amg_z_id_solver_type), intent(inout)          :: sv
     integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_z_ilu_solver.f90

@@ -144,7 +144,7 @@ module amg_z_ilu_solver
            & psb_zspmat_type, psb_z_base_sparse_mat, psb_z_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_z_ilu_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_z_inner_mod.f90

@@ -56,7 +56,7 @@ module amg_z_inner_mod
            & psb_dpk_, psb_z_base_sparse_mat, psb_z_base_vect_type, psb_ipk_
       import :: amg_zprec_type
       implicit none
-      type(psb_zspmat_type), intent(inout), target       :: a
+      type(psb_zspmat_type), intent(in), target          :: a
       type(psb_desc_type), intent(inout), target           :: desc_a
       type(amg_zprec_type), intent(inout), target        :: prec
       integer(psb_ipk_), intent(out)                       :: info
@@ -67,7 +67,7 @@ module amg_z_inner_mod
   end interface amg_mlprec_bld
 
   interface amg_mlprec_aply
-    subroutine amg_zmlprec_aply_a(alpha,p,x,beta,y,desc_data,trans,work,info)
+    subroutine amg_zmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info)
       import :: psb_zspmat_type, psb_desc_type, psb_dpk_, psb_ipk_
       import :: amg_zprec_type
       implicit none 
@@ -79,7 +79,7 @@ module amg_z_inner_mod
       character,intent(in)               :: trans
       complex(psb_dpk_),target             :: work(:)
       integer(psb_ipk_), intent(out)     :: info
-    end subroutine amg_zmlprec_aply_a
+    end subroutine amg_zmlprec_aply
     subroutine amg_zmlprec_aply_vect(alpha,p,x,beta,y,desc_data,trans,work,info)
       import :: psb_zspmat_type, psb_desc_type, &
            & psb_dpk_, psb_z_vect_type, psb_ipk_

amgprec/amg_z_invk_solver.f90

@@ -94,7 +94,7 @@ module amg_z_invk_solver
       Implicit None
 
       ! Arguments
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_z_invk_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_z_invt_solver.f90

@@ -94,7 +94,7 @@ module amg_z_invt_solver
       Implicit None
 
       ! Arguments
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_z_invt_solver_type), intent(inout)        :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_z_jac_smoother.f90

@@ -151,7 +151,7 @@ module amg_z_jac_smoother
       import :: psb_desc_type, amg_z_jac_smoother_type, psb_z_vect_type, psb_dpk_, &
            & psb_zspmat_type, psb_z_base_sparse_mat, psb_z_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_z_jac_smoother_type), intent(inout)       :: sm
       integer(psb_ipk_), intent(out)                      :: info
@@ -274,7 +274,7 @@ module amg_z_jac_smoother
       import :: psb_desc_type, amg_z_l1_jac_smoother_type, psb_z_vect_type, &
            & psb_zspmat_type, psb_z_base_sparse_mat, psb_z_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_z_l1_jac_smoother_type), intent(inout)       :: sm
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_z_jac_solver.f90

@@ -143,7 +143,7 @@ module amg_z_jac_solver
            & psb_zspmat_type, psb_z_base_sparse_mat, psb_z_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_z_jac_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info
@@ -160,7 +160,7 @@ module amg_z_jac_solver
            & psb_zspmat_type, psb_z_base_sparse_mat, psb_z_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none 
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_z_l1_jac_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_z_krm_solver.f90

@@ -174,7 +174,7 @@ module amg_z_krm_solver
            & psb_zspmat_type, psb_z_base_sparse_mat, psb_z_base_vect_type,&
            & psb_ipk_, psb_i_base_vect_type
       implicit none
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a
       class(amg_z_krm_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_z_mumps_solver.F90

@@ -163,7 +163,7 @@ module amg_z_mumps_solver
       Implicit None
 
       ! Arguments
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_z_mumps_solver_type), intent(inout)       :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_z_onelev_mod.f90

@@ -154,35 +154,13 @@ module amg_z_onelev_mod
   private :: z_wrk_alloc, z_wrk_free, &
        & z_wrk_clone, z_wrk_move_alloc, z_wrk_cnv, z_wrk_sizeof
 
-  !
-  ! Remap.
-  !  This keeps track of remapping.
-  !  Logic here is as follows:
-  !  1. AC_PRE_REMAP  need to figure out if we
-  !                really need it.
-  !  2. DESC_AC_PRE_REMAP  contains the descriptor before
-  !                remapping. Meaning that it is possible
-  !                to implement the RESTRICTOR operator by
-  !                 a. Doing LINMAP_U2V onto this one
-  !                 b. For each process, send the data to
-  !                    IDEST.
-  !                This assumes that remapping goes by
-  !                a factor of 2.
-  !                For the PROLONGATOR operators, we first
-  !                use DESC_AC, then split and send onto
-  !                the processes in DESC_AC_PRE_REMAP.
-  !
-  ! To be fixed: what happens if NP the starting processes
-  ! is not an even number? Coordinate with _X_remap in PSBLAS
-  ! 
   type amg_z_remap_data_type
     type(psb_zspmat_type)          :: ac_pre_remap
     type(psb_desc_type)            :: desc_ac_pre_remap
     integer(psb_ipk_)              :: idest
     integer(psb_ipk_), allocatable :: isrc(:), nrsrc(:), naggr(:)
   contains
-    procedure, pass(rmp) :: clone      => z_remap_data_clone
-    procedure, pass(rmp) :: move_alloc => z_remap_move_alloc
+    procedure, pass(rmp) :: clone   => z_remap_data_clone
   end type amg_z_remap_data_type
 
   type amg_z_onelev_type
@@ -228,7 +206,7 @@ module amg_z_onelev_mod
     procedure, pass(lv) :: get_wrksz => z_base_onelev_get_wrksize
     procedure, pass(lv) :: allocate_wrk   => z_base_onelev_allocate_wrk
     procedure, pass(lv) :: free_wrk       => z_base_onelev_free_wrk
-    procedure, nopass   :: stringval  => amg_stringval
+    procedure, nopass   :: stringval => amg_stringval
     procedure, pass(lv) :: move_alloc => z_base_onelev_move_alloc
 
 
@@ -252,7 +230,9 @@ module amg_z_onelev_mod
        & z_base_onelev_free_wrk
 
   interface
-    module subroutine amg_z_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,t_prol,info)
+    subroutine amg_z_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,t_prol,info)
+      import :: psb_zspmat_type, psb_desc_type, psb_dpk_, psb_ipk_, psb_lzspmat_type, psb_lpk_
+      import :: amg_z_onelev_type
       implicit none
       class(amg_z_onelev_type), intent(inout), target :: lv
       type(psb_zspmat_type), intent(in) :: a
@@ -264,7 +244,10 @@ module amg_z_onelev_mod
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_build(lv,info,amold,vmold,imold,ilv)
+    subroutine amg_z_base_onelev_build(lv,info,amold,vmold,imold,ilv)
+      import :: psb_z_base_sparse_mat, psb_z_base_vect_type, &
+           & psb_i_base_vect_type, psb_dpk_, amg_z_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
       class(amg_z_onelev_type), target, intent(inout) :: lv
       integer(psb_ipk_), intent(out) :: info
@@ -276,7 +259,10 @@ module amg_z_onelev_mod
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_descr(lv,il,nl,ilmin,info,iout, verbosity,prefix)
+    subroutine amg_z_base_onelev_descr(lv,il,nl,ilmin,info,iout, verbosity,prefix)
+      import :: psb_zspmat_type, psb_z_vect_type, psb_z_base_vect_type, &
+           & psb_zlinmap_type, psb_dpk_, amg_z_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
       ! Arguments
       class(amg_z_onelev_type), intent(in)    :: lv
@@ -289,8 +275,10 @@ module amg_z_onelev_mod
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_memory_use(lv,il,nl,ilmin,info,&
-         & iout,verbosity, prefix,global) 
+    subroutine amg_z_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity, prefix,global)
+      import :: psb_zspmat_type, psb_z_vect_type, psb_z_base_vect_type, &
+           & psb_zlinmap_type, psb_dpk_, amg_z_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
       ! Arguments
       class(amg_z_onelev_type), intent(in)    :: lv
@@ -304,7 +292,10 @@ module amg_z_onelev_mod
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_cnv(lv,info,amold,vmold,imold)
+    subroutine amg_z_base_onelev_cnv(lv,info,amold,vmold,imold)
+      import :: amg_z_onelev_type, psb_z_base_vect_type, psb_dpk_, &
+           & psb_z_base_sparse_mat, psb_ipk_, psb_i_base_vect_type
+      ! Arguments
       class(amg_z_onelev_type), intent(inout)            :: lv
       integer(psb_ipk_), intent(out)                     :: info
       class(psb_z_base_sparse_mat), intent(in), optional :: amold
@@ -314,32 +305,48 @@ module amg_z_onelev_mod
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_free(lv,info)
+    subroutine amg_z_base_onelev_free(lv,info)
+      import :: psb_zspmat_type, psb_z_vect_type, psb_z_base_vect_type, &
+           & psb_zlinmap_type, psb_dpk_, amg_z_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
+
       class(amg_z_onelev_type), intent(inout) :: lv
       integer(psb_ipk_), intent(out)                :: info
     end subroutine amg_z_base_onelev_free
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_free_smoothers(lv,info)
+    subroutine amg_z_base_onelev_free_smoothers(lv,info)
+      import :: psb_zspmat_type, psb_z_vect_type, psb_z_base_vect_type, &
+           & psb_zlinmap_type, psb_dpk_, amg_z_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
+
       class(amg_z_onelev_type), intent(inout) :: lv
       integer(psb_ipk_), intent(out)                :: info
     end subroutine amg_z_base_onelev_free_smoothers
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_check(lv,info)
+    subroutine amg_z_base_onelev_check(lv,info)
+      import :: psb_zspmat_type, psb_z_vect_type, psb_z_base_vect_type, &
+           & psb_zlinmap_type, psb_dpk_, amg_z_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+      ! Arguments
       class(amg_z_onelev_type), intent(inout) :: lv
       integer(psb_ipk_), intent(out)            :: info
     end subroutine amg_z_base_onelev_check
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_setsm(lv,val,info,pos)
+    subroutine amg_z_base_onelev_setsm(lv,val,info,pos)
+      import :: psb_dpk_, amg_z_onelev_type, amg_z_base_smoother_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_z_onelev_type), target, intent(inout) :: lv
       class(amg_z_base_smoother_type), intent(in)     :: val
       integer(psb_ipk_), intent(out)                  :: info
@@ -348,8 +355,12 @@ module amg_z_onelev_mod
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_setsv(lv,val,info,pos)
+    subroutine amg_z_base_onelev_setsv(lv,val,info,pos)
+      import :: psb_dpk_, amg_z_onelev_type, amg_z_base_solver_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_z_onelev_type), target, intent(inout) :: lv
       class(amg_z_base_solver_type), intent(in)       :: val
       integer(psb_ipk_), intent(out)                  :: info
@@ -358,8 +369,12 @@ module amg_z_onelev_mod
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_setag(lv,val,info,pos)
+    subroutine amg_z_base_onelev_setag(lv,val,info,pos)
+      import :: psb_dpk_, amg_z_onelev_type, amg_z_base_aggregator_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_z_onelev_type), target, intent(inout) :: lv
       class(amg_z_base_aggregator_type), intent(in)       :: val
       integer(psb_ipk_), intent(out)                  :: info
@@ -368,8 +383,13 @@ module amg_z_onelev_mod
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_cseti(lv,what,val,info,pos,idx)
+    subroutine amg_z_base_onelev_cseti(lv,what,val,info,pos,idx)
+      import :: psb_zspmat_type, psb_z_vect_type, psb_z_base_vect_type, &
+           & psb_zlinmap_type, psb_dpk_, amg_z_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
+      ! Arguments
       class(amg_z_onelev_type), intent(inout) :: lv
       character(len=*), intent(in)              :: what
       integer(psb_ipk_), intent(in)             :: val
@@ -380,8 +400,12 @@ module amg_z_onelev_mod
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_csetc(lv,what,val,info,pos,idx)
+    subroutine amg_z_base_onelev_csetc(lv,what,val,info,pos,idx)
+      import :: psb_zspmat_type, psb_z_vect_type, psb_z_base_vect_type, &
+           & psb_zlinmap_type, psb_dpk_, amg_z_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+      ! Arguments
       class(amg_z_onelev_type), intent(inout) :: lv
       character(len=*), intent(in)              :: what
       character(len=*), intent(in)              :: val
@@ -392,8 +416,12 @@ module amg_z_onelev_mod
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_csetr(lv,what,val,info,pos,idx)
+    subroutine amg_z_base_onelev_csetr(lv,what,val,info,pos,idx)
+      import :: psb_zspmat_type, psb_z_vect_type, psb_z_base_vect_type, &
+           & psb_zlinmap_type, psb_dpk_, amg_z_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       Implicit None
+
       class(amg_z_onelev_type), intent(inout) :: lv
       character(len=*), intent(in)              :: what
       real(psb_dpk_), intent(in)                 :: val
@@ -404,8 +432,11 @@ module amg_z_onelev_mod
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_dump(lv,level,info,prefix,head,ac,rp,smoother,&
+    subroutine amg_z_base_onelev_dump(lv,level,info,prefix,head,ac,rp,smoother,&
          & solver,tprol,global_num)
+      import :: psb_zspmat_type, psb_z_vect_type, psb_z_base_vect_type, &
+           & psb_zlinmap_type, psb_dpk_, amg_z_onelev_type, &
+           & psb_ipk_, psb_epk_, psb_desc_type
       implicit none
       class(amg_z_onelev_type), intent(in) :: lv
       integer(psb_ipk_), intent(in)          :: level
@@ -416,7 +447,8 @@ module amg_z_onelev_mod
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_map_rstr_a(lv,alpha,u,beta,v,info,work)
+    subroutine amg_z_base_onelev_map_rstr_a(lv,alpha,u,beta,v,info,work)
+      import
       implicit none
       class(amg_z_onelev_type), target, intent(inout) :: lv
       complex(psb_dpk_), intent(in)     :: alpha, beta
@@ -425,8 +457,8 @@ module amg_z_onelev_mod
       integer(psb_ipk_), intent(out) :: info
       complex(psb_dpk_), optional       :: work(:)
     end subroutine amg_z_base_onelev_map_rstr_a
-    module subroutine amg_z_base_onelev_map_rstr_v(lv,alpha,vect_u,beta,vect_v,info,&
-         & work,vtx,vty)
+    subroutine amg_z_base_onelev_map_rstr_v(lv,alpha,vect_u,beta,vect_v,info,work,vtx,vty)
+      import
       implicit none
       class(amg_z_onelev_type), target, intent(inout) :: lv
       complex(psb_dpk_), intent(in)           :: alpha, beta
@@ -438,7 +470,8 @@ module amg_z_onelev_mod
   end interface
 
   interface
-    module subroutine amg_z_base_onelev_map_prol_a(lv,alpha,v,beta,u,info,work)
+    subroutine amg_z_base_onelev_map_prol_a(lv,alpha,v,beta,u,info,work)
+      import
       implicit none
       class(amg_z_onelev_type), target, intent(inout) :: lv
       complex(psb_dpk_), intent(in)     :: alpha, beta
@@ -448,8 +481,8 @@ module amg_z_onelev_mod
       complex(psb_dpk_), optional          :: work(:)
 
     end subroutine amg_z_base_onelev_map_prol_a
-    module subroutine amg_z_base_onelev_map_prol_v(lv,alpha,vect_v,beta,vect_u,info,&
-         & work,vtx,vty)
+    subroutine amg_z_base_onelev_map_prol_v(lv,alpha,vect_v,beta,vect_u,info,work,vtx,vty)
+      import
       implicit none
       class(amg_z_onelev_type), target, intent(inout) :: lv
       complex(psb_dpk_), intent(in)           :: alpha, beta
@@ -460,118 +493,6 @@ module amg_z_onelev_mod
     end subroutine amg_z_base_onelev_map_prol_v
   end interface
 
-  interface 
-    module subroutine z_base_onelev_move_alloc(lv, b,info)
-      implicit none
-      class(amg_z_onelev_type), target, intent(inout) :: lv, b
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine z_base_onelev_move_alloc
-  end interface
-
-  interface 
-    module subroutine z_base_onelev_allocate_wrk(lv,info,vmold)
-      implicit none
-      class(amg_z_onelev_type), target, intent(inout) :: lv
-      integer(psb_ipk_), intent(out) :: info
-      class(psb_z_base_vect_type), intent(in), optional  :: vmold
-    end subroutine z_base_onelev_allocate_wrk
-  end interface
-  
-  interface 
-    module subroutine z_base_onelev_free_wrk(lv,info)
-      implicit none
-      class(amg_z_onelev_type), target, intent(inout) :: lv
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine z_base_onelev_free_wrk
-  end interface
-
-  interface 
-    module  subroutine z_wrk_alloc(wk,nwv,desc,info,vmold, desc2)
-      Implicit None
-      ! Arguments
-      class(amg_zmlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(in)                     :: nwv
-      type(psb_desc_type), intent(in)                   :: desc
-      integer(psb_ipk_), intent(out)                    :: info
-      class(psb_z_base_vect_type), intent(in), optional  :: vmold
-      type(psb_desc_type), intent(in), optional          :: desc2
-    end subroutine z_wrk_alloc
-  end interface
-
-  interface 
-    module subroutine z_inner_do_wrk_alloc(wk,nwv,desc,vmold)
-      class(amg_zmlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(in)                     :: nwv
-      type(psb_desc_type), intent(in)                   :: desc
-      class(psb_z_base_vect_type), intent(in), optional  :: vmold
-    end subroutine z_inner_do_wrk_alloc
-  end interface
-
-  interface 
-    module  subroutine z_wrk_free(wk,info)
-      Implicit None
-      ! Arguments
-      class(amg_zmlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine z_wrk_free
-  end interface
-
-  interface 
-    module  subroutine z_wrk_clone(wk,wkout,info)
-      Implicit None
-      ! Arguments
-      class(amg_zmlprec_wrk_type), target, intent(inout) :: wk
-      class(amg_zmlprec_wrk_type), target, intent(inout) :: wkout
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine z_wrk_clone
-  end interface
-
-  interface 
-    module subroutine z_wrk_move_alloc(wk, b,info)
-      implicit none
-      class(amg_zmlprec_wrk_type), target, intent(inout) :: wk, b
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine z_wrk_move_alloc
-  end interface
-
-  interface
-    module subroutine z_wrk_cnv(wk,info,vmold)
-      Implicit None
-      class(amg_zmlprec_wrk_type), target, intent(inout) :: wk
-      integer(psb_ipk_), intent(out)                    :: info
-      class(psb_z_base_vect_type), intent(in), optional  :: vmold
-    end subroutine z_wrk_cnv
-  end interface
-
-  interface
-    module function z_wrk_sizeof(wk) result(val)
-      implicit none
-      class(amg_zmlprec_wrk_type), intent(in) :: wk
-      integer(psb_epk_) :: val
-    end  function z_wrk_sizeof
-  end interface
-
-  interface 
-    module subroutine z_remap_data_clone(rmp, remap_out, info)
-      implicit none
-      ! Arguments
-      class(amg_z_remap_data_type), target, intent(inout) :: rmp
-      class(amg_z_remap_data_type), target, intent(inout) :: remap_out
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine z_remap_data_clone
-  end interface
-
-  interface 
-    module subroutine z_remap_move_alloc(rmp, remap_out, info)
-      implicit none
-      ! Arguments
-      class(amg_z_remap_data_type), target, intent(inout) :: rmp
-      class(amg_z_remap_data_type), target, intent(inout) :: remap_out
-      integer(psb_ipk_), intent(out)                    :: info
-    end subroutine z_remap_move_alloc
-  end interface
-  
-
 contains
   !
   ! Function returning the size of the amg_prec_type data structure
@@ -697,7 +618,7 @@ contains
     ! Arguments
     class(amg_z_onelev_type), target, intent(inout) :: lv
     class(amg_z_onelev_type), target, intent(inout) :: lvout
-    integer(psb_ipk_), intent(out)                  :: info
+    integer(psb_ipk_), intent(out)                    :: info
 
     info = psb_success_
     if (allocated(lv%sm)) then
@@ -739,6 +660,36 @@ contains
 
   end subroutine z_base_onelev_clone
 
+  subroutine z_base_onelev_move_alloc(lv, b,info)
+    use psb_base_mod
+    implicit none
+    class(amg_z_onelev_type), target, intent(inout) :: lv, b
+    integer(psb_ipk_), intent(out) :: info
+
+    call b%free(info)
+    b%parms  = lv%parms
+    b%szratio = lv%szratio
+    if (associated(lv%sm2,lv%sm2a)) then
+      call move_alloc(lv%sm,b%sm)
+      call move_alloc(lv%sm2a,b%sm2a)
+      b%sm2 =>b%sm2a
+    else
+      call move_alloc(lv%sm,b%sm)
+      call move_alloc(lv%sm2a,b%sm2a)
+      b%sm2 =>b%sm
+    end if
+
+    call move_alloc(lv%aggr,b%aggr)
+    if (info == psb_success_) call psb_move_alloc(lv%ac,b%ac,info)
+    if (info == psb_success_) call psb_move_alloc(lv%tprol,b%tprol,info)
+    if (info == psb_success_) call psb_move_alloc(lv%desc_ac,b%desc_ac,info)
+    if (info == psb_success_) call psb_move_alloc(lv%linmap,b%linmap,info)
+    b%base_a    => lv%base_a
+    b%base_desc => lv%base_desc
+
+  end subroutine z_base_onelev_move_alloc
+
+
   function z_base_onelev_get_wrksize(lv) result(val)
     implicit none
     class(amg_z_onelev_type), intent(inout) :: lv
@@ -776,5 +727,269 @@ contains
 
   end function z_base_onelev_get_wrksize
 
-  
+  subroutine z_base_onelev_allocate_wrk(lv,info,vmold)
+    use psb_base_mod
+    implicit none
+    class(amg_z_onelev_type), target, intent(inout) :: lv
+    integer(psb_ipk_), intent(out) :: info
+    class(psb_z_base_vect_type), intent(in), optional  :: vmold
+    !
+    integer(psb_ipk_) :: nwv, i
+    info = psb_success_
+    nwv = lv%get_wrksz()
+    if (.not.allocated(lv%wrk)) allocate(lv%wrk,stat=info)
+    if (info == 0) then
+      if (lv%remap_data%desc_ac_pre_remap%is_asb()) then
+        !
+        !  Need to fix this, we need two different allocations
+        !
+        call lv%wrk%alloc(nwv,lv%base_desc,info,vmold=vmold,&
+             & desc2=lv%remap_data%desc_ac_pre_remap)
+      else
+        call lv%wrk%alloc(nwv,lv%base_desc,info,vmold=vmold)
+      end if
+    end if
+
+  end subroutine z_base_onelev_allocate_wrk
+
+
+  subroutine z_base_onelev_free_wrk(lv,info)
+    use psb_base_mod
+    implicit none
+    class(amg_z_onelev_type), target, intent(inout) :: lv
+    integer(psb_ipk_), intent(out) :: info
+    !
+    integer(psb_ipk_) :: nwv,i
+    info = psb_success_
+
+    if (allocated(lv%wrk)) then
+      call lv%wrk%free(info)
+      if (info == 0) deallocate(lv%wrk,stat=info)
+    end if
+  end subroutine z_base_onelev_free_wrk
+
+  subroutine z_wrk_alloc(wk,nwv,desc,info,vmold, desc2)
+    use psb_base_mod
+
+    Implicit None
+
+    ! Arguments
+    class(amg_zmlprec_wrk_type), target, intent(inout) :: wk
+    integer(psb_ipk_), intent(in)                     :: nwv
+    type(psb_desc_type), intent(in)                   :: desc
+    integer(psb_ipk_), intent(out)                    :: info
+    class(psb_z_base_vect_type), intent(in), optional  :: vmold
+    type(psb_desc_type), intent(in), optional          :: desc2
+    !
+    integer(psb_ipk_) :: i
+
+    info = psb_success_
+    call wk%free(info)
+    if  (present(desc2)) then
+!!$      write(0,*) 'Check on wrk_alloc 2',&
+!!$           & desc2%get_local_rows(), desc%get_local_rows(),&
+!!$           & desc2%get_local_cols(),desc%get_local_cols()
+!!$      flush(0)
+      if (desc2%get_local_cols()>desc%get_local_cols()) then
+        call psb_geasb(wk%vx2l,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vy2l,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vtx,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vty,desc2,info,&
+             & scratch=.true.,mold=vmold)
+        allocate(wk%wv(nwv),stat=info)
+        do i=1,nwv
+          call psb_geasb(wk%wv(i),desc2,info,&
+               & scratch=.true.,mold=vmold)
+        end do
+      else
+!!$        write(0,*) 'Check on wrk_alloc 1.5 ',&
+!!$             & desc%get_local_rows(),&
+!!$             & desc%get_local_cols()
+        call psb_geasb(wk%vx2l,desc,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vy2l,desc,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vtx,desc,info,&
+             & scratch=.true.,mold=vmold)
+        call psb_geasb(wk%vty,desc,info,&
+             & scratch=.true.,mold=vmold)
+        allocate(wk%wv(nwv),stat=info)
+        do i=1,nwv
+          call psb_geasb(wk%wv(i),desc,info,&
+               & scratch=.true.,mold=vmold)
+        end do
+      end if
+    else
+!!$      write(0,*) 'Check on wrk_alloc 1 ',&
+!!$           & desc%get_local_rows(),&
+!!$           & desc%get_local_cols()
+      call psb_geasb(wk%vx2l,desc,info,&
+           & scratch=.true.,mold=vmold)
+      call psb_geasb(wk%vy2l,desc,info,&
+           & scratch=.true.,mold=vmold)
+      call psb_geasb(wk%vtx,desc,info,&
+           & scratch=.true.,mold=vmold)
+      call psb_geasb(wk%vty,desc,info,&
+           & scratch=.true.,mold=vmold)
+      allocate(wk%wv(nwv),stat=info)
+      do i=1,nwv
+        call psb_geasb(wk%wv(i),desc,info,&
+             & scratch=.true.,mold=vmold)
+      end do
+    end if
+  end subroutine z_wrk_alloc
+
+  subroutine z_wrk_free(wk,info)
+
+    Implicit None
+
+    ! Arguments
+    class(amg_zmlprec_wrk_type), target, intent(inout) :: wk
+    integer(psb_ipk_), intent(out)                    :: info
+    !
+    integer(psb_ipk_) :: i
+    info = psb_success_
+
+    if (allocated(wk%tx)) deallocate(wk%tx, stat=info)
+    if (allocated(wk%ty)) deallocate(wk%ty, stat=info)
+    if (allocated(wk%x2l)) deallocate(wk%x2l, stat=info)
+    if (allocated(wk%y2l)) deallocate(wk%y2l, stat=info)
+    call wk%vtx%free(info)
+    call wk%vty%free(info)
+    call wk%vx2l%free(info)
+    call wk%vy2l%free(info)
+    if (allocated(wk%wv)) then
+      do i=1,size(wk%wv)
+        call wk%wv(i)%free(info)
+      end do
+      deallocate(wk%wv, stat=info)
+    end if
+
+  end subroutine z_wrk_free
+
+  subroutine z_wrk_clone(wk,wkout,info)
+    use psb_base_mod
+    Implicit None
+
+    ! Arguments
+    class(amg_zmlprec_wrk_type), target, intent(inout) :: wk
+    class(amg_zmlprec_wrk_type), target, intent(inout) :: wkout
+    integer(psb_ipk_), intent(out)                    :: info
+    !
+    integer(psb_ipk_) :: i
+    info = psb_success_
+
+    call psb_safe_ab_cpy(wk%tx,wkout%tx,info)
+    call psb_safe_ab_cpy(wk%ty,wkout%ty,info)
+    call psb_safe_ab_cpy(wk%x2l,wkout%x2l,info)
+    call psb_safe_ab_cpy(wk%y2l,wkout%y2l,info)
+    call wk%vtx%clone(wkout%vtx,info)
+    call wk%vty%clone(wkout%vty,info)
+    call wk%vx2l%clone(wkout%vx2l,info)
+    call wk%vy2l%clone(wkout%vy2l,info)
+    if (allocated(wkout%wv)) then
+      do i=1,size(wkout%wv)
+        call wkout%wv(i)%free(info)
+      end do
+      deallocate( wkout%wv)
+    end if
+    allocate(wkout%wv(size(wk%wv)),stat=info)
+    do i=1,size(wk%wv)
+      call wk%wv(i)%clone(wkout%wv(i),info)
+    end do
+    return
+
+  end subroutine z_wrk_clone
+
+  subroutine z_wrk_move_alloc(wk, b,info)
+    implicit none
+    class(amg_zmlprec_wrk_type), target, intent(inout) :: wk, b
+    integer(psb_ipk_), intent(out) :: info
+
+    call b%free(info)
+    call move_alloc(wk%tx,b%tx)
+    call move_alloc(wk%ty,b%ty)
+    call move_alloc(wk%x2l,b%x2l)
+    call move_alloc(wk%y2l,b%y2l)
+    !
+    ! Should define V%move_alloc....
+    call move_alloc(wk%vtx%v,b%vtx%v)
+    call move_alloc(wk%vty%v,b%vty%v)
+    call move_alloc(wk%vx2l%v,b%vx2l%v)
+    call move_alloc(wk%vy2l%v,b%vy2l%v)
+    call move_alloc(wk%wv,b%wv)
+
+  end subroutine z_wrk_move_alloc
+
+  subroutine z_wrk_cnv(wk,info,vmold)
+    use psb_base_mod
+
+    Implicit None
+
+    ! Arguments
+    class(amg_zmlprec_wrk_type), target, intent(inout) :: wk
+    integer(psb_ipk_), intent(out)                    :: info
+    class(psb_z_base_vect_type), intent(in), optional  :: vmold
+    !
+    integer(psb_ipk_) :: i
+
+    info = psb_success_
+    if (present(vmold)) then
+      call wk%vtx%cnv(vmold)
+      call wk%vty%cnv(vmold)
+      call wk%vx2l%cnv(vmold)
+      call wk%vy2l%cnv(vmold)
+      if (allocated(wk%wv)) then
+        do i=1,size(wk%wv)
+          call wk%wv(i)%cnv(vmold)
+        end do
+      end if
+    end if
+  end subroutine z_wrk_cnv
+
+  function z_wrk_sizeof(wk) result(val)
+    use psb_realloc_mod
+    implicit none
+    class(amg_zmlprec_wrk_type), intent(in) :: wk
+    integer(psb_epk_) :: val
+    integer :: i
+    val = 0
+    val = val + (1_psb_epk_ * (2*psb_sizeof_dp)) * psb_size(wk%tx)
+    val = val + (1_psb_epk_ * (2*psb_sizeof_dp)) * psb_size(wk%ty)
+    val = val + (1_psb_epk_ * (2*psb_sizeof_dp)) * psb_size(wk%x2l)
+    val = val + (1_psb_epk_ * (2*psb_sizeof_dp)) * psb_size(wk%y2l)
+    val = val + wk%vtx%sizeof()
+    val = val + wk%vty%sizeof()
+    val = val + wk%vx2l%sizeof()
+    val = val + wk%vy2l%sizeof()
+    if (allocated(wk%wv)) then
+      do i=1, size(wk%wv)
+        val = val + wk%wv(i)%sizeof()
+      end do
+    end if
+  end function z_wrk_sizeof
+
+  subroutine z_remap_data_clone(rmp, remap_out, info)
+    use psb_base_mod
+    implicit none
+    ! Arguments
+    class(amg_z_remap_data_type), target, intent(inout) :: rmp
+    class(amg_z_remap_data_type), target, intent(inout) :: remap_out
+    integer(psb_ipk_), intent(out)                    :: info
+    !
+    integer(psb_ipk_) :: i
+
+    info = psb_success_
+
+    call rmp%ac_pre_remap%clone(remap_out%ac_pre_remap,info)
+    if (info == psb_success_) &
+         & call rmp%desc_ac_pre_remap%clone(remap_out%desc_ac_pre_remap,info)
+    remap_out%idest = rmp%idest
+    call psb_safe_ab_cpy(rmp%isrc,remap_out%isrc,info)
+    call psb_safe_ab_cpy(rmp%nrsrc,remap_out%nrsrc,info)
+  end subroutine z_remap_data_clone
+
 end module amg_z_onelev_mod

amgprec/amg_z_prec_type.f90

@@ -102,7 +102,6 @@ module amg_z_prec_type
     ! The multilevel hierarchy
     !
     type(amg_z_onelev_type), allocatable :: precv(:)
-    integer(psb_ipk_)                    :: nlevs
   contains
     procedure, pass(prec)               :: psb_z_apply2_vect => amg_z_apply2_vect
     procedure, pass(prec)               :: psb_z_apply1_vect => amg_z_apply1_vect
@@ -120,7 +119,6 @@ module amg_z_prec_type
     procedure, pass(prec)               :: cmp_complexity => amg_z_cmp_compl
     procedure, pass(prec)               :: get_avg_cr => amg_z_get_avg_cr
     procedure, pass(prec)               :: cmp_avg_cr => amg_z_cmp_avg_cr
-    procedure, pass(prec)               :: set_nlevs  => amg_z_set_nlevs
     procedure, pass(prec)               :: get_nlevs  => amg_z_get_nlevs
     procedure, pass(prec)               :: get_nzeros => amg_z_get_nzeros
     procedure, pass(prec)               :: sizeof => amg_zprec_sizeof
@@ -313,7 +311,7 @@ module amg_z_prec_type
            & psb_z_base_sparse_mat, psb_z_base_vect_type, &
            & psb_i_base_vect_type, amg_zprec_type, psb_ipk_
       implicit none
-      type(psb_zspmat_type), intent(inout), target       :: a
+      type(psb_zspmat_type), intent(in), target          :: a
       type(psb_desc_type), intent(inout), target           :: desc_a
       class(amg_zprec_type), intent(inout), target       :: prec
       integer(psb_ipk_), intent(out)                       :: info
@@ -325,15 +323,14 @@ module amg_z_prec_type
   end interface amg_precbld
 
   interface amg_hierarchy_bld
-    subroutine amg_z_hierarchy_bld(a,desc_a,prec,info,cpymat)
+    subroutine amg_z_hierarchy_bld(a,desc_a,prec,info)
       import :: psb_zspmat_type, psb_desc_type, psb_dpk_, &
            & amg_zprec_type, psb_ipk_
       implicit none
-      type(psb_zspmat_type), intent(inout), target       :: a
+      type(psb_zspmat_type), intent(in), target          :: a
       type(psb_desc_type), intent(inout), target           :: desc_a
       class(amg_zprec_type), intent(inout), target        :: prec
       integer(psb_ipk_), intent(out)                       :: info
-      logical, intent(in), optional                        :: cpymat
       !      character, intent(in),optional             :: upd
     end subroutine amg_z_hierarchy_bld
   end interface amg_hierarchy_bld
@@ -437,19 +434,10 @@ contains
     class(amg_zprec_type), intent(in) :: prec
     integer(psb_ipk_) :: val
     val = 0
-!!$    if (allocated(prec%precv)) then
-!!$      val = size(prec%precv)
-!!$    end if
-    val = prec%nlevs
-!!$    write(0,*) ' NLEVS: ',prec%nlevs, val,size(prec%precv)
+    if (allocated(prec%precv)) then
+      val = size(prec%precv)
+    end if
   end function amg_z_get_nlevs
-
-  subroutine amg_z_set_nlevs(prec,nl) 
-    implicit none
-    class(amg_zprec_type), intent(inout) :: prec
-    integer(psb_ipk_) :: nl
-    prec%nlevs = nl
-  end subroutine amg_z_set_nlevs
   !
   ! Function returning the size of the amg_prec_type data structure
   ! in bytes or in number of nonzeros of the operator(s) involved.
@@ -520,7 +508,7 @@ contains
 
     real(psb_dpk_) :: num, den, nmin
     type(psb_ctxt_type) :: ctxt
-    integer(psb_ipk_)   :: il,nl
+    integer(psb_ipk_)   :: il
 
     num = -done
     den = done
@@ -530,10 +518,7 @@ contains
       num = prec%precv(il)%base_a%get_nzeros()
       if (num >= dzero) then
         den = num
-        nl = prec%get_nlevs()
-!!$        write(0,*) 'Inside cmp_compl ',nl,size(prec%precv)
-        do il=2, nl
-!!$          write(0,*) '                 ',il,associated(prec%precv(il)%base_a)
+        do il=2,size(prec%precv)
           num = num + max(0,prec%precv(il)%base_a%get_nzeros())
         end do
       end if
@@ -564,6 +549,7 @@ contains
   end function amg_z_get_avg_cr
 
   subroutine amg_z_cmp_avg_cr(prec)
+
     implicit none
     class(amg_zprec_type), intent(inout) :: prec
 
@@ -571,18 +557,17 @@ contains
     type(psb_ctxt_type) :: ctxt
     integer(psb_ipk_)   :: il, nl, iam, np
 
+
     avgcr = dzero
-    nl = prec%get_nlevs()
-    do il=2,nl
-      if (prec%precv(il)%base_desc%is_ok()) then 
-        ctxt = prec%precv(il)%base_desc%get_ctxt()
-        call psb_info(ctxt,iam,np)
-        if (iam >=0)  avgcr = avgcr + max(dzero,prec%precv(il)%szratio)
-      end if
-    end do
-    avgcr = avgcr / (nl-1)
     ctxt = prec%ctxt
     call psb_info(ctxt,iam,np)
+    if (allocated(prec%precv)) then
+      nl = size(prec%precv)
+      do il=2,nl
+        avgcr = avgcr + max(dzero,prec%precv(il)%szratio)
+      end do
+      avgcr = avgcr / (nl-1)
+    end if
     call psb_sum(ctxt,avgcr)
     prec%ag_data%avg_cr = avgcr/np
   end subroutine amg_z_cmp_avg_cr
@@ -600,7 +585,9 @@ contains
   !             error code.
   !
   subroutine amg_zprecfree(p,info)
+
     implicit none
+
     ! Arguments
     type(amg_zprec_type), intent(inout) :: p
     integer(psb_ipk_), intent(out)        :: info
@@ -626,7 +613,9 @@ contains
   end subroutine amg_zprecfree
 
   subroutine amg_z_prec_free(prec,info)
+
     implicit none
+
     ! Arguments
     class(amg_zprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -646,11 +635,6 @@ contains
     if (allocated(prec%precv)) then
       do i=1,size(prec%precv)
         call prec%precv(i)%free(info)
-        if (psb_errstatus_fatal()) then
-          info=psb_err_internal_error_
-          call psb_errpush(info,name)
-          goto 9999
-        end if
       end do
       deallocate(prec%precv,stat=info)
     end if
@@ -663,7 +647,9 @@ contains
   end subroutine amg_z_prec_free
 
   subroutine amg_z_smoothers_free(prec,info)
+
     implicit none
+
     ! Arguments
     class(amg_zprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -680,7 +666,7 @@ contains
     end if
 
     if (allocated(prec%precv)) then
-      do i=1,prec%get_nlevs()
+      do i=1,size(prec%precv)
         call prec%precv(i)%free_smoothers(info)
       end do
     end if
@@ -694,7 +680,9 @@ contains
   end subroutine amg_z_smoothers_free
 
   subroutine amg_z_hierarchy_free(prec,info)
+
     implicit none
+
     ! Arguments
     class(amg_zprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -721,6 +709,7 @@ contains
 
   end subroutine amg_z_hierarchy_free
 
+
   !
   ! Top level methods.
   !
@@ -785,6 +774,7 @@ contains
 
   end subroutine amg_z_apply1_vect
 
+
   subroutine amg_z_apply2v(prec,x,y,desc_data,info,trans,work)
     implicit none
     type(psb_desc_type),intent(in)    :: desc_data
@@ -849,6 +839,7 @@ contains
   subroutine amg_z_dump(prec,info,istart,iend,iproc,prefix,head,&
        & ac,rp,smoother,solver,tprol,&
        & global_num)
+
     implicit none
     class(amg_zprec_type), intent(in)     :: prec
     integer(psb_ipk_), intent(out)          :: info
@@ -865,7 +856,7 @@ contains
     info = 0
     ctxt = prec%ctxt
     call psb_info(ctxt,iam,np)
-    iln = prec%get_nlevs()
+    iln = size(prec%precv)
     if (present(istart)) then
       il1 = max(1,istart)
     else
@@ -889,6 +880,7 @@ contains
   end subroutine amg_z_dump
 
   subroutine amg_z_cnv(prec,info,amold,vmold,imold)
+
     implicit none
     class(amg_zprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)       :: info
@@ -900,7 +892,7 @@ contains
 
     info = psb_success_
     if (allocated(prec%precv)) then
-      do i=1,prec%get_nlevs()
+      do i=1,size(prec%precv)
         if (info == psb_success_ ) &
              & call prec%precv(i)%cnv(info,amold=amold,vmold=vmold,imold=imold)
       end do
@@ -909,6 +901,7 @@ contains
   end subroutine amg_z_cnv
 
   subroutine amg_z_clone(prec,precout,info)
+
     implicit none
     class(amg_zprec_type), intent(inout) :: prec
     class(psb_zprec_type), intent(inout) :: precout
@@ -920,6 +913,7 @@ contains
   end subroutine amg_z_clone
 
   subroutine amg_z_inner_clone(prec,precout,info)
+
     implicit none
     class(amg_zprec_type), intent(inout)         :: prec
     class(psb_zprec_type), target, intent(inout) :: precout
@@ -935,9 +929,8 @@ contains
       pout%ctxt          = prec%ctxt
       pout%ag_data       = prec%ag_data
       pout%outer_sweeps  = prec%outer_sweeps
-      pout%nlevs         = prec%nlevs
       if (allocated(prec%precv)) then
-        ln = prec%get_nlevs()
+        ln = size(prec%precv)
         allocate(pout%precv(ln),stat=info)
         if (info /= psb_success_) goto 9999
         if (ln >= 1) then
@@ -945,7 +938,6 @@ contains
         end if
         do lev=2, ln
           if (info /= psb_success_) exit
-!!$          write(0,*) 'Inner_clone must be checked and reimplemented! '
           call prec%precv(lev)%clone(pout%precv(lev),info)
           if (info == psb_success_) then
             pout%precv(lev)%base_a       => pout%precv(lev)%ac
@@ -1010,7 +1002,7 @@ contains
     integer(psb_ipk_), intent(out)        :: info
     class(psb_z_base_vect_type), intent(in), optional  :: vmold
     !
-    ! In AMG the DESC optional argument is ignored, since
+    ! In MLD the DESC optional argument is ignored, since
     ! the necessary info is contained in the various entries of the
     ! PRECV component.
     type(psb_desc_type), intent(in), optional  :: desc
@@ -1025,7 +1017,7 @@ contains
     if (psb_errstatus_fatal()) then
       info = psb_err_internal_error_; goto 9999
     end if
-    nlev   = prec%get_nlevs()
+    nlev   = size(prec%precv)
     level = 1
     do level = 1, nlev
       call prec%precv(level)%allocate_wrk(info,vmold=vmold)
@@ -1048,6 +1040,7 @@ contains
   subroutine amg_z_free_wrk(prec,info)
     use psb_base_mod
     implicit none
+
     ! Arguments
     class(amg_zprec_type), intent(inout) :: prec
     integer(psb_ipk_), intent(out)        :: info
@@ -1064,7 +1057,7 @@ contains
     end if
 
     if (allocated(prec%precv)) then
-      nlev   = prec%get_nlevs()
+      nlev   = size(prec%precv)
       do level = 1, nlev
         call prec%precv(level)%free_wrk(info)
       end do

amgprec/amg_z_slu_solver.F90

@@ -124,7 +124,7 @@ module amg_z_slu_solver
       Implicit None
 
       ! Arguments
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_z_slu_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                      :: info

amgprec/amg_z_sludist_solver.F90

@@ -259,7 +259,7 @@ contains
     Implicit None
 
     ! Arguments
-    type(psb_zspmat_type), intent(inout), target        :: a
+    type(psb_zspmat_type), intent(in), target           :: a
     Type(psb_desc_type), Intent(inout)                  :: desc_a 
     class(amg_z_sludist_solver_type), intent(inout)     :: sv
     integer, intent(out)                                :: info

amgprec/amg_z_umf_solver.F90

@@ -163,7 +163,7 @@ module amg_z_umf_solver
       Implicit None
       
       ! Arguments
-      type(psb_zspmat_type), intent(inout), target        :: a
+      type(psb_zspmat_type), intent(in), target           :: a
       Type(psb_desc_type), Intent(inout)                  :: desc_a 
       class(amg_z_umf_solver_type), intent(inout)         :: sv
       integer(psb_ipk_), intent(out)                        :: info

amgprec/impl/Makefile

@@ -25,22 +25,22 @@ MPCOBJS=amg_dslud_interface.o amg_zslud_interface.o
 
 DINNEROBJS= amg_dmlprec_bld.o amg_dfile_prec_descr.o amg_dfile_prec_memory_use.o \
 	amg_d_smoothers_bld.o amg_d_hierarchy_bld.o amg_d_hierarchy_rebld.o \
-	amg_dmlprec_aply.o amg_dmlprec_aply_a.o \
+	amg_dmlprec_aply.o   \
 	$(DMPFOBJS) amg_d_extprol_bld.o
 
 SINNEROBJS=   amg_smlprec_bld.o amg_sfile_prec_descr.o amg_sfile_prec_memory_use.o \
 	amg_s_smoothers_bld.o amg_s_hierarchy_bld.o amg_s_hierarchy_rebld.o \
-	amg_smlprec_aply.o amg_smlprec_aply_a.o \
+	amg_smlprec_aply.o   \
 	$(SMPFOBJS) amg_s_extprol_bld.o 
 
 ZINNEROBJS=   amg_zmlprec_bld.o amg_zfile_prec_descr.o amg_zfile_prec_memory_use.o \
 	amg_z_smoothers_bld.o amg_z_hierarchy_bld.o amg_z_hierarchy_rebld.o \
-	amg_zmlprec_aply.o amg_zmlprec_aply_a.o \
+	amg_zmlprec_aply.o   \
 	$(ZMPFOBJS)  amg_z_extprol_bld.o
 
 CINNEROBJS=   amg_cmlprec_bld.o amg_cfile_prec_descr.o amg_cfile_prec_memory_use.o \
 	amg_c_smoothers_bld.o amg_c_hierarchy_bld.o amg_c_hierarchy_rebld.o \
-	amg_cmlprec_aply.o amg_cmlprec_aply_a.o \
+	amg_cmlprec_aply.o   \
 	$(CMPFOBJS)  amg_c_extprol_bld.o
 
 INNEROBJS= $(SINNEROBJS) $(DINNEROBJS) $(CINNEROBJS) $(ZINNEROBJS)

amgprec/impl/aggregator/amg_c_dec_aggregator_mat_asb.f90

@@ -114,67 +114,63 @@ subroutine  amg_c_dec_aggregator_mat_asb(ag,parms,a,desc_a,&
   info  = psb_success_
   ctxt = desc_a%get_context()
   call psb_info(ctxt,me,np)
-  
-  if (me >=0) then 
-    select case(parms%coarse_mat)
 
-    case(amg_distr_mat_) 
+  select case(parms%coarse_mat)
 
-      call ac%cscnv(info,type='csr')
-      call op_prol%cscnv(info,type='csr')
-      call op_restr%cscnv(info,type='csr')
+  case(amg_distr_mat_) 
 
-      if (debug_level >= psb_debug_outer_) &
-           & write(debug_unit,*) me,' ',trim(name),&
-           & 'Done ac '
+    call ac%cscnv(info,type='csr')
+    call op_prol%cscnv(info,type='csr')
+    call op_restr%cscnv(info,type='csr')
 
-    case(amg_repl_mat_) 
-      !
-      ! We are assuming here that an c matrix
-      ! can hold all entries
-      !
-      if (desc_ac%get_global_rows() < huge(1_psb_ipk_) ) then 
-        ntaggr = desc_ac%get_global_rows()
-        i_nr   = ntaggr
-      else
-        info = psb_err_internal_error_
-        call psb_errpush(info,name,a_err='invalid amg_coarse_mat_')
-        goto 9999
-      end if
+    if (debug_level >= psb_debug_outer_) &
+         & write(debug_unit,*) me,' ',trim(name),&
+         & 'Done ac '
 
-      call op_prol%mv_to(tmpcoo)
-      nzl = tmpcoo%get_nzeros()
-      call psb_loc_to_glob(tmpcoo%ja(1:nzl),desc_ac,info,'I')
-      call tmpcoo%set_ncols(i_nr)
-      call op_prol%mv_from(tmpcoo)
-
-      call op_restr%mv_to(tmpcoo)
-      nzl = tmpcoo%get_nzeros()
-      call psb_loc_to_glob(tmpcoo%ia(1:nzl),desc_ac,info,'I')
-      call tmpcoo%set_nrows(i_nr)
-      call op_restr%mv_from(tmpcoo)
-
-
-      call psb_gather(tmp_ac,ac,desc_ac,info,root=-ione,&
-           & dupl=psb_dupl_add_,keeploc=.false.)
-      call tmp_ac%mv_to(tmpcoo)
-      call ac%mv_from(tmpcoo)
-
-      call psb_cdall(ctxt,desc_ac,info,mg=ntaggr,repl=.true.)
-      if (info == psb_success_) call psb_cdasb(desc_ac,info)
-
-      if (info /= psb_success_) goto 9999
-
-    case default 
+  case(amg_repl_mat_) 
+    !
+    ! We are assuming here that an c matrix
+    ! can hold all entries
+    !
+    if (desc_ac%get_global_rows() < huge(1_psb_ipk_) ) then 
+      ntaggr = desc_ac%get_global_rows()
+      i_nr   = ntaggr
+    else
       info = psb_err_internal_error_
       call psb_errpush(info,name,a_err='invalid amg_coarse_mat_')
       goto 9999
-    end select
-  else
-    call op_prol%allocate(izero,izero,info)
-    call op_restr%allocate(izero,izero,info)
-    call ac%allocate(izero,izero,info)
-  end if
+    end if
+    
+    call op_prol%mv_to(tmpcoo)
+    nzl = tmpcoo%get_nzeros()
+    call psb_loc_to_glob(tmpcoo%ja(1:nzl),desc_ac,info,'I')
+    call tmpcoo%set_ncols(i_nr)
+    call op_prol%mv_from(tmpcoo)
+
+    call op_restr%mv_to(tmpcoo)
+    nzl = tmpcoo%get_nzeros()
+    call psb_loc_to_glob(tmpcoo%ia(1:nzl),desc_ac,info,'I')
+    call tmpcoo%set_nrows(i_nr)
+    call op_restr%mv_from(tmpcoo)
+
+
+    call psb_gather(tmp_ac,ac,desc_ac,info,root=-ione,&
+         & dupl=psb_dupl_add_,keeploc=.false.)
+    call tmp_ac%mv_to(tmpcoo)
+    call ac%mv_from(tmpcoo)
+    
+    call psb_cdall(ctxt,desc_ac,info,mg=ntaggr,repl=.true.)
+    if (info == psb_success_) call psb_cdasb(desc_ac,info)
+
+    if (info /= psb_success_) goto 9999
+
+  case default 
+    info = psb_err_internal_error_
+    call psb_errpush(info,name,a_err='invalid amg_coarse_mat_')
+    goto 9999
+  end select
+
+
   call psb_erractionrestore(err_act)
   return
 

amgprec/impl/aggregator/amg_c_dec_aggregator_mat_bld.f90

@@ -139,7 +139,7 @@ subroutine  amg_c_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,&
   use amg_c_prec_type, amg_protect_name => amg_c_dec_aggregator_mat_bld
   use amg_c_inner_mod 
   implicit none
-
+  
   class(amg_c_dec_aggregator_type), target, intent(inout) :: ag
   type(amg_sml_parms), intent(inout)      :: parms 
   type(psb_cspmat_type), intent(in)    :: a
@@ -169,46 +169,39 @@ subroutine  amg_c_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,&
   ctxt = desc_a%get_context()
   call psb_info(ctxt,me,np)
 
-  if (me >=0) then 
-    !
-    ! Build the coarse-level matrix from the fine-level one, starting from 
-    ! the mapping defined by amg_aggrmap_bld and applying the aggregation
-    ! algorithm specified by 
-    !
-    select case (parms%aggr_prol)
-    case (amg_no_smooth_) 
+  !
+  ! Build the coarse-level matrix from the fine-level one, starting from 
+  ! the mapping defined by amg_aggrmap_bld and applying the aggregation
+  ! algorithm specified by 
+  !
+  select case (parms%aggr_prol)
+  case (amg_no_smooth_) 
 
-      call amg_caggrmat_nosmth_bld(parms%aggr_prol,a,desc_a,ilaggr,&
-           nlaggr,parms,ac,desc_ac,op_prol,op_restr,t_prol,info)
+    call amg_caggrmat_nosmth_bld(parms%aggr_prol,a,desc_a,ilaggr,&
+            nlaggr,parms,ac,desc_ac,op_prol,op_restr,t_prol,info)
 
-    case(amg_smooth_prol_,amg_l1_smooth_prol_) 
+  case(amg_smooth_prol_,amg_l1_smooth_prol_) 
 
-      call amg_caggrmat_smth_bld(parms%aggr_prol,a,desc_a,&
-           ilaggr,nlaggr,parms,ac,desc_ac,op_prol,&
-           op_restr,t_prol,info)
+    call amg_caggrmat_smth_bld(parms%aggr_prol,a,desc_a,&
+            ilaggr,nlaggr,parms,ac,desc_ac,op_prol,&
+            op_restr,t_prol,info)
 
 !!$  case(amg_biz_prol_) 
 !!$
 !!$    call amg_caggrmat_biz_bld(a,desc_a,ilaggr,nlaggr, &
 !!$         & parms,ac,desc_ac,op_prol,op_restr,t_prol,info)
+  
+  case(amg_min_energy_) 
 
-    case(amg_min_energy_) 
+    call amg_caggrmat_minnrg_bld(parms%aggr_prol,a,desc_a,ilaggr,&
+            nlaggr,parms,ac,desc_ac,op_prol,op_restr,t_prol,info)
 
-      call amg_caggrmat_minnrg_bld(parms%aggr_prol,a,desc_a,ilaggr,&
-           nlaggr,parms,ac,desc_ac,op_prol,op_restr,t_prol,info)
-
-    case default
-      info = psb_err_internal_error_
-      call psb_errpush(info,name,a_err='Invalid aggr kind')
-      goto 9999
-
-    end select
-  else
-    call op_prol%allocate(izero,izero,info)
-    call op_restr%allocate(izero,izero,info)
-    call ac%allocate(izero,izero,info)
-  end if
+  case default
+    info = psb_err_internal_error_
+    call psb_errpush(info,name,a_err='Invalid aggr kind')
+    goto 9999
 
+  end select
   if (info /= psb_success_) then
     call psb_errpush(psb_err_from_subroutine_,name,a_err='Inner aggrmat bld')
     goto 9999
@@ -221,5 +214,5 @@ subroutine  amg_c_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,&
 9999 call psb_error_handler(err_act)
   return
 
-
+  
 end subroutine amg_c_dec_aggregator_mat_bld

amgprec/impl/aggregator/amg_c_dec_aggregator_tprol.f90

@@ -122,23 +122,19 @@ subroutine  amg_c_dec_aggregator_build_tprol(ag,parms,ag_data,&
   call amg_check_def(parms%aggr_ord,'Ordering',&
        &   amg_aggr_ord_nat_,is_legal_ml_aggr_ord)
   call amg_check_def(parms%aggr_thresh,'Aggr_Thresh',szero,is_legal_s_aggr_thrs)
-  if (me >=0) then 
-    !
-    ! The decoupled aggregator based on SOC measures ignores
-    ! ag_data except for clean_zeros; soc_map_bld is a procedure pointer.
-    !
-    if (do_timings) call psb_tic(idx_map_bld)
-    clean_zeros = ag%do_clean_zeros
-    call ag%soc_map_bld(parms%aggr_ord,parms%aggr_thresh,clean_zeros,a,desc_a,nlaggr,ilaggr,info)
-    if (do_timings) call psb_toc(idx_map_bld)
-    if (do_timings) call psb_tic(idx_map_tprol)
 
-    if (info==psb_success_) call amg_map_to_tprol(desc_a,ilaggr,nlaggr,t_prol,info)
-    if (do_timings) call psb_toc(idx_map_tprol)
-  else
-    allocate(nlaggr(0),ilaggr(0))
-    call t_prol%allocate(lzero,lzero,info)
-  end if
+  !
+  ! The decoupled aggregator based on SOC measures ignores
+  ! ag_data except for clean_zeros; soc_map_bld is a procedure pointer.
+  !
+  if (do_timings) call psb_tic(idx_map_bld)
+  clean_zeros = ag%do_clean_zeros
+  call ag%soc_map_bld(parms%aggr_ord,parms%aggr_thresh,clean_zeros,a,desc_a,nlaggr,ilaggr,info)
+  if (do_timings) call psb_toc(idx_map_bld)
+  if (do_timings) call psb_tic(idx_map_tprol)
+
+  if (info==psb_success_) call amg_map_to_tprol(desc_a,ilaggr,nlaggr,t_prol,info)
+  if (do_timings) call psb_toc(idx_map_tprol)
   if (info /= psb_success_) then
     info=psb_err_from_subroutine_
     call psb_errpush(info,name,a_err='soc_map_bld/map_to_tprol')

amgprec/impl/aggregator/amg_caggrmat_minnrg_bld.f90

@@ -155,7 +155,7 @@ subroutine amg_caggrmat_minnrg_bld(dol1smoothing,a,desc_a,ilaggr,nlaggr,&
   debug_level = psb_get_debug_level()
 
   ctxt = desc_a%get_context()
-  icomm = ctxt%get_mpic()
+  icomm = desc_a%get_mpic()
 
   call psb_info(ctxt, me, np)
 

amgprec/impl/aggregator/amg_d_dec_aggregator_mat_asb.f90

@@ -114,67 +114,63 @@ subroutine  amg_d_dec_aggregator_mat_asb(ag,parms,a,desc_a,&
   info  = psb_success_
   ctxt = desc_a%get_context()
   call psb_info(ctxt,me,np)
-  
-  if (me >=0) then 
-    select case(parms%coarse_mat)
 
-    case(amg_distr_mat_) 
+  select case(parms%coarse_mat)
 
-      call ac%cscnv(info,type='csr')
-      call op_prol%cscnv(info,type='csr')
-      call op_restr%cscnv(info,type='csr')
+  case(amg_distr_mat_) 
 
-      if (debug_level >= psb_debug_outer_) &
-           & write(debug_unit,*) me,' ',trim(name),&
-           & 'Done ac '
+    call ac%cscnv(info,type='csr')
+    call op_prol%cscnv(info,type='csr')
+    call op_restr%cscnv(info,type='csr')
 
-    case(amg_repl_mat_) 
-      !
-      ! We are assuming here that an d matrix
-      ! can hold all entries
-      !
-      if (desc_ac%get_global_rows() < huge(1_psb_ipk_) ) then 
-        ntaggr = desc_ac%get_global_rows()
-        i_nr   = ntaggr
-      else
-        info = psb_err_internal_error_
-        call psb_errpush(info,name,a_err='invalid amg_coarse_mat_')
-        goto 9999
-      end if
+    if (debug_level >= psb_debug_outer_) &
+         & write(debug_unit,*) me,' ',trim(name),&
+         & 'Done ac '
 
-      call op_prol%mv_to(tmpcoo)
-      nzl = tmpcoo%get_nzeros()
-      call psb_loc_to_glob(tmpcoo%ja(1:nzl),desc_ac,info,'I')
-      call tmpcoo%set_ncols(i_nr)
-      call op_prol%mv_from(tmpcoo)
-
-      call op_restr%mv_to(tmpcoo)
-      nzl = tmpcoo%get_nzeros()
-      call psb_loc_to_glob(tmpcoo%ia(1:nzl),desc_ac,info,'I')
-      call tmpcoo%set_nrows(i_nr)
-      call op_restr%mv_from(tmpcoo)
-
-
-      call psb_gather(tmp_ac,ac,desc_ac,info,root=-ione,&
-           & dupl=psb_dupl_add_,keeploc=.false.)
-      call tmp_ac%mv_to(tmpcoo)
-      call ac%mv_from(tmpcoo)
-
-      call psb_cdall(ctxt,desc_ac,info,mg=ntaggr,repl=.true.)
-      if (info == psb_success_) call psb_cdasb(desc_ac,info)
-
-      if (info /= psb_success_) goto 9999
-
-    case default 
+  case(amg_repl_mat_) 
+    !
+    ! We are assuming here that an d matrix
+    ! can hold all entries
+    !
+    if (desc_ac%get_global_rows() < huge(1_psb_ipk_) ) then 
+      ntaggr = desc_ac%get_global_rows()
+      i_nr   = ntaggr
+    else
       info = psb_err_internal_error_
       call psb_errpush(info,name,a_err='invalid amg_coarse_mat_')
       goto 9999
-    end select
-  else
-    call op_prol%allocate(izero,izero,info)
-    call op_restr%allocate(izero,izero,info)
-    call ac%allocate(izero,izero,info)
-  end if
+    end if
+    
+    call op_prol%mv_to(tmpcoo)
+    nzl = tmpcoo%get_nzeros()
+    call psb_loc_to_glob(tmpcoo%ja(1:nzl),desc_ac,info,'I')
+    call tmpcoo%set_ncols(i_nr)
+    call op_prol%mv_from(tmpcoo)
+
+    call op_restr%mv_to(tmpcoo)
+    nzl = tmpcoo%get_nzeros()
+    call psb_loc_to_glob(tmpcoo%ia(1:nzl),desc_ac,info,'I')
+    call tmpcoo%set_nrows(i_nr)
+    call op_restr%mv_from(tmpcoo)
+
+
+    call psb_gather(tmp_ac,ac,desc_ac,info,root=-ione,&
+         & dupl=psb_dupl_add_,keeploc=.false.)
+    call tmp_ac%mv_to(tmpcoo)
+    call ac%mv_from(tmpcoo)
+    
+    call psb_cdall(ctxt,desc_ac,info,mg=ntaggr,repl=.true.)
+    if (info == psb_success_) call psb_cdasb(desc_ac,info)
+
+    if (info /= psb_success_) goto 9999
+
+  case default 
+    info = psb_err_internal_error_
+    call psb_errpush(info,name,a_err='invalid amg_coarse_mat_')
+    goto 9999
+  end select
+
+
   call psb_erractionrestore(err_act)
   return
 

amgprec/impl/aggregator/amg_d_dec_aggregator_mat_bld.f90

@@ -139,7 +139,7 @@ subroutine  amg_d_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,&
   use amg_d_prec_type, amg_protect_name => amg_d_dec_aggregator_mat_bld
   use amg_d_inner_mod 
   implicit none
-
+  
   class(amg_d_dec_aggregator_type), target, intent(inout) :: ag
   type(amg_dml_parms), intent(inout)      :: parms 
   type(psb_dspmat_type), intent(in)    :: a
@@ -169,46 +169,39 @@ subroutine  amg_d_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,&
   ctxt = desc_a%get_context()
   call psb_info(ctxt,me,np)
 
-  if (me >=0) then 
-    !
-    ! Build the coarse-level matrix from the fine-level one, starting from 
-    ! the mapping defined by amg_aggrmap_bld and applying the aggregation
-    ! algorithm specified by 
-    !
-    select case (parms%aggr_prol)
-    case (amg_no_smooth_) 
+  !
+  ! Build the coarse-level matrix from the fine-level one, starting from 
+  ! the mapping defined by amg_aggrmap_bld and applying the aggregation
+  ! algorithm specified by 
+  !
+  select case (parms%aggr_prol)
+  case (amg_no_smooth_) 
 
-      call amg_daggrmat_nosmth_bld(parms%aggr_prol,a,desc_a,ilaggr,&
-           nlaggr,parms,ac,desc_ac,op_prol,op_restr,t_prol,info)
+    call amg_daggrmat_nosmth_bld(parms%aggr_prol,a,desc_a,ilaggr,&
+            nlaggr,parms,ac,desc_ac,op_prol,op_restr,t_prol,info)
 
-    case(amg_smooth_prol_,amg_l1_smooth_prol_) 
+  case(amg_smooth_prol_,amg_l1_smooth_prol_) 
 
-      call amg_daggrmat_smth_bld(parms%aggr_prol,a,desc_a,&
-           ilaggr,nlaggr,parms,ac,desc_ac,op_prol,&
-           op_restr,t_prol,info)
+    call amg_daggrmat_smth_bld(parms%aggr_prol,a,desc_a,&
+            ilaggr,nlaggr,parms,ac,desc_ac,op_prol,&
+            op_restr,t_prol,info)
 
 !!$  case(amg_biz_prol_) 
 !!$
 !!$    call amg_daggrmat_biz_bld(a,desc_a,ilaggr,nlaggr, &
 !!$         & parms,ac,desc_ac,op_prol,op_restr,t_prol,info)
+  
+  case(amg_min_energy_) 
 
-    case(amg_min_energy_) 
+    call amg_daggrmat_minnrg_bld(parms%aggr_prol,a,desc_a,ilaggr,&
+            nlaggr,parms,ac,desc_ac,op_prol,op_restr,t_prol,info)
 
-      call amg_daggrmat_minnrg_bld(parms%aggr_prol,a,desc_a,ilaggr,&
-           nlaggr,parms,ac,desc_ac,op_prol,op_restr,t_prol,info)
-
-    case default
-      info = psb_err_internal_error_
-      call psb_errpush(info,name,a_err='Invalid aggr kind')
-      goto 9999
-
-    end select
-  else
-    call op_prol%allocate(izero,izero,info)
-    call op_restr%allocate(izero,izero,info)
-    call ac%allocate(izero,izero,info)
-  end if
+  case default
+    info = psb_err_internal_error_
+    call psb_errpush(info,name,a_err='Invalid aggr kind')
+    goto 9999
 
+  end select
   if (info /= psb_success_) then
     call psb_errpush(psb_err_from_subroutine_,name,a_err='Inner aggrmat bld')
     goto 9999
@@ -221,5 +214,5 @@ subroutine  amg_d_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,&
 9999 call psb_error_handler(err_act)
   return
 
-
+  
 end subroutine amg_d_dec_aggregator_mat_bld

amgprec/impl/aggregator/amg_d_dec_aggregator_tprol.f90

@@ -122,23 +122,19 @@ subroutine  amg_d_dec_aggregator_build_tprol(ag,parms,ag_data,&
   call amg_check_def(parms%aggr_ord,'Ordering',&
        &   amg_aggr_ord_nat_,is_legal_ml_aggr_ord)
   call amg_check_def(parms%aggr_thresh,'Aggr_Thresh',dzero,is_legal_d_aggr_thrs)
-  if (me >=0) then 
-    !
-    ! The decoupled aggregator based on SOC measures ignores
-    ! ag_data except for clean_zeros; soc_map_bld is a procedure pointer.
-    !
-    if (do_timings) call psb_tic(idx_map_bld)
-    clean_zeros = ag%do_clean_zeros
-    call ag%soc_map_bld(parms%aggr_ord,parms%aggr_thresh,clean_zeros,a,desc_a,nlaggr,ilaggr,info)
-    if (do_timings) call psb_toc(idx_map_bld)
-    if (do_timings) call psb_tic(idx_map_tprol)
 
-    if (info==psb_success_) call amg_map_to_tprol(desc_a,ilaggr,nlaggr,t_prol,info)
-    if (do_timings) call psb_toc(idx_map_tprol)
-  else
-    allocate(nlaggr(0),ilaggr(0))
-    call t_prol%allocate(lzero,lzero,info)
-  end if
+  !
+  ! The decoupled aggregator based on SOC measures ignores
+  ! ag_data except for clean_zeros; soc_map_bld is a procedure pointer.
+  !
+  if (do_timings) call psb_tic(idx_map_bld)
+  clean_zeros = ag%do_clean_zeros
+  call ag%soc_map_bld(parms%aggr_ord,parms%aggr_thresh,clean_zeros,a,desc_a,nlaggr,ilaggr,info)
+  if (do_timings) call psb_toc(idx_map_bld)
+  if (do_timings) call psb_tic(idx_map_tprol)
+
+  if (info==psb_success_) call amg_map_to_tprol(desc_a,ilaggr,nlaggr,t_prol,info)
+  if (do_timings) call psb_toc(idx_map_tprol)
   if (info /= psb_success_) then
     info=psb_err_from_subroutine_
     call psb_errpush(info,name,a_err='soc_map_bld/map_to_tprol')

amgprec/impl/aggregator/amg_daggrmat_minnrg_bld.f90

@@ -155,7 +155,7 @@ subroutine amg_daggrmat_minnrg_bld(dol1smoothing,a,desc_a,ilaggr,nlaggr,&
   debug_level = psb_get_debug_level()
 
   ctxt = desc_a%get_context()
-  icomm = ctxt%get_mpic()
+  icomm = desc_a%get_mpic()
 
   call psb_info(ctxt, me, np)