| #
23b6c49a
|
| 27-Apr-2015 |
Jason Sarich <sarich@mcs.anl.gov> |
passes object prefixes to child ksp and ls
Merge branch 'pefarrell/tao-set-ksp-ls-prefix'
|
| #
5d527766
|
| 23-Apr-2015 |
Patrick Farrell <patrick.farrell@maths.ox.ac.uk> |
Set the options prefix correctly on tao->ksp and tao->linesearch.
|
| #
ab56800f
|
| 21-Apr-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'sarich/feature-tao-iteration-count'
|
| #
af3d4eeb
|
| 16-Apr-2015 |
Fande Kong <fdkong.jd@gmail.com> |
Merge branch 'pr192/Fande-Kong/scalable-matincreaseoverlap/master' of https://bitbucket.org/petsc/petsc
|
| #
f1c23e0e
|
| 15-Apr-2015 |
Fande Kong <fdkong.jd@gmail.com> |
Merged petsc/petsc into master
|
| #
4bc2dc4b
|
| 15-Apr-2015 |
Stefano Zampini <stefano.zampini@gmail.com> |
Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection
Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/mat/impls/aij/mpi/mumps/mumps.c
s
Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection
Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/mat/impls/aij/mpi/mumps/mumps.c
src/mat/impls/is/matis.h
show more ...
|
| #
305f5a7e
|
| 14-Apr-2015 |
semihozmen <semihozmen@gmail.com> |
Merged master into semihozmen/ksp-fcg-eigen-comp-support
|
| #
e178f0ad
|
| 14-Apr-2015 |
semihozmen <semihozmen@gmail.com> |
Merged petsc/petsc into master
|
| #
8931d482
|
| 13-Apr-2015 |
Jason Sarich <sarich@mcs.anl.gov> |
add accessors to tao iteration counter, tao total iteration count
|
| #
f9185b66
|
| 13-Apr-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into pr192/Fande-Kong/scalable-matincreaseoverlap/master
Needed to merge master to update to new calling sequence PetscCommBuildTwoSided
|
| #
302440fd
|
| 13-Apr-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
fixed missing CHKERRQ() detected by clang's --analyze
|
| #
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
|
| #
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
|
| #
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
|
| #
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
|
| #
621a7d72
|
| 24-Sep-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/fix-tao-petsc-c-begin'
|
| #
728e0ed0
|
| 17-Sep-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
removed Tao use of antediluvian PETSC_C_BEGIN/END with PETSC_EXTERN for Tao implementation class constructors
|
| #
4d6b9c5a
|
| 10-Sep-2014 |
Jason Sarich <sarich@mcs.anl.gov> |
Merge branch 'sarich/tao-history-store-ksp-its'
|
| #
773155f9
|
| 29-Jul-2014 |
Jason Sarich <sarich@mcs.anl.gov> |
Merge branch 'sarich/tao-history-store-ksp-its'
|
| #
b0026674
|
| 28-Jul-2014 |
Jason Sarich <sarich@mcs.anl.gov> |
correct ksp counting complementarity and ipm solvers
|
| #
950edbcf
|
| 04-Jun-2014 |
Jason Sarich <sarich@mcs.anl.gov> |
Merge branch 'sarich/tao-docs-update'
|
| #
1eb8069c
|
| 03-Jun-2014 |
Jason Sarich <sarich@mcs.anl.gov> |
tao: documentation update
|
| #
1522df2e
|
| 02-Jun-2014 |
Jason Sarich <sarich@mcs.anl.gov> |
add a tao solver page to man pages for each solver (could be filled in a bit more)
|