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 'knepley/remove-sieve'

Conflicts:
src/dm/impls/mesh/examples/tests/output/ex10_0.out
src/dm/impls/mesh/examples/tests/output/ex10_1.out
src/dm/impls/mesh/examples/tests/output/ex11f9

Merge branch 'knepley/remove-sieve'

Conflicts:
src/dm/impls/mesh/examples/tests/output/ex10_0.out
src/dm/impls/mesh/examples/tests/output/ex10_1.out
src/dm/impls/mesh/examples/tests/output/ex11f90_0.out
src/dm/impls/mesh/examples/tests/output/ex11f90_1.out
src/dm/impls/mesh/examples/tests/output/ex3_0.out
src/dm/impls/mesh/examples/tests/output/ex3_1.out
src/dm/impls/mesh/examples/tests/output/ex3_2.out
src/dm/impls/mesh/examples/tests/output/ex3_3.out
src/dm/impls/mesh/examples/tests/output/ex8_0.out
src/dm/impls/mesh/examples/tests/output/ex9f90_0.out
src/dm/impls/mesh/examples/tests/output/ex9f90_1.out
src/dm/impls/mesh/mesh.c
src/dm/interface/dlregisdmdm.c
src/vec/vec/interface/vecregall.c

show more ...

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

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

SNES and KSP: add deprecation for *DefaultConverged and *SkipConverged

SNESSkipConverged, KSPSkipConverged, KSPDefaultConverged* were renamed
for consistency. The renaming started before v3.4 with

SNES and KSP: add deprecation for *DefaultConverged and *SkipConverged

SNESSkipConverged, KSPSkipConverged, KSPDefaultConverged* were renamed
for consistency. The renaming started before v3.4 with
SNESDefaultConverged -> SNESConvergedDefault, but left a lot of loose
ends.

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 'master' into knepley/feature-dt-fem

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

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

* master: (211 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:
config/builder.py
src/dm/impls/plex/plexgeometry.c

show more ...

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 'master' of bitbucket.org:petsc/petsc

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

Merge branch 'prbrune/snes-removesetfunctionnorm'

Conflicts:
src/snes/impls/composite/snescomposite.c

Renamed SNESSkipConverged --> SNESConvergedSkip.

Removed extraneous SNESSetInitialFunctionNorm().

The norm is cached on vec_func after copy, so this is unnecessary.

Merge branch 'prbrune/snes-snesfunctiontype'

Merged petsc/petsc into rmills/petsc master.

Merge branch 'barry/fix-docs-regarding-xxxtype'

Removed the ability of XXXType to be the string name of a library and function in that library but forgot to remove this form from all the XXXAType manual pages

Merge branch 'prbrune/snes-snescomposite' into prbrune/snes-snesfunctiontype

Merge branch 'prbrune/snes-npcjacobianlagging' into prbrune/snes-snesfunctiontype

Conflicts:
src/snes/examples/tutorials/makefile
src/snes/impls/ls/ls.c
src/snes/impls/ngmres/snesngmres.c
src/sn

Merge branch 'prbrune/snes-npcjacobianlagging' into prbrune/snes-snesfunctiontype

Conflicts:
src/snes/examples/tutorials/makefile
src/snes/impls/ls/ls.c
src/snes/impls/ngmres/snesngmres.c
src/snes/impls/qn/qn.c

show more ...

Added SNESGetPCFunction() which decides how to get the function from the NPC.

SNESLinesearchSetFunction() for setting what function the line search uses

Add SNESApplyPC() replacing the PC_LEFT control path in SNESComputeFunction()

Added SNESFunctionType,SNESGet/SetFunctionType()

Changed SNESNormType to SNESNormSchedule to better describe what it does.