Merge branch 'hzhang/fix-pcredundant'

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

add PetscSubcommSetOptionsPrefix()

add PetscOptionsBegin/End to PetscSubcommSetFromOptions()

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 hongzh/checkpointing

Manual merges for a couple of PetscOptions changes in master

Merge remote-tracking branch 'origin/knepley/feature-plex-add-time' into tisaac/dmforest

Both branches changeds DM projection behavior, so I wanted to sort it
out before merging

* origin/knepley/fe

Merge remote-tracking branch 'origin/knepley/feature-plex-add-time' into tisaac/dmforest

Both branches changeds DM projection behavior, so I wanted to sort it
out before merging

* origin/knepley/feature-plex-add-time: (59 commits)
SNES ex69: Updated to new function API, fixed test output
SNES ex75: Fixed for new function API
add fortran stub for TSMonitorLGSetTransform() and fix TSMonitorLG for multiple fields but no names provided for fields
add -binary_write_double so __float128 precision can save as double to binary files
TSClone() did not clone Fortran function pointers hence some TS methods would fail if functions provided in Fortan
petsc4py: update to snapshot with 'barry/petscoptions-object' changes
fix bad merge that introduced 2 copies of the MPI_Comm_free()
update example to use MAT_INPLACE_MATRIX, not REUSE
incorrect addition of float to PetscInt
update for new PetscOptions API
TS ex18: Fixed function API and test output
Function now takes PetscOptions as first argument, this was missed during the first round of updates
bugfix for MatSetOption_Elemental()
fix test example no change output that was missing a line
fixes for new PetscOptions.. API that are needed based on problems with nightly build
Plex ex3: Use new function API
SNES ex62: Use new function API
SNES ex12: Use new function API
Plex: Fixed unused options in examples
Plex+DMDA: Add time to signatures
...

show more ...

Merge branch 'master' into pr391/zianekhodja/lilia/tsirm/master

Merge branch 'master' into knepley/feature-plex-add-time

* master: (57 commits)
add fortran stub for TSMonitorLGSetTransform() and fix TSMonitorLG for multiple fields but no names provided for fie

Merge branch 'master' into knepley/feature-plex-add-time

* master: (57 commits)
add fortran stub for TSMonitorLGSetTransform() and fix TSMonitorLG for multiple fields but no names provided for fields
add -binary_write_double so __float128 precision can save as double to binary files
TSClone() did not clone Fortran function pointers hence some TS methods would fail if functions provided in Fortan
petsc4py: update to snapshot with 'barry/petscoptions-object' changes
fix bad merge that introduced 2 copies of the MPI_Comm_free()
update example to use MAT_INPLACE_MATRIX, not REUSE
incorrect addition of float to PetscInt
update for new PetscOptions API
Function now takes PetscOptions as first argument, this was missed during the first round of updates
bugfix for MatSetOption_Elemental()
fix test example no change output that was missing a line
fixes for new PetscOptions.. API that are needed based on problems with nightly build
mark variable as unused so compiler doesn't warn about unused value
configure: use 'git cat-file -e' to check for existance of a commit in localrepo. ['git rev-parse' does not give error for a hash thats not in repo]
petsc4py: revert to manually syncing petsc4py with petsc master changes
configure: revert gitcommit default value to Null. If a pacakge using giturl does not change this value - raise an error
fix: revert change in a44bcdf that breaks with pgf90
update test output for fixed to hypre interface that now actually pass the interp vectors to BoomerAMG
fixes for merge from Jed's branch that should have been merged into master months ago!
Add to changes dev.html file the change to the PetscOptions routines
...

show more ...

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

Merge remote-tracking branch 'petsc/master' into moved-partitioning-to-pcgasmsetup

Merge branch 'barry/petscoptions-object'

Merge branch 'barry/petscoptions-object' into stefano_zampini/feature-pardiso-schur

Complete update to new PetscOptions interface

