diff options
author | Leo Famulari <leo@famulari.name> | 2016-05-13 02:03:22 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2016-05-13 02:08:11 -0400 |
commit | eb74eb4199db3faac654114257996f244ec308f5 (patch) | |
tree | 9504ae968710941557be6d1edd244618eeb14448 /gnu/packages/patches/hypre-doc-tables.patch | |
parent | f10e7ef475da430afa46e0b062010952ed886694 (diff) | |
parent | e9017c98d61f305b624bacaa30e8891ec0100980 (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/hypre-doc-tables.patch')
-rw-r--r-- | gnu/packages/patches/hypre-doc-tables.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/gnu/packages/patches/hypre-doc-tables.patch b/gnu/packages/patches/hypre-doc-tables.patch new file mode 100644 index 0000000000..6a852ee78e --- /dev/null +++ b/gnu/packages/patches/hypre-doc-tables.patch @@ -0,0 +1,25 @@ +Fixes doc++'s treatment of tabular within a parameter block. + +From commit 883925f8a at http://github.com/LLNL/hypre + +--- hypre-2.10.1/src/parcsr_ls/HYPRE_parcsr_ls.h 2015-12-04 22:12:19.000000000 -0600 ++++ hypre-2.10.1/src/parcsr_ls/HYPRE_parcsr_ls.h 2016-03-16 09:02:58.547501336 -0500 +@@ -1154,8 +1154,6 @@ + * Set the symmetry parameter for the + * ParaSails preconditioner. + * +- * @param solver [IN] Preconditioner object for which to set symmetry parameter. +- * @param sym [IN] Value of the symmetry parameter: + * \begin{tabular}{|c|l|} \hline + * value & meaning \\ \hline + * 0 & nonsymmetric and/or indefinite problem, and nonsymmetric preconditioner\\ +@@ -1163,6 +1161,9 @@ + * 2 & nonsymmetric, definite problem, and SPD (factored) preconditioner \\ + * \hline + * \end{tabular} ++ * ++ * @param solver [IN] Preconditioner object for which to set symmetry parameter. ++ * @param sym [IN] Value of the symmetry parameter: + **/ + HYPRE_Int HYPRE_ParaSailsSetSym(HYPRE_Solver solver, + HYPRE_Int sym); |