Merge branch 'maint'

fortran: fix macro redefinition error

Merge branch 'master' into knepley/feature-plex-sphere-mesh

* master: (2633 commits)
Bib: Added ref
SNES ex56: Update test output
add a citation to petsc.bib
Plex: Initialize variables
ini

Merge branch 'master' into knepley/feature-plex-sphere-mesh

* master: (2633 commits)
Bib: Added ref
SNES ex56: Update test output
add a citation to petsc.bib
Plex: Initialize variables
initialize ap as complained by the nightly tests
Plex ex3: Update to new point function API
initialize some variables as complained by nightly tests
SNES ex12: Mix misnaming Nf --> Nc
update tests
add tests
add MatView_SeqXAIJ_ASCII_structonly(); enable A->structure_only in MatSetValuesBlocked_SeqBAIJ
typo
fill-in some references
Bib: Fixed ref
Plex: Added PLY to file support
Plex: Adding PLY support
PetscDS: Turn off Fortran bindings for Constants
Plex tests: Updated to new point function API
SNES ex56: Moved tests to new format
DM: Allow field projection functions to take an array of scalars - This will allow us to pass in user data to kernels without void *, more efficiency than aux fields
...

Conflicts:
config/builder.py
include/petscdmplex.h
src/dm/impls/plex/examples/tests/ex1.c
src/dm/impls/plex/plexcreate.c
src/dm/impls/plex/plexgmsh.c
src/snes/examples/tutorials/ex63.c

show more ...

Merge branch 'knepley/fix-plex-example-logging' into knepley/feature-plex-torus

* knepley/fix-plex-example-logging: (151 commits)
Plex ex12: Added logging stages
Plex ex1: Added logging stages

Merge branch 'knepley/fix-plex-example-logging' into knepley/feature-plex-torus

* knepley/fix-plex-example-logging: (151 commits)
Plex ex12: Added logging stages
Plex ex1: Added logging stages
update to latest hypre tag on github
fix 'inf' vs 'Inf' diff wrt vec_vec_utils_tagger_tutorials-ex1_8,9,18,19
MatSetOption(mat,MAT_IGNORE_ZERO_ENTRIES,PETSC_TRUE) no longer applies to zero values set or added to the matrix diagonal, they are now not ignored and are included in the matrix nonzero structure. This is useful for Jacobians passed to TS.
replace use/mention of depreciated -log_summary in many places
add extchem.py which was written years ago but never put in the distribution (hence it is broken).
petsc4py: update to snapshot with MatGetSubMatrices -> MatCreateSubMatrices etc API changes
Minor fixes for tchem examples due to changes in PETSc infrastructure
update webpage about API changes
add help menu for MatCreateSubMatricesMPI()
PetscCMPLX: assume type punning is safe
rename struct Mat_SubMat -> Mat_SubSppt
add a little information to the manual about using tchem
rename MatCreateSubMatrixComposite -> MatCreateSubMatrixVirtual; Mat_SubMatrix -> Mat_SubVirtual
need to protect the \ passed on the makefile on my Mac
Bib: Updated ref
update src/mat/examples/tests/output/ex23_#.out
rename MatGetSubMat -> MatCreateSubMat
Mark MatCreateMPIAIJWithSplitArrays() and MatMPIAIJSetPreallocationCSR() with MAT_NO_OFF_PROC_ENTRIES
...

Conflicts:
src/dm/impls/plex/examples/tests/ex1.c
src/dm/impls/plex/examples/tests/ex12.c

show more ...

Merge branch 'knepley/fix-plex-example-logging' into knepley/feature-plex-tests-new

* knepley/fix-plex-example-logging: (151 commits)
Plex ex12: Added logging stages
Plex ex1: Added logging stag

Merge branch 'knepley/fix-plex-example-logging' into knepley/feature-plex-tests-new

