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

Merged master into barry/update-xxxviewfromoptions

Merge branch 'master' into barry/xcode

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

Merge branch 'barry/hide-fntptr-conversion'

use caste through (PETSC_UINTPTR_T) in a couple of places to remove warning about cast between pointer to function and object

Merge bug fix/patch releases up to 3.2-p7 into maint-3.2

* commit 'a9157d915ed96804280c3dc077186a2a633fd603': (157 commits)
Fix PyPI download URL to help pip figure out the release version
#1109

Merge bug fix/patch releases up to 3.2-p7 into maint-3.2

* commit 'a9157d915ed96804280c3dc077186a2a633fd603': (157 commits)
Fix PyPI download URL to help pip figure out the release version
#110990 fix timestamp order for .so vs .a during 'make install'
Update FFTW download
Increase patchlevel to 3.2-p7
...

show more ...

Merge branch 'master' into jed/ts-eimex

Sync to include Git conversion, PETSC_EXTERN, and minor API changes.

Conflicts:
src/ts/interface/tsregall.c

commit after merge

Hg-commit: ca5404a226ff5a48d2327a4d3511af1048ac8a7d

#155909 fix fortran 'external' functions to be PETSC_EXTERN

Hg-commit: 2bc1f5c3b5961df15636eaa655cb6a1b3a5db8cb

Automerge.

Hg-commit: b6659d546870fb013f3da5bcd5066d1dc0dc329c

Merge branch 'master' of gitifyhg::ssh://hg@bitbucket.org/BarryFSmith/petsc-dev-simp

Symbol visibility and namespacing.

C++ builds always set extern "C" and can be called from plain C. Most
users w

Merge branch 'master' of gitifyhg::ssh://hg@bitbucket.org/BarryFSmith/petsc-dev-simp

Symbol visibility and namespacing.

C++ builds always set extern "C" and can be called from plain C. Most
users will only want --with-clanguage=C++ for std::complex.


Hg-commit: f848d02318cae92d7b32037c7ee88f92dbe46347

show more ...

Change all PETSC_EXTERN_C to PETSC_EXTERN

Hg-commit: 8d2ebbb193fb583bccc64015e35640c4e08c3426

Change all PETSC_EXTERN_C to PETSC_EXTERN


Hg-commit: ba0cf153561ff2dc521f42e94b7164fbe7b5d798

updated EXTERN_C_BEGIN/END through TS

Hg-commit: c76fd273af402078ae0fa266ac7dcdc7b8d0306e

Remove petscviewer.h from petscsys.h

Much of sys is independent of viewer. Viewer is used in so many other
places that it is now included by petscvec.h.

Hg-commit: 1d745f01618aa51d3043fb1f87b0546f6

Remove petscviewer.h from petscsys.h

Much of sys is independent of viewer. Viewer is used in so many other
places that it is now included by petscvec.h.

Hg-commit: 1d745f01618aa51d3043fb1f87b0546f60e6e730

show more ...

removed PETSC_NULL from C and Fortran (except declaration in C for backward compatibility). Kept PETSC_NULL_xxx for Fortran
Fixed a few bugs where PETSC_NULL had been used incorrectly.

Hg-commit: 05

removed PETSC_NULL from C and Fortran (except declaration in C for backward compatibility). Kept PETSC_NULL_xxx for Fortran
Fixed a few bugs where PETSC_NULL had been used incorrectly.

Hg-commit: 054705a517d7f4388a8a084415d7478cbe95dff4

show more ...

commit after merge
x

Hg-commit: 5ca7425bdc061d16496b42615f4a99db34a78eec

Uncrustified src/ts/*

Hg-commit: 688366eb7a8ecbc6948bb32d69e2de3093f22e25

commit after merge

Hg-commit: f6a88fee9ba1b8041ee9b459d0ad54470439160a