Merge branch 'master' into pr263/PierreBdR/ts-domain-error-in-stage/master

Merge branch 'master' into tisaac/dmforest

Get 3.6.2 patches

* master: (1360 commits)
remove nasty memory leak with CUDA code when using block Jacobi with multiple blocks per process
print abs

Merge branch 'master' into tisaac/dmforest

Get 3.6.2 patches

* master: (1360 commits)
remove nasty memory leak with CUDA code when using block Jacobi with multiple blocks per process
print abs in Fortran test example in order to have same result with real and complex builds
changed outdate mpirun and -np to mpiexec and -n
force sqrt to be taken in the precision of PetscReal in fortran examples
continuation line too soon for some compilers
stop configure if user selected C++ clanguage, single precision, complex combination since we do not support it
fixes for Fortran examples to compile cleanly in single precision that do not involve complex numbers
fixes to Fortran examples to compile cleanly in single precision complex
fix previous mistake
must cast 1. to PetscScalar before dividing by a PetscScalar (C++ complex class is terrible)
must cast 0.0 to PetscScalar before comparison with a PetscScalar
changed order of suggested locations of downloadable PETSc to Barry's preference
Increase patchlevel to 3.6.2
remove debug print statement from two commits before
remove debug print statements I accidently left in the last commit
PetscDraw: Fix dummy definition of PetscDrawCollective{Begin|End}()
remove cleanupMumps flag from MatDestroy_Mumps() it should always free the memory it allocated Bug detected while adding features to libMesh
improved viewing of fractional counts in xml nested log viewing fixed bug in output of doubles to xml nested log files
chombo: build only libs - not examples
fix typo. 'gcc-4.8 --with-cxx-dialect=C++11' gives a warning with this line - even though its in a #ifdef thats never enabled.
...

show more ...

Merge branch 'tisaac/dmplex-stable-tet-refinement' into tisaac/plex-feature-tree-fv

This feature branch also changed the topology of nonconforming examples:
I am merging so that I can make the regre

Merge branch 'tisaac/dmplex-stable-tet-refinement' into tisaac/plex-feature-tree-fv

This feature branch also changed the topology of nonconforming examples:
I am merging so that I can make the regression output that should be
correct in master and next

* tisaac/dmplex-stable-tet-refinement: (594 commits)
plex: added tet shape regression test
plexrefine: remove replaced code
plex: update test output for new tet refinement order
plex: fix tet refinement for stable element shape
DMPlex: added test of shape quality to ex1
Better to use the proper error handling version of PetscViewerASCIIGetStdout() instead of PETSC_VIEWER_STDOUT_()
Generate a very useful error message if PetscLogView(), PetscLogEventGetPerfInfo() or PetscLogEventGetFlops() is called with a preceeding call to PetscLogBegin() and friends (also -log_summary which triggers a PetscLogBegin())
fix compile warnings
Plex: Fix bug with bcComps initialization
Turn off elemental shared libraries if --with-shared-libraries=0 is used
Bib: Added refs
Bib: Fixed a bunch of errors
add warning/error flag for '-mat_superlu_dist_parsymbfact' when MatInputMode=GLOBAL
makefile: fix format
tests: add back ex6f, runex6f targets - that got removed in 2f1d3d565a6a43067e6df75b043e6343b05fcd1d
accessing option that may never have been set
typo in DMNetworkSetNumVariables() reported by Sean Shahkarami
superlu_dist: update to using latest 4.1 version
fix compile warnings
Generate an error message when trying to overwrite default options of CN and BEULER
...

show more ...

Merge branch 'barry/fix-nonew-notcollective/maint' into jed/mat-assembly-perf

Jed this fucking 6+ month running thing in next that is not in master is a royal fucking pain in the ass and
an abuse of

Merge branch 'barry/fix-nonew-notcollective/maint' into jed/mat-assembly-perf

