| #
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 ...
|
| #
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'
|
| #
fed2a9ca
|
| 28-May-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'knepley/fix-fe-multifield'
* knepley/fix-fe-multifield:
DMPlex ex4: Changed numbering for hybrid edges
DMPlex ex3: Interpolation now working for Discontinuous Lagrange
PetscDualS
Merge branch 'knepley/fix-fe-multifield'
* knepley/fix-fe-multifield:
DMPlex ex4: Changed numbering for hybrid edges
DMPlex ex3: Interpolation now working for Discontinuous Lagrange
PetscDualSpace: Fixed index error in Lagrange creation
PetscFE: Fixed PetscFERefine() - The refined dual space was not properly duplicated - Added PetscDualSpaceDuplicate()
DMPlex ex1: Updated test output
DM: Added check for erroneous input when creating default SF
PetscFE: Fixed allocation bug
PetscBag: Added PetscBagGetNames()
show more ...
|
| #
ffb7e86c
|
| 19-May-2014 |
Matthew G. Knepley <knepley@gmail.com> |
PetscBag: Added PetscBagGetNames()
|
| #
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
|
| #
6daa6ed0
|
| 25-Jul-2013 |
Stefano Zampini <stefano.zampini@gmail.com> |
Merge remote-tracking branch 'origin/master' into stefano_zampini/pcbddc-constraintssetupimproved
|
| #
81f98445
|
| 02-Jul-2013 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'prbrune/dm-coordinaterestrict' into prbrune/snes-elasticityexample
|
| #
b77d5d46
|
| 01-Jul-2013 |
Satish Balay <balay@mcs.anl.gov> |
Merge branch 'bourdin/add-PetscBoolRegisterArray'
|
| #
dd66f111
|
| 14-Jun-2013 |
Blaise Bourdin <bourdin@lsu.edu> |
Added PetscBagResgisterBoolArray
|
| #
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
|
| #
6c2930d4
|
| 18-Sep-2012 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
Commit after merge
Hg-commit: 29c41d281e3ece3127c753661dccfd04e452b7f8
|
| #
3e08d2be
|
| 18-Sep-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
removed trailing blanks from source code
added rule rmtrailingblanks accessible via make ACTION=remtrailingblanks tree
Hg-commit: 6e3652165d48aa5f3e94dd66bf607adea6fac27a
|
| #
2c8e378d
|
| 01-Aug-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
consistently use #include <petsc... instead of sometimes #include "petsc.... ; I hope this is ok Jed?
completed and tested bin/maint/makeframework
Hg-commit: 908e7d10407583f0a5bd5d356d023bd7969681
consistently use #include <petsc... instead of sometimes #include "petsc.... ; I hope this is ok Jed?
completed and tested bin/maint/makeframework
Hg-commit: 908e7d10407583f0a5bd5d356d023bd79696815b
show more ...
|
| #
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
|
| #
8382e67f
|
| 26-Jun-2012 |
Paul Mullowney <paulm@txcorp.com> |
committing after previous merge.
Hg-commit: 62ea3b3249ac52e1d599b51313301ac9e25ed491
|
| #
f1301baf
|
| 25-Jun-2012 |
Matthew G Knepley <knepley@gmail.com> |
Merge
Hg-commit: 5fd7344ebb01d47fc51348189c58908ebeb94702
|
| #
887c112d
|
| 31-May-2012 |
Jed Brown <jed@59A2.org> |
Const correctness in PetscBagRegisterEnum
Hg-commit: 4380ce7a2ecfb8c6a6c0888ee3cb669e934f7718
|
| #
10e9db80
|
| 30-May-2012 |
Paul Mullowney <paulm@txcorp.com> |
Pulled in changes from petsc-dev. make tests passing. Everything looks good.
Hg-commit: 94eb5d50210da3db6d654576e30f2a31ec2adf25
|
| #
7898cc68
|
| 01-Jun-2012 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
commit after merge.
Hg-commit: 10823c0d180e66f83993b9212110a78526e9f782
|