Fix bounds computation in set_vect. Bug report by Alexandre Silva Lopes

8 years ago · 4f8acf331a
parent deea842017
commit 4f8acf331a
6 changed files with 12 additions and 12 deletions
--- a/base/modules/serial/psb_c_base_vect_mod.f90
+++ b/base/modules/serial/psb_c_base_vect_mod.f90
@ -794,9 +794,9 @@ contains
        
    integer(psb_ipk_) :: info, first_, last_, nr

-    first_=1
-    last_=min(psb_size(x%v),size(val))
+    first_                     = 1
    if (present(first)) first_ = max(1,first)
+    last_                      = min(psb_size(x%v),first_+size(val)-1)
    if (present(last))  last_  = min(last,last_)

    if (allocated(x%v)) then 
--- a/base/modules/serial/psb_d_base_vect_mod.f90
+++ b/base/modules/serial/psb_d_base_vect_mod.f90
@ -794,9 +794,9 @@ contains
        
    integer(psb_ipk_) :: info, first_, last_, nr

-    first_=1
-    last_=min(psb_size(x%v),size(val))
+    first_                     = 1
    if (present(first)) first_ = max(1,first)
+    last_                      = min(psb_size(x%v),first_+size(val)-1)
    if (present(last))  last_  = min(last,last_)

    if (allocated(x%v)) then 
--- a/base/modules/serial/psb_i_base_vect_mod.f90
+++ b/base/modules/serial/psb_i_base_vect_mod.f90
@ -762,9 +762,9 @@ contains
        
    integer(psb_ipk_) :: info, first_, last_, nr

-    first_=1
-    last_=min(psb_size(x%v),size(val))
+    first_                     = 1
    if (present(first)) first_ = max(1,first)
+    last_                      = min(psb_size(x%v),first_+size(val)-1)
    if (present(last))  last_  = min(last,last_)

    if (allocated(x%v)) then 
--- a/base/modules/serial/psb_l_base_vect_mod.f90
+++ b/base/modules/serial/psb_l_base_vect_mod.f90
@ -763,9 +763,9 @@ contains
        
    integer(psb_ipk_) :: info, first_, last_, nr

-    first_=1
-    last_=min(psb_size(x%v),size(val))
+    first_                     = 1
    if (present(first)) first_ = max(1,first)
+    last_                      = min(psb_size(x%v),first_+size(val)-1)
    if (present(last))  last_  = min(last,last_)

    if (allocated(x%v)) then 
--- a/base/modules/serial/psb_s_base_vect_mod.f90
+++ b/base/modules/serial/psb_s_base_vect_mod.f90
@ -794,9 +794,9 @@ contains
        
    integer(psb_ipk_) :: info, first_, last_, nr

-    first_=1
-    last_=min(psb_size(x%v),size(val))
+    first_                     = 1
    if (present(first)) first_ = max(1,first)
+    last_                      = min(psb_size(x%v),first_+size(val)-1)
    if (present(last))  last_  = min(last,last_)

    if (allocated(x%v)) then 
--- a/base/modules/serial/psb_z_base_vect_mod.f90
+++ b/base/modules/serial/psb_z_base_vect_mod.f90
@ -794,9 +794,9 @@ contains
        
    integer(psb_ipk_) :: info, first_, last_, nr

-    first_=1
-    last_=min(psb_size(x%v),size(val))
+    first_                     = 1
    if (present(first)) first_ = max(1,first)
+    last_                      = min(psb_size(x%v),first_+size(val)-1)
    if (present(last))  last_  = min(last,last_)

    if (allocated(x%v)) then