| #
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 ...
|
| #
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.
|
| #
cd9d9ea4
|
| 05-May-2013 |
Jed Brown <jedbrown@mcs.anl.gov> |
Merge branch 'toby/fix-sor-baij'
Consolidates code and adds support for BAIJ SOR with nonzero initial
guess (required for use as a MG smoother).
* toby/fix-sor-baij:
Mat: add MatSOR/BAIJ test to
Merge branch 'toby/fix-sor-baij'
Consolidates code and adds support for BAIJ SOR with nonzero initial
guess (required for use as a MG smoother).
* toby/fix-sor-baij:
Mat: add MatSOR/BAIJ test to nightlies
Mat: move new MatSOR macros to a common header blockmatmult.h
MatSOR_SeqBAIJ: refactor, enable nonzero initial guess.
MatSOR, test ex43: removed BlockMat from test
MatSOR: added test ex43, currently fails
MatSOR_SeqBAIJ: protect against zero vector length
Conflicts:
src/ksp/ksp/examples/tests/makefile
show more ...
|
| #
999144b0
|
| 04-May-2013 |
Jed Brown <jedbrown@mcs.anl.gov> |
Mat: move new MatSOR macros to a common header blockmatmult.h
These macros would be useful for condensing the BAIJ triangular solve
code, for example.
|
| #
6a4bb4b0
|
| 26-Apr-2013 |
Jed Brown <jedbrown@mcs.anl.gov> |
Merge bug fix/patch releases up to 3.2-p7 into maint-3.2
* commit 'a9157d915ed96804280c3dc077186a2a633fd603': (157 commits)
Fix PyPI download URL to help pip figure out the release version
#1109
Merge bug fix/patch releases up to 3.2-p7 into maint-3.2
* commit 'a9157d915ed96804280c3dc077186a2a633fd603': (157 commits)
Fix PyPI download URL to help pip figure out the release version
#110990 fix timestamp order for .so vs .a during 'make install'
Update FFTW download
Increase patchlevel to 3.2-p7
...
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
|
| #
06873bf2
|
| 08-Mar-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
moved "macro" kernel interfaces to petsc-private/kernels
Hg-commit: a5f14392b251a7db2c640b6be7e611f6c23ef9ea
|
| #
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
|
| #
8e7768b9
|
| 24-Mar-2012 |
Matthew G Knepley <knepley@gmail.com> |
Merge
Hg-commit: f997b2abc12025b16065184c2bb279689bbd06ac
|
| #
b45d2f2c
|
| 24-Mar-2012 |
Jed Brown <jed@59A2.org> |
Rename include/private/ to include/petsc-private/
Hg-commit: 9a1730720b0d9756437b40462617551504641ade
|
| #
51322221
|
| 28-Feb-2012 |
Jungho Lee <julee@mcs.anl.gov> |
commit after merge
Hg-commit: e8d19a834d936a4816c3abf3af0b68733c00be11
|
| #
1f9dcb65
|
| 18-Feb-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
commit after merge
Hg-commit: ad9064ecab6663bf6a24da505dd949d26e524f4c
|
| #
b43b03e9
|
| 18-Feb-2012 |
Mark F. Adams <mark.adams@columbia.edu> |
moved coarsening methods from GAMG into a new MatCoarsen object.
Hg-commit: b06ea7c221bedafd90090f0d06af519ce815e2c0
|
| #
c5287449
|
| 28-Oct-2011 |
Matthew G Knepley <knepley@gmail.com> |
Merge
Hg-commit: 2a372a7e1e4585876ca01c369fbe01ef7cdc023e
|