From 12911a295ab7ef1aec901f0e4eee4f008d5bbe91 Mon Sep 17 00:00:00 2001
From: Cirdans-Home <f.durastante@na.iac.cnr.it>
Date: Fri, 27 Nov 2020 12:46:47 +0100
Subject: [PATCH] Corrected checks for options

---
 prec/impl/psb_c_bjacprec_impl.f90 | 78 ++++++++++++++++++-------------
 prec/impl/psb_d_bjacprec_impl.f90 | 78 ++++++++++++++++++-------------
 prec/impl/psb_s_bjacprec_impl.f90 | 78 ++++++++++++++++++-------------
 prec/impl/psb_z_bjacprec_impl.f90 | 78 ++++++++++++++++++-------------
 4 files changed, 184 insertions(+), 128 deletions(-)

diff --git a/prec/impl/psb_c_bjacprec_impl.f90 b/prec/impl/psb_c_bjacprec_impl.f90
index 1d11e60c..32baf385 100644
--- a/prec/impl/psb_c_bjacprec_impl.f90
+++ b/prec/impl/psb_c_bjacprec_impl.f90
@@ -566,38 +566,52 @@ subroutine psb_c_bjac_precbld(a,desc_a,prec,info,amold,vmold,imold)
     call psb_errpush(info,name,a_err=ch_err)
     goto 9999
   end if
-  ! Check if the variant for the AINV is known to the library
-  if( (prec%iprcparm(psb_f_type_) == psb_f_ainv_).and.(&
-    & (iinvalg == psb_ainv_llk_).or.(iinvalg == psb_ainv_s_llk_).or. &
-    & (iinvalg == psb_ainv_s_ft_llk_).or.(iinvalg == psb_ainv_llk_noth_).or.&
-    & (iinvalg == psb_ainv_mlk_).or.(iinvalg == psb_ainv_lmx_ ) ) ) then
-    ! Do nothing, these are okay
-  else
-    info=psb_err_from_subroutine_
-    ch_err='psb_ainv_alg_'
-    call psb_errpush(info,name,a_err=ch_err)
-    goto 9999
-  end if
-  ! Check if the drop-tolerance make sense, if fact_eps > 1 and we are requiring
-  ! either ILUT, or INVT we give an error.
-  if( (fact_eps > 1).and.( &
-    & (prec%iprcparm(psb_f_type_) == psb_f_ilu_t_).or.&
-    & (prec%iprcparm(psb_f_type_) == psb_f_invt_) )) then
-    info=psb_err_from_subroutine_
-    ch_err='psb_fact_eps_'
-    call psb_errpush(info,name,a_err=ch_err)
-    goto 9999
-  end if
-  ! It the drop-tolerance for the inverse factors, inv_thresh > 1 and we are
-  ! requiring AINV or, or INVT we give an error
-  if( (inv_thresh > 1).and.( &
-    & (prec%iprcparm(psb_f_type_) == psb_f_ainv_).or.&
-    & (prec%iprcparm(psb_f_type_) == psb_f_invt_) )) then
-    info=psb_err_from_subroutine_
-    ch_err='psb_inv_thresh_'
-    call psb_errpush(info,name,a_err=ch_err)
-    goto 9999
-  end if
+  select case (prec%iprcparm(psb_f_type_))
+    case (psb_f_ainv_)
+      ! Check if the variant for the AINV is known to the library
+      select case (iinvalg)
+      case(psb_ainv_llk_,psb_ainv_s_llk_,psb_ainv_s_ft_llk_,psb_ainv_llk_noth_,&
+        & psb_ainv_mlk_)
+        ! Do nothing these are okay
+      case default
+        info=psb_err_from_subroutine_
+        ch_err='psb_ainv_alg_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end select ! AINV Variant
+      ! Check if the drop-tolerance make sense
+      if( inv_thresh > 1) then
+        info=psb_err_from_subroutine_
+        ch_err='psb_inv_thresh_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+    case (psb_f_ilu_t_)
+      if (fact_eps > 1) then
+        ! Check if the drop-tolerance make sense
+        info=psb_err_from_subroutine_
+        ch_err='psb_fact_eps_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+    case (psb_f_invt_)
+      ! Check both tolerances
+      if (fact_eps > 1) then
+        info=psb_err_from_subroutine_
+        ch_err='psb_fact_eps_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+      if( inv_thresh > 1) then
+        info=psb_err_from_subroutine_
+        ch_err='psb_inv_thresh_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+    case default
+  end select
+
+
   ! Checks relative to the fill-in parameters
   if (prec%iprcparm(psb_f_type_) == psb_f_ilu_n_) then
     if(fill_in < 0) then
