Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection

Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c

Merge branch 'master' into barry/saws-options-merge-master

Totally confusing manual merge, could be wrong

Conflicts:
include/petscoptions.h
src/dm/impls/da/dacreate.c
src/sys/objects/aoptions.c

Merge branch 'master' into barry/saws-options-merge-master

Totally confusing manual merge, could be wrong

Conflicts:
include/petscoptions.h
src/dm/impls/da/dacreate.c
src/sys/objects/aoptions.c
src/sys/threadcomm/interface/threadcomm.c

show more ...

Merge branch 'master' into pr252/dmay/PetscViewerBinarySkipHeaderVecViewLoad
Manual merge of makefile

Conflicts:
src/sys/classes/viewer/examples/tutorials/makefile

Merge branch 'barry/feature-vec-lock'

Added VecLockPush() and VecLockPop() to make vector read only
Used VecLockPush() and VecLockPop() in a couple of key locations; PCApply(), KSPSolve(), MatMult()
Fixed many uses of VecGetArray() to Ve

Added VecLockPush() and VecLockPop() to make vector read only
Used VecLockPush() and VecLockPop() in a couple of key locations; PCApply(), KSPSolve(), MatMult()
Fixed many uses of VecGetArray() to VecGetArrayRead()
Added VecGet/RestoreArrayPair() for commonly occuring pattern
Added const to many locations driven by use of VecGetArrayRead()

show more ...

Merge branch 'barry/remove-unneeded-paren-petscmalloc'

Conflicts:
src/mat/impls/baij/seq/baij.c

Merge branch 'master' into mlange/refactor-plex-distribute

Conflicts:
src/dm/impls/plex/examples/tests/output/ex12_1.out
src/dm/impls/plex/examples/tests/output/ex12_2.out

convert some PetscMalloc() to PetscMalloc1()
remove unneeded () in first argument to PetscMalloc/Calloc1()
fixes for MATLAB examples

Merge branch 'barry/dynamic-matsolverpackageregister'

Conflicts:
src/mat/impls/aij/seq/seqcusparse/aijcusparse.cu

Moved registration of MatSolverPackages out of MatCreate_XXX routines into standalone system, this allows
1) more precise error message when a requested solver is not found
2) easier to add new solve

Moved registration of MatSolverPackages out of MatCreate_XXX routines into standalone system, this allows
1) more precise error message when a requested solver is not found
2) easier to add new solvers without touching basic PETSc matrix implementation files and the possibility of adding new solvers to the library after PETSc is installed or even at run time

show more ...

Merge branch 'barry/add-some-matsolveforward-back' into maint

Merge branch 'barry/add-some-matsolveforward-back'

Added MatForward/BackwardSolve for SeqBAIJ block size 1-3 natural ordering
Added testing for them in already existing test code

Merged upstream/master to feature-dmmoab

Merge remote-tracking branch 'upstream/master'

Merge branch 'master' into prbrune/snes-fascontinuation

* master: (855 commits)
fix for moab example had wrong blocksize of mapping
docs:remove src/docs/doxygen/manual [per Barry's instructions]

Merge branch 'master' into prbrune/snes-fascontinuation

* master: (855 commits)
fix for moab example had wrong blocksize of mapping
docs:remove src/docs/doxygen/manual [per Barry's instructions]
gfortran: remove 132 char limit from f90 free-form
SNES: Set up matrix-free *after* copying the user Jacobian to snes->pc
DMPlex-Gmsh: Use trueNumCells when building the coordinate section
Sys: Got guard logic reversed
Sys: The #define guard for PetscMalloc*() must match the one for PetscFree*()
PetscFV: I hate fucking complex
removed ltog scatter from DMDA since functionality can be obtained with gtol scatter and less memory
fix test of DMLocalToGlobalBegin/End and add actual test cases
improve object memory logging for DA, ISLocalToGlobal and ISBLOCK
lower high water mark of constructing parallel scatter by allocating only as much room in svalues as needed
owner in VecScatter construction is the rank, therefor can use PetscMPIInt to hold it do not PetscInt
another reuse of allocated array in 2d/3d DMDA create
improved high water mark of DMDASetups by implementing and using PETSC_USE_POINTER for ISCreateBlock()
PetscFV: Another complex fix
DMPlex+TS: Fixing types
ISIdentity() was wrong for block IS! Indices are NOT scaled by bs
PetscFV: Straighten out complex types
TS ex11: Fix casts and remove unused variable
...

show more ...

Merge branch 'master' into barry/saws-options

Merge branch 'master' into stefano_zampini/pcbddc-multilevel-improvement

Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bdd

Merge branch 'master' into stefano_zampini/pcbddc-multilevel-improvement

Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bddcprivate.c

show more ...

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

Damn, Jed will be mad at me again for forgetting to push earlier; oh well git makes it too difficult to fix

Merge branch 'knepley/fix-mat-missing-diagonal'

check misssing diagonal for PETSc cholesky symbolic factorization

check misssing diagonal for PETSc icc symbolic factorization; bugfix for MatMarkDiagonal_SeqSBAIJ()

Merge branch 'master' into shri/ts-events

Conflicts:
src/ts/interface/ts.c

Merge branch 'master' into shri/feature-dm-circuit

Conflicts:
src/dm/impls/makefile

Merging master with feature-dmmoab. Only conflict was with SOURCECXX specification under impls/moab/makefile.