| #
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
|
| #
909a08a4
|
| 28-Nov-2014 |
Michael Lange <michael.lange@imperial.ac.uk> |
Merge branch 'master' into mlange/refactor-plex-distribute
Conflicts:
src/dm/impls/plex/examples/tests/output/ex12_1.out
src/dm/impls/plex/examples/tests/output/ex12_2.out
|
| #
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
|
| #
bc430e59
|
| 13-Nov-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'dave-may/mat-fixes'
|
| #
dc31dd32
|
| 13-Nov-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'dave-may/mat-fixes' into maint
|
| #
9b30a8f6
|
| 12-Nov-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
fixes for matfd and next
Contributed-by: Dave May <dave.mayhem23@gmail.com>
|
| #
ee2838f6
|
| 30-Sep-2014 |
Toby Isaac <tisaac@ices.utexas.edu> |
Merge branch 'tisaac/feature-fe-geom-dim' into tisaac/plex-flexible-projection
Use the new PetscFECellGeom
Conflicts:
include/petscdmplex.h
include/petscfe.h
src/dm/impls/plex/plexfem.c
|
| #
ca3142fd
|
| 26-Sep-2014 |
Mark Adams <mfadams@lbl.gov> |
Merge branch 'master' of bitbucket.org:petsc/petsc into mark/ex49-bs
|
| #
96a74ce7
|
| 24-Sep-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/docs-matblocksize'
|
| #
2a7a6963
|
| 19-Sep-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
MatGetVecs() and KSPGetVecs() replaced with MatCreateVecs() and KSPCreateVecs()
since they are creators not getters
|
| #
cc0847ea
|
| 16-Jun-2014 |
Satish Balay <balay@mcs.anl.gov> |
matnest: enable (auto) fortran interface to MatNestGetISs
|
| #
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
|
| #
021e0df4
|
| 23-May-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'jed/dmda-memusage'
|
| #
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
|
| #
dce7ea71
|
| 11-May-2014 |
Jed Brown <jed@jedbrown.org> |
Merge branch 'davidham/matnest-copy'
* davidham/matnest-copy:
MatNest: ignore empty blocks when copying
Initial implementation of copy for mat nests.
|
| #
46a2b97c
|
| 06-May-2014 |
Jed Brown <jed@jedbrown.org> |
MatNest: ignore empty blocks when copying
|
| #
c222c20d
|
| 23-Mar-2014 |
David Ham <David.Ham@imperial.ac.uk> |
Initial implementation of copy for mat nests.
|