Merge branch 'master' into barry/wirth-fusion-materials
bad manual merge needs to be fixed
this is what happens when branches hang around too long

Conflicts:
src/ts/examples/tutorials/advection-dif

Merge branch 'master' into barry/wirth-fusion-materials
bad manual merge needs to be fixed
this is what happens when branches hang around too long

Conflicts:
src/ts/examples/tutorials/advection-diffusion-reaction/ex10.c

show more ...

Merge branch 'master' into barry/reduce-dmsetup-da-memoryusage

Conflicts:
src/dm/examples/tests/ex15.c
src/dm/examples/tutorials/ex3.c
src/dm/impls/da/da2.c
src/dm/impls/da/da3.c

Merge branch 'master' into barry/xcode

Merge branch 'master' into knepley/feature-dmda-section

* master: (528 commits)
Doc: Fixed configure doc
Nightly summary: Added configure section.
TSSetErrorIfStepFails: fix __FUNCT__
TS: fi

Merge branch 'master' into knepley/feature-dmda-section

* master: (528 commits)
Doc: Fixed configure doc
Nightly summary: Added configure section.
TSSetErrorIfStepFails: fix __FUNCT__
TS: fix for TSGetRHSMats_Private() in the creation of the Arhs and Brhs matrices
protect logging of objects (which uses global variables) with PETSC_USE_LOG
error handler API had been previously changed but this example was not updated to new API.
DMPlex: Fixed bug in coordinate permutation
PetscSection: Doc fix for permutation
Bib: Added Top500 and fixed entry
fun3d: update PetscMallocValidate() usage
bugfix of MatCreateSeqAIJFromTriple() contributed by Nicolas Marsic <nicolas.marsic@montefiore.ulg.ac.be>
bib: rename ref with duplicate key
Webpage: Corrected '-dm_mat_type cusp' to 'dm_mat_type aijcusp'.
completed removing server code that was not removed in previous commit
removed PETSc webserver and configure package files that supported it
Allow calling MatGetBlockSize[s]() before matrix preallocation
SNESLINESEARCHBT: Set the norms when exiting early due to negligible step.
fix outdated PetscOptionsList
SNESQN: only monitor real part of dot product (fails with C++ complex)
Fix for multiple definitions in mat/color/interface/ custom fortran bindings
...

Conflicts:
config/builder.py
include/petscdmplex.h
src/dm/impls/da/dageometry.c
src/dm/impls/plex/examples/tests/ex4.c
src/dm/impls/plex/plex.c
src/dm/impls/plex/plexinterpolate.c

show more ...

Merge branch 'master' into knepley/feature-fem-dgspace

* master: (593 commits)
Bib: Added Top500 and fixed entry
fun3d: update PetscMallocValidate() usage
bib: rename ref with duplicate key

Merge branch 'master' into knepley/feature-fem-dgspace

* master: (593 commits)
Bib: Added Top500 and fixed entry
fun3d: update PetscMallocValidate() usage
bib: rename ref with duplicate key
Webpage: Corrected '-dm_mat_type cusp' to 'dm_mat_type aijcusp'.
Allow calling MatGetBlockSize[s]() before matrix preallocation
SNESLINESEARCHBT: Set the norms when exiting early due to negligible step.
SNESQN: only monitor real part of dot product (fails with C++ complex)
Corrected the #include statement in the man pages for the PetscObjectComposedDataSet/Getwhatever routines.
DMPlex: Added doc for DMPlexGetHybridBounds()
winzip: detect if winzip is used to extract petsc.tar.gz and error out.
configure: remove self.archIndependent as its not being used. [it is used to create externalpackages/package/arch dir which is unused]
configure: fix packages using package-dir/PETSC_ARCH as out-of-source-build location Perhaps this should be changed to package-dir/build?
configure: remove dead code previously used to download BuildSystem
configure: check if compilerDefines [and compilerFixes] exist in framework before using them
configure: save/restore reconfigure.py when --with-clean is used
configure: add --with-clean option to delete buildfiles/externalpackages in PETSC_DIR/PETSC_ARCH and potential externalpackages in --with-external-package-dir/PETSC_ARCH
configure: With --with-externalpackages-dir=dir store/build packages in dir/PETSC_ARCH
Add MatSeqSBAIJSetPreallocationCSR()
configure: switch to using PETSC_DIR/PETSC_ARCH/externalpackages by updating package.py to use externalpackages.py as the externalPackagesDirProvider
configure: move dead code configureExternalPackagesDir() from petscdir.py to externalpackagesdir.py Also set PETSC_DIR/PETSC_ARCH/externalpackages as the externalpackagesdir
...

