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 'knepley/feature-plex-hdf5'

* knepley/feature-plex-hdf5: (63 commits)
DMPlex ex2: Added an example that checks a mesh
DMPlex: #ifdef support functions for HDF5
TS: Fix output sequ

Merge branch 'knepley/feature-plex-hdf5'

* knepley/feature-plex-hdf5: (63 commits)
DMPlex ex2: Added an example that checks a mesh
DMPlex: #ifdef support functions for HDF5
TS: Fix output sequence
DMPlex: Check for HDF5 attributes before writing them
DMPlex: Label with timestep number since we do not have times
Viewer+HDF5: Added PetscViewerHDF5HasAttribute()
TS: Set output sequence for timesteps
DMPlex: Handle output sequences - Added static to some functions
DM: Add idea of an output sequence - Added DMGet/SetOutputSequenceNumber() - Added doc for outputDM
REVERT TS: Timestep gets set into DMTS
DMPlex: Fix up HDF5 segregation
DMPlex: Replace MAXPATHLEN with PETSC_MAX_PATH_LEN
DMPlex: Fix HDF5 timestep handling
DMPlex: Set correct block size on HDF5 field vectors
TS: Timestep gets set into DMTS
DMTS: Added timestep
DMPlex: Fix output of fields - Corrected name - Fixed vector type
DMPlex: Return errors from HDF5 function
DMPlex+Viewer: Now output separate fields for viz - Added the PETSC_VIEWER_HDF5_VIZ format for creating viz fields - Added field type determination
Sys+HDF5: Added PetscDataType string and HDF5 support for it
...

Conflicts:
config/BuildSystem/config/packages/__init__.py
src/ts/interface/ts.c

show more ...

Merge branch 'knepley/feature-plex-hdf5' into knepley/feature-plex-bc

* knepley/feature-plex-hdf5: (61 commits)
TS: Fix output sequence
DMPlex: Check for HDF5 attributes before writing them
DM

Merge branch 'knepley/feature-plex-hdf5' into knepley/feature-plex-bc

* knepley/feature-plex-hdf5: (61 commits)
TS: Fix output sequence
DMPlex: Check for HDF5 attributes before writing them
DMPlex: Label with timestep number since we do not have times
Viewer+HDF5: Added PetscViewerHDF5HasAttribute()
TS: Set output sequence for timesteps
DMPlex: Handle output sequences - Added static to some functions
DM: Add idea of an output sequence - Added DMGet/SetOutputSequenceNumber() - Added doc for outputDM
REVERT TS: Timestep gets set into DMTS
DMPlex: Fix up HDF5 segregation
DMPlex: Replace MAXPATHLEN with PETSC_MAX_PATH_LEN
DMPlex: Fix HDF5 timestep handling
DMPlex: Set correct block size on HDF5 field vectors
TS: Timestep gets set into DMTS
DMTS: Added timestep
DMPlex: Fix output of fields - Corrected name - Fixed vector type
DMPlex: Return errors from HDF5 function
DMPlex+Viewer: Now output separate fields for viz - Added the PETSC_VIEWER_HDF5_VIZ format for creating viz fields - Added field type determination
Sys+HDF5: Added PetscDataType string and HDF5 support for it
IS: Fix compiler warning
IS: Forgot to protect HDF5
...

Conflicts:
config/BuildSystem/config/packages/__init__.py
src/ts/interface/ts.c

show more ...

DMPlex+Viewer: Now output separate fields for viz
- Added the PETSC_VIEWER_HDF5_VIZ format for creating viz fields
- Added field type determination

ViewerHDF5: Added a default HDF5 viewer

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 prbrune/matcoloring-greedy

Merge branch 'master' into knepley/feature-plex-fas

* master: (863 commits)
Revert "mpich: use latest mpich tarball with gcov but use '--enable-coverage' mpich configure option."
MatCreateTransp

Merge branch 'master' into knepley/feature-plex-fas

