From 992a760fe87426ca8d04854e30a24c71bd17b1d0 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 6 Jan 2016 12:05:37 +0000 Subject: [PATCH] psblas3 docs/psblas-3.4.pdf docs/src/methods.tex krylov/psb_ckrylov.f90 krylov/psb_dkrylov.f90 krylov/psb_skrylov.f90 krylov/psb_zkrylov.f90 Default COND to zero if present. --- docs/psblas-3.4.pdf | 22 +++++++++++----------- docs/src/methods.tex | 6 ++++-- krylov/psb_ckrylov.f90 | 3 +++ krylov/psb_dkrylov.f90 | 3 +++ krylov/psb_skrylov.f90 | 3 +++ krylov/psb_zkrylov.f90 | 3 +++ 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/docs/psblas-3.4.pdf b/docs/psblas-3.4.pdf index 2dbb2a90..b702b398 100644 --- a/docs/psblas-3.4.pdf +++ b/docs/psblas-3.4.pdf @@ -21126,7 +21126,7 @@ ET endstream endobj 1707 0 obj << -/Length 2478 +/Length 2800 >> stream 0 g 0 G @@ -21143,13 +21143,13 @@ BT 0 g 0 G /F27 9.9626 Tf -24.907 -19.925 Td [(cond)]TJ 0 g 0 G -/F8 9.9626 Tf 28.532 0 Td [(An)-280(estimate)-280(of)-279(the)-280(condition)-280(n)28(um)28(b)-28(er)-280(of)-279(matrix)]TJ/F11 9.9626 Tf 204.226 0 Td [(A)]TJ/F8 9.9626 Tf 7.472 0 Td [(;)-298(only)-279(a)27(v)56(ailable)-280(with)-279(the)]TJ/F11 9.9626 Tf -215.323 -11.955 Td [(C)-72(G)]TJ/F8 9.9626 Tf 18.987 0 Td [(metho)-28(d.)]TJ -18.987 -11.955 Td [(Scop)-28(e:)]TJ/F27 9.9626 Tf 32.379 0 Td [(global)]TJ/F8 9.9626 Tf -32.379 -11.956 Td [(T)28(yp)-28(e:)]TJ/F27 9.9626 Tf 29.611 0 Td [(optional)]TJ/F8 9.9626 Tf -29.611 -11.955 Td [(In)28(ten)28(t:)]TJ/F27 9.9626 Tf 33.486 0 Td [(out)]TJ/F8 9.9626 Tf 16.549 0 Td [(.)]TJ -50.035 -11.955 Td [(Returned)-333(as:)-445(a)-333(real)-333(n)27(um)28(b)-28(er.)]TJ +/F8 9.9626 Tf 28.532 0 Td [(An)-280(estimate)-280(of)-279(the)-280(condition)-280(n)28(um)28(b)-28(er)-280(of)-279(matrix)]TJ/F11 9.9626 Tf 204.226 0 Td [(A)]TJ/F8 9.9626 Tf 7.472 0 Td [(;)-298(only)-279(a)27(v)56(ailable)-280(with)-279(the)]TJ/F11 9.9626 Tf -215.323 -11.955 Td [(C)-72(G)]TJ/F8 9.9626 Tf 18.987 0 Td [(metho)-28(d)-333(on)-333(real)-334(data.)]TJ -18.987 -11.955 Td [(Scop)-28(e:)]TJ/F27 9.9626 Tf 32.379 0 Td [(global)]TJ/F8 9.9626 Tf -32.379 -11.956 Td [(T)28(yp)-28(e:)]TJ/F27 9.9626 Tf 29.611 0 Td [(optional)]TJ/F8 9.9626 Tf -29.611 -11.955 Td [(In)28(ten)28(t:)]TJ/F27 9.9626 Tf 33.486 0 Td [(out)]TJ/F8 9.9626 Tf 16.549 0 Td [(.)]TJ -50.035 -11.955 Td [(Returned)-287(as:)-421(a)-287(real)-287(n)28(um)28(b)-28(er.)-429(A)-287(correct)-287(result)-286(will)-287(b)-28(e)-287(greater)-287(than)-287(or)-286(equal)]TJ 0 -11.955 Td [(to)-267(on)1(e)-1(;)-288(if)-267(sp)-28(eci\014ed)-266(for)-267(non)1(-)-1(r)1(e)-1(al)-266(data,)-280(or)-266(an)-267(error)-266(o)-28(ccurred,)-280(zero)-267(is)-266(returned.)]TJ 0 g 0 G /F27 9.9626 Tf -24.907 -19.925 Td [(info)]TJ 0 g 0 G -/F8 9.9626 Tf 23.758 0 Td [(Error)-333(co)-28(de.)]TJ 1.149 -11.955 Td [(Scop)-28(e:)]TJ/F27 9.9626 Tf 32.379 0 Td [(lo)-32(cal)]TJ/F8 9.9626 Tf -32.379 -11.956 Td [(T)28(yp)-28(e:)]TJ/F27 9.9626 Tf 29.611 0 Td [(required)]TJ/F8 9.9626 Tf -29.611 -11.955 Td [(In)28(ten)28(t:)]TJ/F27 9.9626 Tf 33.486 0 Td [(out)]TJ/F8 9.9626 Tf 16.549 0 Td [(.)]TJ -50.035 -11.955 Td [(An)-333(in)28(tege)-1(r)-333(v)56(alue;)-334(0)-333(means)-333(no)-334(error)-333(has)-333(b)-28(een)-333(detecte)-1(d)1(.)]TJ +/F8 9.9626 Tf 23.758 0 Td [(Error)-333(co)-28(de.)]TJ 1.149 -11.956 Td [(Scop)-28(e:)]TJ/F27 9.9626 Tf 32.379 0 Td [(lo)-32(cal)]TJ/F8 9.9626 Tf -32.379 -11.955 Td [(T)28(yp)-28(e:)]TJ/F27 9.9626 Tf 29.611 0 Td [(required)]TJ/F8 9.9626 Tf -29.611 -11.955 Td [(In)28(ten)28(t:)]TJ/F27 9.9626 Tf 33.486 0 Td [(out)]TJ/F8 9.9626 Tf 16.549 0 Td [(.)]TJ -50.035 -11.955 Td [(An)-333(in)28(tege)-1(r)-333(v)56(alue;)-334(0)-333(means)-333(no)-334(error)-333(has)-333(b)-28(een)-333(detecte)-1(d)1(.)]TJ 0 g 0 G - 139.477 -352.677 Td [(135)]TJ + 139.477 -340.722 Td [(135)]TJ 0 g 0 G ET endstream @@ -26246,8 +26246,8 @@ endstream endobj 1894 0 obj << /Title (Parallel Sparse BLAS V. 3.4) /Subject (Parallel Sparse Basic Linear Algebra Subroutines) /Keywords (Computer Science Linear Algebra Fluid Dynamics Parallel Linux MPI PSBLAS Iterative Solvers Preconditioners) /Creator (pdfLaTeX) /Producer ($Id: userguide.tex 9115 2015-04-28 17:26:14Z sfilippo $) /Author()/Title()/Subject()/Creator(LaTeX with hyperref package)/Producer(pdfTeX-1.40.11)/Keywords() -/CreationDate (D:20151208161556Z) -/ModDate (D:20151208161556Z) +/CreationDate (D:20160106111950Z) +/ModDate (D:20160106111950Z) /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-1.40.11-2.2 (TeX Live 2010) kpathsea version 6.0.0) >> endobj @@ -26316,7 +26316,7 @@ endobj /W [1 3 1] /Root 1893 0 R /Info 1894 0 R -/ID [ ] +/ID [<02BAFC6D9032AABCCBB6B7DB13999F12> <02BAFC6D9032AABCCBB6B7DB13999F12>] /Length 9480 >> stream @@ -26351,11 +26351,11 @@ v GIJQL WMOP<WR SUV\X Y[a] )^`cb ?- ! ! |]  -   '" U#%&=-( )+,3. /1294 m578=: ;?D> ,@BCFKE GIJ>MRL NPQXS ZTVWZ_Y []^m` acm mm Bmmmm m Fm m ?mmmmmm  Xmmmmmmm u-mmm!m mm%m" m#m)m& m'm+m,m-m5m3m* m.m0m1m2@m6m7m9m4 m8m<m: Sm;m?m= =m>mOm@ mAmBmDmLmNmYmP kmQmXmZm[m\m]m^m_m`mambmc) :`  E  -FY dm  5-mk CZrcABCDEF3EY_  -    !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abc]]]]]]]]]d$ +   '" U#%&=-( )+,3. /1294 m578=: ;?D> ,@BCFKE GIJ>MRL NPQXS ZTVWZ_Y []^m` acm mm Bmmmm m Fm m ?mmmmmm  Xmmmmmmm u-mmm!m mm%m" m#m)m& m'm+m,m-m5m3m* m.m0m1m2@m6m7m9m4 m8m<m: Sm;m?m= m>mOm@ mAmBmDmLmNmYmP mQmXmZm[m\m]m^m_m`mambmck ; Z ߇ ^ +G e 8 w/=nK Dt)¥ABCDEF4Z  +    !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abc] ]]]]]]]]f endstream endobj startxref -1157412 +1157734 %%EOF diff --git a/docs/src/methods.tex b/docs/src/methods.tex index 277e13a0..3c8e812c 100644 --- a/docs/src/methods.tex +++ b/docs/src/methods.tex @@ -119,11 +119,13 @@ Type: {\bf optional}\\ Intent: {\bf out}.\\ Returned as: a real number. \item[cond] An estimate of the condition number of matrix $A$; only - available with the $CG$ method.\\ + available with the $CG$ method on real data.\\ Scope: {\bf global} \\ Type: {\bf optional}\\ Intent: {\bf out}.\\ -Returned as: a real number. +Returned as: a real number. A correct result will be greater than or +equal to one; if specified for non-real data, or an error occurred, +zero is returned. \item[info] Error code.\\ Scope: {\bf local} \\ Type: {\bf required} \\ diff --git a/krylov/psb_ckrylov.f90 b/krylov/psb_ckrylov.f90 index 7d3ac982..464aca2e 100644 --- a/krylov/psb_ckrylov.f90 +++ b/krylov/psb_ckrylov.f90 @@ -200,6 +200,9 @@ Subroutine psb_ckrylov_vect(method,a,prec,b,x,eps,desc_a,info,& call psb_info(ictxt, me, np) + ! Default return for COND + if (present(cond)) cond = szero + select case(psb_toupper(method)) case('CG') call psb_ccg_vect(a,prec,b,x,eps,desc_a,info,& diff --git a/krylov/psb_dkrylov.f90 b/krylov/psb_dkrylov.f90 index 656628e9..b97ab66d 100644 --- a/krylov/psb_dkrylov.f90 +++ b/krylov/psb_dkrylov.f90 @@ -200,6 +200,9 @@ Subroutine psb_dkrylov_vect(method,a,prec,b,x,eps,desc_a,info,& call psb_info(ictxt, me, np) + ! Default return for COND + if (present(cond)) cond = dzero + select case(psb_toupper(method)) case('CG') call psb_dcg_vect(a,prec,b,x,eps,desc_a,info,& diff --git a/krylov/psb_skrylov.f90 b/krylov/psb_skrylov.f90 index 763b3c2f..49fdd083 100644 --- a/krylov/psb_skrylov.f90 +++ b/krylov/psb_skrylov.f90 @@ -200,6 +200,9 @@ Subroutine psb_skrylov_vect(method,a,prec,b,x,eps,desc_a,info,& call psb_info(ictxt, me, np) + ! Default return for COND + if (present(cond)) cond = szero + select case(psb_toupper(method)) case('CG') call psb_scg_vect(a,prec,b,x,eps,desc_a,info,& diff --git a/krylov/psb_zkrylov.f90 b/krylov/psb_zkrylov.f90 index 6162334b..77373e17 100644 --- a/krylov/psb_zkrylov.f90 +++ b/krylov/psb_zkrylov.f90 @@ -200,6 +200,9 @@ Subroutine psb_zkrylov_vect(method,a,prec,b,x,eps,desc_a,info,& call psb_info(ictxt, me, np) + ! Default return for COND + if (present(cond)) cond = dzero + select case(psb_toupper(method)) case('CG') call psb_zcg_vect(a,prec,b,x,eps,desc_a,info,&