| #
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
|
| #
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
|
| #
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
|
| #
8c722d37
|
| 10-Dec-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/reduce-dmsetup-da-memoryusage
Conflicts:
src/dm/examples/tests/ex15.c
src/dm/examples/tutorials/ex3.c
src/dm/impls/da/da2.c
src/dm/impls/da/da3.c
|
| #
edbbd480
|
| 10-Dec-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/xcode
|
| #
244aa513
|
| 28-Nov-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/minor-draw-improvements' into jed/chem
|
| #
cd4f0679
|
| 18-Nov-2013 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'master' into knepley/feature-dmda-section
* master: (528 commits)
Doc: Fixed configure doc
Nightly summary: Added configure section.
TSSetErrorIfStepFails: fix __FUNCT__
TS: fi
Merge branch 'master' into knepley/feature-dmda-section
* master: (528 commits)
Doc: Fixed configure doc
Nightly summary: Added configure section.
TSSetErrorIfStepFails: fix __FUNCT__
TS: fix for TSGetRHSMats_Private() in the creation of the Arhs and Brhs matrices
protect logging of objects (which uses global variables) with PETSC_USE_LOG
error handler API had been previously changed but this example was not updated to new API.
DMPlex: Fixed bug in coordinate permutation
PetscSection: Doc fix for permutation
Bib: Added Top500 and fixed entry
fun3d: update PetscMallocValidate() usage
bugfix of MatCreateSeqAIJFromTriple() contributed by Nicolas Marsic <nicolas.marsic@montefiore.ulg.ac.be>
bib: rename ref with duplicate key
Webpage: Corrected '-dm_mat_type cusp' to 'dm_mat_type aijcusp'.
completed removing server code that was not removed in previous commit
removed PETSc webserver and configure package files that supported it
Allow calling MatGetBlockSize[s]() before matrix preallocation
SNESLINESEARCHBT: Set the norms when exiting early due to negligible step.
fix outdated PetscOptionsList
SNESQN: only monitor real part of dot product (fails with C++ complex)
Fix for multiple definitions in mat/color/interface/ custom fortran bindings
...
Conflicts:
config/builder.py
include/petscdmplex.h
src/dm/impls/da/dageometry.c
src/dm/impls/plex/examples/tests/ex4.c
src/dm/impls/plex/plex.c
src/dm/impls/plex/plexinterpolate.c
show more ...
|
| #
87f44e3f
|
| 09-Nov-2013 |
Peter Brune <brune@mcs.anl.gov> |
SNESFAS: added tau-corrected grid continuation.
This just means exact upsweep solves.
|
| #
3060fb07
|
| 09-Nov-2013 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'prbrune/snes-fasfull'
This branch adds several cycle types to FAS
|
| #
928e959b
|
| 22-Aug-2013 |
Peter Brune <brune@mcs.anl.gov> |
Options for FAS_FULL with respect to the initial downsweep.
|
| #
8c94862e
|
| 14-Aug-2013 |
Peter Brune <brune@mcs.anl.gov> |
Added SNES_FAS_FULL, which does a multigrid F-cycle.
|
| #
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
|
| #
d2c146c7
|
| 30-Jan-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
commit after merge
Hg-commit: ebb357f10b0c83746021a2f5d6008cb620ae37d0
|
| #
f5af7f23
|
| 30-Jan-2013 |
Karl Rupp <rupp@mcs.anl.gov> |
Uncrustified src/snes/*
Hg-commit: 0b89af55379cc95040ca47c4c1f8000d6a978df2
|
| #
c5a46771
|
| 22-Jan-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
commit aftr merge
Hg-commit: 854807b200896ff0e3d6fb344a549ed1a2b93850
|
| #
0dd27c6c
|
| 22-Jan-2013 |
Peter Brune <brune@mcs.anl.gov> |
Added per-level event logging like what's in MG to FAS
Hg-commit: 9911ab5068e76b1737a0c603b97add98a53d5056
|
| #
519f805a
|
| 20-Jan-2013 |
Karl Rupp <rupp@mcs.anl.gov> |
Replaced '#ifdef' and '#ifndef' with '#if defined()' and '#if !defined()'.
Hg-commit: b3ebae8b626a88c2ac067fd7c3f04f229b43f305
|
| #
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
|