diff --git a/prec/impl/psb_d_bjacprec_impl.f90 b/prec/impl/psb_d_bjacprec_impl.f90
index 0cb0bdb9..ec866dbe 100644
--- a/prec/impl/psb_d_bjacprec_impl.f90
+++ b/prec/impl/psb_d_bjacprec_impl.f90
@@ -566,38 +566,52 @@ subroutine psb_d_bjac_precbld(a,desc_a,prec,info,amold,vmold,imold)
     call psb_errpush(info,name,a_err=ch_err)
     goto 9999
   end if
-  ! Check if the variant for the AINV is known to the library
-  if( (prec%iprcparm(psb_f_type_) == psb_f_ainv_).and.(&
-    & (iinvalg == psb_ainv_llk_).or.(iinvalg == psb_ainv_s_llk_).or. &
-    & (iinvalg == psb_ainv_s_ft_llk_).or.(iinvalg == psb_ainv_llk_noth_).or.&
-    & (iinvalg == psb_ainv_mlk_).or.(iinvalg == psb_ainv_lmx_ ) ) ) then
-    ! Do nothing, these are okay
-  else
-    info=psb_err_from_subroutine_
-    ch_err='psb_ainv_alg_'
-    call psb_errpush(info,name,a_err=ch_err)
-    goto 9999
-  end if
-  ! Check if the drop-tolerance make sense, if fact_eps > 1 and we are requiring
-  ! either ILUT, or INVT we give an error.
-  if( (fact_eps > 1).and.( &
-    & (prec%iprcparm(psb_f_type_) == psb_f_ilu_t_).or.&
-    & (prec%iprcparm(psb_f_type_) == psb_f_invt_) )) then
-    info=psb_err_from_subroutine_
-    ch_err='psb_fact_eps_'
-    call psb_errpush(info,name,a_err=ch_err)
-    goto 9999
-  end if
-  ! It the drop-tolerance for the inverse factors, inv_thresh > 1 and we are
-  ! requiring AINV or, or INVT we give an error
-  if( (inv_thresh > 1).and.( &
-    & (prec%iprcparm(psb_f_type_) == psb_f_ainv_).or.&
-    & (prec%iprcparm(psb_f_type_) == psb_f_invt_) )) then
-    info=psb_err_from_subroutine_
-    ch_err='psb_inv_thresh_'
-    call psb_errpush(info,name,a_err=ch_err)
-    goto 9999
-  end if
+  select case (prec%iprcparm(psb_f_type_))
+    case (psb_f_ainv_)
+      ! Check if the variant for the AINV is known to the library
+      select case (iinvalg)
+      case(psb_ainv_llk_,psb_ainv_s_llk_,psb_ainv_s_ft_llk_,psb_ainv_llk_noth_,&
+        & psb_ainv_mlk_)
+        ! Do nothing these are okay
+      case default
+        info=psb_err_from_subroutine_
+        ch_err='psb_ainv_alg_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end select ! AINV Variant
+      ! Check if the drop-tolerance make sense
+      if( inv_thresh > 1) then
+        info=psb_err_from_subroutine_
+        ch_err='psb_inv_thresh_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+    case (psb_f_ilu_t_)
+      if (fact_eps > 1) then
+        ! Check if the drop-tolerance make sense
+        info=psb_err_from_subroutine_
+        ch_err='psb_fact_eps_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+    case (psb_f_invt_)
+      ! Check both tolerances
+      if (fact_eps > 1) then
+        info=psb_err_from_subroutine_
+        ch_err='psb_fact_eps_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+      if( inv_thresh > 1) then
+        info=psb_err_from_subroutine_
+        ch_err='psb_inv_thresh_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+    case default
+  end select
+
+
   ! Checks relative to the fill-in parameters
   if (prec%iprcparm(psb_f_type_) == psb_f_ilu_n_) then
     if(fill_in < 0) then
