| #
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
|
| #
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
|
| #
3fe9ae9b
|
| 15-Jan-2015 |
Mark Adams <mfadams@lbl.gov> |
Merge branch 'master' of bitbucket.org:petsc/petsc into mark/gamg-crs-ksp2
|
| #
fe998a80
|
| 13-Jan-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
manual merge of conflict
|
| #
d3c8c067
|
| 01-Jan-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Three directory namespace changes for better --prefix install support
1) include/finclude becomes include/petsc-finclude
2) include/mpiuni becomes include/petsc-mpiuni
3) conf (both $PETSC_DIR/conf
Three directory namespace changes for better --prefix install support
1) include/finclude becomes include/petsc-finclude
2) include/mpiuni becomes include/petsc-mpiuni
3) conf (both $PETSC_DIR/conf and $PETSC_DIR/$PETSC_ARCH/conf become) lib/petsc-conf
show more ...
|
| #
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
|
| #
e33c197d
|
| 11-Jun-2013 |
Richard Mills <rtm@eecs.utk.edu> |
Merged petsc/petsc into rmills/petsc master.
|
| #
3e2ac207
|
| 23-May-2013 |
Hong Zhang <hzhang@mcs.anl.gov> |
Merge branch 'hzhang/mat-multiprocblock_baij'
|
| #
e8271787
|
| 22-May-2013 |
Hong Zhang <hzhang@mcs.anl.gov> |
implement MatGetMultiProcBlock_MPIBAIJ()
|
| #
4042b796
|
| 17-Mar-2013 |
Jed Brown <jed@59A2.org> |
Merge branch 'master' into jed/ts-eimex
Sync to include Git conversion, PETSC_EXTERN, and minor API changes.
Conflicts:
src/ts/interface/tsregall.c
|
| #
b769355b
|
| 31-Dec-2012 |
Jed Brown <jed@59A2.org> |
merge PetscSF implementation
Hg-commit: 98dccc99445b69cb7a66312149eb16fec359e294
|
| #
5a4671ae
|
| 30-Dec-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
removed trailing spaces from all files
Hg-commit: 1cfa55059afe46c5145e0e830cd797b97216abfb
|
| #
31134e8c
|
| 03-Nov-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
commit after merge
Hg-commit: d0f613618ca66a5aeb1aac97d210d2cc29755d3d
|
| #
2d507118
|
| 03-Nov-2012 |
Satish Balay <balay@mcs.anl.gov> |
reemove OBJSC and OBJSF from invididual makefiles and auto-define in conf/variables
Hg-commit: 2f01c17f3c19dc4b89aaf306cfd60a12312c270d
|
| #
0f55b88d
|
| 03-Jul-2012 |
Satish Balay <balay@mcs.anl.gov> |
backout all chmod stuff in bf971ba58125
[but keep diffs to src/mat/impls/aij/mpi/mpimatmatmult.c ]
Hg-commit: 4a812fc1f35496ce2717c7da9ef12ffabbd13258
|
| #
c0174eb7
|
| 03-Jul-2012 |
Mark F. Adams <mark.adams@columbia.edu> |
removed a spurious call to MatSetBlockSize.
Hg-commit: bf971ba58125bd8cf7ceb2a9d0f5cdf27c27cc6a
|
| #
bfae9544
|
| 08-Sep-2011 |
Jungho Lee <julee@mcs.anl.gov> |
commit after merge
Hg-commit: aee85eceae49b0be84b866808d01e3877a200a0a
|
| #
fc3f3fdc
|
| 08-Sep-2011 |
Peter Brune <brune@cs.uchicago.edu> |
commit after merge
Hg-commit: 9cbf2c231923b083e521e934a6bca8e96ed54c26
|
| #
5f6043d5
|
| 08-Sep-2011 |
Satish Balay <balay@mcs.anl.gov> |
merge from 32
Hg-commit: 2a932b9678b7d18ec91ebd2fa634798d76d1c322
|
| #
b6d6499f
|
| 08-Sep-2011 |
Satish Balay <balay@mcs.anl.gov> |
remove dscpack interface as its been unused/unmaintained for the past few releases
Hg-commit: b4a56a5226a6394c9382bc82d021edeedbc6de93
|
| #
d39137a2
|
| 12-Jan-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
commit after merge
Hg-commit: d540875a63b3c979c82b6a7fa7f062571e906d10
|