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-fe-fv-hybrid'

* knepley/feature-fe-fv-hybrid: (43 commits)
PetscFE: Small fixes
Plex+SNES: Volumes are PetscReal
Plex+SNES: Missing declaration
TS ex11: Remove

Merge branch 'knepley/feature-fe-fv-hybrid'

* knepley/feature-fe-fv-hybrid: (43 commits)
PetscFE: Small fixes
Plex+SNES: Volumes are PetscReal
Plex+SNES: Missing declaration
TS ex11: Remove unused var
Plex+SNES+TS: Complete reorganization of residual evaluation - Now both FE and FV examples use the same method, but there are a bunch of switches which should be eliminated - There is a confusion about IFunction and RHS, but I think they can both be in one function - Added DMPlexSNESGetGeometryFVM() and DMPlexSNESGetGradientFVM() - Added DMPlexGet/RestoreCellFields() and DMPlexGet/RestoreFaceFields() and DMPlexGet/RestoreFaceGeometry() - I think that FV geometry caching needs to be redone - Added DMPlexReconstructGradients_Internal() - Added DMPlexComputeBdResidual_Internal() which does not work for FV - Replaced DMPlexComputeResidualFEM_Internal() with DMPlexComputeResidual_Internal()
Plex: Added DMPlexInsertBoundaryValues() - Unified FE and FV boundary values
Plex: DMPlexProjectFunctionLableLocal() gets discretizations from the DM now
Plex: Added DMPlexComputeGradientFVM()
PetscDS: Fix up some functions to work for both FV and FE
PetscFV: Change PetscFVIntegrateRHSFunction() to get info from PetscDS
TS ex11: There is only one field in our current paradigm - We would need to split Riemann solvers for multiple fields right now
Plex+TS: Remove use of computeGradients in favor of check for dmGrad
TS ex11: Updated interface calls
Plex+TS: Change DMPlexTSGetGradientDM() to automatically construct the gradient info, DMPlexTSSetRHSFunctionLocal() can now be replaced by the DMTS version - Remove unnecessary declarations
Plex+SNES: Add missing declaration
Plex+FE: Removed all use of PetscCellGeometry, Changed FE integration to use PetscFECellGeom
DMSNES+Plex: Added DMPlexSNESGetGeometryFEM() to cache geometry
PetscDualSpace: Remove use of PetscCellGeometry in PetscDualSpaceApply() - Fixed up calls to it for projection into spaces
DMDA: Remove use of PetscCellGeometry in DMDAProjectFunctionLocal()
Plex: Added DMPlexComputeGeometryFEM() and PetscFECellGeom structure
...

show more ...

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

Plex+FE: Removed all use of PetscCellGeometry, Changed FE integration to use PetscFECellGeom

Merged upstream/master to feature-dmmoab

Merge remote-tracking branch 'upstream/master'

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 'knepley/feature-fv-class'

* knepley/feature-fv-class: (44 commits)
PetscFV: Another complex fix
DMPlex+TS: Fixing types
PetscFV: Straighten out complex types
TS ex11: Fix casts

Merge branch 'knepley/feature-fv-class'

* knepley/feature-fv-class: (44 commits)
PetscFV: Another complex fix
DMPlex+TS: Fixing types
PetscFV: Straighten out complex types
TS ex11: Fix casts and remove unused variable
PetscFV: Fix Fortran define
PetscFV: Complex fixes
SNES+DM: Added SNESMonitorFields() - Activated by -snes_monitor_fields
PetscFV: Add Fortran types
SNES ex62: Use new DMPlexAddBoundary() interface - Added declaration of DMPlexComputeL2FieldDiff() - Fixed cast
SNES ex12: Fixed Neumann boundary conditions, and moved to new DMPlexAddBoundary interface() - Now do not automatically mark boundary faces
PetscFV: Fixed Fortran bindings
PetscFV+Plex: Refactored to put reconstruction routines in PetscFV_LeastSquares - Added PetscFVComputeGradient() - Added PetscFVLeastSquaresSetMaxFaces() - Moved last squares fitting routines to PetscFV_LeastSquares, and all the work space
PetscLimiter: Add other implementations
TS ex11: Fixed parallel mesh creation - Distribute after physics - Add output for tests
DMPlex: Fixed bug when using refinement from options - Must copy over the point SF
DMPlex: Distribution should copy over BC info
TS ex11: Added refinement tests
TS ex11: Fix boundary conditions after refinement, set types from command line
DMPlex: Added DMPlexCopyBoundary() - Copy boundary conditions after DMRefine() and DMPlexConstructGhostCells()
TS ex11: Specify boundary label
...

