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 barry/google

removed unneeded includes in include files
added findvisibleprivatefunctions for finding symbols in libraries that might not belong
removed a couple of global symbols
named spaced a couple of Tao fun

removed unneeded includes in include files
added findvisibleprivatefunctions for finding symbols in libraries that might not belong
removed a couple of global symbols
named spaced a couple of Tao functions

show more ...

Merge branch 'master' into prbrune/snes-fascontinuation

Conflicts:
include/petscsnesfas.h

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/reduce-dmsetup-da-memoryusage'

removed idx and Nl from DM_DA object since the dm->ltogmap has the same information

this eliminates one memory usage of size dof * number of local grid points in DMSetUp_DA
Needed to add DMDARestore

removed idx and Nl from DM_DA object since the dm->ltogmap has the same information

this eliminates one memory usage of size dof * number of local grid points in DMSetUp_DA
Needed to add DMDARestoreGlobalIndices() to properly allow access to dm->logmap with DMDAGetGlobalIndices().
Though users could use DMGetGlobalToLocalMapping() followed by ISLocalGetGlobalMappingGetIndices() I have retained
DMDAGetGlobalIndices() to the code refactorization is less dramatic; the code could be changed later to eliminate
DMDAGetGlobalIndices()

show more ...

Merge branch 'master' into barry/wirth-fusion-materials

Conflicts:
src/ts/examples/tutorials/advection-diffusion-reaction/ex10.c

Merged petsc/petsc into rmills/petsc master

Merge branch 'barry/rm-xxxregisterdynamic' into jed/ts-eimex

PetscObjectComposeFunctionDynamic() and TSRegisterDynamic() were
replaced by PetscObjectComposeFunction() and TSRegister(), both of which

Merge branch 'barry/rm-xxxregisterdynamic' into jed/ts-eimex

PetscObjectComposeFunctionDynamic() and TSRegisterDynamic() were
replaced by PetscObjectComposeFunction() and TSRegister(), both of which
drop the string name argument.

* barry/rm-xxxregisterdynamic: (82 commits)
...

Conflicts:
src/ts/interface/tsregall.c

show more ...

Merge branch 'barry/ams' into master

* commit 'eb4227cfdd169cc03749ba3ef12d3932f2f322bf': (24 commits)
forgotten files
basic snooping on PetscStack is now working
split AMSJavascript.py into A

Merge branch 'barry/ams' into master

* commit 'eb4227cfdd169cc03749ba3ef12d3932f2f322bf': (24 commits)
forgotten files
basic snooping on PetscStack is now working
split AMSJavascript.py into AMS.py for AMS javascript and AMSSnoopObjects.py for example showing published objects
fix bug in previous commit
added error returns for JSON-RPC AMS calls
don't let web accessor change length of array setting to publisher
Pass arrays of values back from webserver to AMS publisher
fix for last commit, missing errorcode and wrong variable name
KSPLogResidualHistory and SNESLogConvergenceHistory need to lock for AMS and have error checking when called
shutdown webserver if you started it on PetscFinalize(), what about when crash, should still shut it down
Added support for starting server automatically by application code messed around finding a bug in AMS
got value back from webclient to application
goddman script Jed sent me doesn;t work, it loses changes
split webserver into standalone problem that is not part of running PETSc application had to do this since impossible for AMS publisher and accessor to be in same application better to just totally redo AMS! But that is to large a project
moved webserver code to its own directory and file
added callback for changable fields in pyjs representation of AMS memories
add AMS viewer for PC, server can only run without any memory debugging
changed AMS publishing to use the Viewer model added simple AMS viewer for mat,ksp,snes,ts added --ksp/snes/ts_view_pre for starting the viewer before the solve (ugly but useful for AMS) added PetscStackCalls around AMS function calls when appropriate (note do not want these in webserver because do not webserver stopping just because AMS server is down
more work on moving AMS model to viewer
Fix for SNESSetConvergenceHistory() when input a is null
...

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

work on AMS interface, consistent naming, ams.h not included in petscviewer.h, no ifdefs

Hg-commit: 642571a1dc7109fdb7e5b0abb23bf260d10eb970

daimpl.h was never fixed? Well it is now

Hg-commit: a4f3f6d7e4f165ac5276405a089a596a28adc0b3

commit after merge

Hg-commit: 1fa981254c79c783277e37654668dfe698cddf41

Uncrustified src/dm/*. No re-uncrustification of un-uncrustified plex.c.

Hg-commit: 0eadce41498eb88aa85fb46f989ad9d09bfd9c3e

merge PetscSF implementation

Hg-commit: 98dccc99445b69cb7a66312149eb16fec359e294