* knepley/fix-plex-example-logging: (151 commits)
Plex ex12: Added logging stages
Plex ex1: Added logging stages
update to latest hypre tag on github
fix 'inf' vs 'Inf' diff wrt vec_vec_utils_tagger_tutorials-ex1_8,9,18,19
MatSetOption(mat,MAT_IGNORE_ZERO_ENTRIES,PETSC_TRUE) no longer applies to zero values set or added to the matrix diagonal, they are now not ignored and are included in the matrix nonzero structure. This is useful for Jacobians passed to TS.
replace use/mention of depreciated -log_summary in many places
add extchem.py which was written years ago but never put in the distribution (hence it is broken).
petsc4py: update to snapshot with MatGetSubMatrices -> MatCreateSubMatrices etc API changes
Minor fixes for tchem examples due to changes in PETSc infrastructure
update webpage about API changes
add help menu for MatCreateSubMatricesMPI()
PetscCMPLX: assume type punning is safe
rename struct Mat_SubMat -> Mat_SubSppt
add a little information to the manual about using tchem
rename MatCreateSubMatrixComposite -> MatCreateSubMatrixVirtual; Mat_SubMatrix -> Mat_SubVirtual
need to protect the \ passed on the makefile on my Mac
Bib: Updated ref
update src/mat/examples/tests/output/ex23_#.out
rename MatGetSubMat -> MatCreateSubMat
Mark MatCreateMPIAIJWithSplitArrays() and MatMPIAIJSetPreallocationCSR() with MAT_NO_OFF_PROC_ENTRIES
...

Conflicts:
src/dm/impls/plex/examples/tests/ex12.c

show more ...

Merge branch 'master' into knepley/feature-plex-pragmatic-parallel

* master: (1379 commits)
Minor fixes for tchem examples due to changes in PETSc infrastructure
update webpage about API changes

Merge branch 'master' into knepley/feature-plex-pragmatic-parallel

* master: (1379 commits)
Minor fixes for tchem examples due to changes in PETSc infrastructure
update webpage about API changes
add help menu for MatCreateSubMatricesMPI()
rename struct Mat_SubMat -> Mat_SubSppt
add a little information to the manual about using tchem
rename MatCreateSubMatrixComposite -> MatCreateSubMatrixVirtual; Mat_SubMatrix -> Mat_SubVirtual
need to protect the \ passed on the makefile on my Mac
Bib: Updated ref
update src/mat/examples/tests/output/ex23_#.out
rename MatGetSubMat -> MatCreateSubMat
Mark MatCreateMPIAIJWithSplitArrays() and MatMPIAIJSetPreallocationCSR() with MAT_NO_OFF_PROC_ENTRIES
superlu: libray is installed in PREFIX/lib64 - fix this to use PREFIX/lib
backport fixes cc105cc3 2b35c90a - required for 3bf428d - that was backported from master - 80c96bb
'echo -n' fails on opensolaris/osx - so avoid using it.
fix diffs in nightlybuilds due to options in ~/.petscrc
add Kelley03 to src/docs/tex/petsc.bib
build: determine moudles, mpi.h used during buildtime and print in 'info'
fix analyzer warnings
fix build failure on opensolaris - where -lm from flibs is removed due to -lm in cxxlibs. But then - only flib gets used for some configure tests [blaslapack, parms]
config: prefer __restrict over C99 restrict keyword
...

show more ...

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

Merge remote-tracking branch 'origin/hzhang/rename_matgetsubmats'

rename MatGetSubMat -> MatCreateSubMat

Merge branch 'hzhang/fix-getsubmats-reuse'

bugfix for matgetmatrices_

add MatDestroySubMatrices(); bugfix

Merge branch 'barry/minor-cleanup'

Minor cleanup, remove some outdated code, remove unneeded constructs, improve manual pages slightly, add missing test case

Time: 2.5 hours

additional Fortran support needed by SLEPc examples

Time: .2 hours

Merge branch 'barry/fortran-update'

MatSetValues: fix fortran interface mangling for MatSetValuesnnnn()

Updated and simplified Fortran interface

Reduced from 4 distinct approaches to using PETSc from Fortran to 1
No more .h90 files (Fortran 90 functionality is now always available)
Parameters and func

Updated and simplified Fortran interface

Reduced from 4 distinct approaches to using PETSc from Fortran to 1
No more .h90 files (Fortran 90 functionality is now always available)
Parameters and function prototypes are now provide through Fortran modules, not includes;
only #define are provided in the petscXXXdef.h files
PETSc objects can be declared as either type(tXXX) or XXX. For example type(tVec) or Vec
Moved now private Fortran include files out of public include directory since uses don't use them;
they are only used to generate the Fortran modules
Easier to support and test; we can now easily add more function prototypes
Also had to rework generation of manual pages to consistently use MANSEC and SUBMANSEC
since these variables also handle how the Fortran modules are generated.

