Merge branch 'master' of bitbucket.org:petsc/petsc

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

removed string version of function name for XXXRegister(), PetscFunctionListAdd() and PetscObjectComposeFunction()

removed path and MPI_Comm arguments from PetscFunctionListFind/Add()

removed path argument to XXXInitializePackage() and XXXRegister()

removed XXXRegisterDynamic() but kept the APIs for everything else underneath the same
phase I of the update to handling registering function pointers

-pc_reuse: remove obsolete option

This option was added by Shri to reuse numerical factorization for parts
of a system when using fieldsplit, but it was only ever seen by PCLU. If
the option is to b

-pc_reuse: remove obsolete option

This option was added by Shri to reuse numerical factorization for parts
of a system when using fieldsplit, but it was only ever seen by PCLU. If
the option is to be brought back, it can be in the form of "lagging" for
PCFieldSplit, which would pass SAME_PRECONDITIONER when calling
KSPSetOperators() to configure sub-solvers.

petsc-dev: 5CEF7766-56C2-4E44-97B7-61B3D87B1822@mcs.anl.gov

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

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 PetscS

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

show more ...

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

Hg-commit: 642571a1dc7109fdb7e5b0abb23bf260d10eb970

merge

Hg-commit: 7389c209275f9836f3a0d332eaa5c591108892c4

Merged PCBJacobiSetUseTrueLocal(), -pc_bjacobi_true_local, PCKSPSetUseTrue(), -pc_ksp_true, PCCompositeSetUseTrue() -pc_composite_true to PCSetUserAmat(), -pc_use_amat.

Hg-commit: 28c28f0c8c27af7553

Merged PCBJacobiSetUseTrueLocal(), -pc_bjacobi_true_local, PCKSPSetUseTrue(), -pc_ksp_true, PCCompositeSetUseTrue() -pc_composite_true to PCSetUserAmat(), -pc_use_amat.

Hg-commit: 28c28f0c8c27af7553d524c69009ff509f6495ce

show more ...

consistent variable names and wording for operators to PCSetOperators(), PCGetOperators(), KSPSetOperators(), SNESSetJacobian(), SNESSetPicard(), TSSetRHSJacobian() and TSSetIJacobian() still need t

consistent variable names and wording for operators to PCSetOperators(), PCGetOperators(), KSPSetOperators(), SNESSetJacobian(), SNESSetPicard(), TSSetRHSJacobian() and TSSetIJacobian() still need to do the Get versions and the users manual

Hg-commit: 774f9fd7b29cb84e28b8af455343ed4f6bdaa9b0

show more ...

Automerge.

Hg-commit: 81500f7e84c8ec0c4dcae9cb31d1cb32892d545d

simplified design of VecValidValues() not worth the complications to save a function call

Hg-commit: 234f2a55d16ddb81bfaf0672e62560aad670b624

commit after merge

Hg-commit: d45994b710e27c421e3a611629d33b9d321ce16b

Split out petscdmdatypes.h and petscdmtypes.h

Hg-commit: 3f8f2ebaa036547d616a74a818868b81d0922c1f

added petscdrawtypes.h removed the typedef _xx* xx definitions from petscdraw.h and removed petscdraw.h from petscsys.h

Hg-commit: 01be7b4c0ac1e993b540535c319de45af820a255

added PetscObjectComm() and used it to replace (((PetscObject)obj)->comm)

Hg-commit: 3da37c458124ad48ae939f4e9823e4430ee0b8be

removed typeid from PetscHeaderCreate() args since it is not know at create time anyway

Hg-commit: 368e928141e31cf1ff6cf108913006e5886dc6cc

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

Uncrustified src/ksp/pc/*

Hg-commit: b80b33e3b1d8943a898b18384bc7b2c1a3103a32