| #
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 ...
|
| #
a188d78d
|
| 17-May-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
removed use of block mapping in moab dxx code and documentation
|
| #
b3fc9300
|
| 01-May-2014 |
Vijay Mahadevan <vijay.m@gmail.com> |
Merge remote-tracking branch 'origin/master' into feature-dmmoab
|
| #
49fcfd5b
|
| 01-May-2014 |
Vijay Mahadevan <vijay.m@gmail.com> |
Merged petsc/petsc into master
|
| #
86fd59d5
|
| 02-Apr-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'knepley/fix-dm-vec-blocksize'
* knepley/fix-dm-vec-blocksize: DMPlex: Fix variable init DMPlex: Fix coordinate blocksize in uniform refinement Vec: Fix blocksize determination wi
Merge branch 'knepley/fix-dm-vec-blocksize'
* knepley/fix-dm-vec-blocksize: DMPlex: Fix variable init DMPlex: Fix coordinate blocksize in uniform refinement Vec: Fix blocksize determination with VecGetSubVector() DM: Handle empty vectors correctly for blocksize determination
show more ...
|
| #
1d803361
|
| 31-Mar-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge remote-tracking branch 'origin/knepley/fix-dm-vec-blocksize' into knepley/feature-plex-hdf5-parallel-load
* origin/knepley/fix-dm-vec-blocksize: DMPlex: Fix variable init DMPlex: Fix coord
Merge remote-tracking branch 'origin/knepley/fix-dm-vec-blocksize' into knepley/feature-plex-hdf5-parallel-load
* origin/knepley/fix-dm-vec-blocksize: DMPlex: Fix variable init DMPlex: Fix coordinate blocksize in uniform refinement Vec: Fix blocksize determination with VecGetSubVector() DM: Handle empty vectors correctly for blocksize determination
show more ...
|
| #
6bf20b62
|
| 31-Mar-2014 |
Matthew G. Knepley <knepley@gmail.com> |
DM: Handle empty vectors correctly for blocksize determination
|
| #
b2533dd1
|
| 22-Mar-2014 |
Vijay Mahadevan <vijay.m@gmail.com> |
Fixing merge conflicts in dmregall.
|
| #
204681ed
|
| 19-Mar-2014 |
Vijay Mahadevan <vijay.m@gmail.com> |
Merged petsc/petsc into master
|
| #
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
|
| #
899e4425
|
| 10-Mar-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'knepley/feature-plex-fas'
* knepley/feature-plex-fas: (56 commits) DMPlex: Removed unused variable DMPlex: Fix for C++ build, small fix for PetscFE DMPlex: Removed leak from Tria
Merge branch 'knepley/feature-plex-fas'
* knepley/feature-plex-fas: (56 commits) DMPlex: Removed unused variable DMPlex: Fix for C++ build, small fix for PetscFE DMPlex: Removed leak from Triangle SNES ex12: Two working unstructured FAS solves for the unregularized p-Laplacian DMPlex: Cleaned up some memory issues DMPlex: Implement injection - I don't think this should be required DMPlex: DM interpolation requires the scaling vector for FAS DMPlex: Can now create a map from coarse to fine vertices - This is currently necessary for FAS, which I think is wrong DMPlex: Turn off Fortran stub DMPlex: Fix DMPlexMatSetClosureRefined() - Reject duplicate fine points - Screen out point with dof = 0 - Fix the allocation for fine points DMPlex: My brain did not work for several days - I have fixed the interpolation code - I think I can reuse that other code for something else DMPlex: Fix setting Plex options on automatically refined meshed SNES ex12/31/52/62/72: Use new SNESComputeJacobian() interface DMPlex: Remove MatStructure from DMPlexComputeJacobianFEM() - Add missing declarations Sys Logging: Fixes for log detail - Must preserve reduction count - Output objects and memory - Output stage summary SNES ex12: Fixing things for multilevel - Need to set PetscFE on all coarse grids - Need application context for interpolator construction SNES ex12: Use PetscFESetUp(), and fix quadrature ref handling SNES ex52/62: Use PetscFESetUp(), and fix quadrature ref handling DMPlex ex3: Uses automatic section creation, PetscFESetUp(), and fix quadrature ref handling DMPlex: Fixing interpolator construction - Fixed definition of rectangular sizes - Use PetscFERefine() - Use special MatSet ...
show more ...
|
| #
020631bc
|
| 19-Feb-2014 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'master' into prbrune/snes-fascontinuation
Conflicts: include/petscsnesfas.h
|
| #
decb47aa
|
| 18-Feb-2014 |
Matthew G. Knepley <knepley@gmail.com> |
DM: Change DM fields to PetscFE - Really the DM should be split into topology and function space parts, and this would go in the later. Right now I can't do it properly without circular dependencie
DM: Change DM fields to PetscFE - Really the DM should be split into topology and function space parts, and this would go in the later. Right now I can't do it properly without circular dependencies. - This is setting up for automatic creation of Sections
show more ...
|
| #
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 ...
|
| #
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
|
| #
8c722d37
|
| 10-Dec-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/reduce-dmsetup-da-memoryusage
Conflicts: src/dm/examples/tests/ex15.c src/dm/examples/tutorials/ex3.c src/dm/impls/da/da2.c src/dm/impls/da/da3.c
|
| #
a906b49b
|
| 10-Dec-2013 |
BarryFSmith <bsmith@mcs.anl.gov> |
Merged master into barry/update-xxxviewfromoptions
|