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

Merge branch 'master' into prbrune/snes-fascontinuation

Conflicts:
include/petscsnesfas.h

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 knepley/feature-dmda-section

* master: (319 commits)
SNESGS: Fix for uninitialized variable warning in gssecant.c
DMPlex: Fix for orientation in Gmsh files - Fixed tes

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

* master: (319 commits)
SNESGS: Fix for uninitialized variable warning in gssecant.c
DMPlex: Fix for orientation in Gmsh files - Fixed test output
do not use C99 struct initialization code in PETSc
Nightly Summary: Added time taken to each of the tests in the dashboard.
ASCII printing of floating point numbers must cast to (double) to support quad precision
configure: check fortranDatatypes only when fortran is enabled [this fixes configure crash with --with-fc=0]
don't use non-portable and also dependent on floating point precision system level math constants
picky compilers
fix a couple compiler warnings/errors (depending on compiler) for Matlab engine code
DMPlex: More fixup from bad rebase, moved to DMGet/SetCoordinateSection()
DM: Added DMGet/SetCoordinateSection()
Fuckup: Fix for merge that is still untangling bad rebase from Oct. 17th 2013 - Fixed const in declarations - Fixed merge from PetscFE - Fixed 2 mallocs
replace all echo in test/tutorial makefiles with printf since echo behaves differently on different systems
DMDA: Missing header - Damn rebase
DMPlex ex3: Added 2D Q_1 and 3D P_2 tests
DMDA: Added DMDAProjectFunction() and DMDAComputeL2Diff()
DMDA: Fixed 2D geometry - Should reuse DMPlex routines
DMDA: Fix bug in 2D closure operation for cells
DMDA: Make closure operations also return the size
DMDA: Changed DMDACreateSection() to emulate DMPlexCreateSection()
...

Conflicts:
config/builder.py
include/petscdmda.h
src/dm/dt/interface/dtfe.c
src/dm/impls/da/dageometry.c
src/dm/impls/da/dalocal.c
src/dm/impls/plex/plexgeometry.c

show more ...

Merged petsc/petsc into master

Merge branch 'madams/gamg-destroy' into prbrune/pcgamg-classicalinterpolationstrategies

Merge branch 'master' into madams/gamg-destroy

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

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 'barry/minor-draw-improvements' into jed/chem

Merge branch 'knepley/fix-hash-scaling'

* knepley/fix-hash-scaling: (25 commits)
PetscSF: Register logging events
PetscSF: Added logging
DMPlex: Bug fix for interpolated adjacency formation

Merge branch 'knepley/fix-hash-scaling'

* knepley/fix-hash-scaling: (25 commits)
PetscSF: Register logging events
PetscSF: Added logging
DMPlex: Bug fix for interpolated adjacency formation
DMPlex: Fast adjacency graph construction for interpolated meshes
DMPlex: Fixed error in new events
DMPlex: More events for distribution
DMPlex: Fixed allocation bug in reordering
DMPlex: Fixed mismatched Malloc2 in reordering
DMLabel: Split Malloc3 into Malloc2 and Malloc
Hash+DMPlex: Changed PetscHashIPut() to eliminate pass-by-ref - Jed can sleep soundly tonight
DMPlex: Use PetscHashIHasKey() to check for membership
Hash; Added PetscHashIHasKey() - PetscHashIMap does not match the documentation
DMPlex: Added simple DMLabel test
DMPlex: Fix missing restore Reported-by: Jed Brown <jedbrown@mcs.anl.gov>
DMPlex: Use DMLabelDistribute() in DMPlexDistribute()
DMPlex: Use DMLabelGetStrautmBounds() in DMPlexGetDepth/HeightStratum()
DMPlex: Added DMLabelDistribute()
DMPlex: Added DMLabelGetStratumBounds()
DMPlex: Fixed quadratic behavior of DMLabel insert - Added hash table for each label value for insertion - Added arrayValid flag which says whether array data or hash table data is valid - Convert between representations using DMLabelMakeValid_Private() and DMLabelMakeInvalid_Private() - Split up allocation of stratumValues and stratumSize/Offsets - Most functions only use the array representation, but some can use both (should probably expand this with GetStratum) - Moved the DMLabelFIlter() function
Hash: Added PetscHashIPut() and PetscHashIDel() - Removed unused variable
...

show more ...

PetscSF: Register logging events

Merge branch 'master' into barry/wirth-fusion-materials

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

Merged petsc/petsc into rmills/petsc master.

Merge branch 'barry/rm-xxxregisteralldestroy'

* barry/rm-xxxregisteralldestroy:
TSSSP: Fix to use proper TSSSPInitializePackage() system
flag should have been false
removed unnneeded and unuse

Merge branch 'barry/rm-xxxregisteralldestroy'

* barry/rm-xxxregisteralldestroy:
TSSSP: Fix to use proper TSSSPInitializePackage() system
flag should have been false
removed unnneeded and unused XXXRegisterDestroy() routines
removed PetscFunctionListDestroyAll() and put PetscFunctionListDestroy(&XXXList) into the package finalize

show more ...

Merged petsc/petsc into rmills/petsc master

flag should have been false

removed PetscFunctionListDestroyAll() and put PetscFunctionListDestroy(&XXXList) into the package finalize

Merge branch 'barry/fix-matlab'

Fix PetscSFunctionList update to PetscSFList

Fixes for MATLAB interface. (1) Fixed MPIUni to be reentrant again, (2) fixed PetscSF to be reentrant

Merge branch 'barry/rm-xxxregisterdynamic'

* barry/rm-xxxregisterdynamic:
Registration: remove stale 'XXRegisterDynamic)' entries in man pages
TS examples: fix use of PetscFunctionList and add t

Merge branch 'barry/rm-xxxregisterdynamic'

* barry/rm-xxxregisterdynamic:
Registration: remove stale 'XXRegisterDynamic)' entries in man pages
TS examples: fix use of PetscFunctionList and add to nightlies
Changes: Note updates to XRegisterDynamic/PetscObjectComposeFunctionDynamic
PetscObjectComposeFunctionDynamic: remove stale docs and usage
developers.tex: remove complications from function composition with dlls
removed string version of function name for XXXRegister(), PetscFunctionListAdd() and PetscObjectComposeFunction()
changes: document PetscFunctionListAdd() API change
developers.tex: update documentation of PetscObjectComposeFunction
removed path and MPI_Comm arguments from PetscFunctionListFind/Add()
removed path argument to XXXInitializePackage() and XXXRegister()
removed XXXRegisterDynamic() but kept the APIs for everything else underneath the same phase I of the update to handling registering function pointers

show more ...

Merge branch 'barry/rm-xxxregisterdynamic' into jed/ts-eimex

PetscObjectComposeFunctionDynamic() and TSRegisterDynamic() were
replaced by PetscObjectComposeFunction() and TSRegister(), both of which

Merge branch 'barry/rm-xxxregisterdynamic' into jed/ts-eimex

PetscObjectComposeFunctionDynamic() and TSRegisterDynamic() were
replaced by PetscObjectComposeFunction() and TSRegister(), both of which
drop the string name argument.

* barry/rm-xxxregisterdynamic: (82 commits)
...

Conflicts:
src/ts/interface/tsregall.c

show more ...

removed path argument to XXXInitializePackage() and XXXRegister()