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

Merge branch 'master' into barry/experiment

Merge branch 'pr245/mapdes/dmcreateinjection-mat'

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

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

Merge branch 'knepley/feature-combined-tabulation'

* knepley/feature-combined-tabulation: (38 commits)
Plex: Fix compiler warning
Plex+SNES: Fixes for nonzero cStart
Plex: Preserve periodicity

Merge branch 'knepley/feature-combined-tabulation'

* knepley/feature-combined-tabulation: (38 commits)
Plex: Fix compiler warning
Plex+SNES: Fixes for nonzero cStart
Plex: Preserve periodicity when adding ghost cells
Plex: Fixed DMPlexGetGlobalFieldOffset_Private() in optimized mode
Plex+SNES: Offset should be into field components, not basis functions
Plex+SNES: Add guards for optional arrays
DS: Added PetscDSGetComponentOffset(), Added to petsc.h
Plex+TS: FVM RHS computation uses a global F
Plex+FV: Corrected accumulation of fluxes to cells and added time derivative term
Plex: Added DMPlexPointGlobalFieldRead/Ref()
Plex+SNES: Fixed DMPlexGetFaceFields() - It returns field values, not coefficients - FE evaluation is now done
FV: In PetscFVIntegrateRHSFunction(), the arguments are field values, not coefficients
FE: Added EvaluateFaceFields() to FE fields at face centroids
Plex: Added DMPlexPointLocalFieldRead()
FE: Have a standard tabulation at face centroids
Plex: Copy BC for hierarchical refinement
FE: Allow P0 over 1D cells
Plex+FV: Fixed BC with gradient calculation
Plex ex1: Move overlap computation after SetFromOptions
Plex: DMPlexDistribute() no longer calls DMSetFromOptions() - Fixed examples
...

show more ...

simplify option object names

Merge branch 'knepley/feature-combined-tabulation' into knepley/feature-ts-fem+fvm-example

* knepley/feature-combined-tabulation: (41 commits)
Plex: Fix distribution of uninterpolated meshes - Doe

Merge branch 'knepley/feature-combined-tabulation' into knepley/feature-ts-fem+fvm-example

* knepley/feature-combined-tabulation: (41 commits)
Plex: Fix distribution of uninterpolated meshes - Does SF stratification by depth, not by dimension - The old code numbered cells after vertices
Plex+SNES: Fixes for nonzero cStart
cannot call PetscObjectGetName() on a subset of the MPI processes
MatView() with some matrix formats and ASCII_MATLAB did not print correct matrix name
Plex: Preserve periodicity when adding ghost cells
Plex: Fixed DMPlexGetGlobalFieldOffset_Private() in optimized mode
Plex+SNES: Offset should be into field components, not basis functions
Plex+SNES: Add guards for optional arrays
DS: Added PetscDSGetComponentOffset(), Added to petsc.h
Plex+TS: FVM RHS computation uses a global F
Plex+FV: Corrected accumulation of fluxes to cells and added time derivative term
Plex: Added DMPlexPointGlobalFieldRead/Ref()
Plex+SNES: Fixed DMPlexGetFaceFields() - It returns field values, not coefficients - FE evaluation is now done
FV: In PetscFVIntegrateRHSFunction(), the arguments are field values, not coefficients
FE: Added EvaluateFaceFields() to FE fields at face centroids
Plex: Added DMPlexPointLocalFieldRead()
FE: Have a standard tabulation at face centroids
Plex: Copy BC for hierarchical refinement
FE: Allow P0 over 1D cells
Plex+FV: Fixed BC with gradient calculation
...

Conflicts:
config/builder.py

show more ...

Plex: Added face markers to cube mesh

updated new XXXSetFromOptions_YYY() methods to take PetscOptionsObjectType

DMCreateInjection: return Mat rather than VecScatter

For (amongst others) FV discretisations, the natural injection may well
be cell averaging, which is not expressible as a VecScatter.

Merge branch 'mlange/plex-gmsh-binary'

* mlange/plex-gmsh-binary:
Viewer: Fix 64-bit integer parse
Plex-Gmsh: Improve error handling
Viewer: Use %lld to parse 64-bit integers
Plex-Gmsh: Fixe

Merge branch 'mlange/plex-gmsh-binary'

