| #
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
|
| #
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
|
| #
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
|
| #
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 ...
|
| #
c0420575
|
| 18-May-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'knepley/feature-fe-dg-space'
* knepley/feature-fe-dg-space: (38 commits)
DMPlex: Added coordinate field info for generated mesh
DMPlex: Update to new DMPlexGetBoundary() interface
Merge branch 'knepley/feature-fe-dg-space'
* knepley/feature-fe-dg-space: (38 commits)
DMPlex: Added coordinate field info for generated mesh
DMPlex: Update to new DMPlexGetBoundary() interface
PetscFE: Fix complex casting
DMPlex: Fixup type mismatch in PetscFEIntegrate()
DMPlex ex62: Fixed test output
SNES ex62: Added test output
SNES ex62: Added tests for Q2-Q1 and Q2-P1disc - Added -show_error - Removed spurious refinement of quads - Fixed cast - CreatePressureNullspace() now uses DMPlexProjectFunction() - Replace SetupElement() with PetscFECreateDefault()
DMPlex ex3: Added tests for P1disc
SNES ex12: Updated to new PetscFECreateDefault()
PetscFE: Fixes for discontinuous elements
PetscSpace: Fixed polynomial space view
PetscFE: Changed PetscFECreateDefault() - Now continuity and reference cell shape are set from the command line
PetscFE: Added domain integration - Added PetscFEIntegrate(), only implemented for Basic - Added DMPlexComputeIntegralFEM() and DMPlexComputeL2FieldDiff() - This should replace the L2Diff functions
Mat+Doc: Fixed MatNullSpaceRemove()
SNES ex62: Updated to new PetscFECreateDefault()
SNES ex12: Updated to new PetscFECreateDefault() - 3D simplex moves the P_0 point from the centroid
DMPlex ex3: Updated for corrected cell dof
PetscFE: I think I finally fixed the cell dof
DMPlex ex3: Added test case for P1disc on a quad
DMPlex ex3: Added P1 discontinuous test - Something looks wrong with interpolation
...
show more ...
|
| #
359a2de3
|
| 29-Apr-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Mat+Doc: Fixed MatNullSpaceRemove()
|
| #
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
|
| #
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
|
| #
6d808a57
|
| 13-Feb-2014 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
Merge branch 'shri/update-SuiteSparse' into shri/external-package-KLU
Conflicts:
conf/test
config/examples/arch-linux-pkgs-dbg-ftn-interfaces.py
config/examples/arch-linux-pkgs-opt.py
|
| #
036f3cb5
|
| 26-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into balay/tao-to-petsc
Conflicts:
include/makefile
|
| #
9fdc1e34
|
| 26-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge remote-tracking branch 'origin/barry/remove-big-g'
|
| #
f9cfb505
|
| 26-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into knepley/feature-mat-zerorowscols-baij
|
| #
57622a8e
|
| 16-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
completed some percentage of changes from %G format in prints
|
| #
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 ...
|