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 'hzhang/snes-jacobiancoloropt' of bitbucket.org:petsc/petsc into hzhang/snes-jacobiancoloropt

Merge branch 'hzhang/snes-jacobiancoloropt' of bitbucket.org:petsc/petsc into hzhang/snes-jacobiancoloropt

Merge branch 'master' into barry/dmvecmattypes
possible some messed up manual merges!

Conflicts:
src/dm/impls/mesh/examples/tutorials/ex4f90.F
src/dm/impls/mesh/mesh.c
src/dm/impls/mesh/meshcreat

Merge branch 'master' into barry/dmvecmattypes
possible some messed up manual merges!

Conflicts:
src/dm/impls/mesh/examples/tutorials/ex4f90.F
src/dm/impls/mesh/mesh.c
src/dm/impls/mesh/meshcreate.c
src/dm/impls/mesh/section.c
src/snes/examples/tutorials/ex10.c
src/snes/examples/tutorials/ex12.c
src/snes/examples/tutorials/ex52.c
src/snes/examples/tutorials/ex62.c
src/snes/utils/mesh/dmmeshsnes.c

show more ...

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

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

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

* master: (124 commits)
SNES ex12: Fix buggy checkin
add missing output file src/snes/examples/tutorials/output/ex14_3.out
fixed bunch

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

* master: (124 commits)
SNES ex12: Fix buggy checkin
add missing output file src/snes/examples/tutorials/output/ex14_3.out
fixed bunch of bibtex items that should ahve used abbreviations only
PetscDualSpace: Pointer check barfs for function pointer
Sys: Add ability to turn off CUBLAS initialization - This continually SEGVs on my Air
SNES ex62: Updated test output - Matrix now prints attached nullspace indicator - 3D tests are wierdly different, they need to be verified by hand
SNES ex12: Updated test output - Mostly for completed labels
SNES ex12/62: Changed to new DMPlexProjectFunction() interface - Took DM out of main struct
SNES ex12/62: Complete boundary label - Puts in edges in 3D - Perhaps should be moved to the creation routine
PetscDualSpace: Fixed orientation of reference tetrahedron - Now this does not match FIAT
PetscDualSpace: Fixed numDof for P0
PetscDualSpace: Added PetscDualSpaceApply() for the action of a functional - Declared PetscDualSpaceGetFunctional()
DMPlex: Updated ProjectFunction() to use PetscDualSpace for generic projection - Has not been tested with moment dofs - Accommodates vector functions
DMPlex: Added support for INSERT_BC_VALUES in VecSetClosure()
DMPlex: Fixed missing RestoreTransitiveClosure()
DMPlex: Fixed optimized portion of VecGetClosure() for NULL input array
DMPlex: Allow NULL array as input to DMPlexVecGetClosure()
DMPlex: Fix VecGetClosure() when the array is input
PetscFE: OpenCL is hardcoded for P0 coefficients right now
SNES ex12: Added test cases for variable coefficient Laplace - The P1 tests reproduce the analytic linear coefficient
...

Conflicts:
config/builder.py
src/dm/impls/plex/plex.c

show more ...

Merge branch 'knepley/feature-dt-fem'

* knepley/feature-dt-fem: (122 commits)
SNES ex12: Fix buggy checkin
PetscDualSpace: Pointer check barfs for function pointer
Sys: Add ability to turn off

Merge branch 'knepley/feature-dt-fem'

* knepley/feature-dt-fem: (122 commits)
SNES ex12: Fix buggy checkin
PetscDualSpace: Pointer check barfs for function pointer
Sys: Add ability to turn off CUBLAS initialization - This continually SEGVs on my Air
SNES ex62: Updated test output - Matrix now prints attached nullspace indicator - 3D tests are wierdly different, they need to be verified by hand
SNES ex12: Updated test output - Mostly for completed labels
SNES ex12/62: Changed to new DMPlexProjectFunction() interface - Took DM out of main struct
SNES ex12/62: Complete boundary label - Puts in edges in 3D - Perhaps should be moved to the creation routine
PetscDualSpace: Fixed orientation of reference tetrahedron - Now this does not match FIAT
PetscDualSpace: Fixed numDof for P0
PetscDualSpace: Added PetscDualSpaceApply() for the action of a functional - Declared PetscDualSpaceGetFunctional()
DMPlex: Updated ProjectFunction() to use PetscDualSpace for generic projection - Has not been tested with moment dofs - Accommodates vector functions
DMPlex: Added support for INSERT_BC_VALUES in VecSetClosure()
DMPlex: Fixed missing RestoreTransitiveClosure()
DMPlex: Fixed optimized portion of VecGetClosure() for NULL input array
DMPlex: Allow NULL array as input to DMPlexVecGetClosure()
DMPlex: Fix VecGetClosure() when the array is input
PetscFE: OpenCL is hardcoded for P0 coefficients right now
SNES ex12: Added test cases for variable coefficient Laplace - The P1 tests reproduce the analytic linear coefficient
PetscFE: Added auxiliary fields to PetscFEIntegrateJacobian() - Hooked it up to DMPlexComputeJacobian()
SNES ex12: Removed code generation
...

