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-adaptive-selection

Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.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

Merge branch 'tisaac/feature-gamg-extensible' into barry/experiment

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

Merge branch 'knepley/feature-combined-tabulation'

* knepley/feature-combined-tabulation: (38 commits)
Plex: Fix compiler warning
Plex+SNES: Fixes for nonzero cStart
Plex: Preserve periodicity

Merge branch 'knepley/feature-combined-tabulation'

* knepley/feature-combined-tabulation: (38 commits)
Plex: Fix compiler warning
Plex+SNES: Fixes for nonzero cStart
Plex: Preserve periodicity when adding ghost cells
Plex: Fixed DMPlexGetGlobalFieldOffset_Private() in optimized mode
Plex+SNES: Offset should be into field components, not basis functions
Plex+SNES: Add guards for optional arrays
DS: Added PetscDSGetComponentOffset(), Added to petsc.h
Plex+TS: FVM RHS computation uses a global F
Plex+FV: Corrected accumulation of fluxes to cells and added time derivative term
Plex: Added DMPlexPointGlobalFieldRead/Ref()
Plex+SNES: Fixed DMPlexGetFaceFields() - It returns field values, not coefficients - FE evaluation is now done
FV: In PetscFVIntegrateRHSFunction(), the arguments are field values, not coefficients
FE: Added EvaluateFaceFields() to FE fields at face centroids
Plex: Added DMPlexPointLocalFieldRead()
FE: Have a standard tabulation at face centroids
Plex: Copy BC for hierarchical refinement
FE: Allow P0 over 1D cells
Plex+FV: Fixed BC with gradient calculation
Plex ex1: Move overlap computation after SetFromOptions
Plex: DMPlexDistribute() no longer calls DMSetFromOptions() - Fixed examples
...

show more ...

Merge branch 'knepley/feature-combined-tabulation' into knepley/feature-ts-fem+fvm-example

* knepley/feature-combined-tabulation: (41 commits)
Plex: Fix distribution of uninterpolated meshes - Doe

Merge branch 'knepley/feature-combined-tabulation' into knepley/feature-ts-fem+fvm-example

* knepley/feature-combined-tabulation: (41 commits)
Plex: Fix distribution of uninterpolated meshes - Does SF stratification by depth, not by dimension - The old code numbered cells after vertices
Plex+SNES: Fixes for nonzero cStart
cannot call PetscObjectGetName() on a subset of the MPI processes
MatView() with some matrix formats and ASCII_MATLAB did not print correct matrix name
Plex: Preserve periodicity when adding ghost cells
Plex: Fixed DMPlexGetGlobalFieldOffset_Private() in optimized mode
Plex+SNES: Offset should be into field components, not basis functions
Plex+SNES: Add guards for optional arrays
DS: Added PetscDSGetComponentOffset(), Added to petsc.h
Plex+TS: FVM RHS computation uses a global F
Plex+FV: Corrected accumulation of fluxes to cells and added time derivative term
Plex: Added DMPlexPointGlobalFieldRead/Ref()
Plex+SNES: Fixed DMPlexGetFaceFields() - It returns field values, not coefficients - FE evaluation is now done
FV: In PetscFVIntegrateRHSFunction(), the arguments are field values, not coefficients
FE: Added EvaluateFaceFields() to FE fields at face centroids
Plex: Added DMPlexPointLocalFieldRead()
FE: Have a standard tabulation at face centroids
Plex: Copy BC for hierarchical refinement
FE: Allow P0 over 1D cells
Plex+FV: Fixed BC with gradient calculation
...

Conflicts:
config/builder.py

show more ...

DT: Added PetscQuadratureDuplicate()

Merge branch 'master' into knepley/fix-configure-petsc-dep

* master: (210 commits)
error out on special cases where DMLocalToGlobal_DA won't work
remove unneed uses of local DM vectors and DMLoc

Merge branch 'master' into knepley/fix-configure-petsc-dep

