| #
f2dee214
|
| 06-Mar-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into jed/chem
Note merging a branch with good stuff in it for a year and a half is insane!
Conflicts:
src/ts/examples/tutorials/makefile
src/ts/interface/ts.c
|
| #
4e7385fa
|
| 16-Feb-2015 |
Stefano Zampini <stefano.zampini@gmail.com> |
Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection
Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
|
| #
a197972a
|
| 11-Feb-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/saws-options-merge-master
Totally confusing manual merge, could be wrong
Conflicts:
include/petscoptions.h
src/dm/impls/da/dacreate.c
src/sys/objects/aoptions.c
Merge branch 'master' into barry/saws-options-merge-master
Totally confusing manual merge, could be wrong
Conflicts:
include/petscoptions.h
src/dm/impls/da/dacreate.c
src/sys/objects/aoptions.c
src/sys/threadcomm/interface/threadcomm.c
show more ...
|
| #
50705773
|
| 10-Feb-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into pr252/dmay/PetscViewerBinarySkipHeaderVecViewLoad
Manual merge of makefile
Conflicts:
src/sys/classes/viewer/examples/tutorials/makefile
|
| #
69c6db66
|
| 27-Jan-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/experiment'
|
| #
584b3052
|
| 24-Jan-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'tisaac/feature-gamg-extensible' into barry/experiment
Conflicts:
src/ksp/pc/impls/gamg/gamg.h
|
| #
db3a253a
|
| 23-Jan-2015 |
Toby Isaac <tisaac@ices.utexas.edu> |
GAMG: fix inclusion of source headers in public header
The source headers that GAMG uses to access matrix types have been moved
back to gamg.h
|
| #
8c34d3f5
|
| 20-Jan-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
simplify option object names
|
| #
e55864a3
|
| 08-Nov-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
moved PetscOptionsObject from global variable to local variable in functions
|
| #
909a08a4
|
| 28-Nov-2014 |
Michael Lange <michael.lange@imperial.ac.uk> |
Merge branch 'master' into mlange/refactor-plex-distribute
Conflicts:
src/dm/impls/plex/examples/tests/output/ex12_1.out
src/dm/impls/plex/examples/tests/output/ex12_2.out
|
| #
bdcddefd
|
| 03-Nov-2014 |
Hong Zhang <hzhang@mcs.anl.gov> |
Merge branch 'master' of bitbucket.org:petsc/petsc
|
| #
fced3c3f
|
| 30-Oct-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/fix-setters'
|
| #
c60c7ad4
|
| 23-Oct-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
added a variety of getters and fixed calling sequence of a few setters
|
| #
9c925a2c
|
| 18-Mar-2014 |
Shri <abhyshr@mcs.anl.gov> |
Merge branch 'master' into shri/ts-events
Conflicts:
src/ts/interface/ts.c
|
| #
edbbd480
|
| 10-Dec-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/xcode
|
| #
256ff83f
|
| 11-Sep-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/wirth-fusion-materials
Conflicts:
src/ts/examples/tutorials/advection-diffusion-reaction/ex10.c
|
| #
81f98445
|
| 02-Jul-2013 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'prbrune/dm-coordinaterestrict' into prbrune/snes-elasticityexample
|
| #
7a068497
|
| 28-Jun-2013 |
Jed Brown <jedbrown@mcs.anl.gov> |
Merge branch 'madams/gamg-nokkt'
* madams/gamg-nokkt:
PCGAMG: remove dead function PCGAMGKKTProl_AGG
PCGAMG: remove dead KKT code
|
| #
91b455ba
|
| 27-Jun-2013 |
Jed Brown <jedbrown@mcs.anl.gov> |
Merge branch 'prbrune/pcgamg-classical'
* prbrune/pcgamg-classical:
PCGAMG Classical: no need to explicitly zero formkktprol
Fixed types for PCGAMGProlongator_Classical and PCGAMGGraph_Classical
Merge branch 'prbrune/pcgamg-classical'
* prbrune/pcgamg-classical:
PCGAMG Classical: no need to explicitly zero formkktprol
Fixed types for PCGAMGProlongator_Classical and PCGAMGGraph_Classical, strict C fix.
Complex fixes for classical
Added test examples for classical AMG
Fixed a number of bugs in Classical GAMG
Fix to the threshold calculation
Fixed PCGAMG_Classical so that thresholding decreases fill as bugs are fixed
Fixed one-processor memory corruption bug for classical GAMG.
Namespacing in gamg/classical.c
Added classical AMG to GAMG
show more ...
|
| #
7700e67b
|
| 11-Jun-2013 |
Mark Adams <mark.adams@columbia.edu> |
PCGAMG: remove dead KKT code
|
| #
e33c197d
|
| 11-Jun-2013 |
Richard Mills <rtm@eecs.utk.edu> |
Merged petsc/petsc into rmills/petsc master.
|
| #
8e6d0c30
|
| 20-Mar-2013 |
Peter Brune <brune@mcs.anl.gov> |
Added classical AMG to GAMG
|
| #
3630d664
|
| 26-Apr-2013 |
Jed Brown <jedbrown@mcs.anl.gov> |
Merge branch 'madams/gamg-aggoptions'
More delegation and less method-overriding.
* madams/gamg-aggoptions:
PCGAMG: call subtype destroy from PCDestroy_GAMG
PCGAMG: move subtype pointers to _PC
Merge branch 'madams/gamg-aggoptions'
More delegation and less method-overriding.
* madams/gamg-aggoptions:
PCGAMG: call subtype destroy from PCDestroy_GAMG
PCGAMG: move subtype pointers to _PCGAMGOps.
PCGAMG: set subtype in PCSetFromOptions_GAMG instead of PCCreate_GAMG
show more ...
|
| #
1ab5ffc9
|
| 15-Apr-2013 |
Jed Brown <jed@59A2.org> |
PCGAMG: move subtype pointers to _PCGAMGOps.
Avoid stomping on user subtype preference in PCSetFromOptions_GAMG.
Subtype function pointers are now cleared by PCGAMGSetType to avoid
lingering from t
PCGAMG: move subtype pointers to _PCGAMGOps.
Avoid stomping on user subtype preference in PCSetFromOptions_GAMG.
Subtype function pointers are now cleared by PCGAMGSetType to avoid
lingering from the last type in cases where not all pointers get set.
Also store the type name to help with debugging and diagnostic output.
show more ...
|
| #
b7cbab4e
|
| 31-Mar-2013 |
Mark Adams <mark.adams@columbia.edu> |
PCGAMG: set subtype in PCSetFromOptions_GAMG instead of PCCreate_GAMG
|