Merge branch 'barry/dmvecmattypes' into shri/feature-dm-circuit

Conflicts:
src/dm/impls/makefile
src/dm/interface/dmregall.c

Merge branch 'master' into knepley/feature-plex-refine-3d

* master: (149 commits)
Bib: Added papers referencing PETSc from ResearchGate
Bib: Fixed urls for some refs Suggested-by: Michele De Ste

Merge branch 'master' into knepley/feature-plex-refine-3d

* master: (149 commits)
Bib: Added papers referencing PETSc from ResearchGate
Bib: Fixed urls for some refs Suggested-by: Michele De Stefano
fixed bug that has appeared recently of false positive errors when there are zero local equations on coarse grids in gamg-agg.
MatSchurComplement: Must initialize KSP package
bib: fix inbook citation
Bib: Updated some refs
SNES: fix copy/paste in man page
fortran: fix KSPCONVERGEDDEFAULT and SNESCONVERGEDSKIP in fortran includes
Mat SBAIJ: avoid invalid memory read in MatSOR_SBAIJ
Revert "MatMPIBAIJSetPreallocationCSR() handled the input matrix entries incorrectly, it treated them as if each row of values"
PCGAMG: fix corruption for multiple solves when MatSetNearNullSpace is used
PCGAMG: remove distracting comment
KSP ex49: restrict near-null space for elasticity example with sym BC
MatMPIBAIJSetPreallocationCSR() handled the input matrix entries incorrectly, it treated them as if each row of values was provided ordered by row within the block rows instead of by block as it was originally designed to be. Also added more discussion to the manual pages on the expected order of the values
Fix accidental creation of the matrices in SNESNCG used for linear analogue LS.
PCGAMG: add man page for PCGAMGType
fortran: fix snesconvergedskip_() kspconvergedskip_() kspconvergeddefault*_()
rm //
Sys: new_ir changed from PetscInt to PetscObjectState - so fix mallocs to use the new type
SNES: Fixed package init in SNESLineSearchCreate()
...

Conflicts:
include/petscdmplex.h
src/dm/impls/plex/examples/tests/ex5.c
src/dm/impls/plex/plex.c
src/dm/interface/dm.c

show more ...

Merge branch 'barry/dmvecmattypes'

The MatType argument is removed from DMCreateMatrix(), you can use
DMSetMatType() to indicate the type you want used with a DM, defaults to
MATAIJ.

* barry/dmvecm

Merge branch 'barry/dmvecmattypes'

The MatType argument is removed from DMCreateMatrix(), you can use
DMSetMatType() to indicate the type you want used with a DM, defaults to
MATAIJ.

* barry/dmvecmattypes:
DMPlex ExodusII: fix dm->vectype pointer syntax
removed use of VecSetFromOptions() all over the placed, instead use MatGetVecs() or use dm->vectype to determine type added DMGetVecType() and DMGetMatTYpe()
removed MatType argument from DMCreateMatrix() and DMCreateColoring() since information is obtained from DM

Conflicts:
src/dm/impls/da/fdda.c
src/dm/impls/plex/plex.c

show more ...

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

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

Merge branch 'barry/dmvecmattypes' into barry/saws

Needed to work with version of PETSc that did not have constant calls to VecSetFromOptions() etc

Conflicts:
src/ksp/ksp/interface/ams/kspams.c
s

Merge branch 'barry/dmvecmattypes' into barry/saws

Needed to work with version of PETSc that did not have constant calls to VecSetFromOptions() etc

Conflicts:
src/ksp/ksp/interface/ams/kspams.c
src/snes/impls/composite/snescomposite.c
src/snes/impls/gs/snesgs.c
src/snes/impls/nasm/nasm.c
src/snes/impls/ngmres/snesngmres.c

show more ...

removed MatType argument from DMCreateMatrix() and DMCreateColoring() since information is obtained from DM

Merge branch 'master' into knepley/feature-plex-refine-3d

* master: (273 commits)
Mat ex170: Comments
VTK: Small fix to error message (.vts to .vtu)
VTK: Small fix to error message
Fixed bib

Merge branch 'master' into knepley/feature-plex-refine-3d

* master: (273 commits)
Mat ex170: Comments
VTK: Small fix to error message (.vts to .vtu)
VTK: Small fix to error message
Fixed bib entries
Bib: Updates
AO: fix erroneous processing of -ao_view and factor into AOViewFromOptions
doc: fix named argument in {Vec,Mat,DM}ViewFromOptions
Sys: add PetscDataTypeFromString() and test code
Mat: Should say that it has a nullspace in MatView()
parms: update tarball with fix for namespace conflict with metis
fix citation 'Golub_Varga_1961'
parmetis: update tarball to parmetis-4.0.2-p5 which fixes an install issue with cygwin
Sys Logging: revert parent traversal
fixed hdf5.py so that if self.libraries.compression is None the code still runs correctly
DMDA: fix bad cast of DM_DA to PetscObject
MatClique: follow DistMultiVec API changes
MatClique: remove unused variables
config cmakeboot: add C++ flags any time compiler is available
config OpenMP: check for C++ flag any time the compiler is available
replaced all left-over uses of a single PetscMalloc() to allocated multiple arrays: replaced with PetscMallocN() The only ones left are when the second array is set into the first array and one ugly usage in the MUMPS interface that cannot be easily fixed
...

