| #
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
|
| #
e92229d0
|
| 13-Mar-2014 |
Satish Balay <balay@mcs.anl.gov> |
Merge branch 'maint'
Conflicts:
src/mat/impls/dense/seq/dense.c
|
| #
3d15e191
|
| 13-Mar-2014 |
Satish Balay <balay@mcs.anl.gov> |
dense: fix overflow with int32*int32 during malloc()
|
| #
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
|
| #
bab9b9ec
|
| 07-Feb-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into balay/tao-to-petsc
Conflicts:
src/dm/examples/tests/ex42.c
src/dm/examples/tutorials/ex65dm.c
src/ksp/ksp/examples/tutorials/ex42.c
src/snes/examples/tutorials/cahn-hi
Merge branch 'master' into balay/tao-to-petsc
Conflicts:
src/dm/examples/tests/ex42.c
src/dm/examples/tutorials/ex65dm.c
src/ksp/ksp/examples/tutorials/ex42.c
src/snes/examples/tutorials/cahn-hilliard-schemes/ex1.c
src/snes/examples/tutorials/ex54.c
src/snes/examples/tutorials/ex55.c
src/snes/examples/tutorials/ex60.c
src/snes/examples/tutorials/ex61.c
src/snes/examples/tutorials/ex63.c
src/snes/examples/tutorials/ex633d_db.c
src/snes/examples/tutorials/ex64.c
src/snes/examples/tutorials/ex65.c
src/snes/examples/tutorials/ex653d.c
src/ts/examples/tutorials/ex23.c
show more ...
|
| #
296d98f6
|
| 03-Feb-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'knepley/feature-schurm-explicit-op'
* knepley/feature-schurm-explicit-op:
KSP: Fix for name change in another branch
KSP: It looks like someone forgot this declaration
Mat: Impro
Merge branch 'knepley/feature-schurm-explicit-op'
* knepley/feature-schurm-explicit-op:
KSP: Fix for name change in another branch
KSP: It looks like someone forgot this declaration
Mat: Improve conversion of MATDENSE to MATAIJ - Previously, we were creating a fully dense AIJ matrix
Section: Small doc fix
PC: Allow FieldSplit to explicitly compute S for preconditioning - Yes I know it is generally slow
KSP: Added MatSchurComplementComputeExplicitOperator - This could be optimized to compute a sparse S for preconditioning (Saad has some papers here)
show more ...
|
| #
9399e1b8
|
| 30-Jan-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Mat: Improve conversion of MATDENSE to MATAIJ
- Previously, we were creating a fully dense AIJ matrix
|
| #
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'
|
| #
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 ...
|
| #
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
|