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

Merged master into tomklotz/feature-tanh-sinh-quadrature

Merge branch 'pr330/knepley/dmshell-set-create-subdm/master'

* pr330/knepley/dmshell-set-create-subdm/master:
DMShell: support DMShellSetCreateSubDM

DMShell: support DMShellSetCreateSubDM

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

Merge branch 'master' into tisaac/dmforest

If we're going to start developing on this again, the recent changes to the
location of configuration files will make it annoying to switch to and from
thi

Merge branch 'master' into tisaac/dmforest

If we're going to start developing on this again, the recent changes to the
location of configuration files will make it annoying to switch to and from
this branch. Matt's and my fixes in DMPlex will also be relevant.

* master: (1557 commits)
MatLoad_MPIDense() always allocated array space even if it was previously provided
Clarified lumping options for PCFieldSplitSchurPreType SELFP.
fixed up PetscInfo in GAMG
TSErrorWeightedNorm[2|Infinity]: API changes
MatLoad_SeqDense() always allocated new space for the data even if the user already provided it
Fixed DMCompositeGetAccessArray() to support readonly vectors
Fix obviously-wrong aspects of documentation on SNESVINEWTONRSLS and SNESVINEWTONSSLS.
fixed example to compile - demonstrates a bug
var name 'len' was F90 key word
For user provided Jacobian functions they should always assembly into the second matrix, the one from which the preconditioner is built because the first may be used as matrix-free with -snes_mf_operator
Suggest --with-64-bit-indices if users mistakenly use --with-64bit-indices
Fix configure logging of integer size.
missing underscore in #define of vecgetarrayread translation of fortran stub for VECGETARRAYREAD
updated test output files to reflect differences introduced previously in PCView output
-ksp_type preonly does not support -ksp_monitor_short so remove from test line to prevent extranious warning output
missing CHKERRQ; and ugly double declaration of ierr
Plex ex3: For want of a semicolon, the kingdom was lost
MatSetValuesMPISBAIJ will now print correct global indices when error generated due to new nonzero location
completed basic use of MatSetValuesBlocked_SeqBAIJ_Inlined() by MatSetValuesBlocked_MPIBAIJ() to allow proper global indices being printed when error generated by new nonzero locations.
Added inline version of MatSetValuesBlocked_SeqBAIJ() to be used by MatSetValuesBlocked_MPIBAIJ() to print error message for nonzero block with global indices
...

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

Merged in mapdes/petsc/dmshell-hierarchy (pull request #273)

Expose more DM functionality to DMShells

Add DMShellSetCreateFieldDecomposition

DMShell: add setters for hierarchical ops

Allows shells to be used as part of an MG hierarchy.

Merge branch 'master' into shri/ts-events

Conflicts:
src/ts/interface/ts.c

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 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 prbrune/mat-matcolor

Conflicts:
src/snes/interface/snesj2.c