Merge branch 'balay/tao-to-petsc'

Conflicts:
src/snes/impls/fas/fasfunc.c
src/snes/impls/fas/fasgalerkin.c

fixed quote marks for includes to <>

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

Merge branch 'master' into barry/xcode

Merge branch 'barry/minor-draw-improvements' into jed/chem

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 'barry/saws'

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

Wrapped math.h and quadmath.h functions used in petsc source exempting examples

Merge branch 'master' into knepley/feature-plex-refine-3d

* master: (149 commits)
Bib: Added papers referencing PETSc from ResearchGate
Bib: Fixed urls for some refs Suggested-by: Michele De Ste

Merge branch 'master' into knepley/feature-plex-refine-3d

* master: (149 commits)
Bib: Added papers referencing PETSc from ResearchGate
Bib: Fixed urls for some refs Suggested-by: Michele De Stefano
fixed bug that has appeared recently of false positive errors when there are zero local equations on coarse grids in gamg-agg.
MatSchurComplement: Must initialize KSP package
bib: fix inbook citation
Bib: Updated some refs
SNES: fix copy/paste in man page
fortran: fix KSPCONVERGEDDEFAULT and SNESCONVERGEDSKIP in fortran includes
Mat SBAIJ: avoid invalid memory read in MatSOR_SBAIJ
Revert "MatMPIBAIJSetPreallocationCSR() handled the input matrix entries incorrectly, it treated them as if each row of values"
PCGAMG: fix corruption for multiple solves when MatSetNearNullSpace is used
PCGAMG: remove distracting comment
KSP ex49: restrict near-null space for elasticity example with sym BC
MatMPIBAIJSetPreallocationCSR() handled the input matrix entries incorrectly, it treated them as if each row of values was provided ordered by row within the block rows instead of by block as it was originally designed to be. Also added more discussion to the manual pages on the expected order of the values
Fix accidental creation of the matrices in SNESNCG used for linear analogue LS.
PCGAMG: add man page for PCGAMGType
fortran: fix snesconvergedskip_() kspconvergedskip_() kspconvergeddefault*_()
rm //
Sys: new_ir changed from PetscInt to PetscObjectState - so fix mallocs to use the new type
SNES: Fixed package init in SNESLineSearchCreate()
...

Conflicts:
include/petscdmplex.h
src/dm/impls/plex/examples/tests/ex5.c
src/dm/impls/plex/plex.c
src/dm/interface/dm.c

show more ...

SNES: Fixed package init in SNESLineSearchCreate()

Merge branch 'master' into barry/wirth-fusion-materials

Conflicts:
src/ts/examples/tutorials/advection-diffusion-reaction/ex10.c

fix name for PetscOptionsFList() and get FList() and EList() working properly with SAWs legal values

converted uAMS usage to SAWs usage; starts server but cannot see any published directories

Merge branch 'barry/fix-PetscObjectPrintClassNamePrefixType'

* barry/fix-PetscObjectPrintClassNamePrefixType:
update tests of src/mat/examples/tests/ex136.c
Use classname in object for object na

Merge branch 'barry/fix-PetscObjectPrintClassNamePrefixType'

* barry/fix-PetscObjectPrintClassNamePrefixType:
update tests of src/mat/examples/tests/ex136.c
Use classname in object for object name when calling PetscObjectPrintClassNamePrefixType() instead of some string with less precise name passed in

Conflicts:
src/snes/interface/snes.c

show more ...

Merge branch 'prbrune/snes-snesfunctiontype'

Merged petsc/petsc into rmills/petsc master.

SNESLinesearchSetFunction() for setting what function the line search uses

Merge branch 'prbrune/snes-linesearchdocfix'

Small formatting fix