| #
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 ...
|
| #
2bc0d5c7
|
| 27-Jun-2014 |
Stefano Zampini <stefano.zampini@gmail.com> |
Merge branch 'stefano_zampini/pcbddc-maint' into stefano_zampini/pcbddc_deluxe
|
| #
b9086f38
|
| 25-Jun-2014 |
Satish Balay <balay@mcs.anl.gov> |
Merge branch 'balay/fix-multiple-zisltogf.c'
|
| #
cf1aed2c
|
| 24-Jun-2014 |
Satish Balay <balay@mcs.anl.gov> |
mv src/vec/is/is/utils/ftn-custom/zisltogf.c src/vec/is/utils/ftn-custom/zisltogf.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
|
| #
64779880
|
| 08-Feb-2011 |
Matthew G Knepley <knepley@gmail.com> |
Now requirepackage is only used for proper packages, functions use requiresfunction, and the rest use requiresdefine
Hg-commit: dd65fd3461c02753386917514e6ebe12d345a30e
|
| #
238e7d2d
|
| 02-Dec-2009 |
Matthew Knepley <knepley@mcs.anl.gov> |
Merge
Hg-commit: 9c9e2b0243eedf0151e3676f8f4ccde9f7b93898
|
| #
f3a56f8b
|
| 30-Nov-2009 |
Jed Brown <jed@59A2.org> |
merge TrMalloc/MEMALIGN updates
Hg-commit: e66e6e0b392d0e3456a0c4fdee411b9bff8fd74a
|
| #
da93591f
|
| 29-Nov-2009 |
Barry Smith <bsmith@mcs.anl.gov> |
removed PETSC_ARCH/conf/base and
added support for not setting PETSC_ARCH and PETSC_DIR with --prefix option
Hg-commit: e478f4df238e5763b64567336d7cf94ca5d89d58
|
| #
3be44c43
|
| 18-Nov-2007 |
Barry Smith <bsmith@mcs.anl.gov> |
commit aFTERmerge
Hg-commit: 45a698803bd457bdc2ba32be5035e710250a5320
|
| #
8da04507
|
| 10-Jun-2007 |
Matthew Knepley <knepley@mcs.anl.gov> |
Merge
Hg-commit: 89a88a4570a641b3af1b53853d576da3947e5ca7
|
| #
2423cecc
|
| 08-Jun-2007 |
Barry Smith <bsmith@mcs.anl.gov> |
changed bmake/common everywhere to conf
fixed a little more for new install system
Hg-commit: 1aa781ff09e652ebafd6f016d84e88c15ea650f1
|