Revert "fixed bad merge into master"

This reverts commit 781194b94830bca829637b611b5b26e16b855a34.

fixed bad merge into master

Merge branch 'emil/fix-ts-dae-rebased-v3'

Merge branch 'knepley/feature-composable-callbacks'

* knepley/feature-composable-callbacks:
TS ex28: Updated to new kernel interface
SNES ex62: Updated to new kernel interface
SNES ex12: Updat

Merge branch 'knepley/feature-composable-callbacks'

* knepley/feature-composable-callbacks:
TS ex28: Updated to new kernel interface
SNES ex62: Updated to new kernel interface
SNES ex12: Updated to new kernel interface
Plex ex3: Updated to new kernel interface
PetscDS: Added NfAux argument to FE kernels
PetscDS: Change signature of Jacobian functions to include the shift a for dF/dU_t
PetscDS: Cleanup - Removed silly consts - Removed unused vars - Fixed declarations
TS: Took extra space out of default monitor
TS ex18: Updated Riemann and pointwise interface
TS ex11: Updated Riemann interface
PetscDS: Added dimension and num fields to Riemann interface
PetscDS: Added missing declarations
SNES ex62: Updated to new pointwise interface
SNES ex12: Updated to new pointwise function interface
Plex+FEM: Update to new pointwise function interface - Basically need to also pass in field offsets
PetscDS: Change interface to pointwise functions - This is intended to make pointwise functions composable - Make function typedefs public - Store component and derivative offsets since they will be provided to the pointwise functions

show more ...

Merge branch 'shri/remove-ts-isdiff'

ts-isdiff: Added a note in TSSetTolerances.

Added a note on how to use TSSetTolerances if one wishes to have the local truncation error
computed only for the differential part. (same as what ts->is_

ts-isdiff: Added a note in TSSetTolerances.

Added a note on how to use TSSetTolerances if one wishes to have the local truncation error
computed only for the differential part. (same as what ts->is_diff did.)

show more ...

ts-isdiff: Removed the index set for differential variables from TS.

Merge branch 'hongzh/add-costintegral-ts-rk-adjoint'

TS: Took extra space out of default monitor

Merge branch 'master' into knepley/feature-composable-callbacks

* master: (151 commits)
PetscMalloc: Fix handling of zero-sized allocations
add note to DMGetLocal/GlobalVector() about intended s

Merge branch 'master' into knepley/feature-composable-callbacks

* master: (151 commits)
PetscMalloc: Fix handling of zero-sized allocations
add note to DMGetLocal/GlobalVector() about intended short-time usage of the vectors.
sf: use patched openmpi tarball that has a potential fix for sf example hang
SNES problems that set VI bounds must use a VI solver since the other solvers ignore the bounds
pounders viewer did not cast PetscReal to double in printf nor use %D instead of %d
fix ts ex20adj
fix ts theta
fixed another variable declaration in the middle of a code block
example main() had PetscInt return type and argument that should be int
DMDAVTKWriteAll_VTS: Fix handling of higher-dimension coordinates
fixed example that declared variables in the middle of a function
C programs do not return PetscInt nor do they take an argument that is PetscInt, fixed example that did
You cannot declare variables in the middle of functions in PETSc.
add ierr checking to PetscOptionsBegin/End() in example
configure: add error check if user specifies PETSC_ARCH=-dbg [i.e starts with a '-']
scale norm of vector difference by norm of vector to insure it is small enough to consider the two vectors equal
missing PetscViewerDestroy() added
MatNestGetISs: use custom fortranstub to handle PETSC_NULL_OBJECT
update location of open-mx website on FAQ page
If the user sets bounds and calls a solver that does not support them, throw an error.
...

show more ...

Merge remote-tracking branch 'origin/stefano_zampini/mattransposedense-ldafix' into stefano_zampini/pcbddc-adaptive-selection

Merged petsc/petsc into master

TSClone: fix c89 syntax

TSClone: update wrt PetscHeaderCreate() change in master. [so as to work in next]

fix a bug in cost integral evaluation for explicit solvers

Merge branch 'hongzh/evaluate-cost-integral-in-fwd'

Merge branch 'pr192/Fande-Kong/scalable-matincreaseoverlap/master' of https://bitbucket.org/petsc/petsc

Merged petsc/petsc into master

Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection

Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/mat/impls/aij/mpi/mumps/mumps.c
s

Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection

Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/mat/impls/aij/mpi/mumps/mumps.c
src/mat/impls/is/matis.h

show more ...

Merged master into semihozmen/ksp-fcg-eigen-comp-support

Merged petsc/petsc into master

Merge branch 'master' into pr192/Fande-Kong/scalable-matincreaseoverlap/master

Needed to merge master to update to new calling sequence PetscCommBuildTwoSided

fixed missing CHKERRQ() detected by clang's --analyze

Merged petsc/petsc into master

Merge branch 'barry/fix-directory-layout'