| #
23524bc8
|
| 29-Mar-2015 |
Mark Adams <mfadams@lbl.gov> |
Merge branch 'master' of https://bitbucket.org/petsc/petsc
|
| #
b00e99b9
|
| 27-Mar-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/feature-bargraph'
|
| #
51fa3d41
|
| 19-Mar-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
added PetscDrawBar object for drawing bar graphs
|
| #
898446f9
|
| 11-Mar-2015 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
Merge branch 'master' into shri/ts-is-for-differential-variables
Conflicts:
include/petsc-private/tsimpl.h
src/ts/impls/eimex/eimex.c
src/ts/interface/ts.c
|
| #
452dd1ff
|
| 10-Mar-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'pr277/pefarrell/pefarrell/fieldsplit-is-block-size/master'
|
| #
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
|
| #
90e68f20
|
| 27-Feb-2015 |
Patrick Farrell <patrick.farrell@maths.ox.ac.uk> |
Set the block size on the IS's, so that the sub-matrices also have
block sizes, so that they can in turn be decomposed.
|
| #
42ddd88e
|
| 26-Feb-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/fix-fortran-pcfieldsplitsetis'
|
| #
218d4943
|
| 24-Feb-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Allow char* argument to pcfieldsplitsetis_ to be null
Reported-by: Gabel Fabian <gabel.fabian@gmail.com>
|
| #
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 ...
|
| #
07607563
|
| 10-Feb-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' of bitbucket.org:petsc/petsc
|
| #
616e4207
|
| 10-Feb-2015 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'knepley/fix-fieldsplit-mg'
* knepley/fix-fieldsplit-mg:
PetscOptions: Name the struct
PCMG: Disconnect coarsening from DMKSP propagation - If a user called KSPSetComputeOperator()
Merge branch 'knepley/fix-fieldsplit-mg'
* knepley/fix-fieldsplit-mg:
PetscOptions: Name the struct
PCMG: Disconnect coarsening from DMKSP propagation - If a user called KSPSetComputeOperator() on the level solves before PCMG creates the level DMs, then when DMCoarsen() is called the first time, the DM will get the DMKSP from the top level. However, for each subsequent coarsening, it will keep the top-level DMKSP and wipe out those on the coarser levels. - To fix this, I just decouple coarsening from KSPSetDM()
FieldSplit: Was assuming the Options functions set the default value
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
|
| #
422e420f
|
| 06-Feb-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'xolotl'
Conflicts:
src/mat/impls/aij/mpi/mpiaij.c
|
| #
2686e3e9
|
| 05-Feb-2015 |
Matthew G. Knepley <knepley@gmail.com> |
FieldSplit: Was assuming the Options functions set the default value
|
| #
69c6db66
|
| 27-Jan-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/experiment'
|
| #
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
|
| #
ee2838f6
|
| 30-Sep-2014 |
Toby Isaac <tisaac@ices.utexas.edu> |
Merge branch 'tisaac/feature-fe-geom-dim' into tisaac/plex-flexible-projection
Use the new PetscFECellGeom
Conflicts:
include/petscdmplex.h
include/petscfe.h
src/dm/impls/plex/plexfem.c
|
| #
ca3142fd
|
| 26-Sep-2014 |
Mark Adams <mfadams@lbl.gov> |
Merge branch 'master' of bitbucket.org:petsc/petsc into mark/ex49-bs
|
| #
96a74ce7
|
| 24-Sep-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/docs-matblocksize'
|
| #
2a7a6963
|
| 19-Sep-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
MatGetVecs() and KSPGetVecs() replaced with MatCreateVecs() and KSPCreateVecs()
since they are creators not getters
|
| #
3bc631e0
|
| 14-Aug-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
don't put references in the comments, put them in the manual pages
|
| #
8094044e
|
| 04-Jun-2014 |
Dmitry Karpeev <karpeev@mcs.anl.gov> |
Merge branch 'karpeev/fix-ksp-pcfieldsplit-submat'
|