show more ...

Merge branch 'master' into barry/saws

Conflicts:
src/ksp/pc/impls/gamg/gamg.c
src/sys/classes/viewer/impls/ams/ams.c
src/sys/objects/pinit.c

Merge branch 'knepley/feature-plex-reordering'

* knepley/feature-plex-reordering:
doc: update makefile with order.h -> ../../../include/petsc-private/matorderimpl.h rename
DMPlex: Fixed bug with

Merge branch 'knepley/feature-plex-reordering'

* knepley/feature-plex-reordering:
doc: update makefile with order.h -> ../../../include/petsc-private/matorderimpl.h rename
DMPlex: Fixed bug with DMPlexPermute - Fixed label permutation
DMPlex: Check whether default section exists to be reordered
DMPlex: Fixed compiler warning
DMPlex ex10: Fixed test output
DMPlex: Added missing declarations
DMPlex: Fixed misuse of PetscObjectSetName()
MatComputeBandwidth: use PetscInt instead of PetscMPIInt
Mat: Fixed declaration
Mat: Changed MatCalcBandwidth() to MatComputeBandwidth() - Added Fortran interface
DMPlex ex10: This tests reordering of meshes
DMPlex: Added DMPlexGetOrdering() and DMPlexPermute()
PetscSection: Added PetscSectionPermute()
DMLabel: Added DMLabelPermute()
DMPlex: Added DMPlexCreateDoublet()
DMPlex: Added DMPlexCopyLabels()
Mat: Added MatCalcBandwidth()
MatOrdering: Moved private header into petsc-private - Fix to pointer checks in sorder.c

Conflicts:
include/petscdmplex.h

show more ...

Mat: Added MatCalcBandwidth()

Merge branch 'master' into jed/ts-eimex

Sync to include Git conversion, PETSC_EXTERN, and minor API changes.

Conflicts:
src/ts/interface/tsregall.c

merge PetscSF implementation

Hg-commit: 98dccc99445b69cb7a66312149eb16fec359e294

removed trailing spaces from all files

Hg-commit: 1cfa55059afe46c5145e0e830cd797b97216abfb

commit after merge

Hg-commit: d0f613618ca66a5aeb1aac97d210d2cc29755d3d

reemove OBJSC and OBJSF from invididual makefiles and auto-define in conf/variables

Hg-commit: 2f01c17f3c19dc4b89aaf306cfd60a12312c270d

cleanup MatPtAP for mpiaij matrix; rm MatPtAP_Basic()

Hg-commit: f6debe79aa665c5b45ffa91e0d3d7d114dfd92c1

backout all chmod stuff in bf971ba58125
[but keep diffs to src/mat/impls/aij/mpi/mpimatmatmult.c ]

Hg-commit: 4a812fc1f35496ce2717c7da9ef12ffabbd13258

removed a spurious call to MatSetBlockSize.

Hg-commit: bf971ba58125bd8cf7ceb2a9d0f5cdf27c27cc6a

committing after previous merge.

Hg-commit: 62ea3b3249ac52e1d599b51313301ac9e25ed491

Merge

Hg-commit: 5fd7344ebb01d47fc51348189c58908ebeb94702

Add PetscHeap: a static size min-heap holding (id,value) pairs, with a stash

Hg-commit: d2e6d8577ed8e2128b0c08a0395d3fea40534d86

commit after merge

Hg-commit: d540875a63b3c979c82b6a7fa7f062571e906d10

Mass revert file modes that were made executable in f6e61ee9c329

Hg-commit: 116d90d0b66125cee0db3e7351047057e756baf5

Merge

Hg-commit: ee8d91ae0580d1d4fa92be38a18d40c838b9a257

changed MatMatMult to MatTranposeMatMult.

Hg-commit: f6e61ee9c329774cd5343eea1ee6b7432be17c3f

Merge

Hg-commit: 8be6b379b7bc1cbb3adf7412dfe042e3e92c6019

commit after merge

Hg-commit: 7678db4dbf4316aad0bed3ee83df6ef0e35b9452