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: 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 barry/wirth-fusion-materials

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

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 'barry/improve-memory-logging'

Conflicts:
src/ksp/pc/impls/redundant/redundant.c
src/mat/interface/matnull.c

logging memory now credits to all ancestors

Merge branch 'master' into jed/ts-eimex

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

Conflicts:
src/ts/interface/tsregall.c

changed outdated PetscDrawLGPrint() and PetscDrawHGPrint() to PetscDrawLG/HGView()

Hg-commit: 45119211e66e0759f6a7d1320f50f50abf2a7458

added petscdrawtypes.h removed the typedef _xx* xx definitions from petscdraw.h and removed petscdraw.h from petscsys.h

Hg-commit: 01be7b4c0ac1e993b540535c319de45af820a255

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

Hg-commit: 3da37c458124ad48ae939f4e9823e4430ee0b8be

removed typeid from PetscHeaderCreate() args since it is not know at create time anyway

Hg-commit: 368e928141e31cf1ff6cf108913006e5886dc6cc

Merge branch 'private-impl-headers'

petsc-private/petscimpl.h and vecimpl.h are no longer included by
petscsys.h and petscvec.h. Some inline functions become normal functions
as a consequence of the

Merge branch 'private-impl-headers'

petsc-private/petscimpl.h and vecimpl.h are no longer included by
petscsys.h and petscvec.h. Some inline functions become normal functions
as a consequence of these changes.

Hg-commit: 5c59734726c7c41f493a5f5b9303cfab5c66ae21

show more ...

Make petscimpl.h private

Hg-commit: 910e8b03a54a915953944da6f75eb81c807d7428

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

Uncrustified src/sys/*

Hg-commit: 9f71677807bad7b55428a6cc0f5ccc5052e91805

silly code formatting problems; some people still need to read the style guide

Hg-commit: 7a98cb06baf90914d565ea8801b6900bdc5a04c1

Commit after merge.

Hg-commit: a128a87f5736ccbab37df5d559616f8376f7026e

reorg of src/sys directory
directories that define objects now in the classes subdirectory
rename several confusing name directories

Hg-commit: b2612422c63ac4afe82112892d9efda808f3d601