manual merge of conflict
Merge branch 'barry/remove-unneeded-paren-petscmalloc'Conflicts: src/mat/impls/baij/seq/baij.c
typos
add error flags for MatGetDiagonal when user calls it for matrix factor of pastix
convert some PetscMalloc() to PetscMalloc1()remove unneeded () in first argument to PetscMalloc/Calloc1()fixes for MATLAB examples
properly extern "C"ing MatSolverPackage registration functions
Moved registration of MatSolverPackages out of MatCreate_XXX routines into standalone system, this allows1) more precise error message when a requested solver is not found2) easier to add new solve
Moved registration of MatSolverPackages out of MatCreate_XXX routines into standalone system, this allows1) more precise error message when a requested solver is not found2) easier to add new solvers without touching basic PETSc matrix implementation files and the possibility of adding new solvers to the library after PETSc is installed or even at run time
show more ...
MatGetVecs() and KSPGetVecs() replaced with MatCreateVecs() and KSPCreateVecs()since they are creators not getters
pastix: fix compile errors [linux-cxx-cmplx-pkgs-64idx]cannot use DCOMPLEX from pastix.h - so use PetscScalar directly
Pastix: Fixes for options handling which I have no way to test
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,@'
Sys: add PetscMalloc1 macro, array allocation without redundant typesThe type is inferred from the pointer return type. This patch isautomated via the following script:git grep -l 'PetscMalloc(
Sys: add PetscMalloc1 macro, array allocation without redundant typesThe type is inferred from the pointer return type. This patch isautomated 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 pointerarity. The code was introduced in 2006, but the allocation could nothave been correct at any time. This probably means thatMatDuplicate_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.
removed use of VecSetFromOptions() all over the placed, instead use MatGetVecs() or use dm->vectype to determine typeadded DMGetVecType() and DMGetMatTYpe()
removed string version of function name for XXXRegister(), PetscFunctionListAdd() and PetscObjectComposeFunction()
Change all PETSC_EXTERN_C to PETSC_EXTERNHg-commit: 8d2ebbb193fb583bccc64015e35640c4e08c3426
completed removing unneeded EXTERN_C_BEGIN/END from Mat directories and converting to PETSC_EXTERN_C for constructorstested with and without dynamic with and without C++Hg-commit: 7d27d7f4d9ea3bfe
completed removing unneeded EXTERN_C_BEGIN/END from Mat directories and converting to PETSC_EXTERN_C for constructorstested with and without dynamic with and without C++Hg-commit: 7d27d7f4d9ea3bfe6616fafdfb32d046b5db53a1
began removing unneeded EXTERN_C_BEGIN/END and converting needed ones to PETSC_EXTERN_CHg-commit: e0c157606a3283d5a4ba8902a0da5cad0e2aa531
changed use of PetscObjectComposeFunctionDynamic() to PetscObjectComposeFunction() to allow use of static for functions for standard use in PETScPetscObjectComposeFunctionDynamic() is still availabl
changed use of PetscObjectComposeFunctionDynamic() to PetscObjectComposeFunction() to allow use of static for functions for standard use in PETScPetscObjectComposeFunctionDynamic() is still available for use if neededalso fixed calls to PetscObjectComposeFunction() to not wrap lines (per PETSc coding style)Hg-commit: 822f9ddaac95a8ff6c2a9ad77fbf07d02d2c20d9
added PetscObjectComm() and used it to replace (((PetscObject)obj)->comm)Hg-commit: 3da37c458124ad48ae939f4e9823e4430ee0b8be
removed a bunch of duplicate unneeded includes of std include filesHg-commit: b6c9f3e2b0eb8b7277fe131cc83beede5d495522
removed PETSC_NULL from C and Fortran (except declaration in C for backward compatibility). Kept PETSC_NULL_xxx for FortranFixed 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 FortranFixed a few bugs where PETSC_NULL had been used incorrectly.Hg-commit: 054705a517d7f4388a8a084415d7478cbe95dff4
Removed remaining spaces in cast to pointer-type.Hg-commit: dccb79187adf08b4501155bd6550e95ac2ab554c
Uncrustified src/mat/*.Hg-commit: 5c6f04286a6cfcd98361b2479b884c0041d95b73
Partially uncrustified /src/mat/*Hg-commit: f66b7241e67ccd55e47747ce1f2433e82e4f86b9
Updated style to obey 'Do not put a blank line immediately after PetscFunctionBegin;'Hg-commit: 5408b9ce2402ad624305b7a7a323ab3ae5e0c3f1
123456