| #
061e9cde
|
| 27-Feb-2014 |
Vijay Mahadevan <vijay.m@gmail.com> |
Merging master with feature-dmmoab. Only conflict was with SOURCECXX specification under impls/moab/makefile.
|
| #
bf5b0b0b
|
| 25-Feb-2014 |
Vijay Mahadevan <vijay.m@gmail.com> |
Merged petsc/petsc into master
|
| #
020631bc
|
| 19-Feb-2014 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'master' into prbrune/snes-fascontinuation
Conflicts:
include/petscsnesfas.h
|
| #
1f1b5a69
|
| 15-Feb-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/ts-rhsjacobian-only
|
| #
6d808a57
|
| 13-Feb-2014 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
Merge branch 'shri/update-SuiteSparse' into shri/external-package-KLU
Conflicts:
conf/test
config/examples/arch-linux-pkgs-dbg-ftn-interfaces.py
config/examples/arch-linux-pkgs-opt.py
|
| #
a7b5fb5f
|
| 08-Feb-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'balay/tao-to-petsc'
Conflicts:
src/snes/impls/fas/fasfunc.c
src/snes/impls/fas/fasgalerkin.c
|
| #
ba92ff59
|
| 31-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
added petsc to front of tao public includes
|
| #
aaa7dc30
|
| 29-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
fixed quote marks for includes to <>
|
| #
5b0d99ae
|
| 29-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
remove tao-private include directory, private goes into petsc-private
|
| #
85f9fe2e
|
| 29-Jan-2014 |
Satish Balay <balay@mcs.anl.gov> |
tao: remove trailing spaces from sources
|
| #
e9f9aeae
|
| 22-Dec-2013 |
Satish Balay <balay@mcs.anl.gov> |
tao: fix comments from // to /* */
|
| #
02702468
|
| 25-Nov-2013 |
Satish Balay <balay@mcs.anl.gov> |
tao: include/tao-private/ -> tao-private/
|
| #
a7e14dcf
|
| 25-Nov-2013 |
Satish Balay <balay@mcs.anl.gov> |
tao: move tao/src/* petsc/src/tao/
|