Corrected routine for weighted masked 2norm

5 years ago · 0f309850cc
parent 9e9a2e3975
commit 0f309850cc
4 changed files with 4 additions and 4 deletions
--- a/base/modules/serial/psb_c_vect_mod.F90
+++ b/base/modules/serial/psb_c_vect_mod.F90
@ -1030,7 +1030,7 @@ contains
    integer(psb_ipk_)                       :: info

    if (allocated(x%v).and.allocated(w%v).and.allocated(id%v)) then
-      call w%v%acmp(id%v,szero,info)
+      where( abs(id%v%v) <= szero) x%v%v = szero
      call w%v%mlt(x%v,info)
      res = w%v%nrm2(n)
    else
--- a/base/modules/serial/psb_d_vect_mod.F90
+++ b/base/modules/serial/psb_d_vect_mod.F90
@ -1037,7 +1037,7 @@ contains
    integer(psb_ipk_)                       :: info

    if (allocated(x%v).and.allocated(w%v).and.allocated(id%v)) then
-      call w%v%acmp(id%v,dzero,info)
+      where( abs(id%v%v) <= dzero) x%v%v = dzero
      call w%v%mlt(x%v,info)
      res = w%v%nrm2(n)
    else
--- a/base/modules/serial/psb_s_vect_mod.F90
+++ b/base/modules/serial/psb_s_vect_mod.F90
@ -1037,7 +1037,7 @@ contains
    integer(psb_ipk_)                       :: info

    if (allocated(x%v).and.allocated(w%v).and.allocated(id%v)) then
-      call w%v%acmp(id%v,szero,info)
+      where( abs(id%v%v) <= szero) x%v%v = szero
      call w%v%mlt(x%v,info)
      res = w%v%nrm2(n)
    else
--- a/base/modules/serial/psb_z_vect_mod.F90
+++ b/base/modules/serial/psb_z_vect_mod.F90
@ -1030,7 +1030,7 @@ contains
    integer(psb_ipk_)                       :: info

    if (allocated(x%v).and.allocated(w%v).and.allocated(id%v)) then
-      call w%v%acmp(id%v,dzero,info)
+      where( abs(id%v%v) <= dzero) x%v%v = dzero
      call w%v%mlt(x%v,info)
      res = w%v%nrm2(n)
    else