| #
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
|
| #
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 ...
|
| #
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
|
| #
020631bc
|
| 19-Feb-2014 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'master' into prbrune/snes-fascontinuation
Conflicts:
include/petscsnesfas.h
|
| #
036f3cb5
|
| 26-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into balay/tao-to-petsc
Conflicts:
include/makefile
|
| #
f9cfb505
|
| 26-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into knepley/feature-mat-zerorowscols-baij
|
| #
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 ...
|
| #
52d48256
|
| 10-Jan-2014 |
Vijay Mahadevan <vijay.m@gmail.com> |
Merged petsc/petsc into master
|
| #
5c903c1c
|
| 22-Dec-2013 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'knepley/feature-dmda-section'
* knepley/feature-dmda-section: (29 commits)
DMPlex: fix stale docs about DMPlexGetCoordinateSection
DMDA: Fix compiler warnings
DMDA+DMPlex: Fixed
Merge branch 'knepley/feature-dmda-section'
* knepley/feature-dmda-section: (29 commits)
DMPlex: fix stale docs about DMPlexGetCoordinateSection
DMDA: Fix compiler warnings
DMDA+DMPlex: Fixed preallocation declarations
DMDA: c89 fix
DMDA: Forgot to add new source file
DMPlex: Fix merge from master
DMDA: Add a matrix preallocation routine that works with PetscSection
DMDA: Add transitive closure - Only working in 2D
DMDA: Add preallocation center dim for using PetscSection
DMDA: Added declaration for DMDAGetCellPoint()
DMDA: Added DMDAGetCellPoint()
DMPlex: Added documentation
DMDA: fix missing declarations and includes
DMPlex ex3: Fixed multicomponent functions - These were zero in all but the first component due to an earlier error
DMPlex: Cleaned up uses of DMPlexGet/SetCoordinateSection()
DMPlex: Cleaned up uses of DMPlexGet/SetCoordinateSection()
DMPlex ex3: Added 2D Q_1 and 3D P_2 tests - Added -simplex argument - Uses DMDA for quad tests
DMDA: Added DMDAProjectFunction() and DMDAComputeL2Diff()
DMDA: Fixed 2D geometry - Should reuse DMPlex routines
DMDA: Fix bug in 2D closure operation for cells
...
Conflicts:
src/dm/dt/interface/dtfe.c
src/dm/impls/plex/examples/tests/ex3.c
src/dm/impls/plex/examples/tests/output/ex3_2.out
src/dm/impls/plex/examples/tests/output/ex3_5.out
show more ...
|
| #
edbbd480
|
| 10-Dec-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/xcode
|