* mlange/plex-gmsh-binary:
Viewer: Fix 64-bit integer parse
Plex-Gmsh: Improve error handling
Viewer: Use %lld to parse 64-bit integers
Plex-Gmsh: Fixes for 64-bit integer mode
Plex-Gmsh: Fix and test parallel Gmsh reads
Plex-Gmsh: Add new Gmsh tests based on 2D square
Plex-Gmsh: Add DMPlexCreateGmshFromFile, which determines file type
Plex-Gmsh: Enabling binary mesh file reads in DMPlexCreateGmsh
Viewer: Add PetscViewerRead()
Plex-Gmsh: Adding PetscViewerASCIIRead()
Plex-Gmsh: Read gmsh elements into memory for repeated file traversal.
Plex-Gmsh: Fix cell and dimension counting

Conflicts:
src/dm/impls/plex/plexgmsh.c

show more ...

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

Plex-Gmsh: Add DMPlexCreateGmshFromFile, which determines file type

The file type is determined by reading the first two lines of the header.

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

Merge remote-tracking branch 'origin/tisaac/plex-flexible-projection'

* origin/tisaac/plex-flexible-projection:
PetscDualSpace: Fixed function signature
Plex: update libraries for ex3
Plex: mo

Merge remote-tracking branch 'origin/tisaac/plex-flexible-projection'

* origin/tisaac/plex-flexible-projection:
PetscDualSpace: Fixed function signature
Plex: update libraries for ex3
Plex: move DMPlexProjectionFunction() back to libdm
Plex: use -dm_plex_max_projection_height in non-conforming examples
Plex: fixed a typo in DMPlexProjectFunctionLocal()
Plex: added DMPlexComputeProjection3Dto1D_Internal()
Plex: fixes to recent merge
PetscFE: added dim, dimEmbed to PetscFECellGeom
Plex: skip empty loops for empty dual spaces
DualSpace: 0-order Lagrange spaces do not have dual spaces for height > 0.
Plex: protect against field projection with height > 0.
Plex: start implementing projection with height > 0.
PetscDualSpace: added PetscDualSpaceGetHeightSubspace()
Plex: added DMPlexGet/SetMaxProjectionHeight()

Conflicts:
src/dm/impls/plex/plexcreate.c

show more ...

Merged in mlange/fix-plex-distributed-refine (pull request #220)

Plex: Test and fix parallel refinement

Merge branch 'barry/fix-options-default'

Conflicts:
src/ksp/ksp/examples/tutorials/ex52.c

Plex ex1: Fix name of local coordinate vector

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 'knepley/feature-plex-partitioner-shell'

* knepley/feature-plex-partitioner-shell:
Plex: Cleanup of examples to use new interfaces
Plex: Added DMPlexCreateFromFile() - Dispatches to

Merge branch 'knepley/feature-plex-partitioner-shell'

* knepley/feature-plex-partitioner-shell:
Plex: Cleanup of examples to use new interfaces
Plex: Added DMPlexCreateFromFile() - Dispatches to the right constructor based on extension
Plex ex1: Added test partitioner
Plex: Added DMPlexGetPartitioner() and PetscPartitionerShellSetPartition()
PetscSection: Added PetscSectionCopy()
Plex ex1: Cleaned up mesh creation - Now use -dm_refine for uniform refinement
Plex: Remove superfluous argument from DMPlexDisitrbute()
Plex: Fixed Fortran stub
PetscFV: Lots of small naming fixes
Partitioner+Plex: Added PetscPartitioner class - Plex holds a PetscPartitioner - Changed args so that PetscSections are modified, not created (also of DMPlexEnlargePartition) - Now partition routine takes a number of partitions instead of assuming commSize - Added a shell partitioner intended to be used for regression testing

Conflicts:
src/dm/impls/plex/examples/tests/ex1.c

show more ...

cleanup of use of PetscOptionsInt and friends including use of flag final argument

Merge branch 'knepley/feature-plex-partitioner-shell' into mlange/feature-parallel-distribute

* knepley/feature-plex-partitioner-shell:
Plex: Cleanup of examples to use new interfaces
Plex: Adde

Merge branch 'knepley/feature-plex-partitioner-shell' into mlange/feature-parallel-distribute

* knepley/feature-plex-partitioner-shell:
Plex: Cleanup of examples to use new interfaces
Plex: Added DMPlexCreateFromFile() - Dispatches to the right constructor based on extension
Plex ex1: Added test partitioner
Plex: Added DMPlexGetPartitioner() and PetscPartitionerShellSetPartition()
PetscSection: Added PetscSectionCopy()
Plex ex1: Cleaned up mesh creation - Now use -dm_refine for uniform refinement
Plex: Remove superfluous argument from DMPlexDisitrbute()
Plex: Fixed Fortran stub

Conflicts:
include/petscdmplex.h
src/dm/impls/plex/examples/tests/ex1.c
src/dm/impls/plex/plexdistribute.c

show more ...

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