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'

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

Plex: Fixed preallocation bug by using DMPlexGetGlobalFieldOffset_Private()

Plex: Switch all reallocation functions to use default sections

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

Plex+TS: Silence compiler warnings

Plex: Allow calculation of sparsity pattern on a per field basis
- Falls back to old implementation without Section information

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 'master' into knepley/fix-plex-examples-refinement

* master: (62 commits)
Plex+Label: Fix logic for label distribution - It is restrictive now, but doing it right would mean a ton of

Merge branch 'master' into knepley/fix-plex-examples-refinement

* master: (62 commits)
Plex+Label: Fix logic for label distribution - It is restrictive now, but doing it right would mean a ton of infrastructure I think
Plex ex12: Fix output after label distribution fix
Plex: Only call SetFromOptions() after Distribute, since we cannot avoid it
TS ex11: Since DMPlexDistribute() calls SetFromOptions(), do not call it again, and cleaned up tests
Plex+FV: If using FVM adjacency, do not create ghost cells for faces in the overlap, or set BC on them
Plex: If using FVM adjacency, we must include the closure in the overlap
Plex+Label: All processes with a valid label should participate in label distribution - Formerly it was just proc 0
Plex: Add check that parallel renumbering fully covers the cone points
Plex: For one level adjacency, include the point itself since this makes sense when looking in parallel from the overlap
Plex: Cannot Malloc2() the arrays passed to PetscSFSetGraph()
Plex: Preallocation fixes for indegree > 1 - Again this should be rewritten
SNES ex62: Changes to output for fixes with quads
Plex+Label: Set default output flag to PETSC_TRUE
Plex ex1: Fixed LaTeX output
Plex ex12: Fixed overlap test
Plex: Fixed incorrect usage of PetscSFGatherBegin/End() in preallocation - This should be rewritten using new style
PetscSF: Incorrect check for computed degrees
Builder: Fix bad search and replace
Configure: Fix for Barry's change to organization - I do not know what happened here
Builder: Fix for Barry's change
...

Conflicts:
src/snes/examples/tutorials/ex12.c

show more ...

Merge branch 'mlange/feature-parallel-distribute'

* mlange/feature-parallel-distribute: (33 commits)
Plex+Label: Fix logic for label distribution - It is restrictive now, but doing it right would

Merge branch 'mlange/feature-parallel-distribute'

* mlange/feature-parallel-distribute: (33 commits)
Plex+Label: Fix logic for label distribution - It is restrictive now, but doing it right would mean a ton of infrastructure I think
Plex ex12: Fix output after label distribution fix
Plex: Only call SetFromOptions() after Distribute, since we cannot avoid it
TS ex11: Since DMPlexDistribute() calls SetFromOptions(), do not call it again, and cleaned up tests
Plex+FV: If using FVM adjacency, do not create ghost cells for faces in the overlap, or set BC on them
Plex: If using FVM adjacency, we must include the closure in the overlap
Plex+Label: All processes with a valid label should participate in label distribution - Formerly it was just proc 0
Plex: Add check that parallel renumbering fully covers the cone points
Plex: For one level adjacency, include the point itself since this makes sense when looking in parallel from the overlap
Plex: Cannot Malloc2() the arrays passed to PetscSFSetGraph()
Plex: Preallocation fixes for indegree > 1 - Again this should be rewritten
SNES ex62: Changes to output for fixes with quads
Plex ex1: Fixed LaTeX output
Plex ex12: Fixed overlap test
Plex: Fixed incorrect usage of PetscSFGatherBegin/End() in preallocation - This should be rewritten using new style
PetscSF: Incorrect check for computed degrees
Builder: Fix for Barry's change
PetscSF: Fixes for sparse leaves - When sf->mine exists, the leaves can be numbered non-sequentially. This causes allocation based upon sf->nleaves to underallocate. Replacing sf->nleaves with the maximum leaf number is sufficient in this case.
Plex: Fix leaks
Configure: How did this break?
...

Conflicts:
config/builder.py

show more ...

Plex: Preallocation fixes for indegree > 1
- Again this should be rewritten

Plex: Fixed incorrect usage of PetscSFGatherBegin/End() in preallocation
- This should be rewritten using new style

Merge branch 'master' into knepley/fix-configure-petsc-dep

* master: (210 commits)
error out on special cases where DMLocalToGlobal_DA won't work
remove unneed uses of local DM vectors and DMLoc

Merge branch 'master' into knepley/fix-configure-petsc-dep

