From 06249c361f582a58fafeec2c07e3784fa8384db7 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 17 Feb 2012 20:44:43 +0000 Subject: [PATCH] psblas3: test/pargen/ppde3d.f90 test/pargen/spde3d.f90 util/psb_d_genpde_impl.f90 util/psb_d_genpde_mod.f90 util/psb_s_genpde_impl.f90 util/psb_s_genpde_mod.f90 Fixed name of gen_pde2|3d --- test/pargen/ppde3d.f90 | 4 ++-- test/pargen/spde3d.f90 | 4 ++-- util/psb_d_genpde_impl.f90 | 12 ++++++------ util/psb_d_genpde_mod.f90 | 12 ++++++------ util/psb_s_genpde_impl.f90 | 12 ++++++------ util/psb_s_genpde_mod.f90 | 12 ++++++------ 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/test/pargen/ppde3d.f90 b/test/pargen/ppde3d.f90 index b710c527..3c4a772c 100644 --- a/test/pargen/ppde3d.f90 +++ b/test/pargen/ppde3d.f90 @@ -122,13 +122,13 @@ program ppde3d ! call psb_barrier(ictxt) t1 = psb_wtime() - call psb_gen_prob3d(ictxt,idim,a,bv,xxv,desc_a,afmt,& + call psb_gen_pde3d(ictxt,idim,a,bv,xxv,desc_a,afmt,& & a1,a2,a3,b1,b2,b3,c,g,info) call psb_barrier(ictxt) t2 = psb_wtime() - t1 if(info /= psb_success_) then info=psb_err_from_subroutine_ - ch_err='psb_gen_prob3d' + ch_err='psb_gen_pde3d' call psb_errpush(info,name,a_err=ch_err) goto 9999 end if diff --git a/test/pargen/spde3d.f90 b/test/pargen/spde3d.f90 index b3673f22..20cce208 100644 --- a/test/pargen/spde3d.f90 +++ b/test/pargen/spde3d.f90 @@ -123,13 +123,13 @@ program spde3d ! call psb_barrier(ictxt) t1 = psb_wtime() - call psb_gen_prob3d(ictxt,idim,a,bv,xxv,desc_a,afmt,& + call psb_gen_pde3d(ictxt,idim,a,bv,xxv,desc_a,afmt,& & a1,a2,a3,b1,b2,b3,c,g,info) call psb_barrier(ictxt) t2 = psb_wtime() - t1 if(info /= psb_success_) then info=psb_err_from_subroutine_ - ch_err='psb_gen_prob3d' + ch_err='psb_gen_pde3d' call psb_errpush(info,name,a_err=ch_err) goto 9999 end if diff --git a/util/psb_d_genpde_impl.f90 b/util/psb_d_genpde_impl.f90 index bac64daf..3aeaad1f 100644 --- a/util/psb_d_genpde_impl.f90 +++ b/util/psb_d_genpde_impl.f90 @@ -2,9 +2,9 @@ ! subroutine to allocate and fill in the coefficient matrix and ! the rhs. ! -subroutine psb_d_gen_prob3d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,a3,b1,b2,b3,c,g,info,f) +subroutine psb_d_gen_pde3d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,a3,b1,b2,b3,c,g,info,f) use psb_base_mod - use psb_d_genpde_mod, psb_protect_name => psb_d_gen_prob3d + use psb_d_genpde_mod, psb_protect_name => psb_d_gen_pde3d ! ! Discretizes the partial differential equation ! @@ -289,7 +289,7 @@ subroutine psb_d_gen_prob3d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,a3,b1,b2,b3,c,g return end if return -end subroutine psb_d_gen_prob3d +end subroutine psb_d_gen_pde3d @@ -297,9 +297,9 @@ end subroutine psb_d_gen_prob3d ! subroutine to allocate and fill in the coefficient matrix and ! the rhs. ! -subroutine psb_d_gen_prob2d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,b1,b2,c,g,info,f) +subroutine psb_d_gen_pde2d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,b1,b2,c,g,info,f) use psb_base_mod - use psb_d_genpde_mod, psb_protect_name => psb_d_gen_prob2d + use psb_d_genpde_mod, psb_protect_name => psb_d_gen_pde2d ! ! Discretizes the partial differential equation ! @@ -560,4 +560,4 @@ subroutine psb_d_gen_prob2d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,b1,b2,c,g,info, return end if return -end subroutine psb_d_gen_prob2d +end subroutine psb_d_gen_pde2d diff --git a/util/psb_d_genpde_mod.f90 b/util/psb_d_genpde_mod.f90 index 9935c46a..4d34d9d0 100644 --- a/util/psb_d_genpde_mod.f90 +++ b/util/psb_d_genpde_mod.f90 @@ -11,8 +11,8 @@ module psb_d_genpde_mod end function d_func_3d end interface - interface psb_gen_prob3d - subroutine psb_d_gen_prob3d(ictxt,idim,a,bv,xv,desc_a,afmt, & + interface psb_gen_pde3d + subroutine psb_d_gen_pde3d(ictxt,idim,a,bv,xv,desc_a,afmt, & & a1,a2,a3,b1,b2,b3,c,g,info,f) ! ! Discretizes the partial differential equation @@ -39,7 +39,7 @@ module psb_d_genpde_mod integer(psb_ipk_) :: ictxt, info character :: afmt*5 procedure(d_func_3d), optional :: f - end subroutine psb_d_gen_prob3d + end subroutine psb_d_gen_pde3d end interface @@ -51,8 +51,8 @@ module psb_d_genpde_mod end function d_func_2d end interface - interface psb_gen_prob2d - subroutine psb_d_gen_prob2d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,b1,b2,c,g,info,f) + interface psb_gen_pde2d + subroutine psb_d_gen_pde2d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,b1,b2,c,g,info,f) ! ! Discretizes the partial differential equation ! @@ -78,7 +78,7 @@ module psb_d_genpde_mod integer(psb_ipk_) :: ictxt, info character :: afmt*5 procedure(d_func_2d), optional :: f - end subroutine psb_d_gen_prob2d + end subroutine psb_d_gen_pde2d end interface contains diff --git a/util/psb_s_genpde_impl.f90 b/util/psb_s_genpde_impl.f90 index fe362135..f0fd8ffb 100644 --- a/util/psb_s_genpde_impl.f90 +++ b/util/psb_s_genpde_impl.f90 @@ -2,9 +2,9 @@ ! subroutine to allocate and fill in the coefficient matrix and ! the rhs. ! -subroutine psb_s_gen_prob3d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,a3,b1,b2,b3,c,g,info,f) +subroutine psb_s_gen_pde3d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,a3,b1,b2,b3,c,g,info,f) use psb_base_mod - use psb_s_genpde_mod, psb_protect_name => psb_s_gen_prob3d + use psb_s_genpde_mod, psb_protect_name => psb_s_gen_pde3d ! ! Discretizes the partial differential equation ! @@ -289,7 +289,7 @@ subroutine psb_s_gen_prob3d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,a3,b1,b2,b3,c,g return end if return -end subroutine psb_s_gen_prob3d +end subroutine psb_s_gen_pde3d @@ -297,9 +297,9 @@ end subroutine psb_s_gen_prob3d ! subroutine to allocate and fill in the coefficient matrix and ! the rhs. ! -subroutine psb_s_gen_prob2d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,b1,b2,c,g,info,f) +subroutine psb_s_gen_pde2d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,b1,b2,c,g,info,f) use psb_base_mod - use psb_s_genpde_mod, psb_protect_name => psb_s_gen_prob2d + use psb_s_genpde_mod, psb_protect_name => psb_s_gen_pde2d ! ! Discretizes the partial differential equation ! @@ -560,4 +560,4 @@ subroutine psb_s_gen_prob2d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,b1,b2,c,g,info, return end if return -end subroutine psb_s_gen_prob2d +end subroutine psb_s_gen_pde2d diff --git a/util/psb_s_genpde_mod.f90 b/util/psb_s_genpde_mod.f90 index 8087d457..1f032497 100644 --- a/util/psb_s_genpde_mod.f90 +++ b/util/psb_s_genpde_mod.f90 @@ -11,8 +11,8 @@ module psb_s_genpde_mod end function d_func_3d end interface - interface psb_gen_prob3d - subroutine psb_s_gen_prob3d(ictxt,idim,a,bv,xv,desc_a,afmt,& + interface psb_gen_pde3d + subroutine psb_s_gen_pde3d(ictxt,idim,a,bv,xv,desc_a,afmt,& & a1,a2,a3,b1,b2,b3,c,g,info,f) ! ! Discretizes the partial differential equation @@ -39,7 +39,7 @@ module psb_s_genpde_mod integer(psb_ipk_) :: ictxt, info character :: afmt*5 procedure(d_func_3d), optional :: f - end subroutine psb_s_gen_prob3d + end subroutine psb_s_gen_pde3d end interface @@ -51,8 +51,8 @@ module psb_s_genpde_mod end function d_func_2d end interface - interface psb_gen_prob2d - subroutine psb_s_gen_prob2d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,b1,b2,c,g,info,f) + interface psb_gen_pde2d + subroutine psb_s_gen_pde2d(ictxt,idim,a,bv,xv,desc_a,afmt,a1,a2,b1,b2,c,g,info,f) ! ! Discretizes the partial differential equation ! @@ -78,7 +78,7 @@ module psb_s_genpde_mod integer(psb_ipk_) :: ictxt, info character :: afmt*5 procedure(d_func_2d), optional :: f - end subroutine psb_s_gen_prob2d + end subroutine psb_s_gen_pde2d end interface contains