| #
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
|
| #
113c68e6
|
| 10-Sep-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Plex+TS: Now the minimum cell radius is held by the Plex - Its a geometric thing that is stashed
|
| #
924a1b8f
|
| 29-Aug-2014 |
Matthew G. Knepley <knepley@gmail.com> |
DMTS: Reorganized DMTS for Plex - Now FVM computation functions look just like FEM - Riemann solvers are specified to DS, just like f0/f1 - Removed explicit DMPlexTS structure, now just attach to DMT
DMTS: Reorganized DMTS for Plex - Now FVM computation functions look just like FEM - Riemann solvers are specified to DS, just like f0/f1 - Removed explicit DMPlexTS structure, now just attach to DMTS - Changed DMPlexTSSetRHSFunctionLocal() - Added DMPlexTSComputeRHSFunctionFVM() - Added minradius to DMTS
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 ...
|
| #
0df3621a
|
| 29-Mar-2014 |
Matthew G. Knepley <knepley@gmail.com> |
REVERT TS: Timestep gets set into DMTS
|
| #
d3826ee4
|
| 28-Mar-2014 |
Matthew G. Knepley <knepley@gmail.com> |
DMTS: Added timestep
|
| #
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
|
| #
860a4d57
|
| 26-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/rm-snesfunction-nonsense'
|
| #
f8b49ee9
|
| 22-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
removed use of SNESFunction, SNESJacobianFunction etc as names in function arguments
Was ugly and stupid. Instead just use reasonable names and reference SNESFunction etc to cause the manual page hy
removed use of SNESFunction, SNESJacobianFunction etc as names in function arguments
Was ugly and stupid. Instead just use reasonable names and reference SNESFunction etc to cause the manual page hyperlinks to be made
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
|
| #
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
|
| #
edbbd480
|
| 10-Dec-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/xcode
|