Jed this fucking 6+ month running thing in next that is not in master is a royal fucking pain in the ass and
an abuse of git. I think it is not justified to ever have anything in next for more than a few weeks at most.
Either take it out of next if it is broken or put it in master if it is not broken. Hanging around in next but
not master for ever is not a good policy.

show more ...

Merge branch 'master' into knepley/feature-snes-deflation

* master: (239 commits)
Bib: Moved entry
revert sources to dev - reset PETSC_VERSION_RELEASE - reset changes/dev.html - enable cuda in c

Merge branch 'master' into knepley/feature-snes-deflation

* master: (239 commits)
Bib: Moved entry
revert sources to dev - reset PETSC_VERSION_RELEASE - reset changes/dev.html - enable cuda in configure
release: set v3.6 strings
doc: add PCGAMGSetReuseInterpolation() to changes file
fix: workarround static initialization issue (perhaps compiler bug) on opensolaris c/complex build
fix: ex40,ex41 errors in src/ts/examples/tutorials/ on bsd with c++/complex Perhaps this code nees a separate section when 'enorm == 0) - as pow(0,-0.33) = inf.
manual: fix format
more changes..
PCGASM/MatGetSubMatricesMPI() changes in dev.html.
changes: more updates
Add size checks for static arrays of assumed max size [-Warray-bounds]
Doc: Update to Changes
configure: default to useThreads= 0as the useThreads=1 code currently prints output in jumbled order [producing hard to read configure.log]
Delete PETSc viewer attribute if none are left on the linked list instead of putting an empty attribute
MatGetSubMatricesMPI_MPIAIJ(): guard for an empty B-matrix when delogging memory in MatSetSeqMats().
PCBDDC: fix typos in the specification of MPI operation
MPIU_SUM was used with MPIU_INT when it should only be used with MPIU_REAL or MPIU_SCALAR
fixed bad PetscPrintf() formatting in two examples
Plex: In pointwise callbacks, use embedding dimension
updates for generating Apple installations due to changes in locations of include files
...

show more ...

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

Merge remote-tracking branch 'petsc/master' into matpartitioning-hierach

Merge remote-tracking branch 'petsc/master' into mat-increaseoverlap

Merged in PR312: karpeev/ksp-pcgasm-overhaul.

Merge branch 'master' into knepley/solkx

* master: (6933 commits)
Bib: Added reference
Includegraph: Updated for compatibility with new folder layout.
Add SNESLineSearchReason to fortran inclu

Merge branch 'master' into knepley/solkx

* master: (6933 commits)
Bib: Added reference
Includegraph: Updated for compatibility with new folder layout.
Add SNESLineSearchReason to fortran includes Also truncate names to fit 32 char fortran limit
fix compile warnings /usr/home/balay/petsc.clone-2/src/vec/vec/interface/vector.c:1944: warning: division by zero in '1.0e+0 / 0.' /usr/home/balay/petsc.clone-2/src/ksp/ksp/interface/itfunc.c:508: warning: 'vec_rhs' may be used uninitialized in this function
updated output for new trust region initial size
initial size of the trust region is set as a percent of the norm of the initial guess, it should not be related to the initial norm of the function (which is kind of nuts).
The default bounds for SNESVISetVariableBounds() in the manual page were reversed from correct values
Bib: Added refs
Bib: Update MPICH webpage
Plex: Forgot to close file
removed nonexistent ex46f from makefile test rule
Revert "fixed bad merge into master"
fixed bad merge into master
fix memory leak in mkl_pardiso fix some formatting in mkl_pardiso code
mv runex111 from TESTEXAMPLES_C to TESTEXAMPLES_DATAFILESPATH
Mat+Doc: More Fortran docs
Plex ex3: Run tests with the correct number of field components
Bib: Added TetGen cite
parmetis: make sure 'ldd libparmetis.so' points to the correct libmetis.so that its linked with.
small fix as reported by the nightly test
...

Conflicts:
config/builder.py

show more ...