| #
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 ...
|
| #
9c925a2c
|
| 18-Mar-2014 |
Shri <abhyshr@mcs.anl.gov> |
Merge branch 'master' into shri/ts-events
Conflicts:
src/ts/interface/ts.c
|
| #
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
|
| #
d971761d
|
| 18-Jun-2013 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'prbrune/snes-snesfunctiontype'
|
| #
2cfa8f2a
|
| 31-May-2013 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'prbrune/snes-snescomposite' into prbrune/snes-snesfunctiontype
|
| #
eed5f15b
|
| 03-Apr-2013 |
Peter Brune <brune@mcs.anl.gov> |
SNESComposite: Additive or Multiplicative composition of different SNESes.
|
| #
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
|
| #
cf6142ae
|
| 29-Sep-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
commit after merge
Hg-commit: 22746e3b3fbadeeb7355c91f5c38c081c818d4a8
|
| #
7659c1be
|
| 28-Sep-2012 |
Matthew G Knepley <knepley@gmail.com> |
Merge
Hg-commit: e67798811b9e9715a27e1162d786ebd65ddc7d21
|
| #
f91908df
|
| 28-Sep-2012 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
Commit after merge.
Hg-commit: 5ac46fc16352f9b05d40fb8eae01aa99e5d44c14
|
| #
eaedb033
|
| 27-Sep-2012 |
Peter Brune <brune@mcs.anl.gov> |
Nonlinear ASM (SNESNASM): initial DM dependent version
Hg-commit: 3d2d1e43c2d259d168619513ab57fc68c738cba9
|
| #
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
|
| #
e5996a9a
|
| 15-May-2012 |
Paul Mullowney <paulm@txcorp.com> |
updated and merged from petsc-dev
Hg-commit: 4bdbb24181fe1c8ce13e9b82c1d499b152c3d14f
|
| #
40be292e
|
| 11-May-2012 |
Peter Brune <brune@mcs.anl.gov> |
remove non-working SORQN
Hg-commit: 5df5da2fbee0018d6214063ab12ea49c0847b4f8
|
| #
51322221
|
| 28-Feb-2012 |
Jungho Lee <julee@mcs.anl.gov> |
commit after merge
Hg-commit: e8d19a834d936a4816c3abf3af0b68733c00be11
|
| #
37e1895a
|
| 06-Feb-2012 |
Jed Brown <jed@59A2.org> |
Add SNESMS: multi-stage smoothers, a nonlinear analogue to polynomial smoothers
Hg-commit: 3de9c70f2af1c2a7d27b25f3ed88b30b58a24e48
|
| #
472b90b3
|
| 26-Sep-2011 |
adams <adams@jaguarpf-login1.ccs.ornl.gov> |
fix for emtpty procs on input grid (2nd commit).
Hg-commit: 416bc569082d603eba1a683707921f8a1b880bdb
|
| #
8aa69af5
|
| 23-Sep-2011 |
Jed Brown <jed@59A2.org> |
merge
Hg-commit: 1e229776bfd44f4b459456504b3110137e0481a8
|
| #
b1f6f9fc
|
| 23-Sep-2011 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
Commit after merge.
Hg-commit: 866723830dfe0ff26ba0638381626709048310af
|
| #
421d9b32
|
| 23-Sep-2011 |
Peter Brune <brune@cs.uchicago.edu> |
added framework for SNESFAS
Hg-commit: d12c30e79e7eb7be21577d95b4769d34fe69cd2d
|