Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection

Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/mat/impls/aij/mpi/mumps/mumps.c
s

Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection

Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/mat/impls/aij/mpi/mumps/mumps.c
src/mat/impls/is/matis.h

show more ...

Merge branch 'master' into tisaac/dmforest

If we're going to start developing on this again, the recent changes to the
location of configuration files will make it annoying to switch to and from
thi

Merge branch 'master' into tisaac/dmforest

If we're going to start developing on this again, the recent changes to the
location of configuration files will make it annoying to switch to and from
this branch. Matt's and my fixes in DMPlex will also be relevant.

* master: (1557 commits)
MatLoad_MPIDense() always allocated array space even if it was previously provided
Clarified lumping options for PCFieldSplitSchurPreType SELFP.
fixed up PetscInfo in GAMG
TSErrorWeightedNorm[2|Infinity]: API changes
MatLoad_SeqDense() always allocated new space for the data even if the user already provided it
Fixed DMCompositeGetAccessArray() to support readonly vectors
Fix obviously-wrong aspects of documentation on SNESVINEWTONRSLS and SNESVINEWTONSSLS.
fixed example to compile - demonstrates a bug
var name 'len' was F90 key word
For user provided Jacobian functions they should always assembly into the second matrix, the one from which the preconditioner is built because the first may be used as matrix-free with -snes_mf_operator
Suggest --with-64-bit-indices if users mistakenly use --with-64bit-indices
Fix configure logging of integer size.
missing underscore in #define of vecgetarrayread translation of fortran stub for VECGETARRAYREAD
updated test output files to reflect differences introduced previously in PCView output
-ksp_type preonly does not support -ksp_monitor_short so remove from test line to prevent extranious warning output
missing CHKERRQ; and ugly double declaration of ierr
Plex ex3: For want of a semicolon, the kingdom was lost
MatSetValuesMPISBAIJ will now print correct global indices when error generated due to new nonzero location
completed basic use of MatSetValuesBlocked_SeqBAIJ_Inlined() by MatSetValuesBlocked_MPIBAIJ() to allow proper global indices being printed when error generated by new nonzero locations.
Added inline version of MatSetValuesBlocked_SeqBAIJ() to be used by MatSetValuesBlocked_MPIBAIJ() to print error message for nonzero block with global indices
...

show more ...

Merge branch 'master' into shri/ts-is-for-differential-variables

Conflicts:
include/petsc-private/tsimpl.h
src/ts/impls/eimex/eimex.c
src/ts/interface/ts.c

Merge branch 'jed/chem'

added DMDASetFieldNames() and DMDAGetFieldNames to allow handling the names of DMDAs with many fields easier

troubles with running extchemfield.c on two processes

Merge branch 'master' into jed/chem
Note merging a branch with good stuff in it for a year and a half is insane!

Conflicts:
src/ts/examples/tutorials/makefile
src/ts/interface/ts.c

Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection

Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c

Merge branch 'master' into barry/saws-options-merge-master

Totally confusing manual merge, could be wrong

Conflicts:
include/petscoptions.h
src/dm/impls/da/dacreate.c
src/sys/objects/aoptions.c

Merge branch 'master' into barry/saws-options-merge-master

Totally confusing manual merge, could be wrong

Conflicts:
include/petscoptions.h
src/dm/impls/da/dacreate.c
src/sys/objects/aoptions.c
src/sys/threadcomm/interface/threadcomm.c

show more ...

Merge branch 'master' into pr252/dmay/PetscViewerBinarySkipHeaderVecViewLoad
Manual merge of makefile

Conflicts:
src/sys/classes/viewer/examples/tutorials/makefile

Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection

Merge branch 'barry/feature-vec-lock'

Added VecLockPush/Pop() around SNES callbacks etc
Added DADAVecGetArray[DOF]Read()
Added use of GetArrayRead() as needed
Added many more const as needed

Note DMDAVecGetArray[DOF]Read() does not yet

Added VecLockPush/Pop() around SNES callbacks etc
Added DADAVecGetArray[DOF]Read()
Added use of GetArrayRead() as needed
Added many more const as needed

Note DMDAVecGetArray[DOF]Read() does not yet require correctly consted argument

show more ...

Merge branch 'master' into barry/ksp-converged-reason-viewer

Conflicts:
src/sys/objects/options.c

Merge branch 'barry/stefano_zampini/dmda-changeaotype'

DMDA: added DMDASetAOType

Merge branch 'knepley/feature-dm-dimension-handling'

* knepley/feature-dm-dimension-handling:
DM: Fixed DMDASetDim() in examples
Plex: Fix for isoparametric geometry
Plex: Complex fix
TS ex1

Merge branch 'knepley/feature-dm-dimension-handling'

* knepley/feature-dm-dimension-handling:
DM: Fixed DMDASetDim() in examples
Plex: Fix for isoparametric geometry
Plex: Complex fix
TS ex11: Fixed calls to DMSetCoordinateSection()
DM: FIxed DMClone() to copy dimension
Plex+DA: Now cell geometry routine can take a PetscFE in order to evaluate at quadrature points - We evaluate isoparametrically at the quadrature points - Changed DMDAComputeCellGeometry() --> DMDAComputeCellGeometryFEM() - Changed DMPlexComputeCellGeometry() --> DMPlexComputeCellGeometryFEM() - Added DMPlexComputeCellGeometryAffineFEM()
DM: Added a embedding dimension, different from the topological dimension - This can now be set in DMSetCoordinateSection(), or it can be automatically determined
Plex: Fix output for ex4
DM: Added DMGetDimPoints() - This replicates DMPlex/DAGetDepthStratum(), but uses the dimension which people have said is more intuitive
DM: Move dimension up into DM - Both DA and Plex had this and I think it makes sense

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

