| #
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 ...
|
| #
909a08a4
|
| 28-Nov-2014 |
Michael Lange <michael.lange@imperial.ac.uk> |
Merge branch 'master' into mlange/refactor-plex-distribute
Conflicts:
src/dm/impls/plex/examples/tests/output/ex12_1.out
src/dm/impls/plex/examples/tests/output/ex12_2.out
|
| #
4446f3b4
|
| 24-Oct-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'maint'
Conflicts:
config/BuildSystem/config/packages/ml.py
src/ksp/pc/impls/mg/mg.c
|
| #
e1bc860d
|
| 24-Oct-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
fix formatting of some manual pages
specifically remove use of $ from the middle of parameter or options lists
|
| #
3d1f5f8d
|
| 13-Jun-2014 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'prbrune/snes-fascontinuation'
* prbrune/snes-fascontinuation:
SNESFAS: added tau-corrected grid continuation.
|
| #
762c2e5f
|
| 05-Jun-2014 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'prbrune/fas-fixprefix'
* prbrune/fas-fixprefix:
SNESFAS: SNESFASGetSmoother(Down/Up) and SNESFASGetCoarseSolve prefix fix.
|
| #
3de4d1db
|
| 04-Jun-2014 |
Peter Brune <brune@mcs.anl.gov> |
SNESFAS: SNESFASGetSmoother(Down/Up) and SNESFASGetCoarseSolve prefix fix.
When the user uses the SNESFASGetSmoother*() interfaces to create the smoothers
the prefix is set incorrectly due to the wr
SNESFAS: SNESFASGetSmoother(Down/Up) and SNESFASGetCoarseSolve prefix fix.
When the user uses the SNESFASGetSmoother*() interfaces to create the smoothers
the prefix is set incorrectly due to the wrong outer SNES being passed to
SNESFASCycleCreateSmoother_Private(). The fix is merely to pass the correct one.
Based-on-patch-by: Lawrence Mitchell <lawrence.mitchell@imperial.ac.uk>
show more ...
|
| #
92c494f3
|
| 23-May-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/saws-options
|
| #
95ecbf38
|
| 18-May-2014 |
Stefano Zampini <stefano.zampini@gmail.com> |
Merge branch 'master' into stefano_zampini/pcbddc-multilevel-improvement
Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bdd
Merge branch 'master' into stefano_zampini/pcbddc-multilevel-improvement
Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bddcprivate.c
show more ...
|
| #
9c925a2c
|
| 18-Mar-2014 |
Shri <abhyshr@mcs.anl.gov> |
Merge branch 'master' into shri/ts-events
Conflicts:
src/ts/interface/ts.c
|
| #
5f6acfaf
|
| 18-Mar-2014 |
Shri <abhyshr@mcs.anl.gov> |
Merge branch 'master' into shri/feature-dm-circuit
Conflicts:
src/dm/impls/makefile
|
| #
1d763ceb
|
| 17-Mar-2014 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'master' into prbrune/matcoloring-greedy
|
| #
ab15ae43
|
| 03-Mar-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'master' into knepley/feature-plex-fas
* master: (863 commits)
Revert "mpich: use latest mpich tarball with gcov but use '--enable-coverage' mpich configure option."
MatCreateTransp
Merge branch 'master' into knepley/feature-plex-fas
* master: (863 commits)
Revert "mpich: use latest mpich tarball with gcov but use '--enable-coverage' mpich configure option."
MatCreateTranspose: fix for lazy block size
mpich: use latest mpich tarball with gcov but use '--enable-coverage' mpich configure option.
configure: add FC_DEFINE_FLAG to petscvariables
added a citation for pounders, Stefan finally came through
update to latest netcdf fixes bug that did not allow building on recent Mac OS X
DMPlex: Fixes for CGNS - Fixed loop bounds since CGNS uses closed intervals - Bug with mixed cell types - Typo with coordinates
final updates from nightly tests
fix for countcfunction
removed outdated docs and comments on MatStructure usage removed SAME_PRECONDITIONER since no longer used removed unneed use of MatStructure in Schur complement matrix
removed MatStructure arguments from Tao
fixes for Sundials and fun3d cannot use MPIU_SUM for integer arrays
inplace ILU factorization must update state of inplace matrix to prevent infinite recursion of updating PC
fixes for BDDC by the way not having BDDC always in the testing is going to lead to trouble
the compute Jacobian functions for SNES and TS now do not take a MatStructure flag
KSPSetOperators() no longer has the MatStructure argument. The Mat objects now track that information themselves. Use KPS/PCSetReusePreconditioner() to prevent the recomputation of the preconditioner if the operator changed in the way that SAME_PRECONDITIONER did with KSPSetOperators()
tracks when Mat's have a change in nonzero structure this information can be used by PC to determine how preconditioners must be rebuilt currently only does an error check if the user said same nonzero pattern but actually changed the pattern
completed cleanup of removal of matrix pointers to compute jacobian routines
makefile: Added 'make includegraph' to create an inclusion dependency graph.
Contrib: Updated include-graph.sh script to ignore *.hh files
...
Conflicts:
src/dm/dt/interface/dt.c
show more ...
|
| #
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
|
| #
b603e5f6
|
| 08-Feb-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/rm-petscsnesfas_h'
|
| #
a055c8ca
|
| 30-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
merge petscsnesfas.h into petscsnes.h
|
| #
aaa7dc30
|
| 29-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
fixed quote marks for includes to <>
|
| #
c7ff62de
|
| 13-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/wirth-fusion-materials
bad manual merge needs to be fixed
this is what happens when branches hang around too long
Conflicts:
src/ts/examples/tutorials/advection-dif
Merge branch 'master' into barry/wirth-fusion-materials
bad manual merge needs to be fixed
this is what happens when branches hang around too long
Conflicts:
src/ts/examples/tutorials/advection-diffusion-reaction/ex10.c
show more ...
|
| #
324c91e4
|
| 17-Dec-2013 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'madams/gamg-destroy' into prbrune/pcgamg-classicalinterpolationstrategies
|
| #
578f55a3
|
| 17-Dec-2013 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'master' into madams/gamg-destroy
Conflicts:
src/ksp/pc/impls/gamg/gamg.c
|