Merge branch 'barry/rm-pcasa'

Conflicts:
src/ksp/ksp/examples/tutorials/ex38.c
src/ksp/ksp/examples/tutorials/ex39.c

Merge branch 'master' into balay/tao-to-petsc

Conflicts:
src/dm/examples/tests/ex42.c
src/dm/examples/tutorials/ex65dm.c
src/ksp/ksp/examples/tutorials/ex42.c
src/snes/examples/tutorials/cahn-hi

Merge branch 'master' into balay/tao-to-petsc

Conflicts:
src/dm/examples/tests/ex42.c
src/dm/examples/tutorials/ex65dm.c
src/ksp/ksp/examples/tutorials/ex42.c
src/snes/examples/tutorials/cahn-hilliard-schemes/ex1.c
src/snes/examples/tutorials/ex54.c
src/snes/examples/tutorials/ex55.c
src/snes/examples/tutorials/ex60.c
src/snes/examples/tutorials/ex61.c
src/snes/examples/tutorials/ex63.c
src/snes/examples/tutorials/ex633d_db.c
src/snes/examples/tutorials/ex64.c
src/snes/examples/tutorials/ex65.c
src/snes/examples/tutorials/ex653d.c
src/ts/examples/tutorials/ex23.c

show more ...

Merge remote-tracking branch 'origin/karpeev/ksp-matschurcomplement'

* origin/karpeev/ksp-matschurcomplement:
Fixed memory leak in MatSchurComplement.
MatSchurComplementXXXSubMatrices renamed fo

Merge remote-tracking branch 'origin/karpeev/ksp-matschurcomplement'

* origin/karpeev/ksp-matschurcomplement:
Fixed memory leak in MatSchurComplement.
MatSchurComplementXXXSubMatrices renamed for consistency.
PCFieldSplit: enable extraction of MatSchurComplement to configure it.
MatSchurComplement can use different approximations to inv(A00) when forming Sp.
PCFieldSplit: Schur can use lumping with MatSchurComplement.
MatSchurComplement: Allow lumping of A00 when forming Sp.
PCFieldSplit implements SELFP preconditioning for Schur using MatSchurComplementGetPmat to assemble Sp.
MatCreateSchurComplementPmat() now public.
MatSchurComplement now uses MatDiagonalScale to form Sp. Factored out Sp constructor for consistency and reuse.
More consistent matrix naming in arguments and docs to MatSchurComplement-related routines.
MatSchurComplement can now assemble Sp on demand.

Conflicts:
include/petscksp.h
include/petscpc.h
src/ksp/pc/impls/fieldsplit/fieldsplit.c

show more ...

Merge branch 'knepley/feature-schurm-explicit-op'

* knepley/feature-schurm-explicit-op:
KSP: Fix for name change in another branch
KSP: It looks like someone forgot this declaration
Mat: Impro

Merge branch 'knepley/feature-schurm-explicit-op'

* knepley/feature-schurm-explicit-op:
KSP: Fix for name change in another branch
KSP: It looks like someone forgot this declaration
Mat: Improve conversion of MATDENSE to MATAIJ - Previously, we were creating a fully dense AIJ matrix
Section: Small doc fix
PC: Allow FieldSplit to explicitly compute S for preconditioning - Yes I know it is generally slow
KSP: Added MatSchurComplementComputeExplicitOperator - This could be optimized to compute a sparse S for preconditioning (Saad has some papers here)

show more ...

PC: Allow FieldSplit to explicitly compute S for preconditioning
- Yes I know it is generally slow

removed PCASA and supporting DMADDA
they don't work and if needed need to be rewritten

Merge branch 'master' into balay/tao-to-petsc

Conflicts:
include/makefile

Merge branch 'master' into knepley/feature-mat-zerorowscols-baij

MatSchurComplement can use different approximations to inv(A00) when forming Sp.

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

Merged petsc/petsc into master

Merge branch 'prbrune/pcgamg-classicalinterpolationstrategies'

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

PCKACZMARZ: Added a basic Kaczmarz row-projection smoother as a PC

Merged petsc/petsc into master

Merge branch 'master' into knepley/feature-plex-gmsh

* master: (163 commits)
do not use C99 struct initialization code in PETSc
Nightly Summary: Added time taken to each of the tests in the dash

Merge branch 'master' into knepley/feature-plex-gmsh

* master: (163 commits)
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()
DMDA: Added functions which emulate DMPlex functionality
DMDA: Now DMDAGetNumCells() returns the cells in each direction as well
...

Conflicts:
config/builder.py

show more ...

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 knepley/feature-plex-refine-hex

* master: (68 commits)
DMPlex: More fixup from bad rebase, moved to DMGet/SetCoordinateSection()
DM: Added DMGet/SetCoordinateSection()

Merge branch 'master' into knepley/feature-plex-refine-hex

* master: (68 commits)
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
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()
DMDA: Added functions which emulate DMPlex functionality
DMDA: Now DMDAGetNumCells() returns the cells in each direction as well
PetscFE: Added support for tensor product cells in PetscDualSpace_Lagrange
PetscFE: Added tensor product polynomial spaces
example fix /sandbox/petsc/petsc.clone-3/include/petscmath.h(260): error: identifier "PETSC_CXX_STATIC_INLINE" is undefined PETSC_STATIC_INLINE PetscReal PetscAbsScalar(PetscScalar a) {return a < 0.0 ? -a : a;} ^
remove warning in fun3d example "user.F", line 1256: warning: In-place macro substitution leaves line truncated "user.F", line 1259: warning: In-place macro substitution leaves line truncated "user.F", line 1262: warning: In-place macro substitution leaves line truncated
/Users/petsc/petsc.clone-2/src/ksp/ksp/examples/tutorials/ex56.c:59: warning: comparison between signed and unsigned integer expressions
fix examples for portability
fixed to example outputs
fix output for a few examples changed due to changes to -mat_view and not using -snes_monitor_short
...

Conflicts:
src/dm/impls/plex/plexrefine.c

show more ...

PCFieldSplit: Schur can use lumping with MatSchurComplement.

PCFieldSplit implements SELFP preconditioning for Schur using MatSchurComplementGetPmat to assemble Sp.

Merge branch 'barry/update-xxxviewfromoptions'

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

Merged master into barry/update-xxxviewfromoptions

Merge branch 'master' into barry/xcode