show more ...

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

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

* knepley/feature-dt-fem: (123 commits)
SNES ex12: Fix buggy checkin
Builder: strip test output before comparing
PetscDua

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

* knepley/feature-dt-fem: (123 commits)
SNES ex12: Fix buggy checkin
Builder: strip test output before comparing
PetscDualSpace: Pointer check barfs for function pointer
Sys: Add ability to turn off CUBLAS initialization - This continually SEGVs on my Air
SNES ex62: Updated test output - Matrix now prints attached nullspace indicator - 3D tests are wierdly different, they need to be verified by hand
SNES ex12: Updated test output - Mostly for completed labels
SNES ex12/62: Changed to new DMPlexProjectFunction() interface - Took DM out of main struct
SNES ex12/62: Complete boundary label - Puts in edges in 3D - Perhaps should be moved to the creation routine
PetscDualSpace: Fixed orientation of reference tetrahedron - Now this does not match FIAT
PetscDualSpace: Fixed numDof for P0
PetscDualSpace: Added PetscDualSpaceApply() for the action of a functional - Declared PetscDualSpaceGetFunctional()
DMPlex: Updated ProjectFunction() to use PetscDualSpace for generic projection - Has not been tested with moment dofs - Accommodates vector functions
DMPlex: Added support for INSERT_BC_VALUES in VecSetClosure()
DMPlex: Fixed missing RestoreTransitiveClosure()
DMPlex: Fixed optimized portion of VecGetClosure() for NULL input array
DMPlex: Allow NULL array as input to DMPlexVecGetClosure()
DMPlex: Fix VecGetClosure() when the array is input
PetscFE: OpenCL is hardcoded for P0 coefficients right now
SNES ex12: Added test cases for variable coefficient Laplace - The P1 tests reproduce the analytic linear coefficient
PetscFE: Added auxiliary fields to PetscFEIntegrateJacobian() - Hooked it up to DMPlexComputeJacobian()
...

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

PetscFE: Large reorganization of FEM dispatch
- WARNING: Now DMPlex and PetscFE have a circular dependence. We need to move the FEM methods to PetscFE
- Changed FEMIntegrateResidualBatch() from to Pe

PetscFE: Large reorganization of FEM dispatch
- WARNING: Now DMPlex and PetscFE have a circular dependence. We need to move the FEM methods to PetscFE
- Changed FEMIntegrateResidualBatch() from to PetscFEIntegrateResidualChunk()
- Changed DMPlexComputeResidualFEM() to use new interface
- Changed signature of f_k and g_kl functions
- Added DMPlexResidualFEM event
- Put PetscQuadrature and PetscCellGeometry
- Moved and changed PetscFEM structure

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

Finished converting DMDALocalToLocalBegin()/End() to internal functions (DMLocalToLocalBegin()/End() should now be used) and deprecated this interface.

Merged petsc/petsc into rmills/petsc master.

Merge branch 'prbrune/dmda-subdomains-per-process'

Conflicts:
src/dm/impls/da/dadd.c

Merge branch 'master' into jed/ts-eimex

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

Conflicts:
src/ts/interface/tsregall.c

DMDAGet/SetNonOverlappingRegion() for subdomain DAs

These functions generalize the capability of defining inner and outer subdomains to the case where the nonoverlapping
portion might not just be th

DMDAGet/SetNonOverlappingRegion() for subdomain DAs

These functions generalize the capability of defining inner and outer subdomains to the case where the nonoverlapping
portion might not just be the processor local bit.

show more ...

Added DMDA{Set/Get}NumLocalSubDomains()

Allow for the creation of multiple subdomains per process; next is implementation

add missing prototype
allow setting coordinates of contour plot smaller than entire domain

Hg-commit: 3cd8fd1ba588913ef042c7c4d699c111b3ea4867

commit after merge

Hg-commit: d45994b710e27c421e3a611629d33b9d321ce16b

Split out petscdmdatypes.h and petscdmtypes.h

Hg-commit: 3f8f2ebaa036547d616a74a818868b81d0922c1f

Commit after merge.

Hg-commit: 3c23ecb14c0f43be48331e905ea49b292a15eb1b

Merge

Hg-commit: 5643807d8e581db8b9355ef7e8a511f49cff4c2a