* master: (210 commits)
error out on special cases where DMLocalToGlobal_DA won't work
remove unneed uses of local DM vectors and DMLocalToGlobalBegin/End in examples removed to prevent cut and paste repeats of their use
openmpi: update to version 1.8.3
added more movies and pubs
more movies
MatGetDiagonalBlock() can be called before matrix is assembled
added a couple more movies/images
PetscLogEventGetId() was missing public prototype
simply output from make streams benchmark test
c2html: fixup so that C2HTML make variable is set [similar to cmake.py]
chaco: current blas test does'nt work with Cray CC [which automatically links with blas] and linux - where -lm needs to be listed explicitly. Switch the test to check if we are using PETSc modifled chaco
builddist: always install c2html/sowing
argonne logo for users manual cover
Remove PETSC_HAVE_CUSP_SMOOTHED_AGGREGATION, use PETSC_HAVE_CUSP instead.
mpich: use older tarball with cygwin/gnu compilers
updated information about packages PETSc can use in users manual
Updated users manual to latest ANL Report format requirements
mpich: update to mpich-3.1.3.tar.gz - remove -download-mpich-mpe [mpich no longer packages mpe] - remove -download-mpich-shared. It was added as a split from --with-mpi-shared to --known-mpi-shared and --download-mpich-shared in 50237a55163f90ac7341b723c6422dfa1dbce792 removing this gives back the control of shared=0/1 to package.py - remove download_solaris as the new tarball works with both gcov and on solaris - remove MPICHInstall() [and use GNUPackage.Install()] as the new tarball fixes 'make clean' requiring sudo
added more images and PETSc pubs
Doc: More refs
...

show more ...

Merge branch 'tisaac/feature-fe-geom-dim' into tisaac/plex-flexible-projection

Use the new PetscFECellGeom

Conflicts:
include/petscdmplex.h
include/petscfe.h
src/dm/impls/plex/plexfem.c

Merge branch 'tisaac/thplex'

This merge brings in related work in the following areas:
- Added a local constraint matrix to DM (see DMSetDefaultConstraints())
- Added point-to-anchor-point constrain

Merge branch 'tisaac/thplex'

This merge brings in related work in the following areas:
- Added a local constraint matrix to DM (see DMSetDefaultConstraints())
- Added point-to-anchor-point constraints in DMPlex (see
DMPlexSetAnchors()), which build on the DM constraints
- Added hierarchically-constrained points to DMPlex (see
DMPlexSetReferenceTree(), DMPlexSetTree()), which builds on the anchor
constraints
- Tests for these constraints in src/dm/impls/plex/examples/ex3.c (try
runex3_* examples in that directory)
- Added quadrature order (see PetscQuadratureGet/SetOrder()) (work by
Matt Knepley)
- Added default return values for DMGetCoordinateDim() (defaults to
DMGetDimension())

Conflicts:
include/petscdmplex.h
src/dm/dt/interface/dt.c
src/dm/impls/plex/examples/tests/ex3.c
src/dm/impls/plex/makefile
src/dm/impls/plex/plexfem.c

show more ...

Merge branch 'knepley/feature-quadrature-fortran'

* knepley/feature-quadrature-fortran:
Plex: Added FEM geometry into example
DMDT: Add to petsc.h90
DMDT: Fixed Fortran line length problems

Merge branch 'knepley/feature-quadrature-fortran'

* knepley/feature-quadrature-fortran:
Plex: Added FEM geometry into example
DMDT: Add to petsc.h90
DMDT: Fixed Fortran line length problems
DMDT: Fixed Fortran HIDE includes
Plex: Fortran bindings for geometry fixed
PetscFE: Fortran bindings
PetscDT: Added F90 headers
PetscDS: Added Fortran wrappers for tabulation
Quadrature: Added Fortran bindings

show more ...

Quadrature+Doc: Add function docs

Quadrature: Add an independent idea of quadrature order
- This is not completely correct yet, since we have to rationalize the creation routines to take this as input

Quadrature: Added Fortran bindings

Merge branch 'master' into prbrune/snes-fascontinuation

