Merge branch 'pr192/Fande-Kong/scalable-matincreaseoverlap/master' of https://bitbucket.org/petsc/petsc

Merged petsc/petsc into master

Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection

Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/mat/impls/aij/mpi/mumps/mumps.c
s

Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection

Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/mat/impls/aij/mpi/mumps/mumps.c
src/mat/impls/is/matis.h

show more ...

Merged master into semihozmen/ksp-fcg-eigen-comp-support

Merge branch 'master' into pr192/Fande-Kong/scalable-matincreaseoverlap/master

Needed to merge master to update to new calling sequence PetscCommBuildTwoSided

Merged petsc/petsc into master

Merge branch 'barry/fix-directory-layout'

updated PETSc directory layout to match standard packaging strategies

include/petsc finclude,private,mpiuni
lib/petsc conf
bin/petsc*

Merge branch 'master' into shri/ts-is-for-differential-variables

Conflicts:
include/petsc-private/tsimpl.h
src/ts/impls/eimex/eimex.c
src/ts/interface/ts.c

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 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 barry/xcode

Merge branch 'master' into knepley/feature-fem-dgspace

* master: (593 commits)
Bib: Added Top500 and fixed entry
fun3d: update PetscMallocValidate() usage
bib: rename ref with duplicate key

Merge branch 'master' into knepley/feature-fem-dgspace

* master: (593 commits)
Bib: Added Top500 and fixed entry
fun3d: update PetscMallocValidate() usage
bib: rename ref with duplicate key
Webpage: Corrected '-dm_mat_type cusp' to 'dm_mat_type aijcusp'.
Allow calling MatGetBlockSize[s]() before matrix preallocation
SNESLINESEARCHBT: Set the norms when exiting early due to negligible step.
SNESQN: only monitor real part of dot product (fails with C++ complex)
Corrected the #include statement in the man pages for the PetscObjectComposedDataSet/Getwhatever routines.
DMPlex: Added doc for DMPlexGetHybridBounds()
winzip: detect if winzip is used to extract petsc.tar.gz and error out.
configure: remove self.archIndependent as its not being used. [it is used to create externalpackages/package/arch dir which is unused]
configure: fix packages using package-dir/PETSC_ARCH as out-of-source-build location Perhaps this should be changed to package-dir/build?
configure: remove dead code previously used to download BuildSystem
configure: check if compilerDefines [and compilerFixes] exist in framework before using them
configure: save/restore reconfigure.py when --with-clean is used
configure: add --with-clean option to delete buildfiles/externalpackages in PETSC_DIR/PETSC_ARCH and potential externalpackages in --with-external-package-dir/PETSC_ARCH
configure: With --with-externalpackages-dir=dir store/build packages in dir/PETSC_ARCH
Add MatSeqSBAIJSetPreallocationCSR()
configure: switch to using PETSC_DIR/PETSC_ARCH/externalpackages by updating package.py to use externalpackages.py as the externalPackagesDirProvider
configure: move dead code configureExternalPackagesDir() from petscdir.py to externalpackagesdir.py Also set PETSC_DIR/PETSC_ARCH/externalpackages as the externalpackagesdir
...

show more ...

Merge branch 'master' into barry/saws

Conflicts:
src/ksp/pc/impls/gamg/gamg.c
src/sys/classes/viewer/impls/ams/ams.c
src/sys/objects/pinit.c

Merge branch 'master' into knepley/feature-dmda-section

* master: (397 commits)
PetscSynchronizedFGets: fix deadlock at EOF
Compiler: Fix warnings from MPI impls which do not initialize outputs

Merge branch 'master' into knepley/feature-dmda-section