show more ...

Plex+DA: Now cell geometry routine can take a PetscFE in order to evaluate at quadrature points
- We evaluate isoparametrically at the quadrature points
- Changed DMDAComputeCellGeometry() --> DMDACo

Plex+DA: Now cell geometry routine can take a PetscFE in order to evaluate at quadrature points
- We evaluate isoparametrically at the quadrature points
- Changed DMDAComputeCellGeometry() --> DMDAComputeCellGeometryFEM()
- Changed DMPlexComputeCellGeometry() --> DMPlexComputeCellGeometryFEM()
- Added DMPlexComputeCellGeometryAffineFEM()

show more ...

DM: Added DMGetDimPoints()
- This replicates DMPlex/DAGetDepthStratum(), but uses the dimension which people have said is more intuitive

DM: Move dimension up into DM
- Both DA and Plex had this and I think it makes sense

manpages: fix formatting for DMDACoor2d, DMDACoor3d

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

Merge branch 'knepley/feature-problem-class'

* knepley/feature-problem-class: (40 commits)
PetscDS: Renamed from PetscProblem
ftn-types: fix compilers errors with PetscSection [remove duplicate

Merge branch 'knepley/feature-problem-class'

* knepley/feature-problem-class: (40 commits)
PetscDS: Renamed from PetscProblem
ftn-types: fix compilers errors with PetscSection [remove duplicate code from petscvec*.h90]
PetscSection: Fix Fortran datatypes support
DMPlex: Added quads to cell refiner transform support
DMPlex ex3: Updated to Problem interface
DMDA: Fixed FE projection functions
PetscSection: Fixes for Fortran stubs
DMPlex+TS+Doc: Function docs
PetscSection: Fortran bindings
DMPlex+HDF5: Had revered handedness of transformed periodic coordinates
DMPlex+HDF5: Preserve aspect ratio with remapping of periodic coordinates
DMPlex: Added missing declarations
Sys+DMDT: Added PetscValidFunction()
DMPlex: Fix for DMPlexProjectField()
DMPlex+HDF5: Selectively output fields for viz - Fields with NULL name are ignored
PetscSection: Allow NULL names
DMPlex: Fixes for DMPlexProjectField()
PetscProblem: Added scalar integral (objective function) - Added PetscProblemGet/SetObjective() - Used in PetscFEIntegrate() - Reworked PetscProblemEnlarge_Static()
DM+DT: Adding Fortran bindings
PetscViewer: Added HDF_VIZ format to names
...

show more ...

Merge branch 'knepley/feature-problem-class' into knepley/fix-fe-gpu

* knepley/feature-problem-class:
PetscDS: Renamed from PetscProblem
ftn-types: fix compilers errors with PetscSection [remove

Merge branch 'knepley/feature-problem-class' into knepley/fix-fe-gpu

* knepley/feature-problem-class:
PetscDS: Renamed from PetscProblem
ftn-types: fix compilers errors with PetscSection [remove duplicate code from petscvec*.h90]
PetscSection: Fix Fortran datatypes support
DMPlex: Added quads to cell refiner transform support
DMPlex ex3: Updated to Problem interface
DMDA: Fixed FE projection functions

show more ...

Merge branch 'knepley/feature-problem-class' into knepley/feature-quad-fas

* knepley/feature-problem-class: (38 commits)
PetscSection: Fix Fortran datatypes support
DMPlex: Added quads to cell r

Merge branch 'knepley/feature-problem-class' into knepley/feature-quad-fas

* knepley/feature-problem-class: (38 commits)
PetscSection: Fix Fortran datatypes support
DMPlex: Added quads to cell refiner transform support
DMPlex ex3: Updated to Problem interface
DMDA: Fixed FE projection functions
PetscSection: Fixes for Fortran stubs
DMPlex+TS+Doc: Function docs
PetscSection: Fortran bindings
DMPlex+HDF5: Had revered handedness of transformed periodic coordinates
DMPlex+HDF5: Preserve aspect ratio with remapping of periodic coordinates
DMPlex: Added missing declarations
Sys+DMDT: Added PetscValidFunction()
DMPlex: Fix for DMPlexProjectField()
DMPlex+HDF5: Selectively output fields for viz - Fields with NULL name are ignored
PetscSection: Allow NULL names
DMPlex: Fixes for DMPlexProjectField()
PetscProblem: Added scalar integral (objective function) - Added PetscProblemGet/SetObjective() - Used in PetscFEIntegrate() - Reworked PetscProblemEnlarge_Static()
DM+DT: Adding Fortran bindings
PetscViewer: Added HDF_VIZ format to names
PetscFE+OpenCL: Make more respectable elasticity
PetscFE+OpenCL: Add flag for printing kernel
...

show more ...