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

Merge branch 'maint'

Merge branch 'balay/to-maint-add-urlretrieve-timeout' into maint

configure add a timeout to urllib.urlretrieve() to prevent it from hanging with some sites

Reported-by: Stefano Zampini <stefano.zampini@gmail.com>

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

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 jed/chem
Note merging a branch with good stuff in it for a year and a half is insane!

Conflicts:
src/ts/examples/tutorials/makefile
src/ts/interface/ts.c

Merge branch 'master' into stefano_zampini/pcbddc-multilevel-improvement

Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bdd

Merge branch 'master' into stefano_zampini/pcbddc-multilevel-improvement

Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bddcprivate.c

show more ...

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 prbrune/snes-fascontinuation

Conflicts:
include/petscsnesfas.h

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 knepley/feature-dmda-section

* master: (319 commits)
SNESGS: Fix for uninitialized variable warning in gssecant.c
DMPlex: Fix for orientation in Gmsh files - Fixed tes

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

* master: (319 commits)
SNESGS: Fix for uninitialized variable warning in gssecant.c
DMPlex: Fix for orientation in Gmsh files - Fixed test output
do not use C99 struct initialization code in PETSc
Nightly Summary: Added time taken to each of the tests in the dashboard.
ASCII printing of floating point numbers must cast to (double) to support quad precision
configure: check fortranDatatypes only when fortran is enabled [this fixes configure crash with --with-fc=0]
don't use non-portable and also dependent on floating point precision system level math constants
picky compilers
fix a couple compiler warnings/errors (depending on compiler) for Matlab engine code
DMPlex: More fixup from bad rebase, moved to DMGet/SetCoordinateSection()
DM: Added DMGet/SetCoordinateSection()
Fuckup: Fix for merge that is still untangling bad rebase from Oct. 17th 2013 - Fixed const in declarations - Fixed merge from PetscFE - Fixed 2 mallocs
replace all echo in test/tutorial makefiles with printf since echo behaves differently on different systems
DMDA: Missing header - Damn rebase
DMPlex ex3: Added 2D Q_1 and 3D P_2 tests
DMDA: Added DMDAProjectFunction() and DMDAComputeL2Diff()
DMDA: Fixed 2D geometry - Should reuse DMPlex routines
DMDA: Fix bug in 2D closure operation for cells
DMDA: Make closure operations also return the size
DMDA: Changed DMDACreateSection() to emulate DMPlexCreateSection()
...

Conflicts:
config/builder.py
include/petscdmda.h
src/dm/dt/interface/dtfe.c
src/dm/impls/da/dageometry.c
src/dm/impls/da/dalocal.c
src/dm/impls/plex/plexgeometry.c

show more ...

Merged petsc/petsc into master

Merge branch 'master' into knepley/feature-plex-gmsh

* master: (163 commits)
do not use C99 struct initialization code in PETSc
Nightly Summary: Added time taken to each of the tests in the dash

Merge branch 'master' into knepley/feature-plex-gmsh

* master: (163 commits)
do not use C99 struct initialization code in PETSc
Nightly Summary: Added time taken to each of the tests in the dashboard.
ASCII printing of floating point numbers must cast to (double) to support quad precision
configure: check fortranDatatypes only when fortran is enabled [this fixes configure crash with --with-fc=0]
don't use non-portable and also dependent on floating point precision system level math constants
picky compilers
fix a couple compiler warnings/errors (depending on compiler) for Matlab engine code
DMPlex: More fixup from bad rebase, moved to DMGet/SetCoordinateSection()
DM: Added DMGet/SetCoordinateSection()
Fuckup: Fix for merge that is still untangling bad rebase from Oct. 17th 2013 - Fixed const in declarations - Fixed merge from PetscFE - Fixed 2 mallocs
replace all echo in test/tutorial makefiles with printf since echo behaves differently on different systems
DMDA: Missing header - Damn rebase
DMPlex ex3: Added 2D Q_1 and 3D P_2 tests
DMDA: Added DMDAProjectFunction() and DMDAComputeL2Diff()
DMDA: Fixed 2D geometry - Should reuse DMPlex routines
DMDA: Fix bug in 2D closure operation for cells
DMDA: Make closure operations also return the size
DMDA: Changed DMDACreateSection() to emulate DMPlexCreateSection()
DMDA: Added functions which emulate DMPlex functionality
DMDA: Now DMDAGetNumCells() returns the cells in each direction as well
...

Conflicts:
config/builder.py

show more ...

Merge branch 'madams/gamg-destroy' into prbrune/pcgamg-classicalinterpolationstrategies

Merge branch 'master' into madams/gamg-destroy

Conflicts:
src/ksp/pc/impls/gamg/gamg.c

Merge branch 'master' into barry/reduce-dmsetup-da-memoryusage

Conflicts:
src/dm/examples/tests/ex15.c
src/dm/examples/tutorials/ex3.c
src/dm/impls/da/da2.c
src/dm/impls/da/da3.c

Merged master into barry/update-xxxviewfromoptions

Merge branch 'master' into barry/xcode