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

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

* knepley/feature-viewer-partial-read:
Viewer: Fixed initialization
TS: Updated example to new interface
Plex: Fix compiler warning
Viewer:

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

* knepley/feature-viewer-partial-read:
Viewer: Fixed initialization
TS: Updated example to new interface
Plex: Fix compiler warning
Viewer: Now ViewerRead() takes an extra argument to return the number of items read - An error is thrown for insufficient data unless the extra argument is non-NULL
Viewer: Fixes for new Read interface - Fixed example - Fixed Fortran 90 binding - Fixed type
Builder: Allow a local dictionary for run parameters
Viewer: PetscViewerRead() should return the number of items actually read - This also applies to all its implementations

show more ...

Viewer: Now ViewerRead() takes an extra argument to return the number of items read
- An error is thrown for insufficient data unless the extra argument is non-NULL

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 'maint'

Viewer: PetscViewerRead() should return the number of items actually read
- This also applies to all its implementations

Added PetscBagRegister64bitInt()

Requested-by: Glenn Hammond <gehammo@sandia.gov>

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 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 ...

Merged upstream/master to feature-dmmoab

Merge remote-tracking branch 'upstream/master'

Merge branch 'knepley/fix-fe-multifield'

* knepley/fix-fe-multifield:
DMPlex ex4: Changed numbering for hybrid edges
DMPlex ex3: Interpolation now working for Discontinuous Lagrange
PetscDualS

Merge branch 'knepley/fix-fe-multifield'

* knepley/fix-fe-multifield:
DMPlex ex4: Changed numbering for hybrid edges
DMPlex ex3: Interpolation now working for Discontinuous Lagrange
PetscDualSpace: Fixed index error in Lagrange creation
PetscFE: Fixed PetscFERefine() - The refined dual space was not properly duplicated - Added PetscDualSpaceDuplicate()
DMPlex ex1: Updated test output
DM: Added check for erroneous input when creating default SF
PetscFE: Fixed allocation bug
PetscBag: Added PetscBagGetNames()

show more ...

Merge branch 'master' into barry/saws-options

PetscBag: Added PetscBagGetNames()

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' 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.

Merged petsc/petsc into master

Merge branch 'master' into prbrune/snes-fascontinuation

Conflicts:
include/petscsnesfas.h

Merge branch 'master' into barry/ts-rhsjacobian-only

Merge branch 'shri/update-SuiteSparse' into shri/external-package-KLU

Conflicts:
conf/test
config/examples/arch-linux-pkgs-dbg-ftn-interfaces.py
config/examples/arch-linux-pkgs-opt.py

Merge branch 'master' into balay/tao-to-petsc

Conflicts:
include/makefile