| #
af3d4eeb
|
| 16-Apr-2015 |
Fande Kong <fdkong.jd@gmail.com> |
Merge branch 'pr192/Fande-Kong/scalable-matincreaseoverlap/master' of https://bitbucket.org/petsc/petsc
|
| #
f1c23e0e
|
| 15-Apr-2015 |
Fande Kong <fdkong.jd@gmail.com> |
Merged petsc/petsc into master
|
| #
4bc2dc4b
|
| 15-Apr-2015 |
Stefano Zampini <stefano.zampini@gmail.com> |
Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection
Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/mat/impls/aij/mpi/mumps/mumps.c
s
Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection
Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/mat/impls/aij/mpi/mumps/mumps.c
src/mat/impls/is/matis.h
show more ...
|
| #
305f5a7e
|
| 14-Apr-2015 |
semihozmen <semihozmen@gmail.com> |
Merged master into semihozmen/ksp-fcg-eigen-comp-support
|
| #
f9185b66
|
| 13-Apr-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into pr192/Fande-Kong/scalable-matincreaseoverlap/master
Needed to merge master to update to new calling sequence PetscCommBuildTwoSided
|
| #
66d7bb0d
|
| 12-Apr-2015 |
semihozmen <semihozmen@gmail.com> |
Merged petsc/petsc into master
|
| #
255664f4
|
| 12-Apr-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/fix-directory-layout'
|
| #
af0996ce
|
| 11-Apr-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
updated PETSc directory layout to match standard packaging strategies
include/petsc finclude,private,mpiuni
lib/petsc conf
bin/petsc*
|
| #
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
|
| #
dafab42b
|
| 22-Aug-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'knepley/feature-dm-dimension-handling'
* knepley/feature-dm-dimension-handling:
DM: Fixed DMDASetDim() in examples
Plex: Fix for isoparametric geometry
Plex: Complex fix
TS ex1
Merge branch 'knepley/feature-dm-dimension-handling'
* knepley/feature-dm-dimension-handling:
DM: Fixed DMDASetDim() in examples
Plex: Fix for isoparametric geometry
Plex: Complex fix
TS ex11: Fixed calls to DMSetCoordinateSection()
DM: FIxed DMClone() to copy dimension
Plex+DA: Now cell geometry routine can take a PetscFE in order to evaluate at quadrature points - We evaluate isoparametrically at the quadrature points - Changed DMDAComputeCellGeometry() --> DMDAComputeCellGeometryFEM() - Changed DMPlexComputeCellGeometry() --> DMPlexComputeCellGeometryFEM() - Added DMPlexComputeCellGeometryAffineFEM()
DM: Added a embedding dimension, different from the topological dimension - This can now be set in DMSetCoordinateSection(), or it can be automatically determined
Plex: Fix output for ex4
DM: Added DMGetDimPoints() - This replicates DMPlex/DAGetDepthStratum(), but uses the dimension which people have said is more intuitive
DM: Move dimension up into DM - Both DA and Plex had this and I think it makes sense
Conflicts:
src/dm/impls/plex/plexcreate.c
show more ...
|
| #
c73cfb54
|
| 31-Jul-2014 |
Matthew G. Knepley <knepley@gmail.com> |
DM: Move dimension up into DM
- Both DA and Plex had this and I think it makes sense
|
| #
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
|
| #
4035e84d
|
| 16-Feb-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
daimpl.h was never fixed? Well it is now
Hg-commit: a4f3f6d7e4f165ac5276405a089a596a28adc0b3
|
| #
ce94432e
|
| 13-Feb-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
added PetscObjectComm() and used it to replace (((PetscObject)obj)->comm)
Hg-commit: 3da37c458124ad48ae939f4e9823e4430ee0b8be
|
| #
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
|
| #
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
|
| #
8e7768b9
|
| 24-Mar-2012 |
Matthew G Knepley <knepley@gmail.com> |
Merge
Hg-commit: f997b2abc12025b16065184c2bb279689bbd06ac
|
| #
b45d2f2c
|
| 24-Mar-2012 |
Jed Brown <jed@59A2.org> |
Rename include/private/ to include/petsc-private/
Hg-commit: 9a1730720b0d9756437b40462617551504641ade
|
| #
d39137a2
|
| 12-Jan-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
commit after merge
Hg-commit: d540875a63b3c979c82b6a7fa7f062571e906d10
|
| #
247e2d92
|
| 06-Jan-2012 |
Jed Brown <jed@59A2.org> |
Mass revert file modes that were made executable in f6e61ee9c329
Hg-commit: 116d90d0b66125cee0db3e7351047057e756baf5
|