diff --git a/prec/impl/psb_s_bjacprec_impl.f90 b/prec/impl/psb_s_bjacprec_impl.f90
index ce1f7444..d4a4fd17 100644
--- a/prec/impl/psb_s_bjacprec_impl.f90
+++ b/prec/impl/psb_s_bjacprec_impl.f90
@@ -566,38 +566,52 @@ subroutine psb_s_bjac_precbld(a,desc_a,prec,info,amold,vmold,imold)
     call psb_errpush(info,name,a_err=ch_err)
     goto 9999
   end if
-  ! Check if the variant for the AINV is known to the library
-  if( (prec%iprcparm(psb_f_type_) == psb_f_ainv_).and.(&
-    & (iinvalg == psb_ainv_llk_).or.(iinvalg == psb_ainv_s_llk_).or. &
-    & (iinvalg == psb_ainv_s_ft_llk_).or.(iinvalg == psb_ainv_llk_noth_).or.&
-    & (iinvalg == psb_ainv_mlk_).or.(iinvalg == psb_ainv_lmx_ ) ) ) then
-    ! Do nothing, these are okay
-  else
-    info=psb_err_from_subroutine_
-    ch_err='psb_ainv_alg_'
-    call psb_errpush(info,name,a_err=ch_err)
-    goto 9999
-  end if
-  ! Check if the drop-tolerance make sense, if fact_eps > 1 and we are requiring
-  ! either ILUT, or INVT we give an error.
-  if( (fact_eps > 1).and.( &
-    & (prec%iprcparm(psb_f_type_) == psb_f_ilu_t_).or.&
-    & (prec%iprcparm(psb_f_type_) == psb_f_invt_) )) then
-    info=psb_err_from_subroutine_
-    ch_err='psb_fact_eps_'
-    call psb_errpush(info,name,a_err=ch_err)
-    goto 9999
-  end if
-  ! It the drop-tolerance for the inverse factors, inv_thresh > 1 and we are
-  ! requiring AINV or, or INVT we give an error
-  if( (inv_thresh > 1).and.( &
-    & (prec%iprcparm(psb_f_type_) == psb_f_ainv_).or.&
-    & (prec%iprcparm(psb_f_type_) == psb_f_invt_) )) then
-    info=psb_err_from_subroutine_
-    ch_err='psb_inv_thresh_'
-    call psb_errpush(info,name,a_err=ch_err)
-    goto 9999
-  end if
+  select case (prec%iprcparm(psb_f_type_))
+    case (psb_f_ainv_)
+      ! Check if the variant for the AINV is known to the library
+      select case (iinvalg)
+      case(psb_ainv_llk_,psb_ainv_s_llk_,psb_ainv_s_ft_llk_,psb_ainv_llk_noth_,&
+        & psb_ainv_mlk_)
+        ! Do nothing these are okay
+      case default
+        info=psb_err_from_subroutine_
+        ch_err='psb_ainv_alg_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end select ! AINV Variant
+      ! Check if the drop-tolerance make sense
+      if( inv_thresh > 1) then
+        info=psb_err_from_subroutine_
+        ch_err='psb_inv_thresh_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+    case (psb_f_ilu_t_)
+      if (fact_eps > 1) then
+        ! Check if the drop-tolerance make sense
+        info=psb_err_from_subroutine_
+        ch_err='psb_fact_eps_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+    case (psb_f_invt_)
+      ! Check both tolerances
+      if (fact_eps > 1) then
+        info=psb_err_from_subroutine_
+        ch_err='psb_fact_eps_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+      if( inv_thresh > 1) then
+        info=psb_err_from_subroutine_
+        ch_err='psb_inv_thresh_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+    case default
+  end select
+
+
   ! Checks relative to the fill-in parameters
   if (prec%iprcparm(psb_f_type_) == psb_f_ilu_n_) then
     if(fill_in < 0) then
