| #
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
|
| #
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
|
| #
72e51967
|
| 30-Nov-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/remove-unneeded-paren-petscmalloc'
Conflicts:
src/mat/impls/baij/seq/baij.c
|
| #
854ce69b
|
| 15-Nov-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
convert some PetscMalloc() to PetscMalloc1()
remove unneeded () in first argument to PetscMalloc/Calloc1()
fixes for MATLAB examples
|
| #
4907a4d7
|
| 03-Jun-2014 |
Vijay Mahadevan <vijay.m@gmail.com> |
Merged upstream/master to feature-dmmoab
|
| #
299992b9
|
| 03-Jun-2014 |
Vijay Mahadevan <vijay.m@gmail.com> |
Merge remote-tracking branch 'upstream/master'
|
| #
b015001c
|
| 28-May-2014 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'master' into prbrune/snes-fascontinuation
* master: (855 commits)
fix for moab example had wrong blocksize of mapping
docs:remove src/docs/doxygen/manual [per Barry's instructions]
Merge branch 'master' into prbrune/snes-fascontinuation
* master: (855 commits)
fix for moab example had wrong blocksize of mapping
docs:remove src/docs/doxygen/manual [per Barry's instructions]
gfortran: remove 132 char limit from f90 free-form
SNES: Set up matrix-free *after* copying the user Jacobian to snes->pc
DMPlex-Gmsh: Use trueNumCells when building the coordinate section
Sys: Got guard logic reversed
Sys: The #define guard for PetscMalloc*() must match the one for PetscFree*()
PetscFV: I hate fucking complex
removed ltog scatter from DMDA since functionality can be obtained with gtol scatter and less memory
fix test of DMLocalToGlobalBegin/End and add actual test cases
improve object memory logging for DA, ISLocalToGlobal and ISBLOCK
lower high water mark of constructing parallel scatter by allocating only as much room in svalues as needed
owner in VecScatter construction is the rank, therefor can use PetscMPIInt to hold it do not PetscInt
another reuse of allocated array in 2d/3d DMDA create
improved high water mark of DMDASetups by implementing and using PETSC_USE_POINTER for ISCreateBlock()
PetscFV: Another complex fix
DMPlex+TS: Fixing types
ISIdentity() was wrong for block IS! Indices are NOT scaled by bs
PetscFV: Straighten out complex types
TS ex11: Fix casts and remove unused variable
...
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 ...
|
| #
28997433
|
| 14-May-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' of bitbucket.org:petsc/petsc
Damn, Jed will be mad at me again for forgetting to push earlier; oh well git makes it too difficult to fix
|
| #
9f3d138b
|
| 14-May-2014 |
Hong Zhang <hzhang@mcs.anl.gov> |
Merge branch 'knepley/fix-mat-missing-diagonal'
|
| #
ece542f9
|
| 12-May-2014 |
Hong Zhang <hzhang@mcs.anl.gov> |
check misssing diagonal for PETSc ilu and lu symbolic factorization
|
| #
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
|
| #
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
|
| #
036f3cb5
|
| 26-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into balay/tao-to-petsc
Conflicts:
include/makefile
|
| #
9fdc1e34
|
| 26-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge remote-tracking branch 'origin/barry/remove-big-g'
|
| #
57622a8e
|
| 16-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
completed some percentage of changes from %G format in prints
|
| #
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 ...
|