* master: (397 commits)
PetscSynchronizedFGets: fix deadlock at EOF
Compiler: Fix warnings from MPI impls which do not initialize outputs
Increase patchlevel to 3.4.3
SNES: Now work vectors come from the DM
SNES ex62: Remove code generation
SNES: Move setup involving snes->vec_sol from SNESSetUp() to SNESolve()
Compiler: Fix warnings from MPI impls which do not initialize outputs
DMPlex ex7: Added missing test output
SNES ex52: Removed old Jacobian stuff, and fixed call to DMPlexProjectFunction() - Fixed calls for new element handling
SNES ex12: Added a performance profiling mode
DMPlex ex8: Fixed leak
PetscSection: Must reset the section when changing the number of fields
DMPlex ex7: Fixed test output - Corrected orientations in interpolation
DMPlex ex1: Fixed test output - Uniform refinement for quads changed
DMPlex: Fix overagressive checks
PC: Removed support graph PC
configure: both downloadonWindows and worksonWindows refer to MS compilers. Also fix isWindows() -> isWindows(CC).
MatXAIJSetPreallocation: use array[] notation to help out Fortran
__float128: when blas/lapack is not found instruct using f2cblaslapack
Configure: Package.downloadonWindows is supposed to mean that Windows compilers work. not Cygwin - Also changed doc for Package.worksonWindows, which does refer to Cygwin
...

Conflicts:
src/dm/impls/da/dalocal.c

show more ...

Merge branch 'master' into knepley/feature-plex-refine-3d

* master: (149 commits)
Bib: Added papers referencing PETSc from ResearchGate
Bib: Fixed urls for some refs Suggested-by: Michele De Ste

Merge branch 'master' into knepley/feature-plex-refine-3d

* master: (149 commits)
Bib: Added papers referencing PETSc from ResearchGate
Bib: Fixed urls for some refs Suggested-by: Michele De Stefano
fixed bug that has appeared recently of false positive errors when there are zero local equations on coarse grids in gamg-agg.
MatSchurComplement: Must initialize KSP package
bib: fix inbook citation
Bib: Updated some refs
SNES: fix copy/paste in man page
fortran: fix KSPCONVERGEDDEFAULT and SNESCONVERGEDSKIP in fortran includes
Mat SBAIJ: avoid invalid memory read in MatSOR_SBAIJ
Revert "MatMPIBAIJSetPreallocationCSR() handled the input matrix entries incorrectly, it treated them as if each row of values"
PCGAMG: fix corruption for multiple solves when MatSetNearNullSpace is used
PCGAMG: remove distracting comment
KSP ex49: restrict near-null space for elasticity example with sym BC
MatMPIBAIJSetPreallocationCSR() handled the input matrix entries incorrectly, it treated them as if each row of values was provided ordered by row within the block rows instead of by block as it was originally designed to be. Also added more discussion to the manual pages on the expected order of the values
Fix accidental creation of the matrices in SNESNCG used for linear analogue LS.
PCGAMG: add man page for PCGAMGType
fortran: fix snesconvergedskip_() kspconvergedskip_() kspconvergeddefault*_()
rm //
Sys: new_ir changed from PetscInt to PetscObjectState - so fix mallocs to use the new type
SNES: Fixed package init in SNESLineSearchCreate()
...

Conflicts:
include/petscdmplex.h
src/dm/impls/plex/examples/tests/ex5.c
src/dm/impls/plex/plex.c
src/dm/interface/dm.c

show more ...

Merge branch 'hzhang/snes-jacobiancoloropt' of bitbucket.org:petsc/petsc into hzhang/snes-jacobiancoloropt

Merge branch 'hzhang/snes-jacobiancoloropt' of bitbucket.org:petsc/petsc into hzhang/snes-jacobiancoloropt

Merge branch 'jed/matgetcolumnnorms-fortran'

* jed/matgetcolumnnorms-fortran:
Mat: fix Fortran interface for MatGetColumnNorms

Mat: fix Fortran interface for MatGetColumnNorms

bfort distinguishes between array[] and *pointer to decide whether the
Fortran interface should have an array or a scalar.

Reported-by: Elliott Sale

Mat: fix Fortran interface for MatGetColumnNorms

bfort distinguishes between array[] and *pointer to decide whether the
Fortran interface should have an array or a scalar.

Reported-by: Elliott Sales de Andrade <qulogic@pidgin.im>

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: 1fa981254c79c783277e37654668dfe698cddf41