Conflicts:
include/petscdmplex.h

show more ...

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

* master: (287 commits)
Mat ex170: Comments
VTK: Small fix to error message (.vts to .vtu)
VTK: Small fix to error message
Fixed bib e

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

* master: (287 commits)
Mat ex170: Comments
VTK: Small fix to error message (.vts to .vtu)
VTK: Small fix to error message
Fixed bib entries
Bib: Updates
AO: fix erroneous processing of -ao_view and factor into AOViewFromOptions
doc: fix named argument in {Vec,Mat,DM}ViewFromOptions
Sys: add PetscDataTypeFromString() and test code
Mat: Should say that it has a nullspace in MatView()
parms: update tarball with fix for namespace conflict with metis
fix citation 'Golub_Varga_1961'
parmetis: update tarball to parmetis-4.0.2-p5 which fixes an install issue with cygwin
Sys Logging: revert parent traversal
fixed hdf5.py so that if self.libraries.compression is None the code still runs correctly
DMDA: fix bad cast of DM_DA to PetscObject
MatClique: follow DistMultiVec API changes
MatClique: remove unused variables
config cmakeboot: add C++ flags any time compiler is available
config OpenMP: check for C++ flag any time the compiler is available
replaced all left-over uses of a single PetscMalloc() to allocated multiple arrays: replaced with PetscMallocN() The only ones left are when the second array is set into the first array and one ugly usage in the MUMPS interface that cannot be easily fixed
...

show more ...

Merge branch 'rmills/dm-localtolocal'

Introduces DMLocalToLocalxxx() (and deprecates DMDALocalToLocalxxx()) to
support local-to-local communication operations for any DM type, not just
DMDA. Adds D

Merge branch 'rmills/dm-localtolocal'

Introduces DMLocalToLocalxxx() (and deprecates DMDALocalToLocalxxx()) to
support local-to-local communication operations for any DM type, not just
DMDA. Adds DMShell routines to set up local-to-local operations.

show more ...

Added support for DMLocalToLocalBegin()/End() to DMShell.

Merged petsc/petsc into rmills/petsc master

Merge branch 'rmills/dmshell'

* 'rmills/dmshell' of bitbucket:petsc/petsc:
Fix potential memory leak when re-setting VecScatters within a DMShell.
DMShellSetGlobalToLocalVecScatter() and DMShell

Merge branch 'rmills/dmshell'

* 'rmills/dmshell' of bitbucket:petsc/petsc:
Fix potential memory leak when re-setting VecScatters within a DMShell.
DMShellSetGlobalToLocalVecScatter() and DMShellSetLocalToGlobalVecScatter() now take a VecScatter instead of a VecScatter*.
ops->localtoglobalbegin/end now assigned appropriately in DMCreate_Shell().
Added DMLocalToGlobalBegin/EndDefaultShell().
Added DMShellSetLocalToGlobalVecScatter().

show more ...

DMShellSetGlobalToLocalVecScatter() and DMShellSetLocalToGlobalVecScatter() now take a VecScatter instead of a VecScatter*.

Added DMLocalToGlobalBegin/EndDefaultShell().

Added DMShellSetLocalToGlobalVecScatter().

Merge branch 'master' into jed/ts-eimex

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

Conflicts:
src/ts/interface/tsregall.c

made DMGlobalToLocalBeginDefaultShell() and DMGlobalToLocalEndDefaultShell() public for rare but possible use cases

Hg-commit: 912c3347d229dd883d6e5ac43cbf0ceb39152658

fixed function names with Default to match new standard (which I just wrote)
fixed a few more functions that should be PETSC_INTERN

Hg-commit: 87889fe4f6d4e8d0963adcc79d438e75330601c6

Automerge.

Hg-commit: b6659d546870fb013f3da5bcd5066d1dc0dc329c

merge, terrible manual process with many conflicts with Jed's PETSC_INTERNAL

Hg-commit: 84df07d03c6e55bd0f27bd5ee8c1738562bd529d

DMShellSetGlobalToLocalVecScatter: declare interface

Missing in 843a1e745f4adac5c560ae71c339edcdf578acae, broken build due to
Fortran stubs.

Hg-commit: e9e96e5897352e348ea33c9ea2cf506b3bd9e12a

Work on DMShell and Fortran interfaces for it; things still aren't quite working.

Hg-commit: 843a1e745f4adac5c560ae71c339edcdf578acae

Added missing function prototypes for DMShellSetGlobalToLocal() and DMShellSetLocalToGlobal().

Hg-commit: e14401f2cd6eaf49ca255270e760a24088d30bb1

commit after merge
x

Hg-commit: 5ca7425bdc061d16496b42615f4a99db34a78eec

DMShellSetLocalVector() and DMShellSetCreateLocalVector()

Makes DMShell use new PetscFortranCallbackId system

Hg-commit: fc6fb9dc677724b5f9d2b1c0c9f8a7ae082a446f