Merge remote-tracking branch 'origin/stefano_zampini/mattransposedense-ldafix' into stefano_zampini/pcbddc-adaptive-selection

Merged petsc/petsc into master

Merge branch 'barry/add-ksp-total-iterations/master'

Merge branch 'pr192/Fande-Kong/scalable-matincreaseoverlap/master' of https://bitbucket.org/petsc/petsc

Merged petsc/petsc into master

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

Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/mat/impls/aij/mpi/mumps/mumps.c
s

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

Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/mat/impls/aij/mpi/mumps/mumps.c
src/mat/impls/is/matis.h

show more ...

Merged master into semihozmen/ksp-fcg-eigen-comp-support

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'

fix ex5.c so SNES counts linear solve over all grid sequencing steps to match cummulative counts of linear solver

updated PETSc directory layout to match standard packaging strategies

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

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 'knepley/feature-harmonic-advection'

* knepley/feature-harmonic-advection: (86 commits)
SNES: Some docs for NASM
TS: Added view for MIMEX
Plex: Silence compiler warnings
Builder

Merge branch 'knepley/feature-harmonic-advection'

* knepley/feature-harmonic-advection: (86 commits)
SNES: Some docs for NASM
TS: Added view for MIMEX
Plex: Silence compiler warnings
Builder: Check for missing numProcs was wrong
PetscFE: Turn off Fortran binding for PetscFECompositeGetMapping()
Plex: Fix big bug in DMPlexGetGlobalFieldOffset_Internal() - If offset is negative (dof is on another proc), then we must have end < start
Builder: Allow override of numProcs
Plex: Fix Fortran wrappers for DMLabelView() and DMPlexDistribute()
Plex+Label: Added Fortran wrapper for DMPlexCreateLabel()
Plex: Dammit, how did this not get checked in?
Plex: Refiner check for hybrid cells must use hybrid faces as well - Ghost cells in FV method are hybrid
TS: MIMEX now uses work vectors for correct grid
Plex: Adding support for FV in automatic interpolator construction - Notice that the injector cannot do the right thing until we scrap VecScatter
Plex+FEM: Using PetscFVGetDualSpace()
SNES+Doc: Added Options Database keys
PetscFV: Added PetscFVRefine() - This allows interpolation to finer grids needed for FAS
PetscFV: Added a dual space for calculating projections
DM: Better error checking in DMCoarsen()
DMDT+PetscFE: Added PetscQuadratureExpandComposite() - Replaces PetscFECompositeExpandQuadrature() - Added PetscFECompositeGetMapping()
Plex: Fixed complex type error
...

Conflicts:
src/dm/impls/plex/ftn-custom/makefile
src/ts/interface/ts.c

show more ...

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

SNES: Added SNESMonitorDefaultField()
- The option is -snes_monitor_field
- It falls back to the default monitor is no field structure is present in a Section

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 'tisaac/simplify-register-all'

Removed the XXXRegisterAll() functions from the public interface. These should now only be handled by the package intialization functions.

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

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

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

Merge branch 'pefarrell/linesearch-nleqerr'

* pefarrell/linesearch-nleqerr:
SNES: Fixed makefile for nleqerr linesearch
Make the citation data static.
Add a test based on ex15
Eliminate an u

Merge branch 'pefarrell/linesearch-nleqerr'

* pefarrell/linesearch-nleqerr:
SNES: Fixed makefile for nleqerr linesearch
Make the citation data static.
Add a test based on ex15
Eliminate an unnecessary C99ism
Implement Barry and Matt's suggestions.
Implement the NLEQ-ERR linesearch of Deuflhard (2011).

show more ...

Fixed errors in manual page documentation including formating.
Fixed rank argument for DMCreateRedundant() to be PetscMPIInt

Reported-by: Dave May <dave.mayhem23@gmail.com>

Merge branch 'tisaac/feature-gamg-extensible' into barry/experiment

Conflicts:
src/ksp/pc/impls/gamg/gamg.h