Merge branch 'master' into stefano_zampini/pcbddc-multilevel-improvement

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

Merge branch 'master' into stefano_zampini/pcbddc-multilevel-improvement

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

show more ...

Merge branch 'master' into shri/ts-events

Conflicts:
src/ts/interface/ts.c

Merge branch 'master' into shri/feature-dm-circuit

Conflicts:
src/dm/impls/makefile

Merge branch 'master' into prbrune/snes-fascontinuation

Conflicts:
include/petscsnesfas.h

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

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

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

Merge branch 'barry/saws-push-header-body' into barry/saws-options

Merge branch 'jed/malloc-array'

Type arguments dropped from PetscMalloc[2-7], PetscNew, and PetscNewLog,
added PetscMalloc1 for allocating typed arrays, add PetscCalloc[1-7] for
allocating cleared (

Merge branch 'jed/malloc-array'

Type arguments dropped from PetscMalloc[2-7], PetscNew, and PetscNewLog,
added PetscMalloc1 for allocating typed arrays, add PetscCalloc[1-7] for
allocating cleared (zeroed) memory.

* jed/malloc-array:
Sys: Add pointer casts from (void **) in calls to PetscMalloc1()
Sys: drop explicit type arguments from PetscNew() and PetscNewLog()
Sys: add PetscCalloc[1-7]
Sys: add PetscMalloc1 macro, array allocation without redundant types
PetscMalloc[2-7]: remove type arguments, infer from pointer type
SNESComputeJacobianDefaultColor: fix uninitialized variable

show more ...

Sys: drop explicit type arguments from PetscNew() and PetscNewLog()

git grep -l 'PetscNew\(Log\)\?(' -- $1 | xargs perl -pi -e '
s@PetscNew\([^,;()]+ *, *@PetscNew(@;
s@PetscNewLog\(([^,;()]+) *,[^,

Sys: drop explicit type arguments from PetscNew() and PetscNewLog()

git grep -l 'PetscNew\(Log\)\?(' -- $1 | xargs perl -pi -e '
s@PetscNew\([^,;()]+ *, *@PetscNew(@;
s@PetscNewLog\(([^,;()]+) *,[^,;()]+, *@PetscNewLog($1,@'

show more ...

Sys: add PetscMalloc1 macro, array allocation without redundant types

The type is inferred from the pointer return type. This patch is
automated via the following script:

git grep -l 'PetscMalloc(

Sys: add PetscMalloc1 macro, array allocation without redundant types

The type is inferred from the pointer return type. This patch is
automated via the following script:

git grep -l 'PetscMalloc(.*sizeof' src | xargs perl -pi -e 's@PetscMalloc\(([^,;]*[^,; ]) *\* *sizeof\([^,;()]+\),@PetscMalloc1($1,@'

This commit contains an additional bug-fix in csrperm.c, fixing pointer
arity. The code was introduced in 2006, but the allocation could not
have been correct at any time. This probably means that
MatDuplicate_SeqAIJPERM has never been tested.

a54129beb540034ba105796c682d589e7e1111f2
Richard Tran Mills <rmills@ornl.gov>

Added MATSEQCSRPERM support for MatDuplicate() and conversion to/from
MATSEQAIJ. Note that these changes are not quite debugged.

show more ...

Merge branch 'master' into jed/ts-eimex

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

Conflicts:
src/ts/interface/tsregall.c

added PetscObjectComm() and used it to replace (((PetscObject)obj)->comm)

Hg-commit: 3da37c458124ad48ae939f4e9823e4430ee0b8be

removed PETSC_NULL from C and Fortran (except declaration in C for backward compatibility). Kept PETSC_NULL_xxx for Fortran
Fixed a few bugs where PETSC_NULL had been used incorrectly.

Hg-commit: 05

removed PETSC_NULL from C and Fortran (except declaration in C for backward compatibility). Kept PETSC_NULL_xxx for Fortran
Fixed a few bugs where PETSC_NULL had been used incorrectly.

Hg-commit: 054705a517d7f4388a8a084415d7478cbe95dff4

show more ...

commit after merge

Hg-commit: db805e8197486aa7db018c01793dec447b9e9cbb

Uncrustified src/mat/*.

Hg-commit: 5c6f04286a6cfcd98361b2479b884c0041d95b73

commit aftr merge

Hg-commit: 854807b200896ff0e3d6fb344a549ed1a2b93850

Carefully replaced more '){' by ') {', added checker script

Hg-commit: a0037010be00b56a68354d942365c8f8df63198a

changed #define char* XXXType to typedef const char* XXXType

Hg-commit: 2f1984a65b4f21a886ea1c854235ca6d51deefad