* master: (855 commits)
fix for moab example had wrong blocksize of mapping
docs:remove src/docs/doxygen/manual [per Barry's instructions]

Merge branch 'master' into prbrune/snes-fascontinuation

* master: (855 commits)
fix for moab example had wrong blocksize of mapping
docs:remove src/docs/doxygen/manual [per Barry's instructions]
gfortran: remove 132 char limit from f90 free-form
SNES: Set up matrix-free *after* copying the user Jacobian to snes->pc
DMPlex-Gmsh: Use trueNumCells when building the coordinate section
Sys: Got guard logic reversed
Sys: The #define guard for PetscMalloc*() must match the one for PetscFree*()
PetscFV: I hate fucking complex
removed ltog scatter from DMDA since functionality can be obtained with gtol scatter and less memory
fix test of DMLocalToGlobalBegin/End and add actual test cases
improve object memory logging for DA, ISLocalToGlobal and ISBLOCK
lower high water mark of constructing parallel scatter by allocating only as much room in svalues as needed
owner in VecScatter construction is the rank, therefor can use PetscMPIInt to hold it do not PetscInt
another reuse of allocated array in 2d/3d DMDA create
improved high water mark of DMDASetups by implementing and using PETSC_USE_POINTER for ISCreateBlock()
PetscFV: Another complex fix
DMPlex+TS: Fixing types
ISIdentity() was wrong for block IS! Indices are NOT scaled by bs
PetscFV: Straighten out complex types
TS ex11: Fix casts and remove unused variable
...

show more ...

Merge branch 'master' into barry/saws-options

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 remote-tracking branch 'origin/master' into feature-dmmoab

Merged petsc/petsc into master

Merge branch 'master' into knepley/feature-plex-hdf5-parallel-load

* master: (125 commits)
since PETSc cannot view factored matrices, generate an error rather than display the wrong stuff (this wa

Merge branch 'master' into knepley/feature-plex-hdf5-parallel-load

* master: (125 commits)
since PETSc cannot view factored matrices, generate an error rather than display the wrong stuff (this was really bad)
outdated example that doesn't match coding style removed and buggy
petscversion.h: workaround ifort -cpp lack of referential transparency
configure: ignore AR, MAKEFLAGS [if set in env]
incorrect first entry in array being zeroed in example
sizeof.c: remove dependence on petsc [and fix syntax error]
nightlybuilds: use consistant PETSC_ARCH, machine names
TS: Allow viewing of TS solutions
DMPlex: Fix comparison for complex
change MPIVersion streams to use MPI_Wtime() to be portable to Windows do not use scalar square root on real number; it upsets Microsoft
cannot use I in PETSc code because in complex it sometimes represents imaginary number cannot pass PetscScalar * to VecNorm()
in dashboard don't warn about SSL and BOI deprecated
TS ex11: Fixed output formatting
Doc+DMPlex: Added function documentation for some refinement functions
streams: translate code from 'bash' to 'sh' [fix freebsd]
barry is an idiot who doesn't have a clue as to what he is doing (and git's unfriendlyness doesn't help matters)
don't list examples under C that don't work with complex!
forgotten output file
removed valgrind warning about sending uninitialized data
nightly builds ignore unrecognized pragma and .c file as C++ code
...

Conflicts:
include/petsc-private/dmpleximpl.h

show more ...

Merge branch 'barry/add-names-for-all-ascii-viewers'

Merge branch 'prbrune/removeunwrappedmathfunctions'

* prbrune/removeunwrappedmathfunctions:
Math: fix typo
Added src/sys/examples/tests/ex25.c for PetscScalar and PetscReal wrapping.
Wrapped t

Merge branch 'prbrune/removeunwrappedmathfunctions'

* prbrune/removeunwrappedmathfunctions:
Math: fix typo
Added src/sys/examples/tests/ex25.c for PetscScalar and PetscReal wrapping.
Wrapped tan(),[sin,cos,tan]h() for Real/Scalar, a[sin,cos,tan]() for Real.
Wrapped math.h and quadmath.h functions used in petsc source exempting examples

Conflicts:
include/petscmath.h
src/dm/dt/interface/dt.c
src/ksp/ksp/impls/cg/stcg/stcg.c
src/snes/linesearch/interface/linesearch.c
src/ts/impls/explicit/rk/rk.c

show more ...

Insure that all ASCII viewers for PETSc objects call PetscObjectPrintClassNamePrefixType()

Fixing merge conflicts in dmregall.