| #
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
|
| #
9ba064df
|
| 26-Feb-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/clean-gamg
Need updates to KSPCHEBYSHEV since I will be adding to them
|
| #
4e812f6a
|
| 23-Feb-2015 |
Satish Balay <balay@mcs.anl.gov> |
Merge branch 'balay/update-Elemental-0.85'
|
| #
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
|
| #
2ef15aa2
|
| 13-Feb-2015 |
Hong Zhang <hzhang@mcs.anl.gov> |
make prototype of MatElementalHermitianGenDefEig() consistent with HermitianGenDefEig()
|
| #
935dd83b
|
| 13-Feb-2015 |
Hong Zhang <hzhang@mcs.anl.gov> |
update MatElementalHermitianGenDefEig_Elemental(); build works now
|
| #
d5560a0b
|
| 12-Feb-2015 |
Satish Balay <balay@mcs.anl.gov> |
elemental: more 0.85 fixes including:
'HermitianGenDefiniteEigType' to 'Pencil' and 'HermitianGenDefiniteEig' to 'HermitianGenDefEig'
Also change MatElementalHermitianGenDefiniteEig() to MatElementa
elemental: more 0.85 fixes including:
'HermitianGenDefiniteEigType' to 'Pencil' and 'HermitianGenDefiniteEig' to 'HermitianGenDefEig'
Also change MatElementalHermitianGenDefiniteEig() to MatElementalHermitianGenDefEig() to correspond
to elemental naming scheme?
show more ...
|
| #
e8146892
|
| 29-Jan-2015 |
Satish Balay <balay@mcs.anl.gov> |
elemental: update petsc interface to 0.85 [elemental.hpp -> El.hpp] [elem: -> El:]
|
| #
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
|
| #
ee900cc9
|
| 31-Jan-2015 |
Hong Zhang <hzhang@mcs.anl.gov> |
Merge branch 'hzhang/elemental-matconvert'
Conflicts:
src/mat/examples/tests/makefile
|
| #
6214f412
|
| 29-Jan-2015 |
Hong Zhang <hzhang@mcs.anl.gov> |
add MatConvert_sbaij_elemental()
|
| #
da0640a4
|
| 29-Jan-2015 |
Hong Zhang <hzhang@mcs.anl.gov> |
fix a small mem leak; valgrind still shows leak in commgrid->grid, don't know how to fix it yet :-(
|
| #
382fd914
|
| 28-Jan-2015 |
Hong Zhang <hzhang@mcs.anl.gov> |
add #include <elemental.hpp> into petscmat.h so elemental data type can be used for API routines
|
| #
7b30e0f1
|
| 27-Jan-2015 |
Hong Zhang <hzhang@mcs.anl.gov> |
add MatLoad_Elemental(): = MatLoad_dense + MatConvert, could be very slow!
|
| #
874e4880
|
| 26-Jan-2015 |
Hong Zhang <hzhang@mcs.anl.gov> |
cleanup
|
| #
d59fe0e1
|
| 22-Jan-2015 |
Hong Zhang <hzhang@mcs.anl.gov> |
continue working on MatElementalHermitianGenDefiniteEig_Elemental()
|
| #
f82baa17
|
| 21-Jan-2015 |
Hong Zhang <hzhang@mcs.anl.gov> |
test eigenvectors in MatElementalHermitianGenDefiniteEig()
|
| #
5dd12673
|
| 20-Jan-2015 |
Hong Zhang <hzhang@mcs.anl.gov> |
MatElementalHermitianGenDefiniteEig() gives evals as an output (PETSc mpi vec)
|
| #
d98da988
|
| 19-Jan-2015 |
Hong Zhang <hzhang@mcs.anl.gov> |
add interface to MatElementalHermitianGenDefiniteEig()
|
| #
1d08bef3
|
| 16-Jan-2015 |
Hong Zhang <hzhang@mcs.anl.gov> |
prepare to add MatElementalComputeEigenvalues() -- may rename it later
|
| #
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
|
| #
81e08676
|
| 11-Nov-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/dynamic-matsolverpackageregister'
Conflicts:
src/mat/impls/aij/seq/seqcusparse/aijcusparse.cu
|
| #
29b38603
|
| 10-Nov-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
properly extern "C"ing MatSolverPackage registration functions
|