| #
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
|
| #
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'
|
| #
0157cb02
|
| 02-Jun-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'jed/dmda-memusage'
|
| #
565245c5
|
| 29-May-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
remove DMDAGetGlobalIndices() since handled by DMGetLocalToGlobalMapping() followed by ISLocalToGlobalMappingGetIndices()
fixed cases where bs of ISLocalToGlobalMapping in Mat did not match matrix bl
remove DMDAGetGlobalIndices() since handled by DMGetLocalToGlobalMapping() followed by ISLocalToGlobalMappingGetIndices()
fixed cases where bs of ISLocalToGlobalMapping in Mat did not match matrix block size
show more ...
|
| #
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
|
| #
021e0df4
|
| 23-May-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'jed/dmda-memusage'
|
| #
bd1fc5ae
|
| 19-May-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
removed ltog scatter from DMDA since functionality can be obtained with gtol scatter and less memory
|
| #
6389a1a1
|
| 18-May-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
improve object memory logging for DA, ISLocalToGlobal and ISBLOCK
|
| #
02fe608e
|
| 18-May-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
another reuse of allocated array in 2d/3d DMDA create
|
| #
b1fb7eb7
|
| 18-May-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
improved high water mark of DMDASetups by implementing and using PETSC_USE_POINTER for ISCreateBlock()
|
| #
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 ...
|
| #
45b6f7e9
|
| 17-May-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
removed blocked versions of ISLocalToGlobalMapping in Vec and Mat
the single ISLocalToGlobalMapping supports ISLocalToGlobalMappingApply and ISLocalToGlobalMappingApplyBlock
still some fixes need for
removed blocked versions of ISLocalToGlobalMapping in Vec and Mat
the single ISLocalToGlobalMapping supports ISLocalToGlobalMappingApply and ISLocalToGlobalMappingApplyBlock
still some fixes need for these extensive changes
show more ...
|
| #
f0413b6f
|
| 16-May-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
added bs argument to ISLocalToGlobalMappingCreate(), not yet used for bs > 1
|
| #
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
|
| #
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
|