Time: 57 hours

show more ...

Merge branch 'barry/fix-fortran-interfaces-matsetvalues'

ftn: fix vecsetvalues() interface def errors wrt pgf90 [similary matsetvalues*()]

[/sandbox/petsc/petsc.clone-2/src/snes/examples/tests ex18f90]
/sandbox/petsc/petsc.clone-2/arch-linux-pgi/bin/mpif9

ftn: fix vecsetvalues() interface def errors wrt pgf90 [similary matsetvalues*()]

[/sandbox/petsc/petsc.clone-2/src/snes/examples/tests ex18f90]
/sandbox/petsc/petsc.clone-2/arch-linux-pgi/bin/mpif90 -c -Mfree -g -I/sandbox/petsc/petsc.clone-2/include -I/sandbox/petsc/petsc.clone-2/arch-linux-pgi/include -o ex18f90.o ex18f90.F90
PGF90-S-0043-Illegal attempt to redefine symbol vecsetvalues (/sandbox/petsc/petsc.clone-2/include/petsc/finclude/ftn-custom/petscvec.h90: 8)
0 inform, 0 warnings, 1 severes, 0 fatal for extended_module
PGF90-S-0043-Illegal attempt to redefine symbol vecsetvalues (/sandbox/petsc/petsc.clone-2/include/petsc/finclude/ftn-custom/petscvec.h90: 8)
0 inform, 0 warnings, 1 severes, 0 fatal for ex18f90

show more ...

Add multiple Fortran interface definitions for MatSetValuesXXX() and VecSetValuesXXX()

Tested against PFlotran.
This is needed because Fortran requires seperate interface definitions if the argument

Add multiple Fortran interface definitions for MatSetValuesXXX() and VecSetValuesXXX()

Tested against PFlotran.
This is needed because Fortran requires seperate interface definitions if the argument is a
scalar or an array of size 1.

Funded-by: IDEAS
Project: IDEAS/xSDK
Time: 6 hours

show more ...

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

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

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

Conflicts:
src/ksp/pc/impls/bddc/bddc.c
src/ksp/pc/impls/bddc/bddcgraph.c
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/ksp/pc/impls/bddc/bddcschurs.c
src/mat/impls/is/matis.c

show more ...

Merge branch 'master' into barry/add-pcfieldsplit-logevent

Merge branch 'master' into barry/add-pcreset-hypre-for-master

Needed to move PCDestroy_HYPRE() added to master to PCReset_HYPRE() since that was introduced
as a bug fix for maint

Merge branch 'master' into tisaac/dmforest

* master: (177 commits)
DT ex3: The test should check the number of digits requested
DT ex3: One test fails in single precision
Plex: Do not automati

Merge branch 'master' into tisaac/dmforest

* master: (177 commits)
DT ex3: The test should check the number of digits requested
DT ex3: One test fails in single precision
Plex: Do not automatically create a default section if no fields are defined
Plex: DMPlexCopyCoordinates() needs to create the coordinate section if it is missing
superlu: no longer requires xerbla slamch dlamch ?
superlu: update to v5.1
skip MatSolve() if matrix factorization fails
replacing SETERRQ with error output info and continue execution
SNES ex12: Added parallel tests - These test parallel, unstructured interpolation/restriction using FAS
Plex+SNES: Now in DMPlexComputeJacobian_Internal(), we also form the Jacobian preconditioner matrix
FE: Now we can form either the Jacobian or the Jacobian preconditioned matrix using a flag
DS: Now have point wise function slots for the Jacobian preconditioned matrix - This will allow us to form the "right" operator for preconditioning, like M in the (2,2) block for Stokes
Plex: When swapping Plexes, also swap point SF
Plex: Fix parallel error in Injector
Mat+Plex: Added MatPreallocator which can be called with MatSetValues() and preallocates another Mat - This could have been another "mode" of Mat, but I thought this was cleaner - Use MatPreallocator to preallocator Plex interpolators
DT ex3: Change tolerance and eliminate tests which need MPFR from regular runs
superlu: fix complex build
superlu: update to using 5.0 tarball with the fix for -Werror=format-security
superlu: update to use tarball with -Werror=format-security fix
DM: Clone the coordinate DM instead of reusing in Clone()
...

Conflicts:
config/builder.py
src/dm/impls/plex/plexcreate.c

show more ...