Conflicts:
config/builder.py
include/petscdmplex.h
src/dm/impls/plex/plex.c
src/snes/examples/tutorials/ex62.c

show more ...

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

DT: Expand things CellGeometry can hold

Fixing merge conflicts in dmregall.

Merged petsc/petsc into master

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 'knepley/fix-fem-multifield'

* knepley/fix-fem-multifield:
DMDT: Fixed Fortran PetscQuadrature definition
DMPlex ex3: Added Q2 tests - Made DA tests only 2x2 - Changed output format

Merge branch 'knepley/fix-fem-multifield'

* knepley/fix-fem-multifield:
DMDT: Fixed Fortran PetscQuadrature definition
DMPlex ex3: Added Q2 tests - Made DA tests only 2x2 - Changed output format - Quad tests now actually work
DMDA: Added DMDAComputeL2GradientDiff()
PetscSpace: Fixed polynomial derivative evaluation for quads
DMDA: Fix closure operations in 2D
DMPlex: Interpolation cleanup - Remove unused PetscSpace - Fix uninitialized variable
PetscFE: Fix PetscBool handling
SNES ex62: Updated output
DMPlex ex3: Use PetscFECreateDefault() and correct tensor tests
PetscFE: Fix PetscFECreateDefault() - The space should default to tensor on a non-simplex - The quadrature should be tensor Gauss on a non-simplex
DT: Added PetscDTGaussTensorQuadrature()
DT: Added citation for Gloub+Welsch method
PetscSection: Now global section can also be viewed
DMPlex: Allow NULL function for ProjectFunction()
PetscDualSpace: Added doc for PetscDualSpaceApply() - Cherry-picked from df2d8bb
PetscFE: Fixed PetscFECreateDefault() - Setup FE - Minimum quad order - Destroy quad after setting
PetscFE: PetscFECreateDefault() now takes a number of components and a reference cell type - Cherry-picked from a255314
PetscFE: Added PetscFECreateDefault() - Cherry-picked from 8919f5a
PetscFE: Allow lowest order cell Lagrange dual basis functions
DMPlex: Fix preallocation with cell variables - I had an incorrect loop optimization

Conflicts:
src/dm/impls/plex/plexpreallocate.c

show more ...

Merge branch 'master' into prbrune/matcoloring-greedy

DT: Added PetscDTGaussTensorQuadrature()

Merge branch 'knepley/feature-plex-fas'

* knepley/feature-plex-fas: (56 commits)
DMPlex: Removed unused variable
DMPlex: Fix for C++ build, small fix for PetscFE
DMPlex: Removed leak from Tria

Merge branch 'knepley/feature-plex-fas'

* knepley/feature-plex-fas: (56 commits)
DMPlex: Removed unused variable
DMPlex: Fix for C++ build, small fix for PetscFE
DMPlex: Removed leak from Triangle
SNES ex12: Two working unstructured FAS solves for the unregularized p-Laplacian
DMPlex: Cleaned up some memory issues
DMPlex: Implement injection - I don't think this should be required
DMPlex: DM interpolation requires the scaling vector for FAS
DMPlex: Can now create a map from coarse to fine vertices - This is currently necessary for FAS, which I think is wrong
DMPlex: Turn off Fortran stub
DMPlex: Fix DMPlexMatSetClosureRefined() - Reject duplicate fine points - Screen out point with dof = 0 - Fix the allocation for fine points
DMPlex: My brain did not work for several days - I have fixed the interpolation code - I think I can reuse that other code for something else
DMPlex: Fix setting Plex options on automatically refined meshed
SNES ex12/31/52/62/72: Use new SNESComputeJacobian() interface
DMPlex: Remove MatStructure from DMPlexComputeJacobianFEM() - Add missing declarations
Sys Logging: Fixes for log detail - Must preserve reduction count - Output objects and memory - Output stage summary
SNES ex12: Fixing things for multilevel - Need to set PetscFE on all coarse grids - Need application context for interpolator construction
SNES ex12: Use PetscFESetUp(), and fix quadrature ref handling
SNES ex52/62: Use PetscFESetUp(), and fix quadrature ref handling
DMPlex ex3: Uses automatic section creation, PetscFESetUp(), and fix quadrature ref handling
DMPlex: Fixing interpolator construction - Fixed definition of rectangular sizes - Use PetscFERefine() - Use special MatSet
...

show more ...