From 898148133682e158631fbe0029c8a4436210ed2d Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 14 Jan 2013 15:23:20 +0000 Subject: [PATCH] psblas-3.0: base/serial/psb_spdot_srtd.f90 base/modules/psb_z_base_mat_mod.f90 base/modules/psb_c_base_mat_mod.f90 base/modules/psb_s_base_mat_mod.f90 base/modules/psb_d_base_mat_mod.f90 prec/psb_c_base_prec_mod.f90 prec/psb_d_base_prec_mod.f90 prec/psb_s_base_prec_mod.f90 prec/psb_z_base_prec_mod.f90 Comment fixes. --- base/modules/psb_c_base_mat_mod.f90 | 9 ++++++++- base/modules/psb_d_base_mat_mod.f90 | 9 ++++++++- base/modules/psb_s_base_mat_mod.f90 | 9 ++++++++- base/modules/psb_z_base_mat_mod.f90 | 9 ++++++++- base/serial/psb_spdot_srtd.f90 | 2 +- prec/psb_c_base_prec_mod.f90 | 20 ++++++++++---------- prec/psb_d_base_prec_mod.f90 | 20 ++++++++++---------- prec/psb_s_base_prec_mod.f90 | 20 ++++++++++---------- prec/psb_z_base_prec_mod.f90 | 20 ++++++++++---------- 9 files changed, 73 insertions(+), 45 deletions(-) diff --git a/base/modules/psb_c_base_mat_mod.f90 b/base/modules/psb_c_base_mat_mod.f90 index 95b28c9a..c025ad6a 100644 --- a/base/modules/psb_c_base_mat_mod.f90 +++ b/base/modules/psb_c_base_mat_mod.f90 @@ -683,7 +683,10 @@ module psb_c_base_mat_mod !! Y = alpha*op(A)*X + beta*Y !! Usually the unwrapping of the encapsulated vector is done !! here, so that all the derived classes need only the - !! versions with the standard arrays. + !! versions with the standard arrays. + !! Must be overridden explicitly in case of non standard memory + !! management; an example would be external memory allocation + !! in attached processors such as GPUs. !! !! !! \param alpha Scaling factor for Ax @@ -784,6 +787,10 @@ module psb_c_base_mat_mod !! Y = alpha*op(A^-1)*X + beta*Y !! !! Internal workhorse called by vect_cssv. + !! Must be overridden explicitly in case of non standard memory + !! management; an example would be external memory allocation + !! in attached processors such as GPUs. + !! !! !! \param alpha Scaling factor for Ax !! \param A the input sparse matrix diff --git a/base/modules/psb_d_base_mat_mod.f90 b/base/modules/psb_d_base_mat_mod.f90 index 89e31d2c..9613a42c 100644 --- a/base/modules/psb_d_base_mat_mod.f90 +++ b/base/modules/psb_d_base_mat_mod.f90 @@ -683,7 +683,10 @@ module psb_d_base_mat_mod !! Y = alpha*op(A)*X + beta*Y !! Usually the unwrapping of the encapsulated vector is done !! here, so that all the derived classes need only the - !! versions with the standard arrays. + !! versions with the standard arrays. + !! Must be overridden explicitly in case of non standard memory + !! management; an example would be external memory allocation + !! in attached processors such as GPUs. !! !! !! \param alpha Scaling factor for Ax @@ -784,6 +787,10 @@ module psb_d_base_mat_mod !! Y = alpha*op(A^-1)*X + beta*Y !! !! Internal workhorse called by vect_cssv. + !! Must be overridden explicitly in case of non standard memory + !! management; an example would be external memory allocation + !! in attached processors such as GPUs. + !! !! !! \param alpha Scaling factor for Ax !! \param A the input sparse matrix diff --git a/base/modules/psb_s_base_mat_mod.f90 b/base/modules/psb_s_base_mat_mod.f90 index f612f231..b29f025e 100644 --- a/base/modules/psb_s_base_mat_mod.f90 +++ b/base/modules/psb_s_base_mat_mod.f90 @@ -683,7 +683,10 @@ module psb_s_base_mat_mod !! Y = alpha*op(A)*X + beta*Y !! Usually the unwrapping of the encapsulated vector is done !! here, so that all the derived classes need only the - !! versions with the standard arrays. + !! versions with the standard arrays. + !! Must be overridden explicitly in case of non standard memory + !! management; an example would be external memory allocation + !! in attached processors such as GPUs. !! !! !! \param alpha Scaling factor for Ax @@ -784,6 +787,10 @@ module psb_s_base_mat_mod !! Y = alpha*op(A^-1)*X + beta*Y !! !! Internal workhorse called by vect_cssv. + !! Must be overridden explicitly in case of non standard memory + !! management; an example would be external memory allocation + !! in attached processors such as GPUs. + !! !! !! \param alpha Scaling factor for Ax !! \param A the input sparse matrix diff --git a/base/modules/psb_z_base_mat_mod.f90 b/base/modules/psb_z_base_mat_mod.f90 index 1d672ebd..38570cf0 100644 --- a/base/modules/psb_z_base_mat_mod.f90 +++ b/base/modules/psb_z_base_mat_mod.f90 @@ -683,7 +683,10 @@ module psb_z_base_mat_mod !! Y = alpha*op(A)*X + beta*Y !! Usually the unwrapping of the encapsulated vector is done !! here, so that all the derived classes need only the - !! versions with the standard arrays. + !! versions with the standard arrays. + !! Must be overridden explicitly in case of non standard memory + !! management; an example would be external memory allocation + !! in attached processors such as GPUs. !! !! !! \param alpha Scaling factor for Ax @@ -784,6 +787,10 @@ module psb_z_base_mat_mod !! Y = alpha*op(A^-1)*X + beta*Y !! !! Internal workhorse called by vect_cssv. + !! Must be overridden explicitly in case of non standard memory + !! management; an example would be external memory allocation + !! in attached processors such as GPUs. + !! !! !! \param alpha Scaling factor for Ax !! \param A the input sparse matrix diff --git a/base/serial/psb_spdot_srtd.f90 b/base/serial/psb_spdot_srtd.f90 index bb1b4c08..811589eb 100644 --- a/base/serial/psb_spdot_srtd.f90 +++ b/base/serial/psb_spdot_srtd.f90 @@ -140,7 +140,7 @@ subroutine psb_d_nspaxpby(nz,iz,z,alpha, nx, ix, x, beta, ny,iy,y,info) integer(psb_ipk_) :: i,j,k, ipx, ipy, isz real(psb_dpk_) :: acc - info=psb_success_ + info = psb_success_ nz = 0 ipx = 1 ipy = 1 diff --git a/prec/psb_c_base_prec_mod.f90 b/prec/psb_c_base_prec_mod.f90 index 8f686840..d1d8b6c7 100644 --- a/prec/psb_c_base_prec_mod.f90 +++ b/prec/psb_c_base_prec_mod.f90 @@ -91,7 +91,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -127,7 +127,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -158,7 +158,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -194,7 +194,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -226,7 +226,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -258,7 +258,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -290,7 +290,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -321,7 +321,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -354,7 +354,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -385,7 +385,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) diff --git a/prec/psb_d_base_prec_mod.f90 b/prec/psb_d_base_prec_mod.f90 index 1dd1bc54..1f30297c 100644 --- a/prec/psb_d_base_prec_mod.f90 +++ b/prec/psb_d_base_prec_mod.f90 @@ -91,7 +91,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -127,7 +127,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -158,7 +158,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -194,7 +194,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -226,7 +226,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -258,7 +258,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -290,7 +290,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -321,7 +321,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -354,7 +354,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -385,7 +385,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) diff --git a/prec/psb_s_base_prec_mod.f90 b/prec/psb_s_base_prec_mod.f90 index 393aa5c1..e98026a1 100644 --- a/prec/psb_s_base_prec_mod.f90 +++ b/prec/psb_s_base_prec_mod.f90 @@ -91,7 +91,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -127,7 +127,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -158,7 +158,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -194,7 +194,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -226,7 +226,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -258,7 +258,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -290,7 +290,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -321,7 +321,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -354,7 +354,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -385,7 +385,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) diff --git a/prec/psb_z_base_prec_mod.f90 b/prec/psb_z_base_prec_mod.f90 index cd4aaebb..1f8a4718 100644 --- a/prec/psb_z_base_prec_mod.f90 +++ b/prec/psb_z_base_prec_mod.f90 @@ -91,7 +91,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -127,7 +127,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -158,7 +158,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -194,7 +194,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -226,7 +226,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -258,7 +258,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -290,7 +290,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -321,7 +321,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -354,7 +354,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name) @@ -385,7 +385,7 @@ contains ! ! This is the base version and we should throw an error. - ! Or should it be the NULL preonditioner??? + ! Or should it be the NULL preconditioner??? ! info = 700 call psb_errpush(info,name)