Merge branch 'gropp/doc-fixes-1' [PR #1838]

Merge from doc-fixes branch

Fixes for doctext update

Merged in barry/optimize-aij-da (pull request #1762)

Non-numeric optimizations focused on AIJ, MatFDColoring, and DMCreateMatrix_DA_*AIJ, looking to improve performance in GPU environments

Non-numeric optimizations focused on AIJ, MatFDColoring, and DMCreateMatrix_DA_*AIJ, looking to improve performance in GPU environments

1) PetscCalloc*() now uses system calloc()
2) Merged some Pets

Non-numeric optimizations focused on AIJ, MatFDColoring, and DMCreateMatrix_DA_*AIJ, looking to improve performance in GPU environments

1) PetscCalloc*() now uses system calloc()
2) Merged some PetscMalloc*()
3) Eliminated unneeded PetscCalloc*()
4) Removed some memory allocations and copies in MatFDColoringSetUp(), added local variables for better compiler optimization
5) Added MatSetValues_SeqAIJ_SortedFull(), added MatSetOption(MAT_SORTED_FULL)
6) Optimized DMCreateMatrix_DA_*AIJ for nonperiodic case to automatically have sorted columns (faster MatSetValues() times)
7) Eliminated call to PetscMemzero() in PetscFree()

Commit-type: style-fix, feature

show more ...

Merge remote-tracking branch 'origin/barry/add-petscarrayxxx-ops' [PR #1771]

Add PetscArraycmp(), PetscArraycpy(), PetscArrayzero(), PetscArraymove(), update code to use new forms

Replace a couple multi-mallocs with a single malloc
Replace backwards loops in MatSetValues_*()

Add PetscArraycmp(), PetscArraycpy(), PetscArrayzero(), PetscArraymove(), update code to use new forms

Replace a couple multi-mallocs with a single malloc
Replace backwards loops in MatSetValues_*() with PetscArraymove()

Commit-type: style-fix, feature

show more ...

Merge remote-tracking branch 'origin/psanan/docs-remove-manconcepts' [PR #1733]

Man pages: remove Concepts: fields

These fields were previously stripped from the man pages by logic removed in
21a59cba2737d49dc2f0bd12c08db0d2a3f3f209

Remove these fields from all man pages (but

Man pages: remove Concepts: fields

These fields were previously stripped from the man pages by logic removed in
21a59cba2737d49dc2f0bd12c08db0d2a3f3f209

Remove these fields from all man pages (but not from examples).

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 -not -path "*/examples/*" -not -name "*.html" -not -name "*.bib" -exec gsed -i '/Concepts:/ {N; /\n\s*$/d}' {} +
find src -type f -not -path "*/examples/*" -not -name "*.html" -not -name "*.bib" -exec gsed -i '/Concepts:/d' {} +
find include -type f -not -path "*/examples/*" -not -name "*.html" -not -name "*.bib" -exec gsed -i '/Concepts:/ {N; /\n\s*$/d}' {} +
find include -type f -not -path "*/examples/*" -not -name "*.html" -not -name "*.bib" -exec gsed -i '/Concepts:/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 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 jolivet/feature-getisbyindex (pull request #1544)

New function PCFieldSplitGetISByIndex

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

Add new function PCFieldSplitGetISByIndex()

Merge branch 'master' of bitbucket.org:petsc/petsc

Merge remote-tracking branch 'origin/jczhang/fix-vecscattercreate-api'

Revert the function name where it is referenced

Merge branch 'master' of bitbucket.org:petsc/petsc

Merge remote-tracking branch 'origin/jczhang/vecscat-in-sf' [PR #1396]

Fix more bugs when y is locked in VecScatter(x,y)

Do not do scatter to the same vector simultaneously

Revert "Undo/understand before merge: revert 95dbaa6faf01fdfd99114b7c9e5668e4b2aa754d"

This reverts commit 96372cdac3ae0e7b6f0dae2d347ffa16ffbd862a.

Undo/understand before merge: revert 95dbaa6faf01fdfd99114b7c9e5668e4b2aa754d

Merge branch 'master' into jpusztay/feature-swarm-symplectic-example

Merge branch 'master' into jpusztay/feature-swarm-symplectic-example

Merged petsc/petsc into master