* master: (210 commits)
error out on special cases where DMLocalToGlobal_DA won't work
remove unneed uses of local DM vectors and DMLocalToGlobalBegin/End in examples removed to prevent cut and paste repeats of their use
openmpi: update to version 1.8.3
added more movies and pubs
more movies
MatGetDiagonalBlock() can be called before matrix is assembled
added a couple more movies/images
PetscLogEventGetId() was missing public prototype
simply output from make streams benchmark test
c2html: fixup so that C2HTML make variable is set [similar to cmake.py]
chaco: current blas test does'nt work with Cray CC [which automatically links with blas] and linux - where -lm needs to be listed explicitly. Switch the test to check if we are using PETSc modifled chaco
builddist: always install c2html/sowing
argonne logo for users manual cover
Remove PETSC_HAVE_CUSP_SMOOTHED_AGGREGATION, use PETSC_HAVE_CUSP instead.
mpich: use older tarball with cygwin/gnu compilers
updated information about packages PETSc can use in users manual
Updated users manual to latest ANL Report format requirements
mpich: update to mpich-3.1.3.tar.gz - remove -download-mpich-mpe [mpich no longer packages mpe] - remove -download-mpich-shared. It was added as a split from --with-mpi-shared to --known-mpi-shared and --download-mpich-shared in 50237a55163f90ac7341b723c6422dfa1dbce792 removing this gives back the control of shared=0/1 to package.py - remove download_solaris as the new tarball works with both gcov and on solaris - remove MPICHInstall() [and use GNUPackage.Install()] as the new tarball fixes 'make clean' requiring sudo
added more images and PETSc pubs
Doc: More refs
...

show more ...

Merge branch 'tisaac/feature-fe-geom-dim' into tisaac/plex-flexible-projection

Use the new PetscFECellGeom

Conflicts:
include/petscdmplex.h
include/petscfe.h
src/dm/impls/plex/plexfem.c

Merge branch 'tisaac/thplex'

This merge brings in related work in the following areas:
- Added a local constraint matrix to DM (see DMSetDefaultConstraints())
- Added point-to-anchor-point constrain

Merge branch 'tisaac/thplex'

This merge brings in related work in the following areas:
- Added a local constraint matrix to DM (see DMSetDefaultConstraints())
- Added point-to-anchor-point constraints in DMPlex (see
DMPlexSetAnchors()), which build on the DM constraints
- Added hierarchically-constrained points to DMPlex (see
DMPlexSetReferenceTree(), DMPlexSetTree()), which builds on the anchor
constraints
- Tests for these constraints in src/dm/impls/plex/examples/ex3.c (try
runex3_* examples in that directory)
- Added quadrature order (see PetscQuadratureGet/SetOrder()) (work by
Matt Knepley)
- Added default return values for DMGetCoordinateDim() (defaults to
DMGetDimension())

Conflicts:
include/petscdmplex.h
src/dm/dt/interface/dt.c
src/dm/impls/plex/examples/tests/ex3.c
src/dm/impls/plex/makefile
src/dm/impls/plex/plexfem.c

show more ...

DM+Plex: change the collective status of default constraints, anchors, and reference tree

The default constraints, anchors, and reference tree are changed to have
PETSC_COMM_SELF communicators.

The

DM+Plex: change the collective status of default constraints, anchors, and reference tree

The default constraints, anchors, and reference tree are changed to have
PETSC_COMM_SELF communicators.

The reasoning is that we would like tree constraints to cause only
minimal changes to the solution workflow demonstrated in
snes/examples/tutorials/ex12.c. We would like to insert only the
following code:

/* ... (construct/choose a reference tree) */
DMPlexSetReferenceTree(dm,refTree);
/* ... (construct the tree structure) */
DMPlexSetTree(dm,...);

This means that the presence of some type of constraints may not be
detected until DMPlexMatSetClosure(), within a cell loop. If that
happens, the following call graph occurs:

DMPlexMatSetClosure(dm,...) calls
DMGetDefaultConstraints(dm,...) calls
*DMCreateDefaultConstraints_Plex(dm,...) calls
DMPlexGetAnchors(dm,...) calls
*DMPlexCreateAnchors_Tree(dm,...)
DMPlexComputeAnchorMatrix_Tree_FromReference(dm,...) calls
DMGetDefaultConstraints(refTree,...) calls
*DMCreateDefaultConstraints_Plex(refTree,...) calls
DMPlexGetAnchors(refTree,...) calls
*DMPlexCreateAnchors_Tree(refTree,...)

The objects created in this cascade have to be local.

show more ...

Plex: rename Constraints as Anchors for clarity.

Now that there are DMGet/SetConstraints() functions, some clarity is
needed:

DMGet/SetConstraints() are any type of linear constraints that are
cons

Plex: rename Constraints as Anchors for clarity.

Now that there are DMGet/SetConstraints() functions, some clarity is
needed:

DMGet/SetConstraints() are any type of linear constraints that are
considered part of the global-to-local map.

DMPlexGet/SetAnchors() are linear constraints that make a point's dofs
linear dependent on the dofs of a set of anchor points.

DMPlexGet/SetTree() are anchor constraints that derive from a
hierarchically refined mesh.

show more ...