diff --git a/prec/impl/psb_z_bjacprec_impl.f90 b/prec/impl/psb_z_bjacprec_impl.f90
index 93d308d4..3533f1e3 100644
--- a/prec/impl/psb_z_bjacprec_impl.f90
+++ b/prec/impl/psb_z_bjacprec_impl.f90
@@ -566,38 +566,52 @@ subroutine psb_z_bjac_precbld(a,desc_a,prec,info,amold,vmold,imold)
     call psb_errpush(info,name,a_err=ch_err)
     goto 9999
   end if
-  ! Check if the variant for the AINV is known to the library
-  if( (prec%iprcparm(psb_f_type_) == psb_f_ainv_).and.(&
-    & (iinvalg == psb_ainv_llk_).or.(iinvalg == psb_ainv_s_llk_).or. &
-    & (iinvalg == psb_ainv_s_ft_llk_).or.(iinvalg == psb_ainv_llk_noth_).or.&
-    & (iinvalg == psb_ainv_mlk_).or.(iinvalg == psb_ainv_lmx_ ) ) ) then
-    ! Do nothing, these are okay
-  else
-    info=psb_err_from_subroutine_
-    ch_err='psb_ainv_alg_'
-    call psb_errpush(info,name,a_err=ch_err)
-    goto 9999
-  end if
-  ! Check if the drop-tolerance make sense, if fact_eps > 1 and we are requiring
-  ! either ILUT, or INVT we give an error.
-  if( (fact_eps > 1).and.( &
-    & (prec%iprcparm(psb_f_type_) == psb_f_ilu_t_).or.&
-    & (prec%iprcparm(psb_f_type_) == psb_f_invt_) )) then
-    info=psb_err_from_subroutine_
-    ch_err='psb_fact_eps_'
-    call psb_errpush(info,name,a_err=ch_err)
-    goto 9999
-  end if
-  ! It the drop-tolerance for the inverse factors, inv_thresh > 1 and we are
-  ! requiring AINV or, or INVT we give an error
-  if( (inv_thresh > 1).and.( &
-    & (prec%iprcparm(psb_f_type_) == psb_f_ainv_).or.&
-    & (prec%iprcparm(psb_f_type_) == psb_f_invt_) )) then
-    info=psb_err_from_subroutine_
-    ch_err='psb_inv_thresh_'
-    call psb_errpush(info,name,a_err=ch_err)
-    goto 9999
-  end if
+  select case (prec%iprcparm(psb_f_type_))
+    case (psb_f_ainv_)
+      ! Check if the variant for the AINV is known to the library
+      select case (iinvalg)
+      case(psb_ainv_llk_,psb_ainv_s_llk_,psb_ainv_s_ft_llk_,psb_ainv_llk_noth_,&
+        & psb_ainv_mlk_)
+        ! Do nothing these are okay
+      case default
+        info=psb_err_from_subroutine_
+        ch_err='psb_ainv_alg_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end select ! AINV Variant
+      ! Check if the drop-tolerance make sense
+      if( inv_thresh > 1) then
+        info=psb_err_from_subroutine_
+        ch_err='psb_inv_thresh_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+    case (psb_f_ilu_t_)
+      if (fact_eps > 1) then
+        ! Check if the drop-tolerance make sense
+        info=psb_err_from_subroutine_
+        ch_err='psb_fact_eps_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+    case (psb_f_invt_)
+      ! Check both tolerances
+      if (fact_eps > 1) then
+        info=psb_err_from_subroutine_
+        ch_err='psb_fact_eps_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+      if( inv_thresh > 1) then
+        info=psb_err_from_subroutine_
+        ch_err='psb_inv_thresh_'
+        call psb_errpush(info,name,a_err=ch_err)
+        goto 9999
+      end if
+    case default
+  end select
+
+
   ! Checks relative to the fill-in parameters
   if (prec%iprcparm(psb_f_type_) == psb_f_ilu_n_) then
     if(fill_in < 0) then