mld2p4-2:

mld_c_inner_mod.f90
 mld_ccoarse_bld.f90
 mld_d_inner_mod.f90
 mld_dcoarse_bld.f90
 mld_scoarse_bld.f90
 mld_z_inner_mod.f90
 mld_zcoarse_bld.f90

Various interface fixes from tests with Cray FTN.

mlprec/Makefile

@@ -86,7 +86,7 @@ $(LIBNAME): $(OBJS)
 # flea: if libdir misses some .mod file, it won't be copied unless the .a file is missing too  
 $(LIBDIR)/$(LIBNAME): $(LIBNAME) 
 	/bin/cp -p $(HERE)/$(LIBNAME) $(LIBDIR)
-	/bin/cp -p $(LIBMOD) $(LOCAL_MODS) mld_const.h $(LIBDIR)
+	/bin/cp -p *$(.mod) mld_const.h $(LIBDIR)
 
 mld_s_prec_type.o mld_d_prec_type.o mld_c_prec_type.o mld_z_prec_type.o	: mld_base_prec_type.o
 mld_prec_type.o: mld_s_prec_type.o mld_d_prec_type.o mld_c_prec_type.o mld_z_prec_type.o	

mlprec/mld_c_inner_mod.f90

@@ -83,10 +83,10 @@ module mld_c_inner_mod
     subroutine mld_ccoarse_bld(a,desc_a,p,info)
       use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_
       use mld_c_prec_type, only : mld_conelev_type
-      type(psb_cspmat_type), intent(in)              :: a
+      type(psb_cspmat_type), intent(in), target     :: a
-      type(psb_desc_type), intent(in)                :: desc_a
+      type(psb_desc_type), intent(in), target       :: desc_a
       type(mld_conelev_type), intent(inout), target :: p
-      integer, intent(out)                           :: info
+      integer, intent(out)                          :: info
     end subroutine mld_ccoarse_bld
   end interface mld_coarse_bld
 

mlprec/mld_ccoarse_bld.f90

@@ -73,10 +73,10 @@ subroutine mld_ccoarse_bld(a,desc_a,p,info)
   implicit none
 
   ! Arguments
-  type(psb_cspmat_type), intent(in), target :: a
+  type(psb_cspmat_type), intent(in), target    :: a
-  type(psb_desc_type), intent(in), target   :: desc_a
+  type(psb_desc_type), intent(in), target      :: desc_a
-  type(mld_conelev_type), intent(inout),target    :: p
+  type(mld_conelev_type), intent(inout),target :: p
-  integer, intent(out)                      :: info
+  integer, intent(out)                         :: info
 
   ! Local variables
   character(len=20)      :: name

mlprec/mld_d_inner_mod.f90

@@ -99,10 +99,10 @@ module mld_d_inner_mod
     subroutine mld_dcoarse_bld(a,desc_a,p,info)
       use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_
       use mld_d_prec_type, only : mld_donelev_type
-      type(psb_dspmat_type), intent(in)              :: a
+      type(psb_dspmat_type), intent(in), target     :: a
-      type(psb_desc_type), intent(in)                :: desc_a
+      type(psb_desc_type), intent(in), target       :: desc_a
       type(mld_donelev_type), intent(inout), target :: p
-      integer, intent(out)                           :: info
+      integer, intent(out)                          :: info
     end subroutine mld_dcoarse_bld
   end interface mld_coarse_bld
 

mlprec/mld_dcoarse_bld.f90

@@ -73,10 +73,10 @@ subroutine mld_dcoarse_bld(a,desc_a,p,info)
   implicit none
 
   ! Arguments
-  type(psb_dspmat_type), intent(in), target :: a
+  type(psb_dspmat_type), intent(in), target    :: a
-  type(psb_desc_type), intent(in), target    :: desc_a
+  type(psb_desc_type), intent(in), target      :: desc_a
-  type(mld_donelev_type), intent(inout),target    :: p
+  type(mld_donelev_type), intent(inout),target :: p
-  integer, intent(out)                       :: info
+  integer, intent(out)                         :: info
 
   ! Local variables
   character(len=20)      :: name

mlprec/mld_scoarse_bld.f90

@@ -73,10 +73,10 @@ subroutine mld_scoarse_bld(a,desc_a,p,info)
   implicit none
 
   ! Arguments
-  type(psb_sspmat_type), intent(in), target :: a
+  type(psb_sspmat_type), intent(in), target    :: a
-  type(psb_desc_type), intent(in), target   :: desc_a
+  type(psb_desc_type), intent(in), target      :: desc_a
-  type(mld_sonelev_type), intent(inout),target    :: p
+  type(mld_sonelev_type), intent(inout),target :: p
-  integer, intent(out)                      :: info
+  integer, intent(out)                         :: info
 
   ! Local variables
   character(len=20)      :: name

mlprec/mld_z_inner_mod.f90

@@ -54,10 +54,10 @@ module mld_z_inner_mod
       use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_
       use mld_z_prec_type, only : mld_zprec_type
       implicit none
-      type(psb_zspmat_type), intent(in), target  :: a
+      type(psb_zspmat_type), intent(in), target   :: a
-      type(psb_desc_type), intent(in), target    :: desc_a
+      type(psb_desc_type), intent(in), target     :: desc_a
-      type(mld_zprec_type), intent(inout)        :: prec
+      type(mld_zprec_type), intent(inout), target :: prec
-      integer, intent(out)                       :: info
+      integer, intent(out)                        :: info
 !!$      character, intent(in),optional             :: upd
     end subroutine mld_zmlprec_bld
   end interface mld_mlprec_bld
@@ -83,10 +83,10 @@ module mld_z_inner_mod
     subroutine mld_zcoarse_bld(a,desc_a,p,info)
       use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_
       use mld_z_prec_type, only : mld_zonelev_type
-      type(psb_zspmat_type), intent(in)              :: a
+      type(psb_zspmat_type), intent(in), target     :: a
-      type(psb_desc_type), intent(in)                :: desc_a
+      type(psb_desc_type), intent(in), target       :: desc_a
       type(mld_zonelev_type), intent(inout), target :: p
-      integer, intent(out)                           :: info
+      integer, intent(out)                          :: info
     end subroutine mld_zcoarse_bld
   end interface mld_coarse_bld
 

mlprec/mld_zcoarse_bld.f90

@@ -73,10 +73,10 @@ subroutine mld_zcoarse_bld(a,desc_a,p,info)
   implicit none
 
   ! Arguments
-  type(psb_zspmat_type), intent(in), target :: a
+  type(psb_zspmat_type), intent(in), target    :: a
-  type(psb_desc_type), intent(in), target   :: desc_a
+  type(psb_desc_type), intent(in), target      :: desc_a
-  type(mld_zonelev_type), intent(inout),target    :: p
+  type(mld_zonelev_type), intent(inout),target :: p
-  integer, intent(out)                      :: info
+  integer, intent(out)                         :: info
 
   ! Local variables
   character(len=20)      :: name