Merge branch 'master' into stefano_zampini/feature-pcbddc-saddlepoint

Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bddc.c

Merge branch 'master' into stefano_zampini/feature-pcbddc-saddlepoint

Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bddc.c
src/ksp/pc/impls/bddc/bddcfetidp.c
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcschurs.c
src/mat/impls/is/matis.c
src/mat/impls/is/matis.h

show more ...

Merge branch 'knepley/feature-plex-particle-example'

* knepley/feature-plex-particle-example: (103 commits)
PetscTypes: * Added newly types into fortran definition
DMSwarmMigrate: printf fix for

Merge branch 'knepley/feature-plex-particle-example'

* knepley/feature-plex-particle-example: (103 commits)
PetscTypes: * Added newly types into fortran definition
DMSwarmMigrate: printf fix for __float128
fix c++ comments for c89
fix scanf warnings using PetscInt_FMT
Sys+DM: Fixing 64-bit format strings
Swarm: Fixed 64-bit integer problems
Swarm: Fixed PetscFree() usage
Swarm: Correct format in scanf
Plex: Small cleanup
Plex: Fixes to draw for complex
Plex: Fixed type for GetNeighbors
Swarm: Cleanup of Dave's code - Guy has a kid and think he doesn't have to play by the rules anymore
SNES ex63: Stokes example with Particles
Swarm: Fixed prototypes
Swarm: Added missing PetscFunctionBegin
Swarm: Fixed DMGetLocalVecTor_Swarm()
Swarm: Added DMSwarmCreate/DestroyLocalVectorFromField()
Swarm: Added missing prototype
Plex: Since we are using an SF, ranks that are not found default to 0, not -1 - You need to check the index for the negative value
Plex: Added a new point location type to remove entries which are not found - This was the default, but its not what DMSwarm wanted and its non-intuitive I agree
...

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

show more ...

Swarm: Cleanup of Dave's code
- Guy has a kid and think he doesn't have to play by the rules anymore

Swarm: Fixed prototypes

Swarm: Added DMSwarmCreate/DestroyLocalVectorFromField()

Swarm: Added missing prototype

Merge branch 'dmay/feature-dm-swarm' into knepley/feature-plex-particle-example

* dmay/feature-dm-swarm: (69 commits)
DMSwarm: * Check for size compatabaility between vectors created for DMSwarm f

Merge branch 'dmay/feature-dm-swarm' into knepley/feature-plex-particle-example

* dmay/feature-dm-swarm: (69 commits)
DMSwarm: * Check for size compatabaility between vectors created for DMSwarm fields * Bug fix for the field register function
DMSwarm DataBucket: * Added guards to ensure that internal arrays are never re-sized if any raw pointers are being currently being accessed
DMSwarm: * Added missing part of macro
DMSwarm: * Added documentation
DMSwarm example: * Added example with DMShell and user point location
DMSwarm Migrate: * Updated to use DMLOCATEPOINT_POINT_NOT_FOUND flag
DM definition: * Added special flag for marking points as being not found within an element during a call to DMLocatePoints
DMSwarm migrate: * Fixed bug with point removal
DMSwarm: * Removed print from data exchanger
DMSwarm: * Use common field names * Re-organized init/finalize fields with DMCreate/DMSetUp * Added methods, flags, checks when using DMSwarmType PIC
SwarmMigrate: * Use common field names
PetscDMSwarm: * Added common names * Corrected extern to PETSC_EXTERN * Added names for migrate
DMSwarm implementation: * Remove unused member
DM implementation: * Added new method locatepointssubdomin
DataBucket: * Print block size
DMSwarm example: * Removed comment
DMSwarm example: * Updated function names
DMSwarm test: * Added new test for variable block sizes
DMSwarm: * Fixed typo in vector name
DMSwarm: * Finishing support for block size != 1
...

Conflicts:
include/petsc/private/dmimpl.h

show more ...

PetscDMSwarm:
* Added common names
* Corrected extern to PETSC_EXTERN
* Added names for migrate

Merged collection routines from dmay/swarm-boundingbox-collect

Merge branch 'dmay/swarm-boundingbox-collect' into dmay/swarm-next

DMSwarm:
* Added blocksize option to user data type register function

DMSwarm:
* Generalizing migrate, collect operations

DMSwarm collection:
* Clean up function names
* Added GetCellDM

DMSwarm collect:
* Added method (not generic) to collect points based on bounding box of a DMDA
* Added example function (ex3())

DMSwarmMigrate:
* Added example how a global-to-local type of operation could be defined

DMSwarm:
* Added migration functionality

DMSwarm:
Added add/remove methods

DMSwarm:
* Added Create{Global,Local}Vector

DMSwarm defs:
* Added headers