* master: (863 commits)
Revert "mpich: use latest mpich tarball with gcov but use '--enable-coverage' mpich configure option."
MatCreateTranspose: fix for lazy block size
mpich: use latest mpich tarball with gcov but use '--enable-coverage' mpich configure option.
configure: add FC_DEFINE_FLAG to petscvariables
added a citation for pounders, Stefan finally came through
update to latest netcdf fixes bug that did not allow building on recent Mac OS X
DMPlex: Fixes for CGNS - Fixed loop bounds since CGNS uses closed intervals - Bug with mixed cell types - Typo with coordinates
final updates from nightly tests
fix for countcfunction
removed outdated docs and comments on MatStructure usage removed SAME_PRECONDITIONER since no longer used removed unneed use of MatStructure in Schur complement matrix
removed MatStructure arguments from Tao
fixes for Sundials and fun3d cannot use MPIU_SUM for integer arrays
inplace ILU factorization must update state of inplace matrix to prevent infinite recursion of updating PC
fixes for BDDC by the way not having BDDC always in the testing is going to lead to trouble
the compute Jacobian functions for SNES and TS now do not take a MatStructure flag
KSPSetOperators() no longer has the MatStructure argument. The Mat objects now track that information themselves. Use KPS/PCSetReusePreconditioner() to prevent the recomputation of the preconditioner if the operator changed in the way that SAME_PRECONDITIONER did with KSPSetOperators()
tracks when Mat's have a change in nonzero structure this information can be used by PC to determine how preconditioners must be rebuilt currently only does an error check if the user said same nonzero pattern but actually changed the pattern
completed cleanup of removal of matrix pointers to compute jacobian routines
makefile: Added 'make includegraph' to create an inclusion dependency graph.
Contrib: Updated include-graph.sh script to ignore *.hh files
...

Conflicts:
src/dm/dt/interface/dt.c

show more ...

Merging master with feature-dmmoab. Only conflict was with SOURCECXX specification under impls/moab/makefile.

Merged petsc/petsc into master

Merge branch 'master' into prbrune/snes-fascontinuation

Conflicts:
include/petscsnesfas.h

Merge branch 'master' into barry/ts-rhsjacobian-only

convert to PetscMalloc1()
better handling of string viewer when running out of space

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 knepley/feature-dmda-section

* master: (319 commits)
SNESGS: Fix for uninitialized variable warning in gssecant.c
DMPlex: Fix for orientation in Gmsh files - Fixed tes

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

* master: (319 commits)
SNESGS: Fix for uninitialized variable warning in gssecant.c
DMPlex: Fix for orientation in Gmsh files - Fixed test output
do not use C99 struct initialization code in PETSc
Nightly Summary: Added time taken to each of the tests in the dashboard.
ASCII printing of floating point numbers must cast to (double) to support quad precision
configure: check fortranDatatypes only when fortran is enabled [this fixes configure crash with --with-fc=0]
don't use non-portable and also dependent on floating point precision system level math constants
picky compilers
fix a couple compiler warnings/errors (depending on compiler) for Matlab engine code
DMPlex: More fixup from bad rebase, moved to DMGet/SetCoordinateSection()
DM: Added DMGet/SetCoordinateSection()
Fuckup: Fix for merge that is still untangling bad rebase from Oct. 17th 2013 - Fixed const in declarations - Fixed merge from PetscFE - Fixed 2 mallocs
replace all echo in test/tutorial makefiles with printf since echo behaves differently on different systems
DMDA: Missing header - Damn rebase
DMPlex ex3: Added 2D Q_1 and 3D P_2 tests
DMDA: Added DMDAProjectFunction() and DMDAComputeL2Diff()
DMDA: Fixed 2D geometry - Should reuse DMPlex routines
DMDA: Fix bug in 2D closure operation for cells
DMDA: Make closure operations also return the size
DMDA: Changed DMDACreateSection() to emulate DMPlexCreateSection()
...

Conflicts:
config/builder.py
include/petscdmda.h
src/dm/dt/interface/dtfe.c
src/dm/impls/da/dageometry.c
src/dm/impls/da/dalocal.c
src/dm/impls/plex/plexgeometry.c

