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:
added -pc_hypre_boomeramg_nodal_coarsen <n> and -pc_hypre_boomeramg_vec_interp_variant <v> options to allow PCType of PCHYPRE Bo

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

* master:
added -pc_hypre_boomeramg_nodal_coarsen <n> and -pc_hypre_boomeramg_vec_interp_variant <v> options to allow PCType of PCHYPRE BoomerAMG to take advantage of MatSetNearNullSpace()
allow clearing the NullSpace or NearNullSpace of a matrix by passing in a NULL
Fixed some PetscValidLogicalCollective calls that used the wrong typename One of these caused problems for a user with 64 bit integers
when using -start_in_debugger option do not use PetscErrorPrintf() function to display message to user since it prepends the message with PETSC ERROR potentially confusing the user since there is no error
Changed VecNorm( NORM_1) to use traditional 1 norm of the 2 norm of the complex entries instead of the previous 1 norm of the 1 norm of the complex entries
KSPCreateVecs() would under certain uncommon circumstances return incorrectly sized vectors for rectangular vectors
When configure options like --with-cusp-include=xxx are given and no corresponding --with-cusp-lib=yyy is needed configure will no longer print an inaccurate error message that you must also set a --with-cusp-lib=yyy but instead correctly use the provided value
update help menu for DMNetworkDistribute()
IS: Added a bunch of Fortran bindings
Bib: More refs
Formatting for several manual pages need fixing
petsc4py: update to snapshot that syncs with the change to PetscSectionCreateGlobalSection()
update to petscthreads.html to reflect our current thinking
TSAdjointEventMonitor should be called before TSAdjointStep
Plex ex5: Added test output
Plex ex2: Added empty output
Plex ex4: Added missing test output
Plex ex1: Fixed test output - CGNS test was broken - Fluent mesh is missing
SNES ex5: Added MMS

show more ...

when using -start_in_debugger option do not use PetscErrorPrintf() function to display message to
user since it prepends the message with PETSC ERROR potentially confusing the user since there is no

when using -start_in_debugger option do not use PetscErrorPrintf() function to display message to
user since it prepends the message with PETSC ERROR potentially confusing the user since there is no error

Reported-by: Anthony Haas <aph@email.arizona.edu>

show more ...

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 barry/saws-options-merge-master

Totally confusing manual merge, could be wrong

Conflicts:
include/petscoptions.h
src/dm/impls/da/dacreate.c
src/sys/objects/aoptions.c

Merge branch 'master' into barry/saws-options-merge-master

Totally confusing manual merge, could be wrong

Conflicts:
include/petscoptions.h
src/dm/impls/da/dacreate.c
src/sys/objects/aoptions.c
src/sys/threadcomm/interface/threadcomm.c

show more ...

Merge branch 'master' into pr252/dmay/PetscViewerBinarySkipHeaderVecViewLoad
Manual merge of makefile

Conflicts:
src/sys/classes/viewer/examples/tutorials/makefile

use xcode for building iOS dynamic library (framework)
update opengles for new objective C rules

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-dmda-section

* master: (528 commits)
Doc: Fixed configure doc
Nightly summary: Added configure section.
TSSetErrorIfStepFails: fix __FUNCT__
TS: fi

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

* master: (528 commits)
Doc: Fixed configure doc
Nightly summary: Added configure section.
TSSetErrorIfStepFails: fix __FUNCT__
TS: fix for TSGetRHSMats_Private() in the creation of the Arhs and Brhs matrices
protect logging of objects (which uses global variables) with PETSC_USE_LOG
error handler API had been previously changed but this example was not updated to new API.
DMPlex: Fixed bug in coordinate permutation
PetscSection: Doc fix for permutation
Bib: Added Top500 and fixed entry
fun3d: update PetscMallocValidate() usage
bugfix of MatCreateSeqAIJFromTriple() contributed by Nicolas Marsic <nicolas.marsic@montefiore.ulg.ac.be>
bib: rename ref with duplicate key
Webpage: Corrected '-dm_mat_type cusp' to 'dm_mat_type aijcusp'.
completed removing server code that was not removed in previous commit
removed PETSc webserver and configure package files that supported it
Allow calling MatGetBlockSize[s]() before matrix preallocation
SNESLINESEARCHBT: Set the norms when exiting early due to negligible step.
fix outdated PetscOptionsList
SNESQN: only monitor real part of dot product (fails with C++ complex)
Fix for multiple definitions in mat/color/interface/ custom fortran bindings
...

Conflicts:
config/builder.py
include/petscdmplex.h
src/dm/impls/da/dageometry.c
src/dm/impls/plex/examples/tests/ex4.c
src/dm/impls/plex/plex.c
src/dm/impls/plex/plexinterpolate.c

show more ...

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 'balay/remove-sdir'

__SDIR__ is gone. This is an ABI change (PetscError) so dependent
packages must be recompiled.

* balay/remove-sdir:
__SDIR__: remove remaining traces and documen

Merge branch 'balay/remove-sdir'

__SDIR__ is gone. This is an ABI change (PetscError) so dependent
packages must be recompiled.

* balay/remove-sdir:
__SDIR__: remove remaining traces and document in changes.html
__SDIR__: remove usage of __SDIR__ from PETSc sources.

This merge fixes one instance of __SDIR__ that was added after
'balay/remove-sdir' branched off.

show more ...

__SDIR__: remove usage of __SDIR__ from PETSc sources.

Merge branch 'master' into jed/ts-eimex

Sync to include Git conversion, PETSC_EXTERN, and minor API changes.

Conflicts:
src/ts/interface/tsregall.c

fixed function names with Default to match new standard (which I just wrote)
fixed a few more functions that should be PETSC_INTERN

Hg-commit: 87889fe4f6d4e8d0963adcc79d438e75330601c6

removed a bunch of duplicate unneeded includes of std include files

Hg-commit: b6c9f3e2b0eb8b7277fe131cc83beede5d495522