| #
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 ...
|
| #
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
|
| #
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
|
| #
d39137a2
|
| 12-Jan-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
commit after merge
Hg-commit: d540875a63b3c979c82b6a7fa7f062571e906d10
|
| #
247e2d92
|
| 06-Jan-2012 |
Jed Brown <jed@59A2.org> |
Mass revert file modes that were made executable in f6e61ee9c329
Hg-commit: 116d90d0b66125cee0db3e7351047057e756baf5
|
| #
832f7384
|
| 01-Jan-2012 |
Matthew G Knepley <knepley@gmail.com> |
Merge
Hg-commit: ee8d91ae0580d1d4fa92be38a18d40c838b9a257
|
| #
14e519b0
|
| 31-Dec-2011 |
Mark F. Adams <mark.adams@columbia.edu> |
changed MatMatMult to MatTranposeMatMult.
Hg-commit: f6e61ee9c329774cd5343eea1ee6b7432be17c3f
|
| #
3bd96682
|
| 21-Apr-2011 |
Barry Smith <bsmith@mcs.anl.gov> |
commit after merge, some manual merges
Hg-commit: a60db41ebcbbb90ab0d02727666a69b6d3ee88a0
|
| #
51a6ce93
|
| 20-Apr-2011 |
Barry Smith <bsmith@mcs.anl.gov> |
commit after merge
Hg-commit: 7bfe1376f1432461d3e26c90cb5fbc8c082e5072
|
| #
2bbaae60
|
| 20-Apr-2011 |
Satish Balay <balay@mcs.anl.gov> |
fix 0fb0bab0f904 to use new SUBMANSEC
[MANSEC for manulapages SUBMANSEC -if it exists - for generatefortranstubs]
Hg-commit: 30b6565f23703ed83e6a6b5642c6c0823387fe48
|
| #
58a6ce57
|
| 20-Apr-2011 |
Matthew G Knepley <knepley@gmail.com> |
Fix MANSEC in DM
Hg-commit: 0fb0bab0f9048f45fa9db15d944449946b222ec4
|
| #
221ff43e
|
| 03-Dec-2010 |
Dmitry Karpeev <karpeev@mcs.anl.gov> |
Merge.
Hg-commit: 3366ca2a4a4d267ee9a024672ba872128fa56739
|
| #
3fa2480e
|
| 01-Dec-2010 |
Jed Brown <jed@59A2.org> |
No need to list automatic directories in the makefile
Hg-commit: 07e0f867cfeb6c9dae6b604ac700b3eeb3c45475
|
| #
47b40911
|
| 01-Dec-2010 |
Dmitry Karpeev <karpeev@mcs.anl.gov> |
Merge.
Hg-commit: e1fc2c73eb56030dc76b20b68b959231bf213deb
|
| #
07ed33dc
|
| 29-Nov-2010 |
Victor Minden <victorminden@gmail.com> |
commit after merge
Hg-commit: 8753319427e40b297e0cf51005f1c3ca012b9dbb
|
| #
6915305f
|
| 29-Nov-2010 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
Commit after merge
Hg-commit: 3830df92b8bce85cdbecd681a87699ec570d54d3
|
| #
a12302e2
|
| 25-Nov-2010 |
Jed Brown <jed@59A2.org> |
Break DMGetMatrix_Composite into a new file
Hg-commit: 46bc940155f2f76e50b27dc63278de5c75aa6dc4
|
| #
ebdbe881
|
| 03-Nov-2010 |
Dmitry Karpeev <karpeev@mcs.anl.gov> |
Merge.
Hg-commit: 408da9d97fba22d7285ddfd7e8a6e622299e2cce
|