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

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

Merge branch 'maint'

Increase patchlevel to 3.6.3

Merge branch 'master' into barry-allow-vecset-nan-3.6

Merge branch 'master' into shri/add-tsevent-to-powergrid-examples

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

Merge branch 'master' into barry/always-mark-floats

Needed to merge in master to resolve conflicts that will appear when this branch is merged with master

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

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

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 'maint'

Increase patchlevel to 3.6.2

To add a space to all comments I have made before. Barry pointed out
that a comment without a space right after '/*' may cause bfort to crash

Merge remote-tracking branch 'petsc/master' into fixed-c

To add a space to all comments I have made before. Barry pointed out
that a comment without a space right after '/*' may cause bfort to crash

Merge remote-tracking branch 'petsc/master' into fixed-comment-space

Conflicts:
include/petsc/finclude/petscmat.h
include/petscmat.h
src/mat/examples/tests/makefile
src/mat/impls/aij/mpi/mpiaij.h

show more ...

Merge branch 'pr329/master/Fande-Kong/matpartitioning-hierarch' into pr361/master/Fande-Kong/pcgasm-increaseoverlap: need hierarch to build GASM subdomains.

Conflicts:
src/mat/examples/tests/makefi

Merge branch 'pr329/master/Fande-Kong/matpartitioning-hierarch' into pr361/master/Fande-Kong/pcgasm-increaseoverlap: need hierarch to build GASM subdomains.

Conflicts:
src/mat/examples/tests/makefile
src/mat/impls/aij/mpi/mpiaij.h

show more ...

Merge branch 'master' into jed/process-options-handler

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' of bitbucket.org:petsc/petsc

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

* master: (206 commits)
Bib: Added ref
fix the output file for the ts example ex20adj
Bugfix: setting post-step function in ztsf.c
f

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

* master: (206 commits)
Bib: Added ref
fix the output file for the ts example ex20adj
Bugfix: setting post-step function in ztsf.c
fix makefile format error with 'all-legacy'
doc: handle missing dev.html in a release tarball
doc: add in petscistypes.h to doc sourcefile list
Increase patchlevel to 3.6.1
update some example output files
Doc+Vec: Fixed VecSetValuesBlocked() Reported by: Shao-Ching Huang <huangsc@gmail.com>
clarify that PETSc's "thread safe" code only works with OpenMP
allow adjoint integration over split time intervals
DT: Goddman it. Why are people stepping on my commits
Bib: Added ref
fix the bug in the endpoint version of discrete adjoint theta and correct the affected example outputs
SNES: Added SNESQN types to Fortran Reported-by: Chris Bradley <c.bradley@auckland.ac.nz>
fix: buggy change in 33da457b864643cfcac2768e47197c286471a5a4
updated petscthreads.html with information on thread per object model
fix for ex56
removed the dead links to threads.html
send petsc repository messages to Karl no longer from his mcs address
...

Conflicts:
config/builder.py
src/dm/impls/plex/examples/tests/ex3.c
src/dm/impls/plex/examples/tests/makefile
src/dm/impls/plex/makefile

show more ...

Merge branch 'master' into knepley/feature-plex-point-location

* master: (202 commits)
Bib: Added ref
fix makefile format error with 'all-legacy'
Increase patchlevel to 3.6.1
update some exa

Merge branch 'master' into knepley/feature-plex-point-location

* master: (202 commits)
Bib: Added ref
fix makefile format error with 'all-legacy'
Increase patchlevel to 3.6.1
update some example output files
Doc+Vec: Fixed VecSetValuesBlocked() Reported by: Shao-Ching Huang <huangsc@gmail.com>
clarify that PETSc's "thread safe" code only works with OpenMP
allow adjoint integration over split time intervals
DT: Goddman it. Why are people stepping on my commits
Bib: Added ref
fix the bug in the endpoint version of discrete adjoint theta and correct the affected example outputs
SNES: Added SNESQN types to Fortran Reported-by: Chris Bradley <c.bradley@auckland.ac.nz>
fix: buggy change in 33da457b864643cfcac2768e47197c286471a5a4
updated petscthreads.html with information on thread per object model
fix for ex56
removed the dead links to threads.html
send petsc repository messages to Karl no longer from his mcs address
Plex: Fix for all the hidebound morons living with c89. Good luck doing computational science in the 80s!
DT: Fix tanh-sinh - Removed wrong var
SNES: Added SNESQN types to Fortran Reported-by: Chris Bradley <c.bradley@auckland.ac.nz>
Bib: More refs
...

Conflicts:
config/builder.py

show more ...

Merge branch 'maint'

Increase patchlevel to 3.6.1

Merge branch 'mat-increaseoverlap' of ssh://bitbucket.org/Fande-Kong/petsc into pr332/master/Fande-Kong/mat-increaseoverlap-scalable

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

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