| #
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 ...
|
| #
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
|
| #
6d367ca2
|
| 20-Jan-2014 |
Jed Brown <jed@jedbrown.org> |
Draw: fix mismatched header guard
|
| #
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
|
| #
849cf4fd
|
| 07-Jan-2014 |
Satish Balay <balay@mcs.anl.gov> |
typo: __VDRAWL_H -> __VDRAW_H [clang-3.4 -Wheader-guard]
|
| #
ed91c37e
|
| 19-Dec-2013 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'master' into knepley/feature-dmda-section
* master: (319 commits) SNESGS: Fix for uninitialized variable warning in gssecant.c DMPlex: Fix for orientation in Gmsh files - Fixed tes
Merge branch 'master' into knepley/feature-dmda-section
* master: (319 commits) SNESGS: Fix for uninitialized variable warning in gssecant.c DMPlex: Fix for orientation in Gmsh files - Fixed test output do not use C99 struct initialization code in PETSc Nightly Summary: Added time taken to each of the tests in the dashboard. ASCII printing of floating point numbers must cast to (double) to support quad precision configure: check fortranDatatypes only when fortran is enabled [this fixes configure crash with --with-fc=0] don't use non-portable and also dependent on floating point precision system level math constants picky compilers fix a couple compiler warnings/errors (depending on compiler) for Matlab engine code DMPlex: More fixup from bad rebase, moved to DMGet/SetCoordinateSection() DM: Added DMGet/SetCoordinateSection() Fuckup: Fix for merge that is still untangling bad rebase from Oct. 17th 2013 - Fixed const in declarations - Fixed merge from PetscFE - Fixed 2 mallocs replace all echo in test/tutorial makefiles with printf since echo behaves differently on different systems DMDA: Missing header - Damn rebase DMPlex ex3: Added 2D Q_1 and 3D P_2 tests DMDA: Added DMDAProjectFunction() and DMDAComputeL2Diff() DMDA: Fixed 2D geometry - Should reuse DMPlex routines DMDA: Fix bug in 2D closure operation for cells DMDA: Make closure operations also return the size DMDA: Changed DMDACreateSection() to emulate DMPlexCreateSection() ...
Conflicts: config/builder.py include/petscdmda.h src/dm/dt/interface/dtfe.c src/dm/impls/da/dageometry.c src/dm/impls/da/dalocal.c src/dm/impls/plex/plexgeometry.c
show more ...
|
| #
0d414b50
|
| 17-Dec-2013 |
Vijay Mahadevan <vijay.m@gmail.com> |
Merged petsc/petsc into master
|
| #
9c5a1e1b
|
| 17-Dec-2013 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'master' into knepley/feature-plex-gmsh
* master: (163 commits) do not use C99 struct initialization code in PETSc Nightly Summary: Added time taken to each of the tests in the dash
Merge branch 'master' into knepley/feature-plex-gmsh
* master: (163 commits) do not use C99 struct initialization code in PETSc Nightly Summary: Added time taken to each of the tests in the dashboard. ASCII printing of floating point numbers must cast to (double) to support quad precision configure: check fortranDatatypes only when fortran is enabled [this fixes configure crash with --with-fc=0] don't use non-portable and also dependent on floating point precision system level math constants picky compilers fix a couple compiler warnings/errors (depending on compiler) for Matlab engine code DMPlex: More fixup from bad rebase, moved to DMGet/SetCoordinateSection() DM: Added DMGet/SetCoordinateSection() Fuckup: Fix for merge that is still untangling bad rebase from Oct. 17th 2013 - Fixed const in declarations - Fixed merge from PetscFE - Fixed 2 mallocs replace all echo in test/tutorial makefiles with printf since echo behaves differently on different systems DMDA: Missing header - Damn rebase DMPlex ex3: Added 2D Q_1 and 3D P_2 tests DMDA: Added DMDAProjectFunction() and DMDAComputeL2Diff() DMDA: Fixed 2D geometry - Should reuse DMPlex routines DMDA: Fix bug in 2D closure operation for cells DMDA: Make closure operations also return the size DMDA: Changed DMDACreateSection() to emulate DMPlexCreateSection() DMDA: Added functions which emulate DMPlex functionality DMDA: Now DMDAGetNumCells() returns the cells in each direction as well ...
Conflicts: config/builder.py
show more ...
|
| #
324c91e4
|
| 17-Dec-2013 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'madams/gamg-destroy' into prbrune/pcgamg-classicalinterpolationstrategies
|
| #
578f55a3
|
| 17-Dec-2013 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'master' into madams/gamg-destroy
Conflicts: src/ksp/pc/impls/gamg/gamg.c
|
| #
3d7bc6b7
|
| 15-Dec-2013 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'master' into knepley/feature-plex-refine-hex
* master: (68 commits) DMPlex: More fixup from bad rebase, moved to DMGet/SetCoordinateSection() DM: Added DMGet/SetCoordinateSection()
Merge branch 'master' into knepley/feature-plex-refine-hex
* master: (68 commits) DMPlex: More fixup from bad rebase, moved to DMGet/SetCoordinateSection() DM: Added DMGet/SetCoordinateSection() Fuckup: Fix for merge that is still untangling bad rebase from Oct. 17th 2013 - Fixed const in declarations - Fixed merge from PetscFE - Fixed 2 mallocs DMDA: Missing header - Damn rebase DMPlex ex3: Added 2D Q_1 and 3D P_2 tests DMDA: Added DMDAProjectFunction() and DMDAComputeL2Diff() DMDA: Fixed 2D geometry - Should reuse DMPlex routines DMDA: Fix bug in 2D closure operation for cells DMDA: Make closure operations also return the size DMDA: Changed DMDACreateSection() to emulate DMPlexCreateSection() DMDA: Added functions which emulate DMPlex functionality DMDA: Now DMDAGetNumCells() returns the cells in each direction as well PetscFE: Added support for tensor product cells in PetscDualSpace_Lagrange PetscFE: Added tensor product polynomial spaces example fix /sandbox/petsc/petsc.clone-3/include/petscmath.h(260): error: identifier "PETSC_CXX_STATIC_INLINE" is undefined PETSC_STATIC_INLINE PetscReal PetscAbsScalar(PetscScalar a) {return a < 0.0 ? -a : a;} ^ remove warning in fun3d example "user.F", line 1256: warning: In-place macro substitution leaves line truncated "user.F", line 1259: warning: In-place macro substitution leaves line truncated "user.F", line 1262: warning: In-place macro substitution leaves line truncated /Users/petsc/petsc.clone-2/src/ksp/ksp/examples/tutorials/ex56.c:59: warning: comparison between signed and unsigned integer expressions fix examples for portability fixed to example outputs fix output for a few examples changed due to changes to -mat_view and not using -snes_monitor_short ...
Conflicts: src/dm/impls/plex/plexrefine.c
show more ...
|
| #
c8129c98
|
| 11-Dec-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/petsc-viewer-draw-set-draw-type'
|
| #
d1da0b69
|
| 09-Dec-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
added PetscViewerDrawSetDrawType() and PetscOptions[Get]Viewer() support for -viewer_type draw:tikz
|
| #
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
|
| #
9804daf3
|
| 15-Feb-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
added petscdrawtypes.h removed the typedef _xx* xx definitions from petscdraw.h and removed petscdraw.h from petscsys.h
Hg-commit: 01be7b4c0ac1e993b540535c319de45af820a255
|
| #
bee44f0b
|
| 11-Feb-2013 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
Commit after merge.
Hg-commit: 51557b92273f11bd6d143d3c76c7fc993c1c6c1d
|
| #
afe78b3c
|
| 11-Feb-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
PetscViewerDrawSetPause() ignored if underlying PetscDraw object didn't already exist. Fixed by stashing draw pause value and applying to all futured created PetscDraw associated with the PetscViewer
PetscViewerDrawSetPause() ignored if underlying PetscDraw object didn't already exist. Fixed by stashing draw pause value and applying to all futured created PetscDraw associated with the PetscViewer
Hg-commit: d4a9a08298b2ea88f86f90635783dce39721a211
show more ...
|
| #
a297a907
|
| 29-Jan-2013 |
Karl Rupp <rupp@mcs.anl.gov> |
Uncrustified src/sys/*
Hg-commit: 9f71677807bad7b55428a6cc0f5ccc5052e91805
|
| #
29aa02fc
|
| 11-Dec-2012 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
Commit after merge.
Hg-commit: a128a87f5736ccbab37df5d559616f8376f7026e
|
| #
5c6c1dae
|
| 10-Dec-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
reorg of src/sys directory directories that define objects now in the classes subdirectory rename several confusing name directories
Hg-commit: b2612422c63ac4afe82112892d9efda808f3d601
|