fdurastante
/
psblas3
mirror of https://github.com/sfilippone/psblas3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected pass argument in div routines

Browse Source
merge-paraggr-newops
Cirdans-Home 5 years ago
parent effb976305
commit 28c1efe650
9 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File

4
base/modules/serial/psb_c_base_vect_mod.f90
Unescape Escape View File

@ -171,8 +171,8 @@ module psb_c_base_vect_mod
! !
procedure, pass(x) :: div_v => c_base_div_v procedure, pass(x) :: div_v => c_base_div_v
procedure, pass(x) :: div_v_check => c_base_div_v_check procedure, pass(x) :: div_v_check => c_base_div_v_check
procedure, pass(x) :: div_v2 => c_base_div_v2 procedure, pass(z) :: div_v2 => c_base_div_v2
procedure, pass(x) :: div_v2_check => c_base_div_v2_check procedure, pass(z) :: div_v2_check => c_base_div_v2_check
procedure, pass(z) :: div_a2 => c_base_div_a2 procedure, pass(z) :: div_a2 => c_base_div_a2
procedure, pass(z) :: div_a2_check => c_base_div_a2_check procedure, pass(z) :: div_a2_check => c_base_div_a2_check
generic, public :: div => div_v, div_v2, div_v_check, & generic, public :: div => div_v, div_v2, div_v_check, &

2
base/modules/serial/psb_c_vect_mod.F90
Unescape Escape View File

@ -97,7 +97,7 @@ module psb_c_vect_mod
generic, public :: mlt => mlt_v, mlt_a, mlt_a_2,& generic, public :: mlt => mlt_v, mlt_a, mlt_a_2,&
& mlt_v_2, mlt_av, mlt_va & mlt_v_2, mlt_av, mlt_va
procedure, pass(x) :: div_v => c_vect_div_v procedure, pass(x) :: div_v => c_vect_div_v
procedure, pass(x) :: div_v2 => c_vect_div_v2 procedure, pass(z) :: div_v2 => c_vect_div_v2
procedure, pass(x) :: div_v_check => c_vect_div_v_check procedure, pass(x) :: div_v_check => c_vect_div_v_check
procedure, pass(x) :: div_v2_check => c_vect_div_v2_check procedure, pass(x) :: div_v2_check => c_vect_div_v2_check
procedure, pass(z) :: div_a2 => c_vect_div_a2 procedure, pass(z) :: div_a2 => c_vect_div_a2

4
base/modules/serial/psb_d_base_vect_mod.f90
Unescape Escape View File

@ -171,8 +171,8 @@ module psb_d_base_vect_mod
! !
procedure, pass(x) :: div_v => d_base_div_v procedure, pass(x) :: div_v => d_base_div_v
procedure, pass(x) :: div_v_check => d_base_div_v_check procedure, pass(x) :: div_v_check => d_base_div_v_check
procedure, pass(x) :: div_v2 => d_base_div_v2 procedure, pass(z) :: div_v2 => d_base_div_v2
procedure, pass(x) :: div_v2_check => d_base_div_v2_check procedure, pass(z) :: div_v2_check => d_base_div_v2_check
procedure, pass(z) :: div_a2 => d_base_div_a2 procedure, pass(z) :: div_a2 => d_base_div_a2
procedure, pass(z) :: div_a2_check => d_base_div_a2_check procedure, pass(z) :: div_a2_check => d_base_div_a2_check
generic, public :: div => div_v, div_v2, div_v_check, & generic, public :: div => div_v, div_v2, div_v_check, &

2
base/modules/serial/psb_d_vect_mod.F90
Unescape Escape View File

@ -97,7 +97,7 @@ module psb_d_vect_mod
generic, public :: mlt => mlt_v, mlt_a, mlt_a_2,& generic, public :: mlt => mlt_v, mlt_a, mlt_a_2,&
& mlt_v_2, mlt_av, mlt_va & mlt_v_2, mlt_av, mlt_va
procedure, pass(x) :: div_v => d_vect_div_v procedure, pass(x) :: div_v => d_vect_div_v
procedure, pass(x) :: div_v2 => d_vect_div_v2 procedure, pass(z) :: div_v2 => d_vect_div_v2
procedure, pass(x) :: div_v_check => d_vect_div_v_check procedure, pass(x) :: div_v_check => d_vect_div_v_check
procedure, pass(x) :: div_v2_check => d_vect_div_v2_check procedure, pass(x) :: div_v2_check => d_vect_div_v2_check
procedure, pass(z) :: div_a2 => d_vect_div_a2 procedure, pass(z) :: div_a2 => d_vect_div_a2

4
base/modules/serial/psb_s_base_vect_mod.f90
Unescape Escape View File

