Merge branch 'master' into pr192/Fande-Kong/scalable-matincreaseoverlap/master

Needed to merge master to update to new calling sequence PetscCommBuildTwoSided

Merged petsc/petsc into master

Merge branch 'barry/fix-directory-layout'

updated PETSc directory layout to match standard packaging strategies

include/petsc finclude,private,mpiuni
lib/petsc conf
bin/petsc*

Merge branch 'master' into knepley/feature-viewer-partial-read

* master: (48 commits)
ViennaCL: Fixes memory leak when destructing an aijviennacl matrix.
MatLoad_MPIDense() always allocated arra

Merge branch 'master' into knepley/feature-viewer-partial-read

* master: (48 commits)
ViennaCL: Fixes memory leak when destructing an aijviennacl matrix.
MatLoad_MPIDense() always allocated array space even if it was previously provided
Clarified lumping options for PCFieldSplitSchurPreType SELFP.
fixed up PetscInfo in GAMG
TSErrorWeightedNorm[2|Infinity]: API changes
MatLoad_SeqDense() always allocated new space for the data even if the user already provided it
Fixed DMCompositeGetAccessArray() to support readonly vectors
Fix obviously-wrong aspects of documentation on SNESVINEWTONRSLS and SNESVINEWTONSSLS.
fixed example to compile - demonstrates a bug
var name 'len' was F90 key word
For user provided Jacobian functions they should always assembly into the second matrix, the one from which the preconditioner is built because the first may be used as matrix-free with -snes_mf_operator
Suggest --with-64-bit-indices if users mistakenly use --with-64bit-indices
Fix configure logging of integer size.
missing underscore in #define of vecgetarrayread translation of fortran stub for VECGETARRAYREAD
updated test output files to reflect differences introduced previously in PCView output
-ksp_type preonly does not support -ksp_monitor_short so remove from test line to prevent extranious warning output
missing CHKERRQ; and ugly double declaration of ierr
Plex: Reorganized PlexPoint interface - Added DMPlexGetPointLocalField() and DMPlexGetPointGlobalField() - Now the DMPlexGetLocalOffset*_Private() functions return start and end - Uniformly use private functions
Plex: Put in explicit cast
MatSetValuesMPISBAIJ will now print correct global indices when error generated due to new nonzero location
...

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

show more ...

Merge branch 'master' into tisaac/dmforest

If we're going to start developing on this again, the recent changes to the
location of configuration files will make it annoying to switch to and from
thi

Merge branch 'master' into tisaac/dmforest

If we're going to start developing on this again, the recent changes to the
location of configuration files will make it annoying to switch to and from
this branch. Matt's and my fixes in DMPlex will also be relevant.

* master: (1557 commits)
MatLoad_MPIDense() always allocated array space even if it was previously provided
Clarified lumping options for PCFieldSplitSchurPreType SELFP.
fixed up PetscInfo in GAMG
TSErrorWeightedNorm[2|Infinity]: API changes
MatLoad_SeqDense() always allocated new space for the data even if the user already provided it
Fixed DMCompositeGetAccessArray() to support readonly vectors
Fix obviously-wrong aspects of documentation on SNESVINEWTONRSLS and SNESVINEWTONSSLS.
fixed example to compile - demonstrates a bug
var name 'len' was F90 key word
For user provided Jacobian functions they should always assembly into the second matrix, the one from which the preconditioner is built because the first may be used as matrix-free with -snes_mf_operator
Suggest --with-64-bit-indices if users mistakenly use --with-64bit-indices
Fix configure logging of integer size.
missing underscore in #define of vecgetarrayread translation of fortran stub for VECGETARRAYREAD
updated test output files to reflect differences introduced previously in PCView output
-ksp_type preonly does not support -ksp_monitor_short so remove from test line to prevent extranious warning output
missing CHKERRQ; and ugly double declaration of ierr
Plex ex3: For want of a semicolon, the kingdom was lost
MatSetValuesMPISBAIJ will now print correct global indices when error generated due to new nonzero location
completed basic use of MatSetValuesBlocked_SeqBAIJ_Inlined() by MatSetValuesBlocked_MPIBAIJ() to allow proper global indices being printed when error generated by new nonzero locations.
Added inline version of MatSetValuesBlocked_SeqBAIJ() to be used by MatSetValuesBlocked_MPIBAIJ() to print error message for nonzero block with global indices
...

show more ...

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

Merge branch 'barry/feature-bargraph'

added PetscDrawBar object for drawing bar graphs

Merge branch 'master' into shri/ts-is-for-differential-variables

Conflicts:
include/petsc-private/tsimpl.h
src/ts/impls/eimex/eimex.c
src/ts/interface/ts.c

Merge branch 'master' into jed/chem
Note merging a branch with good stuff in it for a year and a half is insane!

Conflicts:
src/ts/examples/tutorials/makefile
src/ts/interface/ts.c

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/refactor-petscsubcomm'

minor cleanup of PetscSubcomm code and documentation

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/experiment'

Merge branch 'barry/fix-pc-reuse-preconditioner-bjacobi' into maint

merge

Merge branch 'karpeev/fix-ksp-matgetschurcomplement-pmatreuse' into barry/experiment

Conflicts:
src/ksp/ksp/utils/schurm.c

Merge branch 'barry/update-sowing'

Conflicts:
tutorials/HandsOnExercise.html

KSP/PCSetReusePreconditioner() did not work for block Jacobi preconditioner with one
block per process because the inner ksp accesses directly a portion of the outer matrix
and hence observed a new m

KSP/PCSetReusePreconditioner() did not work for block Jacobi preconditioner with one
block per process because the inner ksp accesses directly a portion of the outer matrix
and hence observed a new matrix state and constructed a new preconditioner even if the
outer KSP/PC had a reuse preconditioner flag. Thus extra computation as performed of
rebuilding the inner preconditioner. This did not affect the solutions accuracy but
did change the time to solution.

Reported-by: Mark Samonds <Mark.Samonds@esi-group.com>

show more ...

simplify option object names