From 5fc55bfc4cf701be10b08b0f831314fbd3a372f4 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 21 Mar 2011 17:08:37 +0000 Subject: [PATCH] mld2p4-2: configure examples/fileread/data_input.f90 examples/fileread/mld_cexample_1lev.f90 examples/fileread/mld_cexample_ml.f90 examples/fileread/mld_dexample_1lev.f90 examples/fileread/mld_dexample_ml.f90 examples/fileread/mld_sexample_1lev.f90 examples/fileread/mld_sexample_ml.f90 examples/fileread/mld_zexample_1lev.f90 examples/fileread/mld_zexample_ml.f90 examples/pdegen/data_input.f90 examples/pdegen/mld_dexample_1lev.f90 examples/pdegen/mld_dexample_ml.f90 examples/pdegen/mld_sexample_1lev.f90 examples/pdegen/mld_sexample_ml.f90 mlprec/Makefile mlprec/mld_base_prec_type.f90 mlprec/mld_c_as_smoother.f90 mlprec/mld_c_diag_solver.f90 mlprec/mld_c_id_solver.f90 mlprec/mld_c_ilu_solver.f90 mlprec/mld_c_inner_mod.f90 mlprec/mld_c_jac_smoother.f90 mlprec/mld_c_move_alloc_mod.f90 mlprec/mld_c_prec_mod.f90 mlprec/mld_c_prec_type.f90 mlprec/mld_c_slu_solver.f90 mlprec/mld_caggrmap_bld.f90 mlprec/mld_caggrmat_asb.f90 mlprec/mld_caggrmat_nosmth_asb.F90 mlprec/mld_caggrmat_smth_asb.F90 mlprec/mld_ccoarse_bld.f90 mlprec/mld_cilu0_fact.f90 mlprec/mld_ciluk_fact.f90 mlprec/mld_cilut_fact.f90 mlprec/mld_cmlprec_aply.f90 mlprec/mld_cmlprec_bld.f90 mlprec/mld_cprecaply.f90 mlprec/mld_cprecbld.f90 mlprec/mld_cprecinit.F90 mlprec/mld_cprecset.F90 mlprec/mld_cslu_bld.f90 mlprec/mld_cslud_bld.f90 mlprec/mld_csp_renum.f90 mlprec/mld_cumf_bld.f90 mlprec/mld_d_as_smoother.f90 mlprec/mld_d_diag_solver.f90 mlprec/mld_d_id_solver.f90 mlprec/mld_d_ilu_solver.f90 mlprec/mld_d_inner_mod.f90 mlprec/mld_d_jac_smoother.f90 mlprec/mld_d_move_alloc_mod.f90 mlprec/mld_d_prec_mod.f90 mlprec/mld_d_prec_type.f90 mlprec/mld_d_slu_solver.f90 mlprec/mld_d_sludist_solver.f90 mlprec/mld_d_umf_solver.f90 mlprec/mld_daggrmap_bld.f90 mlprec/mld_daggrmat_asb.f90 mlprec/mld_daggrmat_minnrg_asb.F90 mlprec/mld_daggrmat_nosmth_asb.F90 mlprec/mld_daggrmat_smth_asb.F90 mlprec/mld_dcoarse_bld.f90 mlprec/mld_dilu0_fact.f90 mlprec/mld_diluk_fact.f90 mlprec/mld_dilut_fact.f90 mlprec/mld_dmlprec_aply.f90 mlprec/mld_dmlprec_bld.f90 mlprec/mld_dprecaply.f90 mlprec/mld_dprecbld.f90 mlprec/mld_dprecinit.F90 mlprec/mld_dprecset.F90 mlprec/mld_dslu_bld.f90 mlprec/mld_dslud_bld.f90 mlprec/mld_dsp_renum.f90 mlprec/mld_s_as_smoother.f90 mlprec/mld_s_diag_solver.f90 mlprec/mld_s_id_solver.f90 mlprec/mld_s_ilu_solver.f90 mlprec/mld_s_inner_mod.f90 mlprec/mld_s_jac_smoother.f90 mlprec/mld_s_move_alloc_mod.f90 mlprec/mld_s_prec_mod.f90 mlprec/mld_s_prec_type.f90 mlprec/mld_s_slu_solver.f90 mlprec/mld_saggrmap_bld.f90 mlprec/mld_saggrmat_asb.f90 mlprec/mld_saggrmat_nosmth_asb.F90 mlprec/mld_saggrmat_smth_asb.F90 mlprec/mld_scoarse_bld.f90 mlprec/mld_silu0_fact.f90 mlprec/mld_siluk_fact.f90 mlprec/mld_silut_fact.f90 mlprec/mld_smlprec_aply.f90 mlprec/mld_smlprec_bld.f90 mlprec/mld_sprecaply.f90 mlprec/mld_sprecbld.f90 mlprec/mld_sprecinit.F90 mlprec/mld_sprecset.F90 mlprec/mld_sslu_bld.f90 mlprec/mld_sslud_bld.f90 mlprec/mld_ssp_renum.f90 mlprec/mld_sumf_bld.f90 mlprec/mld_z_as_smoother.f90 mlprec/mld_z_diag_solver.f90 mlprec/mld_z_id_solver.f90 mlprec/mld_z_ilu_solver.f90 mlprec/mld_z_inner_mod.f90 mlprec/mld_z_jac_smoother.f90 mlprec/mld_z_move_alloc_mod.f90 mlprec/mld_z_prec_mod.f90 mlprec/mld_z_prec_type.f90 mlprec/mld_z_slu_solver.f90 mlprec/mld_z_umf_solver.f90 mlprec/mld_zaggrmap_bld.f90 mlprec/mld_zaggrmat_asb.f90 mlprec/mld_zaggrmat_nosmth_asb.F90 mlprec/mld_zaggrmat_smth_asb.F90 mlprec/mld_zas_aply.f90 mlprec/mld_zas_bld.f90 mlprec/mld_zbaseprec_aply.f90 mlprec/mld_zbaseprec_bld.f90 mlprec/mld_zcoarse_bld.f90 mlprec/mld_zdiag_bld.f90 mlprec/mld_zfact_bld.f90 mlprec/mld_zilu0_fact.f90 mlprec/mld_zilu_bld.f90 mlprec/mld_ziluk_fact.f90 mlprec/mld_zilut_fact.f90 mlprec/mld_zmlprec_aply.f90 mlprec/mld_zmlprec_bld.f90 mlprec/mld_zprecaply.f90 mlprec/mld_zprecbld.f90 mlprec/mld_zprecinit.F90 mlprec/mld_zprecset.F90 mlprec/mld_zslu_bld.f90 mlprec/mld_zslud_bld.f90 mlprec/mld_zsp_renum.f90 mlprec/mld_zumf_bld.f90 tests/fileread/cf_sample.f90 tests/fileread/data_input.f90 tests/fileread/df_sample.f90 tests/fileread/sf_sample.f90 tests/fileread/zf_sample.f90 tests/newslv/data_input.f90 tests/newslv/mld_d_tlu_solver.f90 tests/newslv/ppde.f90 tests/newslv/spde.f90 tests/pdegen/data_input.f90 tests/pdegen/ppde.f90 tests/pdegen/runs/ppde.inp tests/pdegen/spde.f90 Adapted psb_base_mod. --- configure | 282 ++++++++++++------------ examples/fileread/data_input.f90 | 8 +- examples/fileread/mld_cexample_1lev.f90 | 4 +- examples/fileread/mld_cexample_ml.f90 | 4 +- examples/fileread/mld_dexample_1lev.f90 | 4 +- examples/fileread/mld_dexample_ml.f90 | 4 +- examples/fileread/mld_sexample_1lev.f90 | 4 +- examples/fileread/mld_sexample_ml.f90 | 4 +- examples/fileread/mld_zexample_1lev.f90 | 4 +- examples/fileread/mld_zexample_ml.f90 | 4 +- examples/pdegen/data_input.f90 | 8 +- examples/pdegen/mld_dexample_1lev.f90 | 20 +- examples/pdegen/mld_dexample_ml.f90 | 20 +- examples/pdegen/mld_sexample_1lev.f90 | 20 +- examples/pdegen/mld_sexample_ml.f90 | 20 +- mlprec/Makefile | 2 +- mlprec/mld_base_prec_type.f90 | 18 +- mlprec/mld_c_as_smoother.f90 | 22 +- mlprec/mld_c_diag_solver.f90 | 16 +- mlprec/mld_c_id_solver.f90 | 16 +- mlprec/mld_c_ilu_solver.f90 | 22 +- mlprec/mld_c_inner_mod.f90 | 14 +- mlprec/mld_c_jac_smoother.f90 | 16 +- mlprec/mld_c_move_alloc_mod.f90 | 4 +- mlprec/mld_c_prec_mod.f90 | 14 +- mlprec/mld_c_prec_type.f90 | 64 +++--- mlprec/mld_c_slu_solver.f90 | 16 +- mlprec/mld_caggrmap_bld.f90 | 4 +- mlprec/mld_caggrmat_asb.f90 | 2 +- mlprec/mld_caggrmat_nosmth_asb.F90 | 2 +- mlprec/mld_caggrmat_smth_asb.F90 | 2 +- mlprec/mld_ccoarse_bld.f90 | 2 +- mlprec/mld_cilu0_fact.f90 | 4 +- mlprec/mld_ciluk_fact.f90 | 10 +- mlprec/mld_cilut_fact.f90 | 10 +- mlprec/mld_cmlprec_aply.f90 | 2 +- mlprec/mld_cmlprec_bld.f90 | 2 +- mlprec/mld_cprecaply.f90 | 4 +- mlprec/mld_cprecbld.f90 | 2 +- mlprec/mld_cprecinit.F90 | 2 +- mlprec/mld_cprecset.F90 | 10 +- mlprec/mld_cslu_bld.f90 | 2 +- mlprec/mld_cslud_bld.f90 | 2 +- mlprec/mld_csp_renum.f90 | 2 +- mlprec/mld_cumf_bld.f90 | 2 +- mlprec/mld_d_as_smoother.f90 | 22 +- mlprec/mld_d_diag_solver.f90 | 16 +- mlprec/mld_d_id_solver.f90 | 16 +- mlprec/mld_d_ilu_solver.f90 | 22 +- mlprec/mld_d_inner_mod.f90 | 16 +- mlprec/mld_d_jac_smoother.f90 | 16 +- mlprec/mld_d_move_alloc_mod.f90 | 4 +- mlprec/mld_d_prec_mod.f90 | 24 +- mlprec/mld_d_prec_type.f90 | 66 +++--- mlprec/mld_d_slu_solver.f90 | 16 +- mlprec/mld_d_sludist_solver.f90 | 16 +- mlprec/mld_d_umf_solver.f90 | 16 +- mlprec/mld_daggrmap_bld.f90 | 4 +- mlprec/mld_daggrmat_asb.f90 | 2 +- mlprec/mld_daggrmat_minnrg_asb.F90 | 2 +- mlprec/mld_daggrmat_nosmth_asb.F90 | 2 +- mlprec/mld_daggrmat_smth_asb.F90 | 2 +- mlprec/mld_dcoarse_bld.f90 | 2 +- mlprec/mld_dilu0_fact.f90 | 4 +- mlprec/mld_diluk_fact.f90 | 10 +- mlprec/mld_dilut_fact.f90 | 10 +- mlprec/mld_dmlprec_aply.f90 | 2 +- mlprec/mld_dmlprec_bld.f90 | 2 +- mlprec/mld_dprecaply.f90 | 4 +- mlprec/mld_dprecbld.f90 | 2 +- mlprec/mld_dprecinit.F90 | 2 +- mlprec/mld_dprecset.F90 | 12 +- mlprec/mld_dslu_bld.f90 | 2 +- mlprec/mld_dslud_bld.f90 | 2 +- mlprec/mld_dsp_renum.f90 | 2 +- mlprec/mld_s_as_smoother.f90 | 22 +- mlprec/mld_s_diag_solver.f90 | 16 +- mlprec/mld_s_id_solver.f90 | 16 +- mlprec/mld_s_ilu_solver.f90 | 22 +- mlprec/mld_s_inner_mod.f90 | 14 +- mlprec/mld_s_jac_smoother.f90 | 16 +- mlprec/mld_s_move_alloc_mod.f90 | 4 +- mlprec/mld_s_prec_mod.f90 | 20 +- mlprec/mld_s_prec_type.f90 | 64 +++--- mlprec/mld_s_slu_solver.f90 | 16 +- mlprec/mld_saggrmap_bld.f90 | 4 +- mlprec/mld_saggrmat_asb.f90 | 2 +- mlprec/mld_saggrmat_nosmth_asb.F90 | 2 +- mlprec/mld_saggrmat_smth_asb.F90 | 2 +- mlprec/mld_scoarse_bld.f90 | 2 +- mlprec/mld_silu0_fact.f90 | 4 +- mlprec/mld_siluk_fact.f90 | 10 +- mlprec/mld_silut_fact.f90 | 10 +- mlprec/mld_smlprec_aply.f90 | 2 +- mlprec/mld_smlprec_bld.f90 | 2 +- mlprec/mld_sprecaply.f90 | 4 +- mlprec/mld_sprecbld.f90 | 2 +- mlprec/mld_sprecinit.F90 | 2 +- mlprec/mld_sprecset.F90 | 10 +- mlprec/mld_sslu_bld.f90 | 2 +- mlprec/mld_sslud_bld.f90 | 2 +- mlprec/mld_ssp_renum.f90 | 2 +- mlprec/mld_sumf_bld.f90 | 2 +- mlprec/mld_z_as_smoother.f90 | 22 +- mlprec/mld_z_diag_solver.f90 | 16 +- mlprec/mld_z_id_solver.f90 | 16 +- mlprec/mld_z_ilu_solver.f90 | 22 +- mlprec/mld_z_inner_mod.f90 | 14 +- mlprec/mld_z_jac_smoother.f90 | 16 +- mlprec/mld_z_move_alloc_mod.f90 | 4 +- mlprec/mld_z_prec_mod.f90 | 14 +- mlprec/mld_z_prec_type.f90 | 64 +++--- mlprec/mld_z_slu_solver.f90 | 16 +- mlprec/mld_z_umf_solver.f90 | 16 +- mlprec/mld_zaggrmap_bld.f90 | 4 +- mlprec/mld_zaggrmat_asb.f90 | 2 +- mlprec/mld_zaggrmat_nosmth_asb.F90 | 2 +- mlprec/mld_zaggrmat_smth_asb.F90 | 2 +- mlprec/mld_zas_aply.f90 | 2 +- mlprec/mld_zas_bld.f90 | 2 +- mlprec/mld_zbaseprec_aply.f90 | 2 +- mlprec/mld_zbaseprec_bld.f90 | 2 +- mlprec/mld_zcoarse_bld.f90 | 2 +- mlprec/mld_zdiag_bld.f90 | 2 +- mlprec/mld_zfact_bld.f90 | 2 +- mlprec/mld_zilu0_fact.f90 | 4 +- mlprec/mld_zilu_bld.f90 | 2 +- mlprec/mld_ziluk_fact.f90 | 10 +- mlprec/mld_zilut_fact.f90 | 10 +- mlprec/mld_zmlprec_aply.f90 | 2 +- mlprec/mld_zmlprec_bld.f90 | 2 +- mlprec/mld_zprecaply.f90 | 4 +- mlprec/mld_zprecbld.f90 | 2 +- mlprec/mld_zprecinit.F90 | 2 +- mlprec/mld_zprecset.F90 | 10 +- mlprec/mld_zslu_bld.f90 | 2 +- mlprec/mld_zslud_bld.f90 | 2 +- mlprec/mld_zsp_renum.f90 | 2 +- mlprec/mld_zumf_bld.f90 | 2 +- tests/fileread/cf_sample.f90 | 4 +- tests/fileread/data_input.f90 | 8 +- tests/fileread/df_sample.f90 | 4 +- tests/fileread/sf_sample.f90 | 4 +- tests/fileread/zf_sample.f90 | 4 +- tests/newslv/data_input.f90 | 8 +- tests/newslv/mld_d_tlu_solver.f90 | 28 +-- tests/newslv/ppde.f90 | 18 +- tests/newslv/spde.f90 | 18 +- tests/pdegen/data_input.f90 | 8 +- tests/pdegen/ppde.f90 | 18 +- tests/pdegen/runs/ppde.inp | 2 +- tests/pdegen/spde.f90 | 18 +- 152 files changed, 875 insertions(+), 861 deletions(-) diff --git a/configure b/configure index 3c1d0989..db06577c 100755 --- a/configure +++ b/configure @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for MLD2P4 2.0. +# Generated by GNU Autoconf 2.66 for MLD2P4 2.0. # # Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -319,7 +319,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -359,19 +359,19 @@ else fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -533,7 +533,7 @@ test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -807,7 +807,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -833,7 +833,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1037,7 +1037,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1053,7 +1053,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1083,8 +1083,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1092,7 +1092,7 @@ Try \`$0 --help' for more information." # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1110,13 +1110,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1139,7 +1139,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1153,8 +1153,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1169,9 +1169,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1210,11 +1210,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1254,7 +1254,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1420,9 +1420,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF MLD2P4 configure 2.0 -generated by GNU Autoconf 2.65 +generated by GNU Autoconf 2.66 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1554,10 +1554,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1616,17 +1616,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( cat <<\_ASBOX -## ---------------------------------- ## +( $as_echo "## ---------------------------------- ## ## Report this to bugreport@mld2p4.it ## -## ---------------------------------- ## -_ASBOX +## ---------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1690,7 +1688,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1766,7 +1764,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1959,7 +1957,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by MLD2P4 $as_me 2.0, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.66. Invocation command line was $ $0 $@ @@ -2069,11 +2067,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2107,11 +2103,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2124,11 +2118,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2142,11 +2134,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2201,7 +2191,12 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2216,7 +2211,11 @@ do { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2292,7 +2291,7 @@ if $ac_cache_corrupted; then $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2357,17 +2356,17 @@ PSBLAS_DIR="$pac_cv_psblas_dir"; $as_echo_n "checking for PSBLAS build dir... " >&6; } case $PSBLAS_DIR in /*) ;; - *) as_fn_error "The PSBLAS installation dir must be an absolute pathname + *) as_fn_error $? "The PSBLAS installation dir must be an absolute pathname specified with --with-psblas=/path/to/psblas" "$LINENO" 5 esac if test ! -d "$PSBLAS_DIR" ; then - as_fn_error "Could not find PSBLAS build dir $PSBLAS_DIR!" "$LINENO" 5 + as_fn_error $? "Could not find PSBLAS build dir $PSBLAS_DIR!" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PSBLAS_DIR" >&5 $as_echo "$PSBLAS_DIR" >&6; } pac_cv_status_file="$PSBLAS_DIR/Make.inc" if test ! -f "$pac_cv_status_file" ; then - as_fn_error "Could not find an installation in $PSBLAS_DIR." "$LINENO" 5 + as_fn_error $? "Could not find an installation in $PSBLAS_DIR." "$LINENO" 5 fi # @@ -2376,16 +2375,22 @@ fi # ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2728,9 +2733,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "Fortran compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "Fortran compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -2772,8 +2776,8 @@ done else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -2824,9 +2828,9 @@ $as_echo "$ac_try_echo"; } >&5 else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run Fortran compiled programs. +as_fn_error $? "cannot run Fortran compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -2871,8 +2875,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3063,8 +3067,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3305,7 +3309,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "X$CC" == "X" ; then - as_fn_error "Problem : No C compiler specified nor found!" "$LINENO" 5 + as_fn_error $? "Problem : No C compiler specified nor found!" "$LINENO" 5 fi if eval "$FC -qversion 2>&1 | grep XL 2>/dev/null" ; then # Some configurations of the XLF want "-WF," prepended to -D.. flags. @@ -3487,8 +3491,8 @@ if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -3549,7 +3553,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -3615,7 +3619,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -3747,8 +3751,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4199,7 +4202,7 @@ CC="$acx_mpi_save_CC" # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: if test x = x"$MPILIBS"; then - as_fn_error "Cannot find any suitable MPI implementation for C" "$LINENO" 5 + as_fn_error $? "Cannot find any suitable MPI implementation for C" "$LINENO" 5 : else @@ -4263,7 +4266,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -4307,7 +4310,7 @@ fi fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4685,7 +4688,7 @@ F77="$acx_mpi_save_F77" # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: if test x = x"$MPILIBS"; then - as_fn_error "Cannot find any suitable MPI implementation for Fortran 77" "$LINENO" 5 + as_fn_error $? "Cannot find any suitable MPI implementation for Fortran 77" "$LINENO" 5 : else @@ -4964,7 +4967,7 @@ FC="$acx_mpi_save_FC" # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: if test x = x"$MPILIBS"; then - as_fn_error "Cannot find any suitable MPI implementation for Fortran" "$LINENO" 5 + as_fn_error $? "Cannot find any suitable MPI implementation for Fortran" "$LINENO" 5 : else @@ -5301,7 +5304,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done rm -fr tmpdir_$i if test "$ax_flag" = "not found" ; then - as_fn_error "unable to find compiler flag for modules inclusion" "$LINENO" 5 + as_fn_error $? "unable to find compiler flag for modules inclusion" "$LINENO" 5 fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5336,7 +5339,7 @@ else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - as_fn_error "no. + as_fn_error $? "no. Could not find working version of PSBLAS." "$LINENO" 5 fi rm -f conftest* @@ -5364,7 +5367,7 @@ else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - as_fn_error "no. + as_fn_error $? "no. Your version of PSBLAS does not define psb_long_int_k_; please get version 2.3.1 or newer." "$LINENO" 5 fi rm -f conftest* @@ -5515,6 +5518,7 @@ DEFS=`sed -n "$ac_script" confdefs.h` ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -5676,19 +5680,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -5884,7 +5888,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -5938,7 +5942,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by MLD2P4 $as_me 2.0, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.66. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -5991,10 +5995,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ MLD2P4 config.status 2.0 -configured by $0, generated by GNU Autoconf 2.65, +configured by $0, generated by GNU Autoconf 2.66, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -6046,7 +6050,7 @@ do ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -6097,7 +6101,7 @@ do case $ac_config_target in "Make.inc") CONFIG_FILES="$CONFIG_FILES Make.inc" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -6133,7 +6137,7 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -6150,7 +6154,7 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -6164,18 +6168,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -6264,20 +6268,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -6295,7 +6307,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6323,7 +6335,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -6350,7 +6362,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -6481,22 +6493,22 @@ s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -6511,7 +6523,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -6532,7 +6544,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff --git a/examples/fileread/data_input.f90 b/examples/fileread/data_input.f90 index ef3322d7..f5853734 100644 --- a/examples/fileread/data_input.f90 +++ b/examples/fileread/data_input.f90 @@ -73,7 +73,7 @@ contains end subroutine read_int subroutine read_single(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_spk_), intent(out) :: val integer, intent(in) :: file character(len=1), optional, intent(in) :: marker @@ -83,7 +83,7 @@ contains end subroutine read_single subroutine read_double(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_dpk_), intent(out) :: val integer, intent(in) :: file character(len=1), optional, intent(in) :: marker @@ -131,7 +131,7 @@ contains read(charbuf(1:idx-1),*) val end subroutine string_read_int subroutine string_read_single(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_spk_), intent(out) :: val character(len=*), intent(in) :: file character(len=1), optional, intent(in) :: marker @@ -150,7 +150,7 @@ contains read(charbuf(1:idx-1),*) val end subroutine string_read_single subroutine string_read_double(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_dpk_), intent(out) :: val character(len=*), intent(in) :: file character(len=1), optional, intent(in) :: marker diff --git a/examples/fileread/mld_cexample_1lev.f90 b/examples/fileread/mld_cexample_1lev.f90 index 1fc038b1..dbf1a53b 100644 --- a/examples/fileread/mld_cexample_1lev.f90 +++ b/examples/fileread/mld_cexample_1lev.f90 @@ -46,7 +46,7 @@ ! unit rhs is set). ! program mld_cexample_ml - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -305,7 +305,7 @@ contains ! subroutine get_parms(ictxt,mtrx,rhs,filefmt,itmax,tol) - use psb_sparse_mod + use psb_base_mod implicit none integer :: ictxt, itmax diff --git a/examples/fileread/mld_cexample_ml.f90 b/examples/fileread/mld_cexample_ml.f90 index 65243d30..d7c74972 100644 --- a/examples/fileread/mld_cexample_ml.f90 +++ b/examples/fileread/mld_cexample_ml.f90 @@ -49,7 +49,7 @@ ! unit rhs is set). ! program mld_cexample_ml - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -342,7 +342,7 @@ contains ! subroutine get_parms(ictxt,mtrx,rhs,filefmt,choice,itmax,tol) - use psb_sparse_mod + use psb_base_mod implicit none integer :: ictxt, choice, itmax diff --git a/examples/fileread/mld_dexample_1lev.f90 b/examples/fileread/mld_dexample_1lev.f90 index 8d4460a8..221f9cf2 100644 --- a/examples/fileread/mld_dexample_1lev.f90 +++ b/examples/fileread/mld_dexample_1lev.f90 @@ -46,7 +46,7 @@ ! unit rhs is set). ! program mld_dexample_ml - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -304,7 +304,7 @@ contains ! subroutine get_parms(ictxt,mtrx,rhs,filefmt,itmax,tol) - use psb_sparse_mod + use psb_base_mod implicit none integer :: ictxt, itmax diff --git a/examples/fileread/mld_dexample_ml.f90 b/examples/fileread/mld_dexample_ml.f90 index 86230e51..e5b327b1 100644 --- a/examples/fileread/mld_dexample_ml.f90 +++ b/examples/fileread/mld_dexample_ml.f90 @@ -49,7 +49,7 @@ ! unit rhs is set). ! program mld_dexample_ml - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -341,7 +341,7 @@ contains ! subroutine get_parms(ictxt,mtrx,rhs,filefmt,choice,itmax,tol) - use psb_sparse_mod + use psb_base_mod implicit none integer :: ictxt, choice, itmax diff --git a/examples/fileread/mld_sexample_1lev.f90 b/examples/fileread/mld_sexample_1lev.f90 index 69276853..81617471 100644 --- a/examples/fileread/mld_sexample_1lev.f90 +++ b/examples/fileread/mld_sexample_1lev.f90 @@ -46,7 +46,7 @@ ! unit rhs is set). ! program mld_sexample_ml - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -305,7 +305,7 @@ contains ! subroutine get_parms(ictxt,mtrx,rhs,filefmt,itmax,tol) - use psb_sparse_mod + use psb_base_mod implicit none integer :: ictxt, itmax diff --git a/examples/fileread/mld_sexample_ml.f90 b/examples/fileread/mld_sexample_ml.f90 index 2d1a9346..370fd840 100644 --- a/examples/fileread/mld_sexample_ml.f90 +++ b/examples/fileread/mld_sexample_ml.f90 @@ -49,7 +49,7 @@ ! unit rhs is set). ! program mld_sexample_ml - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -342,7 +342,7 @@ contains ! subroutine get_parms(ictxt,mtrx,rhs,filefmt,choice,itmax,tol) - use psb_sparse_mod + use psb_base_mod implicit none integer :: ictxt, choice, itmax diff --git a/examples/fileread/mld_zexample_1lev.f90 b/examples/fileread/mld_zexample_1lev.f90 index cfacb291..ade6043d 100644 --- a/examples/fileread/mld_zexample_1lev.f90 +++ b/examples/fileread/mld_zexample_1lev.f90 @@ -46,7 +46,7 @@ ! unit rhs is set). ! program mld_zexample_ml - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -304,7 +304,7 @@ contains ! subroutine get_parms(ictxt,mtrx,rhs,filefmt,itmax,tol) - use psb_sparse_mod + use psb_base_mod implicit none integer :: ictxt, itmax diff --git a/examples/fileread/mld_zexample_ml.f90 b/examples/fileread/mld_zexample_ml.f90 index a2128f84..018c4964 100644 --- a/examples/fileread/mld_zexample_ml.f90 +++ b/examples/fileread/mld_zexample_ml.f90 @@ -49,7 +49,7 @@ ! unit rhs is set). ! program mld_zexample_ml - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -341,7 +341,7 @@ contains ! subroutine get_parms(ictxt,mtrx,rhs,filefmt,choice,itmax,tol) - use psb_sparse_mod + use psb_base_mod implicit none integer :: ictxt, choice, itmax diff --git a/examples/pdegen/data_input.f90 b/examples/pdegen/data_input.f90 index ef3322d7..f5853734 100644 --- a/examples/pdegen/data_input.f90 +++ b/examples/pdegen/data_input.f90 @@ -73,7 +73,7 @@ contains end subroutine read_int subroutine read_single(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_spk_), intent(out) :: val integer, intent(in) :: file character(len=1), optional, intent(in) :: marker @@ -83,7 +83,7 @@ contains end subroutine read_single subroutine read_double(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_dpk_), intent(out) :: val integer, intent(in) :: file character(len=1), optional, intent(in) :: marker @@ -131,7 +131,7 @@ contains read(charbuf(1:idx-1),*) val end subroutine string_read_int subroutine string_read_single(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_spk_), intent(out) :: val character(len=*), intent(in) :: file character(len=1), optional, intent(in) :: marker @@ -150,7 +150,7 @@ contains read(charbuf(1:idx-1),*) val end subroutine string_read_single subroutine string_read_double(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_dpk_), intent(out) :: val character(len=*), intent(in) :: file character(len=1), optional, intent(in) :: marker diff --git a/examples/pdegen/mld_dexample_1lev.f90 b/examples/pdegen/mld_dexample_1lev.f90 index 24765941..c90ea681 100644 --- a/examples/pdegen/mld_dexample_1lev.f90 +++ b/examples/pdegen/mld_dexample_1lev.f90 @@ -72,7 +72,7 @@ ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! program mld_dexample_1lev - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -231,7 +231,7 @@ contains ! subroutine get_parms(ictxt,idim,itmax,tol) - use psb_sparse_mod + use psb_base_mod implicit none integer :: idim, ictxt, itmax @@ -274,7 +274,7 @@ contains ! ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! - use psb_sparse_mod + use psb_base_mod implicit none integer :: idim integer, parameter :: nb=20 @@ -570,47 +570,47 @@ end program mld_dexample_1lev ! functions parametrizing the differential equation ! function a1(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a1 real(psb_dpk_) :: x,y,z !a1=1.d0 a1=0.d0 end function a1 function a2(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a2 real(psb_dpk_) :: x,y,z !a2=2.d1*y a2=0.d0 end function a2 function a3(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a3 real(psb_dpk_) :: x,y,z !a3=1.d0 a3=0.d0 end function a3 function a4(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a4 real(psb_dpk_) :: x,y,z !a4=1.d0 a4=0.d0 end function a4 function b1(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: b1 real(psb_dpk_) :: x,y,z b1=1.d0 end function b1 function b2(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: b2 real(psb_dpk_) :: x,y,z b2=1.d0 end function b2 function b3(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: b3 real(psb_dpk_) :: x,y,z b3=1.d0 diff --git a/examples/pdegen/mld_dexample_ml.f90 b/examples/pdegen/mld_dexample_ml.f90 index 7e14d95a..b9663412 100644 --- a/examples/pdegen/mld_dexample_ml.f90 +++ b/examples/pdegen/mld_dexample_ml.f90 @@ -72,7 +72,7 @@ ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! program mld_dexample_ml - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -267,7 +267,7 @@ contains ! subroutine get_parms(ictxt,choice,idim,itmax,tol) - use psb_sparse_mod + use psb_base_mod implicit none integer :: choice, idim, ictxt, itmax @@ -312,7 +312,7 @@ contains ! ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! - use psb_sparse_mod + use psb_base_mod implicit none integer :: idim integer, parameter :: nb=20 @@ -608,47 +608,47 @@ end program mld_dexample_ml ! functions parametrizing the differential equation ! function a1(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a1 real(psb_dpk_) :: x,y,z ! a1=1.d0 a1=0.d0 end function a1 function a2(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a2 real(psb_dpk_) :: x,y,z ! a2=2.d1*y a2=0.d0 end function a2 function a3(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a3 real(psb_dpk_) :: x,y,z ! a3=1.d0 a3=0.d0 end function a3 function a4(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a4 real(psb_dpk_) :: x,y,z ! a4=1.d0 a4=0.d0 end function a4 function b1(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: b1 real(psb_dpk_) :: x,y,z b1=1.d0 end function b1 function b2(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: b2 real(psb_dpk_) :: x,y,z b2=1.d0 end function b2 function b3(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: b3 real(psb_dpk_) :: x,y,z b3=1.d0 diff --git a/examples/pdegen/mld_sexample_1lev.f90 b/examples/pdegen/mld_sexample_1lev.f90 index 562e38ea..72e779a4 100644 --- a/examples/pdegen/mld_sexample_1lev.f90 +++ b/examples/pdegen/mld_sexample_1lev.f90 @@ -72,7 +72,7 @@ ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! program mld_sexample_1lev - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -232,7 +232,7 @@ contains ! subroutine get_parms(ictxt,idim,itmax,tol) - use psb_sparse_mod + use psb_base_mod implicit none integer :: idim, ictxt, itmax @@ -275,7 +275,7 @@ contains ! ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! - use psb_sparse_mod + use psb_base_mod implicit none integer :: idim integer, parameter :: nb=20 @@ -571,47 +571,47 @@ end program mld_sexample_1lev ! functions parametrizing the differential equation ! function a1(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a1 real(psb_spk_) :: x,y,z !a1=1.e0 a1=0.e0 end function a1 function a2(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a2 real(psb_spk_) :: x,y,z !a2=2.e1*y a2=0.e0 end function a2 function a3(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a3 real(psb_spk_) :: x,y,z !a3=1.e0 a3=0.e0 end function a3 function a4(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a4 real(psb_spk_) :: x,y,z !a4=1.e0 a4=0.e0 end function a4 function b1(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: b1 real(psb_spk_) :: x,y,z b1=1.e0 end function b1 function b2(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: b2 real(psb_spk_) :: x,y,z b2=1.e0 end function b2 function b3(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: b3 real(psb_spk_) :: x,y,z b3=1.e0 diff --git a/examples/pdegen/mld_sexample_ml.f90 b/examples/pdegen/mld_sexample_ml.f90 index 9e6919da..63384c07 100644 --- a/examples/pdegen/mld_sexample_ml.f90 +++ b/examples/pdegen/mld_sexample_ml.f90 @@ -72,7 +72,7 @@ ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! program mld_sexample_ml - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -268,7 +268,7 @@ contains ! subroutine get_parms(ictxt,choice,idim,itmax,tol) - use psb_sparse_mod + use psb_base_mod implicit none integer :: choice, idim, ictxt, itmax @@ -313,7 +313,7 @@ contains ! ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! - use psb_sparse_mod + use psb_base_mod implicit none integer :: idim integer, parameter :: nb=20 @@ -609,47 +609,47 @@ end program mld_sexample_ml ! functions parametrizing the differential equation ! function a1(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a1 real(psb_spk_) :: x,y,z ! a1=1.e0 a1=0.e0 end function a1 function a2(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a2 real(psb_spk_) :: x,y,z ! a2=2.e1*y a2=0.e0 end function a2 function a3(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a3 real(psb_spk_) :: x,y,z ! a3=1.e0 a3=0.e0 end function a3 function a4(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a4 real(psb_spk_) :: x,y,z ! a4=1.e0 a4=0.e0 end function a4 function b1(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: b1 real(psb_spk_) :: x,y,z b1=1.e0 end function b1 function b2(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: b2 real(psb_spk_) :: x,y,z b2=1.e0 end function b2 function b3(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: b3 real(psb_spk_) :: x,y,z b3=1.e0 diff --git a/mlprec/Makefile b/mlprec/Makefile index 85ab44bd..657a4a83 100644 --- a/mlprec/Makefile +++ b/mlprec/Makefile @@ -86,7 +86,7 @@ mld_s_prec_type.o mld_d_prec_type.o mld_c_prec_type.o mld_z_prec_type.o : mld_ba mld_prec_type.o: mld_s_prec_type.o mld_d_prec_type.o mld_c_prec_type.o mld_z_prec_type.o mld_prec_mod.o: mld_prec_type.o mld_s_prec_mod.o mld_d_prec_mod.o mld_c_prec_mod.o mld_z_prec_mod.o -$(MODOBJS): $(PSBINCDIR)/psb_sparse_mod$(.mod) +$(MODOBJS): $(PSBINCDIR)/psb_base_mod$(.mod) $(SINNEROBJS) $(SOUTEROBJS): $(SMODOBJS) $(DINNEROBJS) $(DOUTEROBJS): $(DMODOBJS) diff --git a/mlprec/mld_base_prec_type.f90 b/mlprec/mld_base_prec_type.f90 index dfe1cda2..a896bc62 100644 --- a/mlprec/mld_base_prec_type.f90 +++ b/mlprec/mld_base_prec_type.f90 @@ -62,7 +62,7 @@ module mld_base_prec_type ! blows up on some systems. ! use psb_const_mod - use psb_sparse_mod, only :& + use psb_base_mod, only :& & psb_dspmat_type, psb_zspmat_type,& & psb_sspmat_type, psb_cspmat_type,& & psb_desc_type,& @@ -393,7 +393,7 @@ contains subroutine ml_parms_descr(pm,iout,info,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -473,7 +473,7 @@ contains subroutine s_ml_parms_descr(pm,iout,info,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -496,7 +496,7 @@ contains subroutine d_ml_parms_descr(pm,iout,info,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1069,7 +1069,7 @@ contains character(len=*), intent(in) :: name interface function is_legal(i) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_), intent(in) :: i logical :: is_legal end function is_legal @@ -1090,7 +1090,7 @@ contains character(len=*), intent(in) :: name interface function is_legal(i) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_), intent(in) :: i logical :: is_legal end function is_legal @@ -1125,7 +1125,7 @@ contains end function pr_to_str subroutine mld_ml_bcast(ictxt,dat,root) - use psb_sparse_mod + use psb_base_mod implicit none integer, intent(in) :: ictxt type(mld_ml_parms), intent(inout) :: dat @@ -1147,7 +1147,7 @@ contains end subroutine mld_ml_bcast subroutine mld_sml_bcast(ictxt,dat,root) - use psb_sparse_mod + use psb_base_mod implicit none integer, intent(in) :: ictxt type(mld_sml_parms), intent(inout) :: dat @@ -1159,7 +1159,7 @@ contains end subroutine mld_sml_bcast subroutine mld_dml_bcast(ictxt,dat,root) - use psb_sparse_mod + use psb_base_mod implicit none integer, intent(in) :: ictxt type(mld_dml_parms), intent(inout) :: dat diff --git a/mlprec/mld_c_as_smoother.f90 b/mlprec/mld_c_as_smoother.f90 index 26e87911..0c68006d 100644 --- a/mlprec/mld_c_as_smoother.f90 +++ b/mlprec/mld_c_as_smoother.f90 @@ -86,7 +86,7 @@ contains subroutine c_as_smoother_default(sm) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -108,7 +108,7 @@ contains subroutine c_as_smoother_check(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -152,7 +152,7 @@ contains end subroutine c_as_smoother_check subroutine c_as_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_c_as_smoother_type), intent(in) :: sm complex(psb_spk_),intent(inout) :: x(:) @@ -588,7 +588,7 @@ contains subroutine c_as_smoother_bld(a,desc_a,sm,upd,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -729,7 +729,7 @@ contains subroutine c_as_smoother_seti(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -773,7 +773,7 @@ contains subroutine c_as_smoother_setc(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -811,7 +811,7 @@ contains subroutine c_as_smoother_setr(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -848,7 +848,7 @@ contains subroutine c_as_smoother_free(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -888,7 +888,7 @@ contains subroutine c_as_smoother_descr(sm,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -942,7 +942,7 @@ contains end subroutine c_as_smoother_descr function c_as_smoother_sizeof(sm) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_c_as_smoother_type), intent(in) :: sm @@ -957,7 +957,7 @@ contains end function c_as_smoother_sizeof subroutine c_as_smoother_dmp(sm,ictxt,level,info,prefix,head,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_c_as_smoother_type), intent(in) :: sm integer, intent(in) :: ictxt,level diff --git a/mlprec/mld_c_diag_solver.f90 b/mlprec/mld_c_diag_solver.f90 index fec01f94..34541adf 100644 --- a/mlprec/mld_c_diag_solver.f90 +++ b/mlprec/mld_c_diag_solver.f90 @@ -70,7 +70,7 @@ module mld_c_diag_solver contains subroutine c_diag_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_c_diag_solver_type), intent(in) :: sv complex(psb_spk_),intent(inout) :: x(:) @@ -191,7 +191,7 @@ contains subroutine c_diag_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -270,7 +270,7 @@ contains subroutine c_diag_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -309,7 +309,7 @@ contains subroutine c_diag_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -347,7 +347,7 @@ contains subroutine c_diag_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -385,7 +385,7 @@ contains subroutine c_diag_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -421,7 +421,7 @@ contains subroutine c_diag_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -451,7 +451,7 @@ contains end subroutine c_diag_solver_descr function c_diag_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_c_diag_solver_type), intent(in) :: sv diff --git a/mlprec/mld_c_id_solver.f90 b/mlprec/mld_c_id_solver.f90 index 5f68a135..c0d02b92 100644 --- a/mlprec/mld_c_id_solver.f90 +++ b/mlprec/mld_c_id_solver.f90 @@ -69,7 +69,7 @@ module mld_c_id_solver contains subroutine c_id_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_c_id_solver_type), intent(in) :: sv complex(psb_spk_),intent(inout) :: x(:) @@ -115,7 +115,7 @@ contains subroutine c_id_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -160,7 +160,7 @@ contains subroutine c_id_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -180,7 +180,7 @@ contains subroutine c_id_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -199,7 +199,7 @@ contains subroutine c_id_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -219,7 +219,7 @@ contains subroutine c_id_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -236,7 +236,7 @@ contains subroutine c_id_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -266,7 +266,7 @@ contains end subroutine c_id_solver_descr function c_id_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_c_id_solver_type), intent(in) :: sv diff --git a/mlprec/mld_c_ilu_solver.f90 b/mlprec/mld_c_ilu_solver.f90 index b117475e..78611b12 100644 --- a/mlprec/mld_c_ilu_solver.f90 +++ b/mlprec/mld_c_ilu_solver.f90 @@ -86,7 +86,7 @@ contains subroutine c_ilu_solver_default(sv) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -102,7 +102,7 @@ contains subroutine c_ilu_solver_check(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -143,7 +143,7 @@ contains subroutine c_ilu_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_c_ilu_solver_type), intent(in) :: sv complex(psb_spk_),intent(inout) :: x(:) @@ -247,7 +247,7 @@ contains subroutine c_ilu_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -419,7 +419,7 @@ contains subroutine c_ilu_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -458,7 +458,7 @@ contains subroutine c_ilu_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -496,7 +496,7 @@ contains subroutine c_ilu_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -534,7 +534,7 @@ contains subroutine c_ilu_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -572,7 +572,7 @@ contains subroutine c_ilu_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -619,7 +619,7 @@ contains end subroutine c_ilu_solver_descr function c_ilu_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_c_ilu_solver_type), intent(in) :: sv @@ -635,7 +635,7 @@ contains end function c_ilu_solver_sizeof subroutine c_ilu_solver_dmp(sv,ictxt,level,info,prefix,head,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_c_ilu_solver_type), intent(in) :: sv integer, intent(in) :: ictxt,level diff --git a/mlprec/mld_c_inner_mod.f90 b/mlprec/mld_c_inner_mod.f90 index 39486517..937c8891 100644 --- a/mlprec/mld_c_inner_mod.f90 +++ b/mlprec/mld_c_inner_mod.f90 @@ -51,7 +51,7 @@ module mld_c_inner_mod interface mld_mlprec_bld subroutine mld_cmlprec_bld(a,desc_a,prec,info) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ use mld_c_prec_type, only : mld_cprec_type implicit none type(psb_cspmat_type), intent(in), target :: a @@ -65,7 +65,7 @@ module mld_c_inner_mod interface mld_mlprec_aply subroutine mld_cmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ use mld_c_prec_type, only : mld_cprec_type type(psb_desc_type),intent(in) :: desc_data type(mld_cprec_type), intent(in) :: p @@ -81,7 +81,7 @@ module mld_c_inner_mod interface mld_coarse_bld subroutine mld_ccoarse_bld(a,desc_a,p,info) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + 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_desc_type), intent(in) :: desc_a @@ -92,7 +92,7 @@ module mld_c_inner_mod interface mld_aggrmap_bld subroutine mld_caggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ integer, intent(in) :: aggr_type real(psb_spk_), intent(in) :: theta type(psb_cspmat_type), intent(in) :: a @@ -104,7 +104,7 @@ module mld_c_inner_mod interface mld_aggrmat_asb subroutine mld_caggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + 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_desc_type), intent(in) :: desc_a @@ -116,7 +116,7 @@ module mld_c_inner_mod interface mld_aggrmat_nosmth_asb subroutine mld_caggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + 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_desc_type), intent(in) :: desc_a @@ -128,7 +128,7 @@ module mld_c_inner_mod interface mld_aggrmat_smth_asb subroutine mld_caggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + 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_desc_type), intent(in) :: desc_a diff --git a/mlprec/mld_c_jac_smoother.f90 b/mlprec/mld_c_jac_smoother.f90 index f19a3963..c1e914ab 100644 --- a/mlprec/mld_c_jac_smoother.f90 +++ b/mlprec/mld_c_jac_smoother.f90 @@ -75,7 +75,7 @@ module mld_c_jac_smoother contains subroutine c_jac_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_c_jac_smoother_type), intent(in) :: sm complex(psb_spk_),intent(inout) :: x(:) @@ -230,7 +230,7 @@ contains subroutine c_jac_smoother_bld(a,desc_a,sm,upd,info) - use psb_sparse_mod + use psb_base_mod use mld_c_diag_solver Implicit None @@ -305,7 +305,7 @@ contains subroutine c_jac_smoother_seti(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -346,7 +346,7 @@ contains subroutine c_jac_smoother_setc(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -384,7 +384,7 @@ contains subroutine c_jac_smoother_setr(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -421,7 +421,7 @@ contains subroutine c_jac_smoother_free(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -461,7 +461,7 @@ contains subroutine c_jac_smoother_descr(sm,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -512,7 +512,7 @@ contains end subroutine c_jac_smoother_descr function c_jac_smoother_sizeof(sm) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_c_jac_smoother_type), intent(in) :: sm diff --git a/mlprec/mld_c_move_alloc_mod.f90 b/mlprec/mld_c_move_alloc_mod.f90 index 67394319..57e381d7 100644 --- a/mlprec/mld_c_move_alloc_mod.f90 +++ b/mlprec/mld_c_move_alloc_mod.f90 @@ -56,7 +56,7 @@ module mld_c_move_alloc_mod contains subroutine mld_conelev_prec_move_alloc(a, b,info) - use psb_sparse_mod + use psb_base_mod implicit none type(mld_conelev_type), intent(inout) :: a, b integer, intent(out) :: info @@ -72,7 +72,7 @@ contains end subroutine mld_conelev_prec_move_alloc subroutine mld_cprec_move_alloc(a, b,info) - use psb_sparse_mod + use psb_base_mod implicit none type(mld_cprec_type), intent(inout) :: a type(mld_cprec_type), intent(inout), target :: b diff --git a/mlprec/mld_c_prec_mod.f90 b/mlprec/mld_c_prec_mod.f90 index 4bb5a392..cbfe36c6 100644 --- a/mlprec/mld_c_prec_mod.f90 +++ b/mlprec/mld_c_prec_mod.f90 @@ -50,7 +50,7 @@ module mld_c_prec_mod interface mld_precinit subroutine mld_cprecinit(p,ptype,info,nlev) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ use mld_c_prec_type, only : mld_cprec_type type(mld_cprec_type), intent(inout) :: p character(len=*), intent(in) :: ptype @@ -89,7 +89,7 @@ module mld_c_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_cprecseti subroutine mld_cprecsetr(p,what,val,info,ilev) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ use mld_c_prec_type, only : mld_cprec_type type(mld_cprec_type), intent(inout) :: p integer, intent(in) :: what @@ -98,7 +98,7 @@ module mld_c_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_cprecsetr subroutine mld_cprecsetc(p,what,string,info,ilev) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ use mld_c_prec_type, only : mld_cprec_type type(mld_cprec_type), intent(inout) :: p integer, intent(in) :: what @@ -110,7 +110,7 @@ module mld_c_prec_mod interface mld_precbld subroutine mld_cprecbld(a,desc_a,prec,info) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ use mld_c_prec_type, only : mld_cprec_type implicit none type(psb_cspmat_type), intent(in), target :: a @@ -124,7 +124,7 @@ module mld_c_prec_mod contains subroutine mld_i_cprecseti(p,what,val,info) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ use mld_c_prec_type, only : mld_cprec_type type(mld_cprec_type), intent(inout) :: p integer, intent(in) :: what @@ -135,7 +135,7 @@ contains end subroutine mld_i_cprecseti subroutine mld_i_cprecsetr(p,what,val,info) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ use mld_c_prec_type, only : mld_cprec_type type(mld_cprec_type), intent(inout) :: p integer, intent(in) :: what @@ -146,7 +146,7 @@ contains end subroutine mld_i_cprecsetr subroutine mld_i_cprecsetc(p,what,val,info) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ use mld_c_prec_type, only : mld_cprec_type type(mld_cprec_type), intent(inout) :: p integer, intent(in) :: what diff --git a/mlprec/mld_c_prec_type.f90 b/mlprec/mld_c_prec_type.f90 index b0e269bd..5aa06aa5 100644 --- a/mlprec/mld_c_prec_type.f90 +++ b/mlprec/mld_c_prec_type.f90 @@ -277,7 +277,7 @@ module mld_c_prec_type interface mld_precaply subroutine mld_cprecaply(prec,x,y,desc_data,info,trans,work) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ import mld_cprec_type type(psb_desc_type),intent(in) :: desc_data type(mld_cprec_type), intent(in) :: prec @@ -288,7 +288,7 @@ module mld_c_prec_type complex(psb_spk_),intent(inout), optional, target :: work(:) end subroutine mld_cprecaply subroutine mld_cprecaply1(prec,x,desc_data,info,trans) - use psb_sparse_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_ import mld_cprec_type type(psb_desc_type),intent(in) :: desc_data type(mld_cprec_type), intent(in) :: prec @@ -476,7 +476,7 @@ contains subroutine c_base_onelev_descr(lv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -535,7 +535,7 @@ contains end subroutine c_base_onelev_descr subroutine mld_c_onelev_precfree(p,info) - use psb_sparse_mod + use psb_base_mod implicit none type(mld_conelev_type), intent(inout) :: p @@ -579,7 +579,7 @@ contains subroutine mld_cprec_free(p,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -619,7 +619,7 @@ contains subroutine c_base_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_c_base_smoother_type), intent(in) :: sm complex(psb_spk_),intent(inout) :: x(:) @@ -660,7 +660,7 @@ contains subroutine c_base_smoother_check(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -698,7 +698,7 @@ contains subroutine c_base_smoother_seti(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -731,7 +731,7 @@ contains subroutine c_base_smoother_setc(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -766,7 +766,7 @@ contains subroutine c_base_smoother_setr(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -802,7 +802,7 @@ contains subroutine c_base_smoother_bld(a,desc_a,sm,upd,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -841,7 +841,7 @@ contains subroutine c_base_smoother_free(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -877,7 +877,7 @@ contains subroutine c_base_smoother_descr(sm,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -953,7 +953,7 @@ contains subroutine c_base_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_c_base_solver_type), intent(in) :: sv complex(psb_spk_),intent(inout) :: x(:) @@ -987,7 +987,7 @@ contains subroutine c_base_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1022,7 +1022,7 @@ contains subroutine c_base_solver_check(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1052,7 +1052,7 @@ contains subroutine c_base_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1072,7 +1072,7 @@ contains subroutine c_base_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1108,7 +1108,7 @@ contains subroutine c_base_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1129,7 +1129,7 @@ contains subroutine c_base_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1159,7 +1159,7 @@ contains subroutine c_base_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1216,7 +1216,7 @@ contains subroutine mld_c_apply2v(prec,x,y,desc_data,info,trans,work) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type),intent(in) :: desc_data class(mld_cprec_type), intent(in) :: prec complex(psb_spk_),intent(inout) :: x(:) @@ -1252,7 +1252,7 @@ contains end subroutine mld_c_apply2v subroutine mld_c_apply1v(prec,x,desc_data,info,trans) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type),intent(in) :: desc_data class(mld_cprec_type), intent(in) :: prec complex(psb_spk_),intent(inout) :: x(:) @@ -1287,7 +1287,7 @@ contains subroutine c_base_onelev_check(lv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1333,7 +1333,7 @@ contains subroutine c_base_onelev_default(lv) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1363,7 +1363,7 @@ contains subroutine c_base_onelev_seti(lv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1438,7 +1438,7 @@ contains subroutine c_base_onelev_setc(lv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1474,7 +1474,7 @@ contains subroutine c_base_onelev_setr(lv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1519,7 +1519,7 @@ contains end subroutine c_base_onelev_setr subroutine mld_c_dump(prec,info,istart,iend,prefix,head,ac,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_cprec_type), intent(in) :: prec integer, intent(out) :: info @@ -1553,7 +1553,7 @@ contains subroutine c_base_onelev_dump(lv,level,info,prefix,head,ac,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_conelev_type), intent(in) :: lv integer, intent(in) :: level @@ -1603,7 +1603,7 @@ contains end subroutine c_base_onelev_dump subroutine c_base_smoother_dmp(sm,ictxt,level,info,prefix,head,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_c_base_smoother_type), intent(in) :: sm integer, intent(in) :: ictxt,level @@ -1644,7 +1644,7 @@ contains end subroutine c_base_smoother_dmp subroutine c_base_solver_dmp(sv,ictxt,level,info,prefix,head,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_c_base_solver_type), intent(in) :: sv integer, intent(in) :: ictxt,level diff --git a/mlprec/mld_c_slu_solver.f90 b/mlprec/mld_c_slu_solver.f90 index 1ec7b390..76797196 100644 --- a/mlprec/mld_c_slu_solver.f90 +++ b/mlprec/mld_c_slu_solver.f90 @@ -106,7 +106,7 @@ module mld_c_slu_solver contains subroutine c_slu_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_c_slu_solver_type), intent(in) :: sv complex(psb_spk_),intent(inout) :: x(:) @@ -189,7 +189,7 @@ contains subroutine c_slu_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -269,7 +269,7 @@ contains subroutine c_slu_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -304,7 +304,7 @@ contains subroutine c_slu_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -342,7 +342,7 @@ contains subroutine c_slu_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -378,7 +378,7 @@ contains subroutine c_slu_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -411,7 +411,7 @@ contains subroutine c_slu_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -450,7 +450,7 @@ contains end subroutine c_slu_solver_descr function c_slu_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_c_slu_solver_type), intent(in) :: sv diff --git a/mlprec/mld_caggrmap_bld.f90 b/mlprec/mld_caggrmap_bld.f90 index f6c2e33c..21078230 100644 --- a/mlprec/mld_caggrmap_bld.f90 +++ b/mlprec/mld_caggrmap_bld.f90 @@ -81,7 +81,7 @@ ! subroutine mld_caggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info) - use psb_sparse_mod + use psb_base_mod use mld_c_inner_mod, mld_protect_name => mld_caggrmap_bld implicit none @@ -164,7 +164,7 @@ contains subroutine mld_dec_map_bld(theta,a,desc_a,nlaggr,ilaggr,info) - use psb_sparse_mod + use psb_base_mod use mld_c_inner_mod !, mld_protect_name => mld_daggrmap_bld implicit none diff --git a/mlprec/mld_caggrmat_asb.f90 b/mlprec/mld_caggrmat_asb.f90 index eca6100f..be1eae4f 100644 --- a/mlprec/mld_caggrmat_asb.f90 +++ b/mlprec/mld_caggrmat_asb.f90 @@ -100,7 +100,7 @@ ! subroutine mld_caggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod + use psb_base_mod use mld_c_inner_mod, mld_protect_name => mld_caggrmat_asb implicit none diff --git a/mlprec/mld_caggrmat_nosmth_asb.F90 b/mlprec/mld_caggrmat_nosmth_asb.F90 index e588118c..81081481 100644 --- a/mlprec/mld_caggrmat_nosmth_asb.F90 +++ b/mlprec/mld_caggrmat_nosmth_asb.F90 @@ -82,7 +82,7 @@ ! Error code. ! subroutine mld_caggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod + use psb_base_mod use mld_c_inner_mod, mld_protect_name => mld_caggrmat_nosmth_asb #ifdef MPI_MOD diff --git a/mlprec/mld_caggrmat_smth_asb.F90 b/mlprec/mld_caggrmat_smth_asb.F90 index b7ff790b..3dae6a8e 100644 --- a/mlprec/mld_caggrmat_smth_asb.F90 +++ b/mlprec/mld_caggrmat_smth_asb.F90 @@ -99,7 +99,7 @@ ! Error code. ! subroutine mld_caggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod + use psb_base_mod use mld_c_inner_mod, mld_protect_name => mld_caggrmat_smth_asb #ifdef MPI_MOD diff --git a/mlprec/mld_ccoarse_bld.f90 b/mlprec/mld_ccoarse_bld.f90 index 811e682d..fe3a900e 100644 --- a/mlprec/mld_ccoarse_bld.f90 +++ b/mlprec/mld_ccoarse_bld.f90 @@ -67,7 +67,7 @@ ! subroutine mld_ccoarse_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_c_inner_mod, mld_protect_name => mld_ccoarse_bld implicit none diff --git a/mlprec/mld_cilu0_fact.f90 b/mlprec/mld_cilu0_fact.f90 index 8442b7a6..406796b7 100644 --- a/mlprec/mld_cilu0_fact.f90 +++ b/mlprec/mld_cilu0_fact.f90 @@ -101,7 +101,7 @@ ! subroutine mld_cilu0_fact(ialg,a,l,u,d,info,blck,upd) - use psb_sparse_mod + use psb_base_mod use mld_c_ilu_fact_mod, mld_protect_name => mld_cilu0_fact implicit none @@ -557,7 +557,7 @@ contains subroutine ilu_copyin(i,m,a,jd,jmin,jmax,l1,lja,lval,& & dia,l2,uja,uval,ktrw,trw,upd) - use psb_sparse_mod + use psb_base_mod implicit none diff --git a/mlprec/mld_ciluk_fact.f90 b/mlprec/mld_ciluk_fact.f90 index 51f6a2f1..72f6faf8 100644 --- a/mlprec/mld_ciluk_fact.f90 +++ b/mlprec/mld_ciluk_fact.f90 @@ -98,7 +98,7 @@ ! subroutine mld_ciluk_fact(fill_in,ialg,a,l,u,d,info,blck) - use psb_sparse_mod + use psb_base_mod use mld_c_ilu_fact_mod, mld_protect_name => mld_ciluk_fact implicit none @@ -273,7 +273,7 @@ contains subroutine mld_ciluk_factint(fill_in,ialg,a,b,& & d,lval,lja,lirp,uval,uja,uirp,l1,l2,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -491,7 +491,7 @@ contains ! subroutine iluk_copyin(i,m,a,jmin,jmax,row,rowlevs,heap,ktrw,trw,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -648,7 +648,7 @@ contains ! subroutine iluk_fact(fill_in,i,row,rowlevs,heap,d,uja,uirp,uval,uplevs,nidx,idxs,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -823,7 +823,7 @@ contains subroutine iluk_copyout(fill_in,ialg,i,m,row,rowlevs,nidx,idxs,& & l1,l2,lja,lirp,lval,d,uja,uirp,uval,uplevs,info) - use psb_sparse_mod + use psb_base_mod implicit none diff --git a/mlprec/mld_cilut_fact.f90 b/mlprec/mld_cilut_fact.f90 index cfce092c..064277b8 100644 --- a/mlprec/mld_cilut_fact.f90 +++ b/mlprec/mld_cilut_fact.f90 @@ -94,7 +94,7 @@ ! subroutine mld_cilut_fact(fill_in,thres,a,l,u,d,info,blck) - use psb_sparse_mod + use psb_base_mod use mld_c_ilu_fact_mod, mld_protect_name => mld_cilut_fact implicit none @@ -273,7 +273,7 @@ contains subroutine mld_cilut_factint(fill_in,thres,a,b,& & d,lval,lja,lirp,uval,uja,uirp,l1,l2,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -485,7 +485,7 @@ contains ! every nrb calls to copyin. If A is in CSR format it is unused. ! subroutine ilut_copyin(i,m,a,jd,jmin,jmax,nlw,nup,jmaxup,nrmi,row,heap,ktrw,trw,info) - use psb_sparse_mod + use psb_base_mod implicit none type(psb_cspmat_type), intent(in) :: a type(psb_c_coo_sparse_mat), intent(inout) :: trw @@ -679,7 +679,7 @@ contains ! subroutine ilut_fact(thres,i,nrmi,row,heap,d,uja,uirp,uval,nidx,idxs,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -865,7 +865,7 @@ contains subroutine ilut_copyout(fill_in,thres,i,m,nlw,nup,jmaxup,nrmi,row, & & nidx,idxs,l1,l2,lja,lirp,lval,d,uja,uirp,uval,info) - use psb_sparse_mod + use psb_base_mod implicit none diff --git a/mlprec/mld_cmlprec_aply.f90 b/mlprec/mld_cmlprec_aply.f90 index 705d1b91..7f3296c1 100644 --- a/mlprec/mld_cmlprec_aply.f90 +++ b/mlprec/mld_cmlprec_aply.f90 @@ -314,7 +314,7 @@ ! subroutine mld_cmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod use mld_c_inner_mod, mld_protect_name => mld_cmlprec_aply implicit none diff --git a/mlprec/mld_cmlprec_bld.f90 b/mlprec/mld_cmlprec_bld.f90 index b1bd18cf..11d3f98a 100644 --- a/mlprec/mld_cmlprec_bld.f90 +++ b/mlprec/mld_cmlprec_bld.f90 @@ -66,7 +66,7 @@ ! subroutine mld_cmlprec_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_c_inner_mod, mld_protect_name => mld_cmlprec_bld use mld_c_prec_mod diff --git a/mlprec/mld_cprecaply.f90 b/mlprec/mld_cprecaply.f90 index 3ee44ae5..fac9cc59 100644 --- a/mlprec/mld_cprecaply.f90 +++ b/mlprec/mld_cprecaply.f90 @@ -73,7 +73,7 @@ ! subroutine mld_cprecaply(prec,x,y,desc_data,info,trans,work) - use psb_sparse_mod + use psb_base_mod use mld_c_inner_mod, mld_protect_name => mld_cprecaply implicit none @@ -206,7 +206,7 @@ end subroutine mld_cprecaply ! subroutine mld_cprecaply1(prec,x,desc_data,info,trans) - use psb_sparse_mod + use psb_base_mod use mld_c_inner_mod, mld_protect_name => mld_cprecaply1 implicit none diff --git a/mlprec/mld_cprecbld.f90 b/mlprec/mld_cprecbld.f90 index 4c13dda2..15f26c7d 100644 --- a/mlprec/mld_cprecbld.f90 +++ b/mlprec/mld_cprecbld.f90 @@ -60,7 +60,7 @@ ! subroutine mld_cprecbld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_c_inner_mod use mld_c_prec_mod, mld_protect_name => mld_cprecbld diff --git a/mlprec/mld_cprecinit.F90 b/mlprec/mld_cprecinit.F90 index 12ea8453..5d1affed 100644 --- a/mlprec/mld_cprecinit.F90 +++ b/mlprec/mld_cprecinit.F90 @@ -90,7 +90,7 @@ ! subroutine mld_cprecinit(p,ptype,info,nlev) - use psb_sparse_mod + use psb_base_mod use mld_c_prec_mod, mld_protect_name => mld_cprecinit use mld_c_jac_smoother use mld_c_as_smoother diff --git a/mlprec/mld_cprecset.F90 b/mlprec/mld_cprecset.F90 index cee1bcb9..b35a3d67 100644 --- a/mlprec/mld_cprecset.F90 +++ b/mlprec/mld_cprecset.F90 @@ -78,7 +78,7 @@ ! subroutine mld_cprecseti(p,what,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_c_prec_mod, mld_protect_name => mld_cprecseti use mld_c_jac_smoother use mld_c_as_smoother @@ -510,7 +510,7 @@ end subroutine mld_cprecseti subroutine mld_cprecsetsm(p,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_c_prec_mod, mld_protect_name => mld_cprecsetsm implicit none @@ -571,7 +571,7 @@ end subroutine mld_cprecsetsm subroutine mld_cprecsetsv(p,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_c_prec_mod, mld_protect_name => mld_cprecsetsv implicit none @@ -681,7 +681,7 @@ end subroutine mld_cprecsetsv ! subroutine mld_cprecsetc(p,what,string,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_c_prec_mod, mld_protect_name => mld_cprecsetc implicit none @@ -765,7 +765,7 @@ end subroutine mld_cprecsetc ! subroutine mld_cprecsetr(p,what,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_c_prec_mod, mld_protect_name => mld_cprecsetr implicit none diff --git a/mlprec/mld_cslu_bld.f90 b/mlprec/mld_cslu_bld.f90 index 2cedec9f..bf30cb59 100644 --- a/mlprec/mld_cslu_bld.f90 +++ b/mlprec/mld_cslu_bld.f90 @@ -71,7 +71,7 @@ ! subroutine mld_cslu_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_c_inner_mod, mld_protect_name => mld_cslu_bld implicit none diff --git a/mlprec/mld_cslud_bld.f90 b/mlprec/mld_cslud_bld.f90 index cfd4c6af..fa46155c 100644 --- a/mlprec/mld_cslud_bld.f90 +++ b/mlprec/mld_cslud_bld.f90 @@ -68,7 +68,7 @@ ! subroutine mld_csludist_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_c_inner_mod, mld_protect_name => mld_csludist_bld implicit none diff --git a/mlprec/mld_csp_renum.f90 b/mlprec/mld_csp_renum.f90 index f33b382a..71297da0 100644 --- a/mlprec/mld_csp_renum.f90 +++ b/mlprec/mld_csp_renum.f90 @@ -83,7 +83,7 @@ ! subroutine mld_csp_renum(a,blck,p,atmp,info) - use psb_sparse_mod + use psb_base_mod use mld_c_inner_mod, mld_protect_name => mld_csp_renum implicit none diff --git a/mlprec/mld_cumf_bld.f90 b/mlprec/mld_cumf_bld.f90 index 52f7fc6d..f07a5fcf 100644 --- a/mlprec/mld_cumf_bld.f90 +++ b/mlprec/mld_cumf_bld.f90 @@ -77,7 +77,7 @@ ! subroutine mld_cumf_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_c_inner_mod, mld_protect_name => mld_cumf_bld implicit none diff --git a/mlprec/mld_d_as_smoother.f90 b/mlprec/mld_d_as_smoother.f90 index 7d3ac62d..d3fd32d0 100644 --- a/mlprec/mld_d_as_smoother.f90 +++ b/mlprec/mld_d_as_smoother.f90 @@ -86,7 +86,7 @@ contains subroutine d_as_smoother_default(sm) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -108,7 +108,7 @@ contains subroutine d_as_smoother_check(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -152,7 +152,7 @@ contains end subroutine d_as_smoother_check subroutine d_as_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_d_as_smoother_type), intent(in) :: sm real(psb_dpk_),intent(inout) :: x(:) @@ -587,7 +587,7 @@ contains subroutine d_as_smoother_bld(a,desc_a,sm,upd,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -728,7 +728,7 @@ contains subroutine d_as_smoother_seti(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -772,7 +772,7 @@ contains subroutine d_as_smoother_setc(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -810,7 +810,7 @@ contains subroutine d_as_smoother_setr(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -847,7 +847,7 @@ contains subroutine d_as_smoother_free(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -887,7 +887,7 @@ contains subroutine d_as_smoother_descr(sm,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -941,7 +941,7 @@ contains end subroutine d_as_smoother_descr function d_as_smoother_sizeof(sm) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_d_as_smoother_type), intent(in) :: sm @@ -956,7 +956,7 @@ contains end function d_as_smoother_sizeof subroutine d_as_smoother_dmp(sm,ictxt,level,info,prefix,head,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_d_as_smoother_type), intent(in) :: sm integer, intent(in) :: ictxt,level diff --git a/mlprec/mld_d_diag_solver.f90 b/mlprec/mld_d_diag_solver.f90 index 983e0038..fa0bc6d1 100644 --- a/mlprec/mld_d_diag_solver.f90 +++ b/mlprec/mld_d_diag_solver.f90 @@ -70,7 +70,7 @@ module mld_d_diag_solver contains subroutine d_diag_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_d_diag_solver_type), intent(in) :: sv real(psb_dpk_),intent(inout) :: x(:) @@ -191,7 +191,7 @@ contains subroutine d_diag_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -270,7 +270,7 @@ contains subroutine d_diag_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -309,7 +309,7 @@ contains subroutine d_diag_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -347,7 +347,7 @@ contains subroutine d_diag_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -385,7 +385,7 @@ contains subroutine d_diag_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -421,7 +421,7 @@ contains subroutine d_diag_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -451,7 +451,7 @@ contains end subroutine d_diag_solver_descr function d_diag_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_d_diag_solver_type), intent(in) :: sv diff --git a/mlprec/mld_d_id_solver.f90 b/mlprec/mld_d_id_solver.f90 index 647a98b1..97f09833 100644 --- a/mlprec/mld_d_id_solver.f90 +++ b/mlprec/mld_d_id_solver.f90 @@ -69,7 +69,7 @@ module mld_d_id_solver contains subroutine d_id_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_d_id_solver_type), intent(in) :: sv real(psb_dpk_),intent(inout) :: x(:) @@ -115,7 +115,7 @@ contains subroutine d_id_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -160,7 +160,7 @@ contains subroutine d_id_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -180,7 +180,7 @@ contains subroutine d_id_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -199,7 +199,7 @@ contains subroutine d_id_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -219,7 +219,7 @@ contains subroutine d_id_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -236,7 +236,7 @@ contains subroutine d_id_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -266,7 +266,7 @@ contains end subroutine d_id_solver_descr function d_id_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_d_id_solver_type), intent(in) :: sv diff --git a/mlprec/mld_d_ilu_solver.f90 b/mlprec/mld_d_ilu_solver.f90 index 7ebb7092..70acc9b0 100644 --- a/mlprec/mld_d_ilu_solver.f90 +++ b/mlprec/mld_d_ilu_solver.f90 @@ -87,7 +87,7 @@ contains subroutine d_ilu_solver_default(sv) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -103,7 +103,7 @@ contains subroutine d_ilu_solver_check(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -144,7 +144,7 @@ contains subroutine d_ilu_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_d_ilu_solver_type), intent(in) :: sv real(psb_dpk_),intent(inout) :: x(:) @@ -248,7 +248,7 @@ contains subroutine d_ilu_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -421,7 +421,7 @@ contains subroutine d_ilu_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -460,7 +460,7 @@ contains subroutine d_ilu_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -498,7 +498,7 @@ contains subroutine d_ilu_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -536,7 +536,7 @@ contains subroutine d_ilu_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -574,7 +574,7 @@ contains subroutine d_ilu_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -621,7 +621,7 @@ contains end subroutine d_ilu_solver_descr function d_ilu_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_d_ilu_solver_type), intent(in) :: sv @@ -637,7 +637,7 @@ contains end function d_ilu_solver_sizeof subroutine d_ilu_solver_dmp(sv,ictxt,level,info,prefix,head,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_d_ilu_solver_type), intent(in) :: sv integer, intent(in) :: ictxt,level diff --git a/mlprec/mld_d_inner_mod.f90 b/mlprec/mld_d_inner_mod.f90 index c6e24dff..64054753 100644 --- a/mlprec/mld_d_inner_mod.f90 +++ b/mlprec/mld_d_inner_mod.f90 @@ -51,7 +51,7 @@ module mld_d_inner_mod interface mld_mlprec_bld subroutine mld_dmlprec_bld(a,desc_a,prec,info) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ use mld_d_prec_type, only : mld_dprec_type implicit none type(psb_dspmat_type), intent(in), target :: a @@ -65,7 +65,7 @@ module mld_d_inner_mod interface mld_mlprec_aply subroutine mld_dmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ use mld_d_prec_type, only : mld_dprec_type type(psb_desc_type),intent(in) :: desc_data type(mld_dprec_type), intent(in) :: p @@ -81,7 +81,7 @@ module mld_d_inner_mod interface mld_coarse_bld subroutine mld_dcoarse_bld(a,desc_a,p,info) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + 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_desc_type), intent(in) :: desc_a @@ -92,7 +92,7 @@ module mld_d_inner_mod interface mld_aggrmap_bld subroutine mld_daggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ integer, intent(in) :: aggr_type real(psb_dpk_), intent(in) :: theta type(psb_dspmat_type), intent(in) :: a @@ -104,7 +104,7 @@ module mld_d_inner_mod interface mld_aggrmat_asb subroutine mld_daggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + 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_desc_type), intent(in) :: desc_a @@ -116,7 +116,7 @@ module mld_d_inner_mod interface mld_aggrmat_nosmth_asb subroutine mld_daggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + 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_desc_type), intent(in) :: desc_a @@ -128,7 +128,7 @@ module mld_d_inner_mod interface mld_aggrmat_smth_asb subroutine mld_daggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + 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_desc_type), intent(in) :: desc_a @@ -140,7 +140,7 @@ module mld_d_inner_mod interface mld_aggrmat_minnrg_asb subroutine mld_daggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + 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_desc_type), intent(in) :: desc_a diff --git a/mlprec/mld_d_jac_smoother.f90 b/mlprec/mld_d_jac_smoother.f90 index dbcb92e1..9158434a 100644 --- a/mlprec/mld_d_jac_smoother.f90 +++ b/mlprec/mld_d_jac_smoother.f90 @@ -75,7 +75,7 @@ module mld_d_jac_smoother contains subroutine d_jac_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_d_jac_smoother_type), intent(in) :: sm real(psb_dpk_),intent(inout) :: x(:) @@ -230,7 +230,7 @@ contains subroutine d_jac_smoother_bld(a,desc_a,sm,upd,info) - use psb_sparse_mod + use psb_base_mod use mld_d_diag_solver Implicit None @@ -303,7 +303,7 @@ contains subroutine d_jac_smoother_seti(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -344,7 +344,7 @@ contains subroutine d_jac_smoother_setc(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -382,7 +382,7 @@ contains subroutine d_jac_smoother_setr(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -419,7 +419,7 @@ contains subroutine d_jac_smoother_free(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -459,7 +459,7 @@ contains subroutine d_jac_smoother_descr(sm,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -510,7 +510,7 @@ contains end subroutine d_jac_smoother_descr function d_jac_smoother_sizeof(sm) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_d_jac_smoother_type), intent(in) :: sm diff --git a/mlprec/mld_d_move_alloc_mod.f90 b/mlprec/mld_d_move_alloc_mod.f90 index 47e52f28..33fc78ce 100644 --- a/mlprec/mld_d_move_alloc_mod.f90 +++ b/mlprec/mld_d_move_alloc_mod.f90 @@ -56,7 +56,7 @@ module mld_d_move_alloc_mod contains subroutine mld_donelev_prec_move_alloc(a, b,info) - use psb_sparse_mod + use psb_base_mod implicit none type(mld_donelev_type), intent(inout) :: a, b integer, intent(out) :: info @@ -72,7 +72,7 @@ contains end subroutine mld_donelev_prec_move_alloc subroutine mld_dprec_move_alloc(a, b,info) - use psb_sparse_mod + use psb_base_mod implicit none type(mld_dprec_type), intent(inout) :: a type(mld_dprec_type), intent(inout), target :: b diff --git a/mlprec/mld_d_prec_mod.f90 b/mlprec/mld_d_prec_mod.f90 index 74a4b361..5d3f3f3a 100644 --- a/mlprec/mld_d_prec_mod.f90 +++ b/mlprec/mld_d_prec_mod.f90 @@ -50,7 +50,7 @@ module mld_d_prec_mod interface mld_precinit subroutine mld_dprecinit(p,ptype,info,nlev) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ use mld_d_prec_type, only : mld_dprec_type type(mld_dprec_type), intent(inout) :: p character(len=*), intent(in) :: ptype @@ -66,7 +66,7 @@ module mld_d_prec_mod interface mld_inner_precset subroutine mld_dprecsetsm(p,val,info,ilev) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ use mld_d_prec_type, only : mld_dprec_type, mld_d_base_smoother_type type(mld_dprec_type), intent(inout) :: p class(mld_d_base_smoother_type), intent(in) :: val @@ -74,7 +74,7 @@ module mld_d_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_dprecsetsm subroutine mld_dprecsetsv(p,val,info,ilev) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ use mld_d_prec_type, only : mld_dprec_type, mld_d_base_solver_type type(mld_dprec_type), intent(inout) :: p class(mld_d_base_solver_type), intent(in) :: val @@ -82,7 +82,7 @@ module mld_d_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_dprecsetsv subroutine mld_dprecseti(p,what,val,info,ilev) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ use mld_d_prec_type, only : mld_dprec_type type(mld_dprec_type), intent(inout) :: p integer, intent(in) :: what @@ -91,7 +91,7 @@ module mld_d_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_dprecseti subroutine mld_dprecsetr(p,what,val,info,ilev) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ use mld_d_prec_type, only : mld_dprec_type type(mld_dprec_type), intent(inout) :: p integer, intent(in) :: what @@ -100,7 +100,7 @@ module mld_d_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_dprecsetr subroutine mld_dprecsetc(p,what,string,info,ilev) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ use mld_d_prec_type, only : mld_dprec_type type(mld_dprec_type), intent(inout) :: p integer, intent(in) :: what @@ -112,7 +112,7 @@ module mld_d_prec_mod interface mld_precbld subroutine mld_dprecbld(a,desc_a,prec,info) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ use mld_d_prec_type, only : mld_dprec_type implicit none type(psb_dspmat_type), intent(in), target :: a @@ -126,7 +126,7 @@ module mld_d_prec_mod contains subroutine mld_i_dprecsetsm(p,val,info) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ use mld_d_prec_type, only : mld_dprec_type, mld_d_base_smoother_type type(mld_dprec_type), intent(inout) :: p class(mld_d_base_smoother_type), intent(in) :: val @@ -136,7 +136,7 @@ contains end subroutine mld_i_dprecsetsm subroutine mld_i_dprecsetsv(p,val,info) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ use mld_d_prec_type, only : mld_dprec_type, mld_d_base_solver_type type(mld_dprec_type), intent(inout) :: p class(mld_d_base_solver_type), intent(in) :: val @@ -146,7 +146,7 @@ contains end subroutine mld_i_dprecsetsv subroutine mld_i_dprecseti(p,what,val,info) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ use mld_d_prec_type, only : mld_dprec_type type(mld_dprec_type), intent(inout) :: p integer, intent(in) :: what @@ -157,7 +157,7 @@ contains end subroutine mld_i_dprecseti subroutine mld_i_dprecsetr(p,what,val,info) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ use mld_d_prec_type, only : mld_dprec_type type(mld_dprec_type), intent(inout) :: p integer, intent(in) :: what @@ -168,7 +168,7 @@ contains end subroutine mld_i_dprecsetr subroutine mld_i_dprecsetc(p,what,val,info) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ use mld_d_prec_type, only : mld_dprec_type type(mld_dprec_type), intent(inout) :: p integer, intent(in) :: what diff --git a/mlprec/mld_d_prec_type.f90 b/mlprec/mld_d_prec_type.f90 index 8fe8dea3..6421e1b7 100644 --- a/mlprec/mld_d_prec_type.f90 +++ b/mlprec/mld_d_prec_type.f90 @@ -277,7 +277,7 @@ module mld_d_prec_type interface mld_precaply subroutine mld_dprecaply(prec,x,y,desc_data,info,trans,work) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ import mld_dprec_type type(psb_desc_type),intent(in) :: desc_data type(mld_dprec_type), intent(in) :: prec @@ -288,7 +288,7 @@ module mld_d_prec_type real(psb_dpk_),intent(inout), optional, target :: work(:) end subroutine mld_dprecaply subroutine mld_dprecaply1(prec,x,desc_data,info,trans) - use psb_sparse_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_ import mld_dprec_type type(psb_desc_type),intent(in) :: desc_data type(mld_dprec_type), intent(in) :: prec @@ -304,7 +304,7 @@ contains ! function mld_dprec_sizeof(prec) result(val) - use psb_sparse_mod + use psb_base_mod implicit none type(mld_dprec_type), intent(in) :: prec integer(psb_long_int_k_) :: val @@ -480,7 +480,7 @@ contains subroutine d_base_onelev_descr(lv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -539,7 +539,7 @@ contains end subroutine d_base_onelev_descr subroutine mld_d_onelev_precfree(p,info) - use psb_sparse_mod + use psb_base_mod implicit none type(mld_donelev_type), intent(inout) :: p @@ -584,7 +584,7 @@ contains subroutine mld_dprec_free(p,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -624,7 +624,7 @@ contains subroutine d_base_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_d_base_smoother_type), intent(in) :: sm real(psb_dpk_),intent(inout) :: x(:) @@ -665,7 +665,7 @@ contains subroutine d_base_smoother_check(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -703,7 +703,7 @@ contains subroutine d_base_smoother_seti(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -736,7 +736,7 @@ contains subroutine d_base_smoother_setc(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -771,7 +771,7 @@ contains subroutine d_base_smoother_setr(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -807,7 +807,7 @@ contains subroutine d_base_smoother_bld(a,desc_a,sm,upd,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -846,7 +846,7 @@ contains subroutine d_base_smoother_free(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -882,7 +882,7 @@ contains subroutine d_base_smoother_descr(sm,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -965,7 +965,7 @@ contains subroutine d_base_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_d_base_solver_type), intent(in) :: sv real(psb_dpk_),intent(inout) :: x(:) @@ -999,7 +999,7 @@ contains subroutine d_base_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1033,7 +1033,7 @@ contains subroutine d_base_solver_check(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1063,7 +1063,7 @@ contains subroutine d_base_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1083,7 +1083,7 @@ contains subroutine d_base_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1119,7 +1119,7 @@ contains subroutine d_base_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1140,7 +1140,7 @@ contains subroutine d_base_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1170,7 +1170,7 @@ contains subroutine d_base_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1227,7 +1227,7 @@ contains subroutine mld_d_apply2v(prec,x,y,desc_data,info,trans,work) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type),intent(in) :: desc_data class(mld_dprec_type), intent(in) :: prec real(psb_dpk_),intent(inout) :: x(:) @@ -1263,7 +1263,7 @@ contains end subroutine mld_d_apply2v subroutine mld_d_apply1v(prec,x,desc_data,info,trans) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type),intent(in) :: desc_data class(mld_dprec_type), intent(in) :: prec real(psb_dpk_),intent(inout) :: x(:) @@ -1298,7 +1298,7 @@ contains subroutine d_base_onelev_check(lv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1344,7 +1344,7 @@ contains subroutine d_base_onelev_default(lv) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1374,7 +1374,7 @@ contains subroutine d_base_onelev_seti(lv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1449,7 +1449,7 @@ contains subroutine d_base_onelev_setc(lv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1485,7 +1485,7 @@ contains subroutine d_base_onelev_setr(lv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1530,7 +1530,7 @@ contains end subroutine d_base_onelev_setr subroutine mld_d_dump(prec,info,istart,iend,prefix,head,ac,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_dprec_type), intent(in) :: prec integer, intent(out) :: info @@ -1564,7 +1564,7 @@ contains subroutine d_base_onelev_dump(lv,level,info,prefix,head,ac,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_donelev_type), intent(in) :: lv integer, intent(in) :: level @@ -1614,7 +1614,7 @@ contains end subroutine d_base_onelev_dump subroutine d_base_smoother_dmp(sm,ictxt,level,info,prefix,head,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_d_base_smoother_type), intent(in) :: sm integer, intent(in) :: ictxt,level @@ -1655,7 +1655,7 @@ contains end subroutine d_base_smoother_dmp subroutine d_base_solver_dmp(sv,ictxt,level,info,prefix,head,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_d_base_solver_type), intent(in) :: sv integer, intent(in) :: ictxt,level diff --git a/mlprec/mld_d_slu_solver.f90 b/mlprec/mld_d_slu_solver.f90 index 9ff0cbc4..d48db1ea 100644 --- a/mlprec/mld_d_slu_solver.f90 +++ b/mlprec/mld_d_slu_solver.f90 @@ -106,7 +106,7 @@ module mld_d_slu_solver contains subroutine d_slu_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_d_slu_solver_type), intent(in) :: sv real(psb_dpk_),intent(inout) :: x(:) @@ -187,7 +187,7 @@ contains subroutine d_slu_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -267,7 +267,7 @@ contains subroutine d_slu_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -302,7 +302,7 @@ contains subroutine d_slu_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -340,7 +340,7 @@ contains subroutine d_slu_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -376,7 +376,7 @@ contains subroutine d_slu_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -409,7 +409,7 @@ contains subroutine d_slu_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -448,7 +448,7 @@ contains end subroutine d_slu_solver_descr function d_slu_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_d_slu_solver_type), intent(in) :: sv diff --git a/mlprec/mld_d_sludist_solver.f90 b/mlprec/mld_d_sludist_solver.f90 index f0f06c37..d05ba0ca 100644 --- a/mlprec/mld_d_sludist_solver.f90 +++ b/mlprec/mld_d_sludist_solver.f90 @@ -106,7 +106,7 @@ module mld_d_sludist_solver contains subroutine d_sludist_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_d_sludist_solver_type), intent(in) :: sv real(psb_dpk_),intent(inout) :: x(:) @@ -187,7 +187,7 @@ contains subroutine d_sludist_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -271,7 +271,7 @@ contains subroutine d_sludist_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -306,7 +306,7 @@ contains subroutine d_sludist_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -344,7 +344,7 @@ contains subroutine d_sludist_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -380,7 +380,7 @@ contains subroutine d_sludist_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -413,7 +413,7 @@ contains subroutine d_sludist_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -452,7 +452,7 @@ contains end subroutine d_sludist_solver_descr function d_sludist_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_d_sludist_solver_type), intent(in) :: sv diff --git a/mlprec/mld_d_umf_solver.f90 b/mlprec/mld_d_umf_solver.f90 index 6887a724..8b65222a 100644 --- a/mlprec/mld_d_umf_solver.f90 +++ b/mlprec/mld_d_umf_solver.f90 @@ -106,7 +106,7 @@ module mld_d_umf_solver contains subroutine d_umf_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_d_umf_solver_type), intent(in) :: sv real(psb_dpk_),intent(inout) :: x(:) @@ -187,7 +187,7 @@ contains subroutine d_umf_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -268,7 +268,7 @@ contains subroutine d_umf_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -303,7 +303,7 @@ contains subroutine d_umf_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -341,7 +341,7 @@ contains subroutine d_umf_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -377,7 +377,7 @@ contains subroutine d_umf_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -412,7 +412,7 @@ contains subroutine d_umf_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -451,7 +451,7 @@ contains end subroutine d_umf_solver_descr function d_umf_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_d_umf_solver_type), intent(in) :: sv diff --git a/mlprec/mld_daggrmap_bld.f90 b/mlprec/mld_daggrmap_bld.f90 index 5e75b336..9387d202 100644 --- a/mlprec/mld_daggrmap_bld.f90 +++ b/mlprec/mld_daggrmap_bld.f90 @@ -81,7 +81,7 @@ ! subroutine mld_daggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info) - use psb_sparse_mod + use psb_base_mod use mld_d_inner_mod, mld_protect_name => mld_daggrmap_bld implicit none @@ -164,7 +164,7 @@ contains subroutine mld_dec_map_bld(theta,a,desc_a,nlaggr,ilaggr,info) - use psb_sparse_mod + use psb_base_mod use mld_d_inner_mod !, mld_protect_name => mld_daggrmap_bld implicit none diff --git a/mlprec/mld_daggrmat_asb.f90 b/mlprec/mld_daggrmat_asb.f90 index 17c73d65..154bb5a6 100644 --- a/mlprec/mld_daggrmat_asb.f90 +++ b/mlprec/mld_daggrmat_asb.f90 @@ -100,7 +100,7 @@ ! subroutine mld_daggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod + use psb_base_mod use mld_d_inner_mod, mld_protect_name => mld_daggrmat_asb implicit none diff --git a/mlprec/mld_daggrmat_minnrg_asb.F90 b/mlprec/mld_daggrmat_minnrg_asb.F90 index 3f4151d4..3430c55e 100644 --- a/mlprec/mld_daggrmat_minnrg_asb.F90 +++ b/mlprec/mld_daggrmat_minnrg_asb.F90 @@ -99,7 +99,7 @@ ! Error code. ! subroutine mld_daggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod + use psb_base_mod use mld_d_inner_mod, mld_protect_name => mld_daggrmat_minnrg_asb #ifdef MPI_MOD diff --git a/mlprec/mld_daggrmat_nosmth_asb.F90 b/mlprec/mld_daggrmat_nosmth_asb.F90 index 323d97e4..b802ec84 100644 --- a/mlprec/mld_daggrmat_nosmth_asb.F90 +++ b/mlprec/mld_daggrmat_nosmth_asb.F90 @@ -82,7 +82,7 @@ ! Error code. ! subroutine mld_daggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod + use psb_base_mod use mld_d_inner_mod, mld_protect_name => mld_daggrmat_nosmth_asb #ifdef MPI_MOD diff --git a/mlprec/mld_daggrmat_smth_asb.F90 b/mlprec/mld_daggrmat_smth_asb.F90 index db76b153..2bdc3095 100644 --- a/mlprec/mld_daggrmat_smth_asb.F90 +++ b/mlprec/mld_daggrmat_smth_asb.F90 @@ -99,7 +99,7 @@ ! Error code. ! subroutine mld_daggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod + use psb_base_mod use mld_d_inner_mod, mld_protect_name => mld_daggrmat_smth_asb #ifdef MPI_MOD diff --git a/mlprec/mld_dcoarse_bld.f90 b/mlprec/mld_dcoarse_bld.f90 index a0b22da5..e9925c00 100644 --- a/mlprec/mld_dcoarse_bld.f90 +++ b/mlprec/mld_dcoarse_bld.f90 @@ -67,7 +67,7 @@ ! subroutine mld_dcoarse_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_d_inner_mod, mld_protect_name => mld_dcoarse_bld implicit none diff --git a/mlprec/mld_dilu0_fact.f90 b/mlprec/mld_dilu0_fact.f90 index 23492248..488c7beb 100644 --- a/mlprec/mld_dilu0_fact.f90 +++ b/mlprec/mld_dilu0_fact.f90 @@ -101,7 +101,7 @@ ! subroutine mld_dilu0_fact(ialg,a,l,u,d,info,blck, upd) - use psb_sparse_mod + use psb_base_mod use mld_d_ilu_fact_mod, mld_protect_name => mld_dilu0_fact implicit none @@ -557,7 +557,7 @@ contains subroutine ilu_copyin(i,m,a,jd,jmin,jmax,l1,lja,lval,& & dia,l2,uja,uval,ktrw,trw,upd) - use psb_sparse_mod + use psb_base_mod implicit none diff --git a/mlprec/mld_diluk_fact.f90 b/mlprec/mld_diluk_fact.f90 index 7c3cb538..cfda3e36 100644 --- a/mlprec/mld_diluk_fact.f90 +++ b/mlprec/mld_diluk_fact.f90 @@ -98,7 +98,7 @@ ! subroutine mld_diluk_fact(fill_in,ialg,a,l,u,d,info,blck) - use psb_sparse_mod + use psb_base_mod use mld_d_ilu_fact_mod, mld_protect_name => mld_diluk_fact implicit none @@ -273,7 +273,7 @@ contains subroutine mld_diluk_factint(fill_in,ialg,a,b,& & d,lval,lja,lirp,uval,uja,uirp,l1,l2,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -491,7 +491,7 @@ contains ! subroutine iluk_copyin(i,m,a,jmin,jmax,row,rowlevs,heap,ktrw,trw,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -648,7 +648,7 @@ contains ! subroutine iluk_fact(fill_in,i,row,rowlevs,heap,d,uja,uirp,uval,uplevs,nidx,idxs,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -824,7 +824,7 @@ contains subroutine iluk_copyout(fill_in,ialg,i,m,row,rowlevs,nidx,idxs,& & l1,l2,lja,lirp,lval,d,uja,uirp,uval,uplevs,info) - use psb_sparse_mod + use psb_base_mod implicit none diff --git a/mlprec/mld_dilut_fact.f90 b/mlprec/mld_dilut_fact.f90 index ca099bc5..c1b6a7d3 100644 --- a/mlprec/mld_dilut_fact.f90 +++ b/mlprec/mld_dilut_fact.f90 @@ -94,7 +94,7 @@ ! subroutine mld_dilut_fact(fill_in,thres,a,l,u,d,info,blck) - use psb_sparse_mod + use psb_base_mod use mld_d_ilu_fact_mod, mld_protect_name => mld_dilut_fact implicit none @@ -272,7 +272,7 @@ contains subroutine mld_dilut_factint(fill_in,thres,a,b,& & d,lval,lja,lirp,uval,uja,uirp,l1,l2,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -484,7 +484,7 @@ contains ! every nrb calls to copyin. If A is in CSR format it is unused. ! subroutine ilut_copyin(i,m,a,jd,jmin,jmax,nlw,nup,jmaxup,nrmi,row,heap,ktrw,trw,info) - use psb_sparse_mod + use psb_base_mod implicit none type(psb_dspmat_type), intent(in) :: a type(psb_d_coo_sparse_mat), intent(inout) :: trw @@ -677,7 +677,7 @@ contains ! subroutine ilut_fact(thres,i,nrmi,row,heap,d,uja,uirp,uval,nidx,idxs,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -863,7 +863,7 @@ contains subroutine ilut_copyout(fill_in,thres,i,m,nlw,nup,jmaxup,nrmi,row, & & nidx,idxs,l1,l2,lja,lirp,lval,d,uja,uirp,uval,info) - use psb_sparse_mod + use psb_base_mod implicit none diff --git a/mlprec/mld_dmlprec_aply.f90 b/mlprec/mld_dmlprec_aply.f90 index e72d0ba3..370c159b 100644 --- a/mlprec/mld_dmlprec_aply.f90 +++ b/mlprec/mld_dmlprec_aply.f90 @@ -314,7 +314,7 @@ ! subroutine mld_dmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod use mld_d_inner_mod, mld_protect_name => mld_dmlprec_aply implicit none diff --git a/mlprec/mld_dmlprec_bld.f90 b/mlprec/mld_dmlprec_bld.f90 index 8925f952..36f76c89 100644 --- a/mlprec/mld_dmlprec_bld.f90 +++ b/mlprec/mld_dmlprec_bld.f90 @@ -65,7 +65,7 @@ ! subroutine mld_dmlprec_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_d_inner_mod, mld_protect_name => mld_dmlprec_bld use mld_d_prec_mod diff --git a/mlprec/mld_dprecaply.f90 b/mlprec/mld_dprecaply.f90 index 65bf04c8..c1ccf078 100644 --- a/mlprec/mld_dprecaply.f90 +++ b/mlprec/mld_dprecaply.f90 @@ -73,7 +73,7 @@ ! subroutine mld_dprecaply(prec,x,y,desc_data,info,trans,work) - use psb_sparse_mod + use psb_base_mod use mld_d_inner_mod, mld_protect_name => mld_dprecaply implicit none @@ -205,7 +205,7 @@ end subroutine mld_dprecaply ! subroutine mld_dprecaply1(prec,x,desc_data,info,trans) - use psb_sparse_mod + use psb_base_mod use mld_d_inner_mod, mld_protect_name => mld_dprecaply1 implicit none diff --git a/mlprec/mld_dprecbld.f90 b/mlprec/mld_dprecbld.f90 index 03bdb015..c27ee54d 100644 --- a/mlprec/mld_dprecbld.f90 +++ b/mlprec/mld_dprecbld.f90 @@ -60,7 +60,7 @@ ! subroutine mld_dprecbld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_d_inner_mod use mld_d_prec_mod, mld_protect_name => mld_dprecbld diff --git a/mlprec/mld_dprecinit.F90 b/mlprec/mld_dprecinit.F90 index 5b329340..887c39a4 100644 --- a/mlprec/mld_dprecinit.F90 +++ b/mlprec/mld_dprecinit.F90 @@ -90,7 +90,7 @@ ! subroutine mld_dprecinit(p,ptype,info,nlev) - use psb_sparse_mod + use psb_base_mod use mld_d_prec_mod, mld_protect_name => mld_dprecinit use mld_d_jac_smoother use mld_d_as_smoother diff --git a/mlprec/mld_dprecset.F90 b/mlprec/mld_dprecset.F90 index 6f3c38a1..55c41d2c 100644 --- a/mlprec/mld_dprecset.F90 +++ b/mlprec/mld_dprecset.F90 @@ -78,7 +78,7 @@ ! subroutine mld_dprecseti(p,what,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_d_prec_mod, mld_protect_name => mld_dprecseti use mld_d_jac_smoother use mld_d_as_smoother @@ -150,6 +150,7 @@ subroutine mld_dprecseti(p,what,val,info,ilev) case default call p%precv(ilev_)%set(what,val,info) + call p%precv(ilev_)%set(what,val,info) end select else if (ilev_ > 1) then @@ -226,6 +227,7 @@ subroutine mld_dprecseti(p,what,val,info,ilev) call p%precv(nlev_)%set(mld_sub_fillin_,val,info) case default call p%precv(ilev_)%set(what,val,info) + call p%precv(ilev_)%set(what,val,info) end select endif @@ -533,7 +535,7 @@ end subroutine mld_dprecseti subroutine mld_dprecsetsm(p,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_d_prec_mod, mld_protect_name => mld_dprecsetsm implicit none @@ -594,7 +596,7 @@ end subroutine mld_dprecsetsm subroutine mld_dprecsetsv(p,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_d_prec_mod, mld_protect_name => mld_dprecsetsv implicit none @@ -703,7 +705,7 @@ end subroutine mld_dprecsetsv ! subroutine mld_dprecsetc(p,what,string,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_d_prec_mod, mld_protect_name => mld_dprecsetc implicit none @@ -786,7 +788,7 @@ end subroutine mld_dprecsetc ! subroutine mld_dprecsetr(p,what,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_d_prec_mod, mld_protect_name => mld_dprecsetr implicit none diff --git a/mlprec/mld_dslu_bld.f90 b/mlprec/mld_dslu_bld.f90 index c177d46e..618b7f42 100644 --- a/mlprec/mld_dslu_bld.f90 +++ b/mlprec/mld_dslu_bld.f90 @@ -71,7 +71,7 @@ ! subroutine mld_dslu_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_d_inner_mod, mld_protect_name => mld_dslu_bld implicit none diff --git a/mlprec/mld_dslud_bld.f90 b/mlprec/mld_dslud_bld.f90 index bf337094..e86e2c80 100644 --- a/mlprec/mld_dslud_bld.f90 +++ b/mlprec/mld_dslud_bld.f90 @@ -68,7 +68,7 @@ ! subroutine mld_dsludist_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_d_inner_mod, mld_protect_name => mld_dsludist_bld implicit none diff --git a/mlprec/mld_dsp_renum.f90 b/mlprec/mld_dsp_renum.f90 index 3923c956..87bcc36c 100644 --- a/mlprec/mld_dsp_renum.f90 +++ b/mlprec/mld_dsp_renum.f90 @@ -83,7 +83,7 @@ ! subroutine mld_dsp_renum(a,blck,p,atmp,info) - use psb_sparse_mod + use psb_base_mod use mld_d_inner_mod, mld_protect_name => mld_dsp_renum implicit none diff --git a/mlprec/mld_s_as_smoother.f90 b/mlprec/mld_s_as_smoother.f90 index ce2d204c..11910ef9 100644 --- a/mlprec/mld_s_as_smoother.f90 +++ b/mlprec/mld_s_as_smoother.f90 @@ -86,7 +86,7 @@ contains subroutine s_as_smoother_default(sm) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -108,7 +108,7 @@ contains subroutine s_as_smoother_check(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -152,7 +152,7 @@ contains end subroutine s_as_smoother_check subroutine s_as_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_s_as_smoother_type), intent(in) :: sm real(psb_spk_),intent(inout) :: x(:) @@ -587,7 +587,7 @@ contains subroutine s_as_smoother_bld(a,desc_a,sm,upd,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -728,7 +728,7 @@ contains subroutine s_as_smoother_seti(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -772,7 +772,7 @@ contains subroutine s_as_smoother_setc(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -810,7 +810,7 @@ contains subroutine s_as_smoother_setr(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -847,7 +847,7 @@ contains subroutine s_as_smoother_free(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -887,7 +887,7 @@ contains subroutine s_as_smoother_descr(sm,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -941,7 +941,7 @@ contains end subroutine s_as_smoother_descr function s_as_smoother_sizeof(sm) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_s_as_smoother_type), intent(in) :: sm @@ -956,7 +956,7 @@ contains end function s_as_smoother_sizeof subroutine s_as_smoother_dmp(sm,ictxt,level,info,prefix,head,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_s_as_smoother_type), intent(in) :: sm integer, intent(in) :: ictxt,level diff --git a/mlprec/mld_s_diag_solver.f90 b/mlprec/mld_s_diag_solver.f90 index cee8d807..0bd4d83c 100644 --- a/mlprec/mld_s_diag_solver.f90 +++ b/mlprec/mld_s_diag_solver.f90 @@ -70,7 +70,7 @@ module mld_s_diag_solver contains subroutine s_diag_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_s_diag_solver_type), intent(in) :: sv real(psb_spk_),intent(inout) :: x(:) @@ -191,7 +191,7 @@ contains subroutine s_diag_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -270,7 +270,7 @@ contains subroutine s_diag_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -309,7 +309,7 @@ contains subroutine s_diag_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -347,7 +347,7 @@ contains subroutine s_diag_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -385,7 +385,7 @@ contains subroutine s_diag_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -421,7 +421,7 @@ contains subroutine s_diag_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -451,7 +451,7 @@ contains end subroutine s_diag_solver_descr function s_diag_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_s_diag_solver_type), intent(in) :: sv diff --git a/mlprec/mld_s_id_solver.f90 b/mlprec/mld_s_id_solver.f90 index bf6e3f9a..31879ceb 100644 --- a/mlprec/mld_s_id_solver.f90 +++ b/mlprec/mld_s_id_solver.f90 @@ -69,7 +69,7 @@ module mld_s_id_solver contains subroutine s_id_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_s_id_solver_type), intent(in) :: sv real(psb_spk_),intent(inout) :: x(:) @@ -115,7 +115,7 @@ contains subroutine s_id_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -160,7 +160,7 @@ contains subroutine s_id_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -180,7 +180,7 @@ contains subroutine s_id_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -199,7 +199,7 @@ contains subroutine s_id_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -219,7 +219,7 @@ contains subroutine s_id_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -236,7 +236,7 @@ contains subroutine s_id_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -266,7 +266,7 @@ contains end subroutine s_id_solver_descr function s_id_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_s_id_solver_type), intent(in) :: sv diff --git a/mlprec/mld_s_ilu_solver.f90 b/mlprec/mld_s_ilu_solver.f90 index 27e22c1f..3aa48199 100644 --- a/mlprec/mld_s_ilu_solver.f90 +++ b/mlprec/mld_s_ilu_solver.f90 @@ -86,7 +86,7 @@ contains subroutine s_ilu_solver_default(sv) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -102,7 +102,7 @@ contains subroutine s_ilu_solver_check(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -143,7 +143,7 @@ contains subroutine s_ilu_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_s_ilu_solver_type), intent(in) :: sv real(psb_spk_),intent(inout) :: x(:) @@ -247,7 +247,7 @@ contains subroutine s_ilu_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -419,7 +419,7 @@ contains subroutine s_ilu_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -458,7 +458,7 @@ contains subroutine s_ilu_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -496,7 +496,7 @@ contains subroutine s_ilu_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -534,7 +534,7 @@ contains subroutine s_ilu_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -572,7 +572,7 @@ contains subroutine s_ilu_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -619,7 +619,7 @@ contains end subroutine s_ilu_solver_descr function s_ilu_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_s_ilu_solver_type), intent(in) :: sv @@ -635,7 +635,7 @@ contains end function s_ilu_solver_sizeof subroutine s_ilu_solver_dmp(sv,ictxt,level,info,prefix,head,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_s_ilu_solver_type), intent(in) :: sv integer, intent(in) :: ictxt,level diff --git a/mlprec/mld_s_inner_mod.f90 b/mlprec/mld_s_inner_mod.f90 index 6aa295f6..d176aa72 100644 --- a/mlprec/mld_s_inner_mod.f90 +++ b/mlprec/mld_s_inner_mod.f90 @@ -51,7 +51,7 @@ module mld_s_inner_mod interface mld_mlprec_bld subroutine mld_smlprec_bld(a,desc_a,prec,info) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sprec_type implicit none type(psb_sspmat_type), intent(in), target :: a @@ -65,7 +65,7 @@ module mld_s_inner_mod interface mld_mlprec_aply subroutine mld_smlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sprec_type type(psb_desc_type),intent(in) :: desc_data type(mld_sprec_type), intent(in) :: p @@ -81,7 +81,7 @@ module mld_s_inner_mod interface mld_coarse_bld subroutine mld_scoarse_bld(a,desc_a,p,info) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sonelev_type type(psb_sspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a @@ -92,7 +92,7 @@ module mld_s_inner_mod interface mld_aggrmap_bld subroutine mld_saggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ integer, intent(in) :: aggr_type real(psb_spk_), intent(in) :: theta type(psb_sspmat_type), intent(in) :: a @@ -104,7 +104,7 @@ module mld_s_inner_mod interface mld_aggrmat_asb subroutine mld_saggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sonelev_type type(psb_sspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a @@ -116,7 +116,7 @@ module mld_s_inner_mod interface mld_aggrmat_nosmth_asb subroutine mld_saggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sonelev_type type(psb_sspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a @@ -128,7 +128,7 @@ module mld_s_inner_mod interface mld_aggrmat_smth_asb subroutine mld_saggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sonelev_type type(psb_sspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a diff --git a/mlprec/mld_s_jac_smoother.f90 b/mlprec/mld_s_jac_smoother.f90 index bf034d3b..80dd8700 100644 --- a/mlprec/mld_s_jac_smoother.f90 +++ b/mlprec/mld_s_jac_smoother.f90 @@ -75,7 +75,7 @@ module mld_s_jac_smoother contains subroutine s_jac_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_s_jac_smoother_type), intent(in) :: sm real(psb_spk_),intent(inout) :: x(:) @@ -230,7 +230,7 @@ contains subroutine s_jac_smoother_bld(a,desc_a,sm,upd,info) - use psb_sparse_mod + use psb_base_mod use mld_s_diag_solver Implicit None @@ -303,7 +303,7 @@ contains subroutine s_jac_smoother_seti(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -344,7 +344,7 @@ contains subroutine s_jac_smoother_setc(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -382,7 +382,7 @@ contains subroutine s_jac_smoother_setr(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -419,7 +419,7 @@ contains subroutine s_jac_smoother_free(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -459,7 +459,7 @@ contains subroutine s_jac_smoother_descr(sm,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -510,7 +510,7 @@ contains end subroutine s_jac_smoother_descr function s_jac_smoother_sizeof(sm) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_s_jac_smoother_type), intent(in) :: sm diff --git a/mlprec/mld_s_move_alloc_mod.f90 b/mlprec/mld_s_move_alloc_mod.f90 index e9976624..d65dbc7a 100644 --- a/mlprec/mld_s_move_alloc_mod.f90 +++ b/mlprec/mld_s_move_alloc_mod.f90 @@ -56,7 +56,7 @@ module mld_s_move_alloc_mod contains subroutine mld_sonelev_prec_move_alloc(a, b,info) - use psb_sparse_mod + use psb_base_mod implicit none type(mld_sonelev_type), intent(inout) :: a, b integer, intent(out) :: info @@ -72,7 +72,7 @@ contains end subroutine mld_sonelev_prec_move_alloc subroutine mld_sprec_move_alloc(a, b,info) - use psb_sparse_mod + use psb_base_mod implicit none type(mld_sprec_type), intent(inout) :: a type(mld_sprec_type), intent(inout), target :: b diff --git a/mlprec/mld_s_prec_mod.f90 b/mlprec/mld_s_prec_mod.f90 index 15a612cc..f149cae9 100644 --- a/mlprec/mld_s_prec_mod.f90 +++ b/mlprec/mld_s_prec_mod.f90 @@ -50,7 +50,7 @@ module mld_s_prec_mod interface mld_precinit subroutine mld_sprecinit(p,ptype,info,nlev) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sprec_type type(mld_sprec_type), intent(inout) :: p character(len=*), intent(in) :: ptype @@ -65,7 +65,7 @@ module mld_s_prec_mod interface mld_inner_precset subroutine mld_sprecsetsm(p,what,val,info,ilev) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sprec_type, mld_s_base_smoother_type type(mld_sprec_type), intent(inout) :: p integer, intent(in) :: what @@ -74,7 +74,7 @@ module mld_s_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_sprecsetsm subroutine mld_sprecsetsv(p,what,val,info,ilev) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sprec_type, mld_s_base_solver_type type(mld_sprec_type), intent(inout) :: p integer, intent(in) :: what @@ -83,7 +83,7 @@ module mld_s_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_sprecsetsv subroutine mld_sprecseti(p,what,val,info,ilev) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sprec_type type(mld_sprec_type), intent(inout) :: p integer, intent(in) :: what @@ -92,7 +92,7 @@ module mld_s_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_sprecseti subroutine mld_sprecsetr(p,what,val,info,ilev) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sprec_type type(mld_sprec_type), intent(inout) :: p integer, intent(in) :: what @@ -101,7 +101,7 @@ module mld_s_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_sprecsetr subroutine mld_sprecsetc(p,what,string,info,ilev) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sprec_type type(mld_sprec_type), intent(inout) :: p integer, intent(in) :: what @@ -113,7 +113,7 @@ module mld_s_prec_mod interface mld_precbld subroutine mld_sprecbld(a,desc_a,prec,info) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sprec_type implicit none type(psb_sspmat_type), intent(in), target :: a @@ -127,7 +127,7 @@ module mld_s_prec_mod contains subroutine mld_i_sprecseti(p,what,val,info) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sprec_type type(mld_sprec_type), intent(inout) :: p integer, intent(in) :: what @@ -138,7 +138,7 @@ contains end subroutine mld_i_sprecseti subroutine mld_i_sprecsetr(p,what,val,info) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sprec_type type(mld_sprec_type), intent(inout) :: p integer, intent(in) :: what @@ -149,7 +149,7 @@ contains end subroutine mld_i_sprecsetr subroutine mld_i_sprecsetc(p,what,val,info) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_sprec_type type(mld_sprec_type), intent(inout) :: p integer, intent(in) :: what diff --git a/mlprec/mld_s_prec_type.f90 b/mlprec/mld_s_prec_type.f90 index ab5b759b..1d43d729 100644 --- a/mlprec/mld_s_prec_type.f90 +++ b/mlprec/mld_s_prec_type.f90 @@ -277,7 +277,7 @@ module mld_s_prec_type interface mld_precaply subroutine mld_sprecaply(prec,x,y,desc_data,info,trans,work) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ import mld_sprec_type type(psb_desc_type),intent(in) :: desc_data type(mld_sprec_type), intent(in) :: prec @@ -288,7 +288,7 @@ module mld_s_prec_type real(psb_spk_),intent(inout), optional, target :: work(:) end subroutine mld_sprecaply subroutine mld_sprecaply1(prec,x,desc_data,info,trans) - use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ + use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ import mld_sprec_type type(psb_desc_type),intent(in) :: desc_data type(mld_sprec_type), intent(in) :: prec @@ -477,7 +477,7 @@ contains subroutine s_base_onelev_descr(lv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -536,7 +536,7 @@ contains end subroutine s_base_onelev_descr subroutine mld_s_onelev_precfree(p,info) - use psb_sparse_mod + use psb_base_mod implicit none type(mld_sonelev_type), intent(inout) :: p @@ -581,7 +581,7 @@ contains subroutine mld_sprec_free(p,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -621,7 +621,7 @@ contains subroutine s_base_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_s_base_smoother_type), intent(in) :: sm real(psb_spk_),intent(inout) :: x(:) @@ -662,7 +662,7 @@ contains subroutine s_base_smoother_check(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -700,7 +700,7 @@ contains subroutine s_base_smoother_seti(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -733,7 +733,7 @@ contains subroutine s_base_smoother_setc(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -768,7 +768,7 @@ contains subroutine s_base_smoother_setr(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -804,7 +804,7 @@ contains subroutine s_base_smoother_bld(a,desc_a,sm,upd,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -843,7 +843,7 @@ contains subroutine s_base_smoother_free(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -879,7 +879,7 @@ contains subroutine s_base_smoother_descr(sm,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -955,7 +955,7 @@ contains subroutine s_base_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_s_base_solver_type), intent(in) :: sv real(psb_spk_),intent(inout) :: x(:) @@ -989,7 +989,7 @@ contains subroutine s_base_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1024,7 +1024,7 @@ contains subroutine s_base_solver_check(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1054,7 +1054,7 @@ contains subroutine s_base_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1074,7 +1074,7 @@ contains subroutine s_base_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1110,7 +1110,7 @@ contains subroutine s_base_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1131,7 +1131,7 @@ contains subroutine s_base_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1161,7 +1161,7 @@ contains subroutine s_base_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1218,7 +1218,7 @@ contains subroutine mld_s_apply2v(prec,x,y,desc_data,info,trans,work) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type),intent(in) :: desc_data class(mld_sprec_type), intent(in) :: prec real(psb_spk_),intent(inout) :: x(:) @@ -1254,7 +1254,7 @@ contains end subroutine mld_s_apply2v subroutine mld_s_apply1v(prec,x,desc_data,info,trans) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type),intent(in) :: desc_data class(mld_sprec_type), intent(in) :: prec real(psb_spk_),intent(inout) :: x(:) @@ -1289,7 +1289,7 @@ contains subroutine s_base_onelev_check(lv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1335,7 +1335,7 @@ contains subroutine s_base_onelev_default(lv) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1365,7 +1365,7 @@ contains subroutine s_base_onelev_seti(lv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1440,7 +1440,7 @@ contains subroutine s_base_onelev_setc(lv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1476,7 +1476,7 @@ contains subroutine s_base_onelev_setr(lv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1521,7 +1521,7 @@ contains end subroutine s_base_onelev_setr subroutine mld_s_dump(prec,info,istart,iend,prefix,head,ac,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_sprec_type), intent(in) :: prec integer, intent(out) :: info @@ -1555,7 +1555,7 @@ contains subroutine s_base_onelev_dump(lv,level,info,prefix,head,ac,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_sonelev_type), intent(in) :: lv integer, intent(in) :: level @@ -1605,7 +1605,7 @@ contains end subroutine s_base_onelev_dump subroutine s_base_smoother_dmp(sm,ictxt,level,info,prefix,head,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_s_base_smoother_type), intent(in) :: sm integer, intent(in) :: ictxt,level @@ -1646,7 +1646,7 @@ contains end subroutine s_base_smoother_dmp subroutine s_base_solver_dmp(sv,ictxt,level,info,prefix,head,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_s_base_solver_type), intent(in) :: sv integer, intent(in) :: ictxt,level diff --git a/mlprec/mld_s_slu_solver.f90 b/mlprec/mld_s_slu_solver.f90 index 271d7f31..1260f1ca 100644 --- a/mlprec/mld_s_slu_solver.f90 +++ b/mlprec/mld_s_slu_solver.f90 @@ -106,7 +106,7 @@ module mld_s_slu_solver contains subroutine s_slu_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_s_slu_solver_type), intent(in) :: sv real(psb_spk_),intent(inout) :: x(:) @@ -187,7 +187,7 @@ contains subroutine s_slu_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -267,7 +267,7 @@ contains subroutine s_slu_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -302,7 +302,7 @@ contains subroutine s_slu_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -340,7 +340,7 @@ contains subroutine s_slu_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -376,7 +376,7 @@ contains subroutine s_slu_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -409,7 +409,7 @@ contains subroutine s_slu_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -448,7 +448,7 @@ contains end subroutine s_slu_solver_descr function s_slu_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_s_slu_solver_type), intent(in) :: sv diff --git a/mlprec/mld_saggrmap_bld.f90 b/mlprec/mld_saggrmap_bld.f90 index 74a72ff2..ac8e12eb 100644 --- a/mlprec/mld_saggrmap_bld.f90 +++ b/mlprec/mld_saggrmap_bld.f90 @@ -81,7 +81,7 @@ ! subroutine mld_saggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info) - use psb_sparse_mod + use psb_base_mod use mld_s_inner_mod, mld_protect_name => mld_saggrmap_bld implicit none @@ -164,7 +164,7 @@ contains subroutine mld_dec_map_bld(theta,a,desc_a,nlaggr,ilaggr,info) - use psb_sparse_mod + use psb_base_mod use mld_s_inner_mod !, mld_protect_name => mld_daggrmap_bld implicit none diff --git a/mlprec/mld_saggrmat_asb.f90 b/mlprec/mld_saggrmat_asb.f90 index 8802e484..e8ed1f34 100644 --- a/mlprec/mld_saggrmat_asb.f90 +++ b/mlprec/mld_saggrmat_asb.f90 @@ -100,7 +100,7 @@ ! subroutine mld_saggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod + use psb_base_mod use mld_s_inner_mod, mld_protect_name => mld_saggrmat_asb implicit none diff --git a/mlprec/mld_saggrmat_nosmth_asb.F90 b/mlprec/mld_saggrmat_nosmth_asb.F90 index bd839ab3..213946e2 100644 --- a/mlprec/mld_saggrmat_nosmth_asb.F90 +++ b/mlprec/mld_saggrmat_nosmth_asb.F90 @@ -82,7 +82,7 @@ ! Error code. ! subroutine mld_saggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod + use psb_base_mod use mld_s_inner_mod, mld_protect_name => mld_saggrmat_nosmth_asb #ifdef MPI_MOD diff --git a/mlprec/mld_saggrmat_smth_asb.F90 b/mlprec/mld_saggrmat_smth_asb.F90 index d19b4e2d..b8432f68 100644 --- a/mlprec/mld_saggrmat_smth_asb.F90 +++ b/mlprec/mld_saggrmat_smth_asb.F90 @@ -99,7 +99,7 @@ ! Error code. ! subroutine mld_saggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod + use psb_base_mod use mld_s_inner_mod, mld_protect_name => mld_saggrmat_smth_asb #ifdef MPI_MOD diff --git a/mlprec/mld_scoarse_bld.f90 b/mlprec/mld_scoarse_bld.f90 index 9abd7e96..146c6d7e 100644 --- a/mlprec/mld_scoarse_bld.f90 +++ b/mlprec/mld_scoarse_bld.f90 @@ -67,7 +67,7 @@ ! subroutine mld_scoarse_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_s_inner_mod, mld_protect_name => mld_scoarse_bld implicit none diff --git a/mlprec/mld_silu0_fact.f90 b/mlprec/mld_silu0_fact.f90 index 2afd8df5..c5023d57 100644 --- a/mlprec/mld_silu0_fact.f90 +++ b/mlprec/mld_silu0_fact.f90 @@ -101,7 +101,7 @@ ! subroutine mld_silu0_fact(ialg,a,l,u,d,info,blck,upd) - use psb_sparse_mod + use psb_base_mod use mld_s_ilu_fact_mod, mld_protect_name => mld_silu0_fact implicit none @@ -557,7 +557,7 @@ contains subroutine ilu_copyin(i,m,a,jd,jmin,jmax,l1,lja,lval,& & dia,l2,uja,uval,ktrw,trw,upd) - use psb_sparse_mod + use psb_base_mod implicit none diff --git a/mlprec/mld_siluk_fact.f90 b/mlprec/mld_siluk_fact.f90 index 793479f0..ad133e6d 100644 --- a/mlprec/mld_siluk_fact.f90 +++ b/mlprec/mld_siluk_fact.f90 @@ -98,7 +98,7 @@ ! subroutine mld_siluk_fact(fill_in,ialg,a,l,u,d,info,blck) - use psb_sparse_mod + use psb_base_mod use mld_s_ilu_fact_mod, mld_protect_name => mld_siluk_fact implicit none @@ -273,7 +273,7 @@ contains subroutine mld_siluk_factint(fill_in,ialg,a,b,& & d,lval,lja,lirp,uval,uja,uirp,l1,l2,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -491,7 +491,7 @@ contains ! subroutine iluk_copyin(i,m,a,jmin,jmax,row,rowlevs,heap,ktrw,trw,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -648,7 +648,7 @@ contains ! subroutine iluk_fact(fill_in,i,row,rowlevs,heap,d,uja,uirp,uval,uplevs,nidx,idxs,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -824,7 +824,7 @@ contains subroutine iluk_copyout(fill_in,ialg,i,m,row,rowlevs,nidx,idxs,& & l1,l2,lja,lirp,lval,d,uja,uirp,uval,uplevs,info) - use psb_sparse_mod + use psb_base_mod implicit none diff --git a/mlprec/mld_silut_fact.f90 b/mlprec/mld_silut_fact.f90 index 6c7b0e0f..a2f94639 100644 --- a/mlprec/mld_silut_fact.f90 +++ b/mlprec/mld_silut_fact.f90 @@ -94,7 +94,7 @@ ! subroutine mld_silut_fact(fill_in,thres,a,l,u,d,info,blck) - use psb_sparse_mod + use psb_base_mod use mld_s_ilu_fact_mod, mld_protect_name => mld_silut_fact implicit none @@ -272,7 +272,7 @@ contains subroutine mld_silut_factint(fill_in,thres,a,b,& & d,lval,lja,lirp,uval,uja,uirp,l1,l2,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -484,7 +484,7 @@ contains ! every nrb calls to copyin. If A is in CSR format it is unused. ! subroutine ilut_copyin(i,m,a,jd,jmin,jmax,nlw,nup,jmaxup,nrmi,row,heap,ktrw,trw,info) - use psb_sparse_mod + use psb_base_mod implicit none type(psb_sspmat_type), intent(in) :: a type(psb_s_coo_sparse_mat), intent(inout) :: trw @@ -677,7 +677,7 @@ contains ! subroutine ilut_fact(thres,i,nrmi,row,heap,d,uja,uirp,uval,nidx,idxs,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -863,7 +863,7 @@ contains subroutine ilut_copyout(fill_in,thres,i,m,nlw,nup,jmaxup,nrmi,row, & & nidx,idxs,l1,l2,lja,lirp,lval,d,uja,uirp,uval,info) - use psb_sparse_mod + use psb_base_mod implicit none diff --git a/mlprec/mld_smlprec_aply.f90 b/mlprec/mld_smlprec_aply.f90 index 91b13b68..e21c39df 100644 --- a/mlprec/mld_smlprec_aply.f90 +++ b/mlprec/mld_smlprec_aply.f90 @@ -315,7 +315,7 @@ ! subroutine mld_smlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod use mld_s_inner_mod, mld_protect_name => mld_smlprec_aply implicit none diff --git a/mlprec/mld_smlprec_bld.f90 b/mlprec/mld_smlprec_bld.f90 index 3a463a45..74e3bc07 100644 --- a/mlprec/mld_smlprec_bld.f90 +++ b/mlprec/mld_smlprec_bld.f90 @@ -66,7 +66,7 @@ ! subroutine mld_smlprec_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_s_inner_mod, mld_protect_name => mld_smlprec_bld use mld_s_prec_mod diff --git a/mlprec/mld_sprecaply.f90 b/mlprec/mld_sprecaply.f90 index 71daa9d5..02336a08 100644 --- a/mlprec/mld_sprecaply.f90 +++ b/mlprec/mld_sprecaply.f90 @@ -73,7 +73,7 @@ ! subroutine mld_sprecaply(prec,x,y,desc_data,info,trans,work) - use psb_sparse_mod + use psb_base_mod use mld_s_inner_mod, mld_protect_name => mld_sprecaply implicit none @@ -205,7 +205,7 @@ end subroutine mld_sprecaply ! subroutine mld_sprecaply1(prec,x,desc_data,info,trans) - use psb_sparse_mod + use psb_base_mod use mld_s_inner_mod, mld_protect_name => mld_sprecaply1 implicit none diff --git a/mlprec/mld_sprecbld.f90 b/mlprec/mld_sprecbld.f90 index 3c62a3a1..5b4bcc4a 100644 --- a/mlprec/mld_sprecbld.f90 +++ b/mlprec/mld_sprecbld.f90 @@ -60,7 +60,7 @@ ! subroutine mld_sprecbld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_s_inner_mod use mld_s_prec_mod, mld_protect_name => mld_sprecbld diff --git a/mlprec/mld_sprecinit.F90 b/mlprec/mld_sprecinit.F90 index 7a0cead3..f2d9b3cc 100644 --- a/mlprec/mld_sprecinit.F90 +++ b/mlprec/mld_sprecinit.F90 @@ -90,7 +90,7 @@ ! subroutine mld_sprecinit(p,ptype,info,nlev) - use psb_sparse_mod + use psb_base_mod use mld_s_prec_mod, mld_protect_name => mld_sprecinit use mld_s_jac_smoother use mld_s_as_smoother diff --git a/mlprec/mld_sprecset.F90 b/mlprec/mld_sprecset.F90 index 963c0e8d..ed47e470 100644 --- a/mlprec/mld_sprecset.F90 +++ b/mlprec/mld_sprecset.F90 @@ -78,7 +78,7 @@ ! subroutine mld_sprecseti(p,what,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_s_prec_mod, mld_protect_name => mld_sprecseti use mld_s_jac_smoother use mld_s_as_smoother @@ -511,7 +511,7 @@ end subroutine mld_sprecseti subroutine mld_sprecsetsm(p,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_s_prec_mod, mld_protect_name => mld_sprecsetsm implicit none @@ -572,7 +572,7 @@ end subroutine mld_sprecsetsm subroutine mld_sprecsetsv(p,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_s_prec_mod, mld_protect_name => mld_sprecsetsv implicit none @@ -682,7 +682,7 @@ end subroutine mld_sprecsetsv ! subroutine mld_sprecsetc(p,what,string,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_s_prec_mod, mld_protect_name => mld_sprecsetc implicit none @@ -766,7 +766,7 @@ end subroutine mld_sprecsetc ! subroutine mld_sprecsetr(p,what,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_s_prec_mod, mld_protect_name => mld_sprecsetr implicit none diff --git a/mlprec/mld_sslu_bld.f90 b/mlprec/mld_sslu_bld.f90 index ed73abd5..25df97f8 100644 --- a/mlprec/mld_sslu_bld.f90 +++ b/mlprec/mld_sslu_bld.f90 @@ -71,7 +71,7 @@ ! subroutine mld_sslu_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_s_inner_mod, mld_protect_name => mld_sslu_bld implicit none diff --git a/mlprec/mld_sslud_bld.f90 b/mlprec/mld_sslud_bld.f90 index 26f2679e..ff63f5f0 100644 --- a/mlprec/mld_sslud_bld.f90 +++ b/mlprec/mld_sslud_bld.f90 @@ -68,7 +68,7 @@ ! subroutine mld_ssludist_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_s_inner_mod, mld_protect_name => mld_ssludist_bld implicit none diff --git a/mlprec/mld_ssp_renum.f90 b/mlprec/mld_ssp_renum.f90 index 2e2cb8e1..c6c53dca 100644 --- a/mlprec/mld_ssp_renum.f90 +++ b/mlprec/mld_ssp_renum.f90 @@ -83,7 +83,7 @@ ! subroutine mld_ssp_renum(a,blck,p,atmp,info) - use psb_sparse_mod + use psb_base_mod use mld_s_inner_mod, mld_protect_name => mld_ssp_renum implicit none diff --git a/mlprec/mld_sumf_bld.f90 b/mlprec/mld_sumf_bld.f90 index 82c8ee76..50a425c8 100644 --- a/mlprec/mld_sumf_bld.f90 +++ b/mlprec/mld_sumf_bld.f90 @@ -77,7 +77,7 @@ ! subroutine mld_sumf_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_s_inner_mod, mld_protect_name => mld_sumf_bld implicit none diff --git a/mlprec/mld_z_as_smoother.f90 b/mlprec/mld_z_as_smoother.f90 index 5597b471..1dee9315 100644 --- a/mlprec/mld_z_as_smoother.f90 +++ b/mlprec/mld_z_as_smoother.f90 @@ -86,7 +86,7 @@ contains subroutine z_as_smoother_default(sm) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -108,7 +108,7 @@ contains subroutine z_as_smoother_check(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -152,7 +152,7 @@ contains end subroutine z_as_smoother_check subroutine z_as_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_z_as_smoother_type), intent(in) :: sm complex(psb_dpk_),intent(inout) :: x(:) @@ -588,7 +588,7 @@ contains subroutine z_as_smoother_bld(a,desc_a,sm,upd,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -729,7 +729,7 @@ contains subroutine z_as_smoother_seti(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -773,7 +773,7 @@ contains subroutine z_as_smoother_setc(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -811,7 +811,7 @@ contains subroutine z_as_smoother_setr(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -848,7 +848,7 @@ contains subroutine z_as_smoother_free(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -888,7 +888,7 @@ contains subroutine z_as_smoother_descr(sm,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -942,7 +942,7 @@ contains end subroutine z_as_smoother_descr function z_as_smoother_sizeof(sm) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_z_as_smoother_type), intent(in) :: sm @@ -957,7 +957,7 @@ contains end function z_as_smoother_sizeof subroutine z_as_smoother_dmp(sm,ictxt,level,info,prefix,head,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_z_as_smoother_type), intent(in) :: sm integer, intent(in) :: ictxt,level diff --git a/mlprec/mld_z_diag_solver.f90 b/mlprec/mld_z_diag_solver.f90 index 0b5ddaf9..b219493c 100644 --- a/mlprec/mld_z_diag_solver.f90 +++ b/mlprec/mld_z_diag_solver.f90 @@ -70,7 +70,7 @@ module mld_z_diag_solver contains subroutine z_diag_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_z_diag_solver_type), intent(in) :: sv complex(psb_dpk_),intent(inout) :: x(:) @@ -191,7 +191,7 @@ contains subroutine z_diag_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -270,7 +270,7 @@ contains subroutine z_diag_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -309,7 +309,7 @@ contains subroutine z_diag_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -347,7 +347,7 @@ contains subroutine z_diag_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -385,7 +385,7 @@ contains subroutine z_diag_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -421,7 +421,7 @@ contains subroutine z_diag_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -451,7 +451,7 @@ contains end subroutine z_diag_solver_descr function z_diag_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_z_diag_solver_type), intent(in) :: sv diff --git a/mlprec/mld_z_id_solver.f90 b/mlprec/mld_z_id_solver.f90 index 54997439..abf772f8 100644 --- a/mlprec/mld_z_id_solver.f90 +++ b/mlprec/mld_z_id_solver.f90 @@ -69,7 +69,7 @@ module mld_z_id_solver contains subroutine z_id_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_z_id_solver_type), intent(in) :: sv complex(psb_dpk_),intent(inout) :: x(:) @@ -115,7 +115,7 @@ contains subroutine z_id_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -160,7 +160,7 @@ contains subroutine z_id_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -180,7 +180,7 @@ contains subroutine z_id_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -199,7 +199,7 @@ contains subroutine z_id_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -219,7 +219,7 @@ contains subroutine z_id_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -236,7 +236,7 @@ contains subroutine z_id_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -266,7 +266,7 @@ contains end subroutine z_id_solver_descr function z_id_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_z_id_solver_type), intent(in) :: sv diff --git a/mlprec/mld_z_ilu_solver.f90 b/mlprec/mld_z_ilu_solver.f90 index fdbaa5ca..e9c4ddc5 100644 --- a/mlprec/mld_z_ilu_solver.f90 +++ b/mlprec/mld_z_ilu_solver.f90 @@ -86,7 +86,7 @@ contains subroutine z_ilu_solver_default(sv) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -102,7 +102,7 @@ contains subroutine z_ilu_solver_check(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -143,7 +143,7 @@ contains subroutine z_ilu_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_z_ilu_solver_type), intent(in) :: sv complex(psb_dpk_),intent(inout) :: x(:) @@ -247,7 +247,7 @@ contains subroutine z_ilu_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -419,7 +419,7 @@ contains subroutine z_ilu_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -458,7 +458,7 @@ contains subroutine z_ilu_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -496,7 +496,7 @@ contains subroutine z_ilu_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -534,7 +534,7 @@ contains subroutine z_ilu_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -572,7 +572,7 @@ contains subroutine z_ilu_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -619,7 +619,7 @@ contains end subroutine z_ilu_solver_descr function z_ilu_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_z_ilu_solver_type), intent(in) :: sv @@ -635,7 +635,7 @@ contains end function z_ilu_solver_sizeof subroutine z_ilu_solver_dmp(sv,ictxt,level,info,prefix,head,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_z_ilu_solver_type), intent(in) :: sv integer, intent(in) :: ictxt,level diff --git a/mlprec/mld_z_inner_mod.f90 b/mlprec/mld_z_inner_mod.f90 index 69ebcf18..4c4efa94 100644 --- a/mlprec/mld_z_inner_mod.f90 +++ b/mlprec/mld_z_inner_mod.f90 @@ -51,7 +51,7 @@ module mld_z_inner_mod interface mld_mlprec_bld subroutine mld_zmlprec_bld(a,desc_a,prec,info) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + 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 @@ -65,7 +65,7 @@ module mld_z_inner_mod interface mld_mlprec_aply subroutine mld_zmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ use mld_z_prec_type, only : mld_zprec_type type(psb_desc_type),intent(in) :: desc_data type(mld_zprec_type), intent(in) :: p @@ -81,7 +81,7 @@ module mld_z_inner_mod interface mld_coarse_bld subroutine mld_zcoarse_bld(a,desc_a,p,info) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + 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_desc_type), intent(in) :: desc_a @@ -92,7 +92,7 @@ module mld_z_inner_mod interface mld_aggrmap_bld subroutine mld_zaggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ integer, intent(in) :: aggr_type real(psb_dpk_), intent(in) :: theta type(psb_zspmat_type), intent(in) :: a @@ -104,7 +104,7 @@ module mld_z_inner_mod interface mld_aggrmat_asb subroutine mld_zaggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + 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_desc_type), intent(in) :: desc_a @@ -116,7 +116,7 @@ module mld_z_inner_mod interface mld_aggrmat_nosmth_asb subroutine mld_zaggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + 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_desc_type), intent(in) :: desc_a @@ -128,7 +128,7 @@ module mld_z_inner_mod interface mld_aggrmat_smth_asb subroutine mld_zaggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + 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_desc_type), intent(in) :: desc_a diff --git a/mlprec/mld_z_jac_smoother.f90 b/mlprec/mld_z_jac_smoother.f90 index 138394c8..14f2c3e3 100644 --- a/mlprec/mld_z_jac_smoother.f90 +++ b/mlprec/mld_z_jac_smoother.f90 @@ -75,7 +75,7 @@ module mld_z_jac_smoother contains subroutine z_jac_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_z_jac_smoother_type), intent(in) :: sm complex(psb_dpk_),intent(inout) :: x(:) @@ -230,7 +230,7 @@ contains subroutine z_jac_smoother_bld(a,desc_a,sm,upd,info) - use psb_sparse_mod + use psb_base_mod use mld_z_diag_solver Implicit None @@ -303,7 +303,7 @@ contains subroutine z_jac_smoother_seti(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -344,7 +344,7 @@ contains subroutine z_jac_smoother_setc(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -382,7 +382,7 @@ contains subroutine z_jac_smoother_setr(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -419,7 +419,7 @@ contains subroutine z_jac_smoother_free(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -459,7 +459,7 @@ contains subroutine z_jac_smoother_descr(sm,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -510,7 +510,7 @@ contains end subroutine z_jac_smoother_descr function z_jac_smoother_sizeof(sm) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_z_jac_smoother_type), intent(in) :: sm diff --git a/mlprec/mld_z_move_alloc_mod.f90 b/mlprec/mld_z_move_alloc_mod.f90 index 42043fc6..d8c91f14 100644 --- a/mlprec/mld_z_move_alloc_mod.f90 +++ b/mlprec/mld_z_move_alloc_mod.f90 @@ -56,7 +56,7 @@ module mld_z_move_alloc_mod contains subroutine mld_zonelev_prec_move_alloc(a, b,info) - use psb_sparse_mod + use psb_base_mod implicit none type(mld_zonelev_type), intent(inout) :: a, b integer, intent(out) :: info @@ -73,7 +73,7 @@ contains subroutine mld_zprec_move_alloc(a, b,info) - use psb_sparse_mod + use psb_base_mod implicit none type(mld_zprec_type), intent(inout) :: a type(mld_zprec_type), intent(inout), target :: b diff --git a/mlprec/mld_z_prec_mod.f90 b/mlprec/mld_z_prec_mod.f90 index 3ec1ec75..650e1439 100644 --- a/mlprec/mld_z_prec_mod.f90 +++ b/mlprec/mld_z_prec_mod.f90 @@ -50,7 +50,7 @@ module mld_z_prec_mod interface mld_precinit subroutine mld_zprecinit(p,ptype,info,nlev) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ use mld_z_prec_type, only : mld_zprec_type type(mld_zprec_type), intent(inout) :: p character(len=*), intent(in) :: ptype @@ -89,7 +89,7 @@ module mld_z_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_zprecseti subroutine mld_zprecsetr(p,what,val,info,ilev) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ use mld_z_prec_type, only : mld_zprec_type type(mld_zprec_type), intent(inout) :: p integer, intent(in) :: what @@ -98,7 +98,7 @@ module mld_z_prec_mod integer, optional, intent(in) :: ilev end subroutine mld_zprecsetr subroutine mld_zprecsetc(p,what,string,info,ilev) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ use mld_z_prec_type, only : mld_zprec_type type(mld_zprec_type), intent(inout) :: p integer, intent(in) :: what @@ -110,7 +110,7 @@ module mld_z_prec_mod interface mld_precbld subroutine mld_zprecbld(a,desc_a,prec,info) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + 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 @@ -125,7 +125,7 @@ contains subroutine mld_i_zprecseti(p,what,val,info) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ use mld_z_prec_type, only : mld_zprec_type type(mld_zprec_type), intent(inout) :: p integer, intent(in) :: what @@ -136,7 +136,7 @@ contains end subroutine mld_i_zprecseti subroutine mld_i_zprecsetr(p,what,val,info) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ use mld_z_prec_type, only : mld_zprec_type type(mld_zprec_type), intent(inout) :: p integer, intent(in) :: what @@ -147,7 +147,7 @@ contains end subroutine mld_i_zprecsetr subroutine mld_i_zprecsetc(p,what,val,info) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ use mld_z_prec_type, only : mld_zprec_type type(mld_zprec_type), intent(inout) :: p integer, intent(in) :: what diff --git a/mlprec/mld_z_prec_type.f90 b/mlprec/mld_z_prec_type.f90 index 7361a841..a80eaac5 100644 --- a/mlprec/mld_z_prec_type.f90 +++ b/mlprec/mld_z_prec_type.f90 @@ -277,7 +277,7 @@ module mld_z_prec_type interface mld_precaply subroutine mld_zprecaply(prec,x,y,desc_data,info,trans,work) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ import mld_zprec_type type(psb_desc_type),intent(in) :: desc_data type(mld_zprec_type), intent(in) :: prec @@ -288,7 +288,7 @@ module mld_z_prec_type complex(psb_dpk_),intent(inout), optional, target :: work(:) end subroutine mld_zprecaply subroutine mld_zprecaply1(prec,x,desc_data,info,trans) - use psb_sparse_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ + use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_ import mld_zprec_type type(psb_desc_type),intent(in) :: desc_data type(mld_zprec_type), intent(in) :: prec @@ -475,7 +475,7 @@ contains subroutine z_base_onelev_descr(lv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -534,7 +534,7 @@ contains end subroutine z_base_onelev_descr subroutine mld_z_onelev_precfree(p,info) - use psb_sparse_mod + use psb_base_mod implicit none type(mld_zonelev_type), intent(inout) :: p @@ -578,7 +578,7 @@ contains subroutine mld_zprec_free(p,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -618,7 +618,7 @@ contains subroutine z_base_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_z_base_smoother_type), intent(in) :: sm complex(psb_dpk_),intent(inout) :: x(:) @@ -659,7 +659,7 @@ contains subroutine z_base_smoother_check(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -697,7 +697,7 @@ contains subroutine z_base_smoother_seti(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -730,7 +730,7 @@ contains subroutine z_base_smoother_setc(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -765,7 +765,7 @@ contains subroutine z_base_smoother_setr(sm,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -801,7 +801,7 @@ contains subroutine z_base_smoother_bld(a,desc_a,sm,upd,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -840,7 +840,7 @@ contains subroutine z_base_smoother_free(sm,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -876,7 +876,7 @@ contains subroutine z_base_smoother_descr(sm,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -950,7 +950,7 @@ contains subroutine z_base_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_z_base_solver_type), intent(in) :: sv complex(psb_dpk_),intent(inout) :: x(:) @@ -984,7 +984,7 @@ contains subroutine z_base_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1019,7 +1019,7 @@ contains subroutine z_base_solver_check(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1049,7 +1049,7 @@ contains subroutine z_base_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1069,7 +1069,7 @@ contains subroutine z_base_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1105,7 +1105,7 @@ contains subroutine z_base_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1126,7 +1126,7 @@ contains subroutine z_base_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1156,7 +1156,7 @@ contains subroutine z_base_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1213,7 +1213,7 @@ contains subroutine mld_z_apply2v(prec,x,y,desc_data,info,trans,work) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type),intent(in) :: desc_data class(mld_zprec_type), intent(in) :: prec complex(psb_dpk_),intent(inout) :: x(:) @@ -1249,7 +1249,7 @@ contains end subroutine mld_z_apply2v subroutine mld_z_apply1v(prec,x,desc_data,info,trans) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type),intent(in) :: desc_data class(mld_zprec_type), intent(in) :: prec complex(psb_dpk_),intent(inout) :: x(:) @@ -1284,7 +1284,7 @@ contains subroutine z_base_onelev_check(lv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1330,7 +1330,7 @@ contains subroutine z_base_onelev_default(lv) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1359,7 +1359,7 @@ contains subroutine z_base_onelev_seti(lv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1434,7 +1434,7 @@ contains subroutine z_base_onelev_setc(lv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1470,7 +1470,7 @@ contains subroutine z_base_onelev_setr(lv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -1515,7 +1515,7 @@ contains end subroutine z_base_onelev_setr subroutine mld_z_dump(prec,info,istart,iend,prefix,head,ac,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_zprec_type), intent(in) :: prec integer, intent(out) :: info @@ -1549,7 +1549,7 @@ contains subroutine z_base_onelev_dump(lv,level,info,prefix,head,ac,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_zonelev_type), intent(in) :: lv integer, intent(in) :: level @@ -1599,7 +1599,7 @@ contains end subroutine z_base_onelev_dump subroutine z_base_smoother_dmp(sm,ictxt,level,info,prefix,head,smoother,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_z_base_smoother_type), intent(in) :: sm integer, intent(in) :: ictxt,level @@ -1640,7 +1640,7 @@ contains end subroutine z_base_smoother_dmp subroutine z_base_solver_dmp(sv,ictxt,level,info,prefix,head,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_z_base_solver_type), intent(in) :: sv integer, intent(in) :: ictxt,level diff --git a/mlprec/mld_z_slu_solver.f90 b/mlprec/mld_z_slu_solver.f90 index d49e4999..28ea543e 100644 --- a/mlprec/mld_z_slu_solver.f90 +++ b/mlprec/mld_z_slu_solver.f90 @@ -106,7 +106,7 @@ module mld_z_slu_solver contains subroutine z_slu_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_z_slu_solver_type), intent(in) :: sv complex(psb_dpk_),intent(inout) :: x(:) @@ -189,7 +189,7 @@ contains subroutine z_slu_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -269,7 +269,7 @@ contains subroutine z_slu_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -304,7 +304,7 @@ contains subroutine z_slu_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -342,7 +342,7 @@ contains subroutine z_slu_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -378,7 +378,7 @@ contains subroutine z_slu_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -411,7 +411,7 @@ contains subroutine z_slu_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -450,7 +450,7 @@ contains end subroutine z_slu_solver_descr function z_slu_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_z_slu_solver_type), intent(in) :: sv diff --git a/mlprec/mld_z_umf_solver.f90 b/mlprec/mld_z_umf_solver.f90 index fef1a6f9..01986790 100644 --- a/mlprec/mld_z_umf_solver.f90 +++ b/mlprec/mld_z_umf_solver.f90 @@ -106,7 +106,7 @@ module mld_z_umf_solver contains subroutine z_umf_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_z_umf_solver_type), intent(in) :: sv complex(psb_dpk_),intent(inout) :: x(:) @@ -189,7 +189,7 @@ contains subroutine z_umf_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -270,7 +270,7 @@ contains subroutine z_umf_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -305,7 +305,7 @@ contains subroutine z_umf_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -343,7 +343,7 @@ contains subroutine z_umf_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -379,7 +379,7 @@ contains subroutine z_umf_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -414,7 +414,7 @@ contains subroutine z_umf_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -453,7 +453,7 @@ contains end subroutine z_umf_solver_descr function z_umf_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_z_umf_solver_type), intent(in) :: sv diff --git a/mlprec/mld_zaggrmap_bld.f90 b/mlprec/mld_zaggrmap_bld.f90 index 19fcc6e3..8dbf1c50 100644 --- a/mlprec/mld_zaggrmap_bld.f90 +++ b/mlprec/mld_zaggrmap_bld.f90 @@ -81,7 +81,7 @@ ! subroutine mld_zaggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zaggrmap_bld implicit none @@ -164,7 +164,7 @@ contains subroutine mld_dec_map_bld(theta,a,desc_a,nlaggr,ilaggr,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod !, mld_protect_name => mld_daggrmap_bld implicit none diff --git a/mlprec/mld_zaggrmat_asb.f90 b/mlprec/mld_zaggrmat_asb.f90 index f273b40a..9e86dc60 100644 --- a/mlprec/mld_zaggrmat_asb.f90 +++ b/mlprec/mld_zaggrmat_asb.f90 @@ -100,7 +100,7 @@ ! subroutine mld_zaggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zaggrmat_asb implicit none diff --git a/mlprec/mld_zaggrmat_nosmth_asb.F90 b/mlprec/mld_zaggrmat_nosmth_asb.F90 index b26f9723..d03f23bc 100644 --- a/mlprec/mld_zaggrmat_nosmth_asb.F90 +++ b/mlprec/mld_zaggrmat_nosmth_asb.F90 @@ -82,7 +82,7 @@ ! Error code. ! subroutine mld_zaggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zaggrmat_nosmth_asb #ifdef MPI_MOD diff --git a/mlprec/mld_zaggrmat_smth_asb.F90 b/mlprec/mld_zaggrmat_smth_asb.F90 index 848711d9..4e9d1fc8 100644 --- a/mlprec/mld_zaggrmat_smth_asb.F90 +++ b/mlprec/mld_zaggrmat_smth_asb.F90 @@ -99,7 +99,7 @@ ! Error code. ! subroutine mld_zaggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zaggrmat_smth_asb #ifdef MPI_MOD diff --git a/mlprec/mld_zas_aply.f90 b/mlprec/mld_zas_aply.f90 index b578b44c..a9c9250d 100644 --- a/mlprec/mld_zas_aply.f90 +++ b/mlprec/mld_zas_aply.f90 @@ -76,7 +76,7 @@ ! subroutine mld_zas_aply(alpha,prec,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zas_aply implicit none diff --git a/mlprec/mld_zas_bld.f90 b/mlprec/mld_zas_bld.f90 index d26c2575..c7e9056f 100644 --- a/mlprec/mld_zas_bld.f90 +++ b/mlprec/mld_zas_bld.f90 @@ -68,7 +68,7 @@ ! subroutine mld_zas_bld(a,desc_a,p,upd,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zas_bld Implicit None diff --git a/mlprec/mld_zbaseprec_aply.f90 b/mlprec/mld_zbaseprec_aply.f90 index 42030411..0597f8fd 100644 --- a/mlprec/mld_zbaseprec_aply.f90 +++ b/mlprec/mld_zbaseprec_aply.f90 @@ -80,7 +80,7 @@ ! subroutine mld_zbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zbaseprec_aply implicit none diff --git a/mlprec/mld_zbaseprec_bld.f90 b/mlprec/mld_zbaseprec_bld.f90 index 6c0e3495..cab11b8a 100644 --- a/mlprec/mld_zbaseprec_bld.f90 +++ b/mlprec/mld_zbaseprec_bld.f90 @@ -70,7 +70,7 @@ ! subroutine mld_zbaseprec_bld(a,desc_a,p,info,upd) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zbaseprec_bld Implicit None diff --git a/mlprec/mld_zcoarse_bld.f90 b/mlprec/mld_zcoarse_bld.f90 index 8163bebd..97139e53 100644 --- a/mlprec/mld_zcoarse_bld.f90 +++ b/mlprec/mld_zcoarse_bld.f90 @@ -67,7 +67,7 @@ ! subroutine mld_zcoarse_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zcoarse_bld implicit none diff --git a/mlprec/mld_zdiag_bld.f90 b/mlprec/mld_zdiag_bld.f90 index 0daee80f..5f501aac 100644 --- a/mlprec/mld_zdiag_bld.f90 +++ b/mlprec/mld_zdiag_bld.f90 @@ -59,7 +59,7 @@ ! subroutine mld_zdiag_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zdiag_bld Implicit None diff --git a/mlprec/mld_zfact_bld.f90 b/mlprec/mld_zfact_bld.f90 index 128c84a0..14846f1a 100644 --- a/mlprec/mld_zfact_bld.f90 +++ b/mlprec/mld_zfact_bld.f90 @@ -111,7 +111,7 @@ ! subroutine mld_zfact_bld(a,p,upd,info,blck) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zfact_bld implicit none diff --git a/mlprec/mld_zilu0_fact.f90 b/mlprec/mld_zilu0_fact.f90 index 0600cca6..53d61ae3 100644 --- a/mlprec/mld_zilu0_fact.f90 +++ b/mlprec/mld_zilu0_fact.f90 @@ -101,7 +101,7 @@ ! subroutine mld_zilu0_fact(ialg,a,l,u,d,info,blck,upd) - use psb_sparse_mod + use psb_base_mod use mld_z_ilu_fact_mod, mld_protect_name => mld_zilu0_fact implicit none @@ -557,7 +557,7 @@ contains subroutine ilu_copyin(i,m,a,jd,jmin,jmax,l1,lja,lval,& & dia,l2,uja,uval,ktrw,trw,upd) - use psb_sparse_mod + use psb_base_mod implicit none diff --git a/mlprec/mld_zilu_bld.f90 b/mlprec/mld_zilu_bld.f90 index 112c6978..b570e863 100644 --- a/mlprec/mld_zilu_bld.f90 +++ b/mlprec/mld_zilu_bld.f90 @@ -91,7 +91,7 @@ ! subroutine mld_zilu_bld(a,p,upd,info,blck) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zilu_bld implicit none diff --git a/mlprec/mld_ziluk_fact.f90 b/mlprec/mld_ziluk_fact.f90 index 36c454e0..abefb4f6 100644 --- a/mlprec/mld_ziluk_fact.f90 +++ b/mlprec/mld_ziluk_fact.f90 @@ -98,7 +98,7 @@ ! subroutine mld_ziluk_fact(fill_in,ialg,a,l,u,d,info,blck) - use psb_sparse_mod + use psb_base_mod use mld_z_ilu_fact_mod, mld_protect_name => mld_ziluk_fact implicit none @@ -273,7 +273,7 @@ contains subroutine mld_ziluk_factint(fill_in,ialg,a,b,& & d,lval,lja,lirp,uval,uja,uirp,l1,l2,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -491,7 +491,7 @@ contains ! subroutine iluk_copyin(i,m,a,jmin,jmax,row,rowlevs,heap,ktrw,trw,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -648,7 +648,7 @@ contains ! subroutine iluk_fact(fill_in,i,row,rowlevs,heap,d,uja,uirp,uval,uplevs,nidx,idxs,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -823,7 +823,7 @@ contains subroutine iluk_copyout(fill_in,ialg,i,m,row,rowlevs,nidx,idxs,& & l1,l2,lja,lirp,lval,d,uja,uirp,uval,uplevs,info) - use psb_sparse_mod + use psb_base_mod implicit none diff --git a/mlprec/mld_zilut_fact.f90 b/mlprec/mld_zilut_fact.f90 index 24ef8cd7..d012c2cd 100644 --- a/mlprec/mld_zilut_fact.f90 +++ b/mlprec/mld_zilut_fact.f90 @@ -94,7 +94,7 @@ ! subroutine mld_zilut_fact(fill_in,thres,a,l,u,d,info,blck) - use psb_sparse_mod + use psb_base_mod use mld_z_ilu_fact_mod, mld_protect_name => mld_zilut_fact implicit none @@ -273,7 +273,7 @@ contains subroutine mld_zilut_factint(fill_in,thres,a,b,& & d,lval,lja,lirp,uval,uja,uirp,l1,l2,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -485,7 +485,7 @@ contains ! every nrb calls to copyin. If A is in CSR format it is unused. ! subroutine ilut_copyin(i,m,a,jd,jmin,jmax,nlw,nup,jmaxup,nrmi,row,heap,ktrw,trw,info) - use psb_sparse_mod + use psb_base_mod implicit none type(psb_zspmat_type), intent(in) :: a type(psb_z_coo_sparse_mat), intent(inout) :: trw @@ -679,7 +679,7 @@ contains ! subroutine ilut_fact(thres,i,nrmi,row,heap,d,uja,uirp,uval,nidx,idxs,info) - use psb_sparse_mod + use psb_base_mod implicit none @@ -865,7 +865,7 @@ contains subroutine ilut_copyout(fill_in,thres,i,m,nlw,nup,jmaxup,nrmi,row, & & nidx,idxs,l1,l2,lja,lirp,lval,d,uja,uirp,uval,info) - use psb_sparse_mod + use psb_base_mod implicit none diff --git a/mlprec/mld_zmlprec_aply.f90 b/mlprec/mld_zmlprec_aply.f90 index 145d1715..74549a89 100644 --- a/mlprec/mld_zmlprec_aply.f90 +++ b/mlprec/mld_zmlprec_aply.f90 @@ -314,7 +314,7 @@ ! subroutine mld_zmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zmlprec_aply implicit none diff --git a/mlprec/mld_zmlprec_bld.f90 b/mlprec/mld_zmlprec_bld.f90 index 29b32f10..741208cd 100644 --- a/mlprec/mld_zmlprec_bld.f90 +++ b/mlprec/mld_zmlprec_bld.f90 @@ -66,7 +66,7 @@ ! subroutine mld_zmlprec_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zmlprec_bld use mld_z_prec_mod diff --git a/mlprec/mld_zprecaply.f90 b/mlprec/mld_zprecaply.f90 index 54db0685..9411f306 100644 --- a/mlprec/mld_zprecaply.f90 +++ b/mlprec/mld_zprecaply.f90 @@ -73,7 +73,7 @@ ! subroutine mld_zprecaply(prec,x,y,desc_data,info,trans,work) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zprecaply implicit none @@ -206,7 +206,7 @@ end subroutine mld_zprecaply ! subroutine mld_zprecaply1(prec,x,desc_data,info,trans) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zprecaply1 implicit none diff --git a/mlprec/mld_zprecbld.f90 b/mlprec/mld_zprecbld.f90 index f60830b1..6c0e36f7 100644 --- a/mlprec/mld_zprecbld.f90 +++ b/mlprec/mld_zprecbld.f90 @@ -60,7 +60,7 @@ ! subroutine mld_zprecbld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod use mld_z_prec_mod, mld_protect_name => mld_zprecbld diff --git a/mlprec/mld_zprecinit.F90 b/mlprec/mld_zprecinit.F90 index 86b71480..fe153a97 100644 --- a/mlprec/mld_zprecinit.F90 +++ b/mlprec/mld_zprecinit.F90 @@ -90,7 +90,7 @@ ! subroutine mld_zprecinit(p,ptype,info,nlev) - use psb_sparse_mod + use psb_base_mod use mld_z_prec_mod, mld_protect_name => mld_zprecinit use mld_z_jac_smoother use mld_z_as_smoother diff --git a/mlprec/mld_zprecset.F90 b/mlprec/mld_zprecset.F90 index 8386079c..37fbb271 100644 --- a/mlprec/mld_zprecset.F90 +++ b/mlprec/mld_zprecset.F90 @@ -79,7 +79,7 @@ ! subroutine mld_zprecseti(p,what,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_z_prec_mod, mld_protect_name => mld_zprecseti use mld_z_jac_smoother use mld_z_as_smoother @@ -534,7 +534,7 @@ end subroutine mld_zprecseti subroutine mld_zprecsetsm(p,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_z_prec_mod, mld_protect_name => mld_zprecsetsm implicit none @@ -595,7 +595,7 @@ end subroutine mld_zprecsetsm subroutine mld_zprecsetsv(p,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_z_prec_mod, mld_protect_name => mld_zprecsetsv implicit none @@ -705,7 +705,7 @@ end subroutine mld_zprecsetsv ! subroutine mld_zprecsetc(p,what,string,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_z_prec_mod, mld_protect_name => mld_zprecsetc implicit none @@ -790,7 +790,7 @@ end subroutine mld_zprecsetc ! subroutine mld_zprecsetr(p,what,val,info,ilev) - use psb_sparse_mod + use psb_base_mod use mld_z_prec_mod, mld_protect_name => mld_zprecsetr implicit none diff --git a/mlprec/mld_zslu_bld.f90 b/mlprec/mld_zslu_bld.f90 index c9c11e32..1c95aa08 100644 --- a/mlprec/mld_zslu_bld.f90 +++ b/mlprec/mld_zslu_bld.f90 @@ -71,7 +71,7 @@ ! subroutine mld_zslu_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zslu_bld implicit none diff --git a/mlprec/mld_zslud_bld.f90 b/mlprec/mld_zslud_bld.f90 index c2957a4e..8d318e85 100644 --- a/mlprec/mld_zslud_bld.f90 +++ b/mlprec/mld_zslud_bld.f90 @@ -68,7 +68,7 @@ ! subroutine mld_zsludist_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zsludist_bld implicit none diff --git a/mlprec/mld_zsp_renum.f90 b/mlprec/mld_zsp_renum.f90 index 4bdd0751..662f38aa 100644 --- a/mlprec/mld_zsp_renum.f90 +++ b/mlprec/mld_zsp_renum.f90 @@ -83,7 +83,7 @@ ! subroutine mld_zsp_renum(a,blck,p,atmp,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zsp_renum implicit none diff --git a/mlprec/mld_zumf_bld.f90 b/mlprec/mld_zumf_bld.f90 index 6fb6d5d9..fd3cb8e4 100644 --- a/mlprec/mld_zumf_bld.f90 +++ b/mlprec/mld_zumf_bld.f90 @@ -77,7 +77,7 @@ ! subroutine mld_zumf_bld(a,desc_a,p,info) - use psb_sparse_mod + use psb_base_mod use mld_z_inner_mod, mld_protect_name => mld_zumf_bld implicit none diff --git a/tests/fileread/cf_sample.f90 b/tests/fileread/cf_sample.f90 index a1307e51..79222c59 100644 --- a/tests/fileread/cf_sample.f90 +++ b/tests/fileread/cf_sample.f90 @@ -37,7 +37,7 @@ !!$ !!$ program cf_sample - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -378,7 +378,7 @@ contains subroutine get_parms(icontxt,mtrx,rhs,filefmt,kmethd,& & prec, ipart,afmt,istopc,itmax,itrace,irst,eps) - use psb_sparse_mod + use psb_base_mod implicit none integer :: icontxt diff --git a/tests/fileread/data_input.f90 b/tests/fileread/data_input.f90 index ef3322d7..f5853734 100644 --- a/tests/fileread/data_input.f90 +++ b/tests/fileread/data_input.f90 @@ -73,7 +73,7 @@ contains end subroutine read_int subroutine read_single(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_spk_), intent(out) :: val integer, intent(in) :: file character(len=1), optional, intent(in) :: marker @@ -83,7 +83,7 @@ contains end subroutine read_single subroutine read_double(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_dpk_), intent(out) :: val integer, intent(in) :: file character(len=1), optional, intent(in) :: marker @@ -131,7 +131,7 @@ contains read(charbuf(1:idx-1),*) val end subroutine string_read_int subroutine string_read_single(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_spk_), intent(out) :: val character(len=*), intent(in) :: file character(len=1), optional, intent(in) :: marker @@ -150,7 +150,7 @@ contains read(charbuf(1:idx-1),*) val end subroutine string_read_single subroutine string_read_double(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_dpk_), intent(out) :: val character(len=*), intent(in) :: file character(len=1), optional, intent(in) :: marker diff --git a/tests/fileread/df_sample.f90 b/tests/fileread/df_sample.f90 index 004f7945..32d9c472 100644 --- a/tests/fileread/df_sample.f90 +++ b/tests/fileread/df_sample.f90 @@ -37,7 +37,7 @@ !!$ !!$ program df_sample - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -378,7 +378,7 @@ contains subroutine get_parms(icontxt,mtrx,rhs,filefmt,kmethd,& & prec, ipart,afmt,istopc,itmax,itrace,irst,eps) - use psb_sparse_mod + use psb_base_mod implicit none integer :: icontxt diff --git a/tests/fileread/sf_sample.f90 b/tests/fileread/sf_sample.f90 index 67041ce5..f9b6eefc 100644 --- a/tests/fileread/sf_sample.f90 +++ b/tests/fileread/sf_sample.f90 @@ -37,7 +37,7 @@ !!$ !!$ program sf_sample - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -378,7 +378,7 @@ contains subroutine get_parms(icontxt,mtrx,rhs,filefmt,kmethd,& & prec, ipart,afmt,istopc,itmax,itrace,irst,eps) - use psb_sparse_mod + use psb_base_mod implicit none integer :: icontxt diff --git a/tests/fileread/zf_sample.f90 b/tests/fileread/zf_sample.f90 index 56a1caae..904f6682 100644 --- a/tests/fileread/zf_sample.f90 +++ b/tests/fileread/zf_sample.f90 @@ -37,7 +37,7 @@ !!$ !!$ program zf_sample - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -379,7 +379,7 @@ contains subroutine get_parms(icontxt,mtrx,rhs,filefmt,kmethd,& & prec, ipart,afmt,istopc,itmax,itrace,irst,eps) - use psb_sparse_mod + use psb_base_mod implicit none integer :: icontxt diff --git a/tests/newslv/data_input.f90 b/tests/newslv/data_input.f90 index ef3322d7..f5853734 100644 --- a/tests/newslv/data_input.f90 +++ b/tests/newslv/data_input.f90 @@ -73,7 +73,7 @@ contains end subroutine read_int subroutine read_single(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_spk_), intent(out) :: val integer, intent(in) :: file character(len=1), optional, intent(in) :: marker @@ -83,7 +83,7 @@ contains end subroutine read_single subroutine read_double(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_dpk_), intent(out) :: val integer, intent(in) :: file character(len=1), optional, intent(in) :: marker @@ -131,7 +131,7 @@ contains read(charbuf(1:idx-1),*) val end subroutine string_read_int subroutine string_read_single(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_spk_), intent(out) :: val character(len=*), intent(in) :: file character(len=1), optional, intent(in) :: marker @@ -150,7 +150,7 @@ contains read(charbuf(1:idx-1),*) val end subroutine string_read_single subroutine string_read_double(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_dpk_), intent(out) :: val character(len=*), intent(in) :: file character(len=1), optional, intent(in) :: marker diff --git a/tests/newslv/mld_d_tlu_solver.f90 b/tests/newslv/mld_d_tlu_solver.f90 index 88e429fa..4d1f97b2 100644 --- a/tests/newslv/mld_d_tlu_solver.f90 +++ b/tests/newslv/mld_d_tlu_solver.f90 @@ -75,7 +75,7 @@ module mld_d_tlu_solver interface mld_ilu0_fact subroutine mld_dilu0_fact(ialg,a,l,u,d,info,blck,upd) - use psb_sparse_mod, only : psb_dspmat_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_dpk_ integer, intent(in) :: ialg integer, intent(out) :: info type(psb_dspmat_type),intent(in) :: a @@ -88,7 +88,7 @@ module mld_d_tlu_solver interface mld_iluk_fact subroutine mld_diluk_fact(fill_in,ialg,a,l,u,d,info,blck) - use psb_sparse_mod, only : psb_dspmat_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_dpk_ integer, intent(in) :: fill_in,ialg integer, intent(out) :: info type(psb_dspmat_type),intent(in) :: a @@ -100,7 +100,7 @@ module mld_d_tlu_solver interface mld_ilut_fact subroutine mld_dilut_fact(fill_in,thres,a,l,u,d,info,blck) - use psb_sparse_mod, only : psb_dspmat_type, psb_dpk_ + use psb_base_mod, only : psb_dspmat_type, psb_dpk_ integer, intent(in) :: fill_in real(psb_dpk_), intent(in) :: thres integer, intent(out) :: info @@ -124,7 +124,7 @@ contains subroutine d_tlu_solver_default(sv) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -140,7 +140,7 @@ contains subroutine d_tlu_solver_check(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -181,7 +181,7 @@ contains subroutine d_tlu_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) - use psb_sparse_mod + use psb_base_mod type(psb_desc_type), intent(in) :: desc_data class(mld_d_tlu_solver_type), intent(in) :: sv real(psb_dpk_),intent(in) :: x(:) @@ -287,7 +287,7 @@ contains subroutine d_tlu_solver_bld(a,desc_a,sv,upd,info,b) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -459,7 +459,7 @@ contains subroutine d_tlu_solver_seti(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -498,7 +498,7 @@ contains subroutine d_tlu_solver_setc(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -536,7 +536,7 @@ contains subroutine d_tlu_solver_setr(sv,what,val,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -574,7 +574,7 @@ contains subroutine d_tlu_solver_free(sv,info) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -612,7 +612,7 @@ contains subroutine d_tlu_solver_descr(sv,info,iout,coarse) - use psb_sparse_mod + use psb_base_mod Implicit None @@ -660,7 +660,7 @@ contains end subroutine d_tlu_solver_descr function d_tlu_solver_sizeof(sv) result(val) - use psb_sparse_mod + use psb_base_mod implicit none ! Arguments class(mld_d_tlu_solver_type), intent(in) :: sv @@ -676,7 +676,7 @@ contains end function d_tlu_solver_sizeof subroutine d_tlu_solver_dmp(sv,ictxt,level,info,prefix,head,solver) - use psb_sparse_mod + use psb_base_mod implicit none class(mld_d_tlu_solver_type), intent(in) :: sv integer, intent(in) :: ictxt,level diff --git a/tests/newslv/ppde.f90 b/tests/newslv/ppde.f90 index 4e51f32e..c94e1dfe 100644 --- a/tests/newslv/ppde.f90 +++ b/tests/newslv/ppde.f90 @@ -69,7 +69,7 @@ ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! program ppde - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -429,7 +429,7 @@ contains ! ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! - use psb_sparse_mod + use psb_base_mod implicit none integer :: idim integer, parameter :: nb=20 @@ -706,43 +706,43 @@ end program ppde ! functions parametrizing the differential equation ! function a1(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a1 real(psb_dpk_) :: x,y,z a1=1.d0 end function a1 function a2(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a2 real(psb_dpk_) :: x,y,z a2=2.d1*y end function a2 function a3(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a3 real(psb_dpk_) :: x,y,z a3=1.d0 end function a3 function a4(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a4 real(psb_dpk_) :: x,y,z a4=1.d0 end function a4 function b1(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: b1 real(psb_dpk_) :: x,y,z b1=1.d0 end function b1 function b2(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: b2 real(psb_dpk_) :: x,y,z b2=1.d0 end function b2 function b3(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: b3 real(psb_dpk_) :: x,y,z b3=1.d0 diff --git a/tests/newslv/spde.f90 b/tests/newslv/spde.f90 index 340ebe95..29f44b5a 100644 --- a/tests/newslv/spde.f90 +++ b/tests/newslv/spde.f90 @@ -69,7 +69,7 @@ ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! program spde - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -423,7 +423,7 @@ contains ! ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! - use psb_sparse_mod + use psb_base_mod implicit none integer :: idim integer, parameter :: nb=20 @@ -700,43 +700,43 @@ end program spde ! functions parametrizing the differential equation ! function a1(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a1 real(psb_spk_) :: x,y,z a1=1.e0 end function a1 function a2(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a2 real(psb_spk_) :: x,y,z a2=2.e1*y end function a2 function a3(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a3 real(psb_spk_) :: x,y,z a3=1.e0 end function a3 function a4(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a4 real(psb_spk_) :: x,y,z a4=1.e0 end function a4 function b1(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: b1 real(psb_spk_) :: x,y,z b1=1.e0 end function b1 function b2(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: b2 real(psb_spk_) :: x,y,z b2=1.e0 end function b2 function b3(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: b3 real(psb_spk_) :: x,y,z b3=1.e0 diff --git a/tests/pdegen/data_input.f90 b/tests/pdegen/data_input.f90 index ef3322d7..f5853734 100644 --- a/tests/pdegen/data_input.f90 +++ b/tests/pdegen/data_input.f90 @@ -73,7 +73,7 @@ contains end subroutine read_int subroutine read_single(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_spk_), intent(out) :: val integer, intent(in) :: file character(len=1), optional, intent(in) :: marker @@ -83,7 +83,7 @@ contains end subroutine read_single subroutine read_double(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_dpk_), intent(out) :: val integer, intent(in) :: file character(len=1), optional, intent(in) :: marker @@ -131,7 +131,7 @@ contains read(charbuf(1:idx-1),*) val end subroutine string_read_int subroutine string_read_single(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_spk_), intent(out) :: val character(len=*), intent(in) :: file character(len=1), optional, intent(in) :: marker @@ -150,7 +150,7 @@ contains read(charbuf(1:idx-1),*) val end subroutine string_read_single subroutine string_read_double(val,file,marker) - use psb_sparse_mod + use psb_base_mod real(psb_dpk_), intent(out) :: val character(len=*), intent(in) :: file character(len=1), optional, intent(in) :: marker diff --git a/tests/pdegen/ppde.f90 b/tests/pdegen/ppde.f90 index 6bef1aa7..6ca3c13f 100644 --- a/tests/pdegen/ppde.f90 +++ b/tests/pdegen/ppde.f90 @@ -69,7 +69,7 @@ ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! program ppde - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -426,7 +426,7 @@ contains ! ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! - use psb_sparse_mod + use psb_base_mod implicit none integer :: idim integer, parameter :: nb=20 @@ -703,43 +703,43 @@ end program ppde ! functions parametrizing the differential equation ! function a1(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a1 real(psb_dpk_) :: x,y,z a1=1.d0 end function a1 function a2(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a2 real(psb_dpk_) :: x,y,z a2=2.d1*y end function a2 function a3(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a3 real(psb_dpk_) :: x,y,z a3=1.d0 end function a3 function a4(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: a4 real(psb_dpk_) :: x,y,z a4=1.d0 end function a4 function b1(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: b1 real(psb_dpk_) :: x,y,z b1=1.d0 end function b1 function b2(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: b2 real(psb_dpk_) :: x,y,z b2=1.d0 end function b2 function b3(x,y,z) - use psb_sparse_mod, only : psb_dpk_ + use psb_base_mod, only : psb_dpk_ real(psb_dpk_) :: b3 real(psb_dpk_) :: x,y,z b3=1.d0 diff --git a/tests/pdegen/runs/ppde.inp b/tests/pdegen/runs/ppde.inp index dc102ec6..0372e40d 100644 --- a/tests/pdegen/runs/ppde.inp +++ b/tests/pdegen/runs/ppde.inp @@ -2,7 +2,7 @@ BICGSTAB ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTA CSR ! Storage format CSR COO JAD 040 ! IDIM; domain size is idim**3 2 ! ISTOPC -0002 ! ITMAX +0200 ! ITMAX 01 ! ITRACE 30 ! IRST (restart for RGMRES and BiCGSTABL) 1.d-6 ! EPS diff --git a/tests/pdegen/spde.f90 b/tests/pdegen/spde.f90 index 340ebe95..29f44b5a 100644 --- a/tests/pdegen/spde.f90 +++ b/tests/pdegen/spde.f90 @@ -69,7 +69,7 @@ ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! program spde - use psb_sparse_mod + use psb_base_mod use mld_prec_mod use psb_krylov_mod use psb_util_mod @@ -423,7 +423,7 @@ contains ! ! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation. ! - use psb_sparse_mod + use psb_base_mod implicit none integer :: idim integer, parameter :: nb=20 @@ -700,43 +700,43 @@ end program spde ! functions parametrizing the differential equation ! function a1(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a1 real(psb_spk_) :: x,y,z a1=1.e0 end function a1 function a2(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a2 real(psb_spk_) :: x,y,z a2=2.e1*y end function a2 function a3(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a3 real(psb_spk_) :: x,y,z a3=1.e0 end function a3 function a4(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: a4 real(psb_spk_) :: x,y,z a4=1.e0 end function a4 function b1(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: b1 real(psb_spk_) :: x,y,z b1=1.e0 end function b1 function b2(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: b2 real(psb_spk_) :: x,y,z b2=1.e0 end function b2 function b3(x,y,z) - use psb_sparse_mod, only : psb_spk_ + use psb_base_mod, only : psb_spk_ real(psb_spk_) :: b3 real(psb_spk_) :: x,y,z b3=1.e0