@ -171,8 +171,8 @@ module psb_s_base_vect_mod
! !
procedure, pass(x) :: div_v => s_base_div_v procedure, pass(x) :: div_v => s_base_div_v
procedure, pass(x) :: div_v_check => s_base_div_v_check procedure, pass(x) :: div_v_check => s_base_div_v_check
procedure, pass(x) :: div_v2 => s_base_div_v2 procedure, pass(z) :: div_v2 => s_base_div_v2
procedure, pass(x) :: div_v2_check => s_base_div_v2_check procedure, pass(z) :: div_v2_check => s_base_div_v2_check
procedure, pass(z) :: div_a2 => s_base_div_a2 procedure, pass(z) :: div_a2 => s_base_div_a2
procedure, pass(z) :: div_a2_check => s_base_div_a2_check procedure, pass(z) :: div_a2_check => s_base_div_a2_check
generic, public :: div => div_v, div_v2, div_v_check, & generic, public :: div => div_v, div_v2, div_v_check, &

2
base/modules/serial/psb_s_vect_mod.F90
Unescape Escape View File

@ -97,7 +97,7 @@ module psb_s_vect_mod
generic, public :: mlt => mlt_v, mlt_a, mlt_a_2,& generic, public :: mlt => mlt_v, mlt_a, mlt_a_2,&
& mlt_v_2, mlt_av, mlt_va & mlt_v_2, mlt_av, mlt_va
procedure, pass(x) :: div_v => s_vect_div_v procedure, pass(x) :: div_v => s_vect_div_v
procedure, pass(x) :: div_v2 => s_vect_div_v2 procedure, pass(z) :: div_v2 => s_vect_div_v2
procedure, pass(x) :: div_v_check => s_vect_div_v_check procedure, pass(x) :: div_v_check => s_vect_div_v_check
procedure, pass(x) :: div_v2_check => s_vect_div_v2_check procedure, pass(x) :: div_v2_check => s_vect_div_v2_check
procedure, pass(z) :: div_a2 => s_vect_div_a2 procedure, pass(z) :: div_a2 => s_vect_div_a2

4
base/modules/serial/psb_z_base_vect_mod.f90
Unescape Escape View File

@ -171,8 +171,8 @@ module psb_z_base_vect_mod
! !
procedure, pass(x) :: div_v => z_base_div_v procedure, pass(x) :: div_v => z_base_div_v
procedure, pass(x) :: div_v_check => z_base_div_v_check procedure, pass(x) :: div_v_check => z_base_div_v_check
procedure, pass(x) :: div_v2 => z_base_div_v2 procedure, pass(z) :: div_v2 => z_base_div_v2
procedure, pass(x) :: div_v2_check => z_base_div_v2_check procedure, pass(z) :: div_v2_check => z_base_div_v2_check
procedure, pass(z) :: div_a2 => z_base_div_a2 procedure, pass(z) :: div_a2 => z_base_div_a2
procedure, pass(z) :: div_a2_check => z_base_div_a2_check procedure, pass(z) :: div_a2_check => z_base_div_a2_check
generic, public :: div => div_v, div_v2, div_v_check, & generic, public :: div => div_v, div_v2, div_v_check, &

2
base/modules/serial/psb_z_vect_mod.F90
Unescape Escape View File

@ -97,7 +97,7 @@ module psb_z_vect_mod
generic, public :: mlt => mlt_v, mlt_a, mlt_a_2,& generic, public :: mlt => mlt_v, mlt_a, mlt_a_2,&
& mlt_v_2, mlt_av, mlt_va & mlt_v_2, mlt_av, mlt_va
procedure, pass(x) :: div_v => z_vect_div_v procedure, pass(x) :: div_v => z_vect_div_v
procedure, pass(x) :: div_v2 => z_vect_div_v2 procedure, pass(z) :: div_v2 => z_vect_div_v2
procedure, pass(x) :: div_v_check => z_vect_div_v_check procedure, pass(x) :: div_v_check => z_vect_div_v_check
procedure, pass(x) :: div_v2_check => z_vect_div_v2_check procedure, pass(x) :: div_v2_check => z_vect_div_v2_check
procedure, pass(z) :: div_a2 => z_vect_div_a2 procedure, pass(z) :: div_a2 => z_vect_div_a2

12
test/kernel/vecoperation.f90
Unescape Escape View File

@ -203,6 +203,18 @@ program vecoperation
write(psb_out_unit,'("y = ",es12.1)')vy(:) write(psb_out_unit,'("y = ",es12.1)')vy(:)
end if end if
call psb_gediv(x,y,z,desc_a,info)
if (iam == psb_root_) then
write(psb_out_unit,'("div : z = x/y")')
vx = x%get_vect()
write(psb_out_unit,'("x = ",es12.1)')vx(:)
vy = y%get_vect()
write(psb_out_unit,'("y = ",es12.1)')vy(:)
vz = z%get_vect()
write(psb_out_unit,'("z = ",es12.1)')vz(:)
end if
call psb_geinv(x,z,desc_a,info) call psb_geinv(x,z,desc_a,info)
if (iam == psb_root_) then if (iam == psb_root_) then

Write Preview
Loading…
Cancel
Save