Merge branch 'jolivet/fix-double-semicolons' into 'maint'

Double semicolons

See merge request petsc/petsc!2150

Double semicolons

Merge branch 'stefanozampini/fix-int-occurencies' into 'master'

Remove wrong usage of int datatype from PETSc code

See merge request petsc/petsc!2101

Remove wrong usage of int datatype from PETSc code

Merge branch 'barry/fix-matmffd' [PR #1732]

* barry/fix-matmffd:
Fix bugs in MATMFFD related to scaling and shifting

Fix bugs in MATMFFD related to scaling and shifting

1) refactored MATMFFD to use MATSHELL and inherit all of its tested handling of shifting and scaling
2) added example testing MATHSHELL handling o

Fix bugs in MATMFFD related to scaling and shifting

1) refactored MATMFFD to use MATSHELL and inherit all of its tested handling of shifting and scaling
2) added example testing MATHSHELL handling of multiple shifts and scales
3) added test of MATMFFD for non-square matrix; from Stefano Zampini <stefano.zampini@gmail.com>
4) refactor MATMFFD and MATSHELL to properly use PetscUseMethod() instead of type comparisons
5) changed handling of -snes_mf so preconditioning is not automatically turned off if -snes_mf is used
6) fixed test cases that now need -pc_type none due to change 5
7) added test case for MatGetDiagonal() for MATMFFD
8) added error checking of use of several MATSHELL operations for non-congruent matrices
9) SNESView now prints additional information about how the Jacobian is computed

Commit-type: bug-fix, testing-fix, style-fix, feature
Reported-by: Stefano Zampini <stefano.zampini@gmail.com>

show more ...

Merged in barry/update-collective-on (pull request #1744)

Update the use of Collective on in the manual pages to reflect the new style

Update the use of Collective on in the manual pages to reflect the new style

Commit-type: style-fix, documentation
Thanks-to: Patrick Sanan <patrick.sanan@gmail.com>

Merged in psanan/man-pages-remove-keywords (pull request #1717)

Man pages: Remove .keywords fields

Approved-by: BarryFSmith <bsmith@mcs.anl.gov>

Man pages: remove .keywords: fields

This field is recognized by doctext from Sowing (http://wgropp.cs.illinois.edu/projects/software/sowing/doctext/node20.htm#Node20),
but it doesn't seem to be unif

Man pages: remove .keywords: fields

This field is recognized by doctext from Sowing (http://wgropp.cs.illinois.edu/projects/software/sowing/doctext/node20.htm#Node20),
but it doesn't seem to be uniformly used or maintained.

Thus, remove all .keywords: fields, and a following blank line, if present.

This is accomplished with GNU sed (gsed on OS X), with the following commands.
*Warning* that this type of command can corrupt a .git directory,
so be cautious in reusing or modifying these commands. They first look
for and delete matching lines with a following line consisting of only whitespace,
and then delete any remaining matching lines.

find src/ -type f -exec gsed -i '/keywords:/ {N; /\n\s*$/d}' {} +
find src/ -type f -exec gsed -i '/keywords:/d' {} +
find include/ -type f -exec gsed -i '/keywords:/ {N; /\n\s*$/d}' {} +
find include/ -type f -exec gsed -i '/keywords:/d' {} +

Hints on the sed command obtained from: https://unix.stackexchange.com/questions/100754/how-to-delete-a-specific-line-and-the-following-blank-line-using-gnu-sed

show more ...

Merged in stefano_zampini/fix-matcomputeexplicitop (pull request #1570)

Allow specifying an operator type when computing operators explicitly

Approved-by: BarryFSmith <bsmith@mcs.anl.gov>
Approved-

Merged in stefano_zampini/fix-matcomputeexplicitop (pull request #1570)

Allow specifying an operator type when computing operators explicitly

Approved-by: BarryFSmith <bsmith@mcs.anl.gov>
Approved-by: Patrick Sanan <patrick.sanan@gmail.com>

show more ...

Deprecate old {Mat|PC|KSP}ComputeExplicitOperator in favor of {Mat|PC|KSP}ComputeOperator

{Mat|PC|KSP}ComputeExplicitOperator: add extra argument for matrix type

Merged in stefano_zampini/feature-matshell-zerorows (pull request #1547)

Add support for zeroing rows and columns of a MATSHELL

Approved-by: Matthew Knepley <knepley@gmail.com>
Approved-by: BarryFS

Merged in stefano_zampini/feature-matshell-zerorows (pull request #1547)

Add support for zeroing rows and columns of a MATSHELL

Approved-by: Matthew Knepley <knepley@gmail.com>
Approved-by: BarryFSmith <bsmith@mcs.anl.gov>

show more ...

Merge branch 'maint'

Merged in stefano_zampini/misc-fixes/maint (pull request #1550)

Stefano zampini/misc fixes/maint

Approved-by: BarryFSmith <bsmith@mcs.anl.gov>

MATSHELL: Added default implementaion for MatZeroRows and MatZeroRowsColumns

MATSHELL: added utility routine to automate creation of a MatShell object from any Mat

MATSHELL: honor MAT_DO_NOT_COPY_VALUES

MATSHELL: Add missing axpy to MatMultTranspose_Shell

Merge branch 'maint'

Clarifying docs for MatCreateShell() on triggering rebuilding of preconditioner
and behavior of MatAssemblyBegin()/MatAssemblyEnd()

Commit-type: documentation
Thanks-to: Robert Nr Nourgaliev <nourga

Clarifying docs for MatCreateShell() on triggering rebuilding of preconditioner
and behavior of MatAssemblyBegin()/MatAssemblyEnd()

Commit-type: documentation
Thanks-to: Robert Nr Nourgaliev <nourgaliev1@llnl.gov>

show more ...

Merge branch 'master' into wence/feature-patch-all-at-once

Merge branch 'jed/fix-matconvert-shell/maint' into maint [PR #1352]

* jed/fix-matconvert-shell/maint:
MatConvert_Shell: fix for non-square and parallel matrices
MatComputeExplicitOperator: use MatCo

Merge branch 'jed/fix-matconvert-shell/maint' into maint [PR #1352]

* jed/fix-matconvert-shell/maint:
MatConvert_Shell: fix for non-square and parallel matrices
MatComputeExplicitOperator: use MatConvert_Shell

show more ...

Merge branch 'jed/fix-matconvert-shell/maint' [PR #1352]

* jed/fix-matconvert-shell/maint:
MatConvert_Shell: fix for non-square and parallel matrices
MatComputeExplicitOperator: use MatConvert_Shell