show more ...

Merged petsc/petsc into master

Merge branch 'master' into knepley/feature-plex-gmsh

* master: (163 commits)
do not use C99 struct initialization code in PETSc
Nightly Summary: Added time taken to each of the tests in the dash

Merge branch 'master' into knepley/feature-plex-gmsh

* master: (163 commits)
do not use C99 struct initialization code in PETSc
Nightly Summary: Added time taken to each of the tests in the dashboard.
ASCII printing of floating point numbers must cast to (double) to support quad precision
configure: check fortranDatatypes only when fortran is enabled [this fixes configure crash with --with-fc=0]
don't use non-portable and also dependent on floating point precision system level math constants
picky compilers
fix a couple compiler warnings/errors (depending on compiler) for Matlab engine code
DMPlex: More fixup from bad rebase, moved to DMGet/SetCoordinateSection()
DM: Added DMGet/SetCoordinateSection()
Fuckup: Fix for merge that is still untangling bad rebase from Oct. 17th 2013 - Fixed const in declarations - Fixed merge from PetscFE - Fixed 2 mallocs
replace all echo in test/tutorial makefiles with printf since echo behaves differently on different systems
DMDA: Missing header - Damn rebase
DMPlex ex3: Added 2D Q_1 and 3D P_2 tests
DMDA: Added DMDAProjectFunction() and DMDAComputeL2Diff()
DMDA: Fixed 2D geometry - Should reuse DMPlex routines
DMDA: Fix bug in 2D closure operation for cells
DMDA: Make closure operations also return the size
DMDA: Changed DMDACreateSection() to emulate DMPlexCreateSection()
DMDA: Added functions which emulate DMPlex functionality
DMDA: Now DMDAGetNumCells() returns the cells in each direction as well
...

Conflicts:
config/builder.py

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 knepley/feature-plex-refine-hex

* master: (68 commits)
DMPlex: More fixup from bad rebase, moved to DMGet/SetCoordinateSection()
DM: Added DMGet/SetCoordinateSection()

Merge branch 'master' into knepley/feature-plex-refine-hex

* master: (68 commits)
DMPlex: More fixup from bad rebase, moved to DMGet/SetCoordinateSection()
DM: Added DMGet/SetCoordinateSection()
Fuckup: Fix for merge that is still untangling bad rebase from Oct. 17th 2013 - Fixed const in declarations - Fixed merge from PetscFE - Fixed 2 mallocs
DMDA: Missing header - Damn rebase
DMPlex ex3: Added 2D Q_1 and 3D P_2 tests
DMDA: Added DMDAProjectFunction() and DMDAComputeL2Diff()
DMDA: Fixed 2D geometry - Should reuse DMPlex routines
DMDA: Fix bug in 2D closure operation for cells
DMDA: Make closure operations also return the size
DMDA: Changed DMDACreateSection() to emulate DMPlexCreateSection()
DMDA: Added functions which emulate DMPlex functionality
DMDA: Now DMDAGetNumCells() returns the cells in each direction as well
PetscFE: Added support for tensor product cells in PetscDualSpace_Lagrange
PetscFE: Added tensor product polynomial spaces
example fix /sandbox/petsc/petsc.clone-3/include/petscmath.h(260): error: identifier "PETSC_CXX_STATIC_INLINE" is undefined PETSC_STATIC_INLINE PetscReal PetscAbsScalar(PetscScalar a) {return a < 0.0 ? -a : a;} ^
remove warning in fun3d example "user.F", line 1256: warning: In-place macro substitution leaves line truncated "user.F", line 1259: warning: In-place macro substitution leaves line truncated "user.F", line 1262: warning: In-place macro substitution leaves line truncated
/Users/petsc/petsc.clone-2/src/ksp/ksp/examples/tutorials/ex56.c:59: warning: comparison between signed and unsigned integer expressions
fix examples for portability
fixed to example outputs
fix output for a few examples changed due to changes to -mat_view and not using -snes_monitor_short
...

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

show more ...

Merge branch 'barry/update-xxxviewfromoptions'