| #
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
|
| #
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
|
| #
a906b49b
|
| 10-Dec-2013 |
BarryFSmith <bsmith@mcs.anl.gov> |
Merged master into barry/update-xxxviewfromoptions
|
| #
edbbd480
|
| 10-Dec-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/xcode
|
| #
96f37fa2
|
| 28-Nov-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/fix-synchronized-printf'
|
| #
0ec8b6e3
|
| 27-Nov-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
added FILE* argument to PetscSynchronizedFlush() so it knows where to flush the off process values
Previously if process 0 did not call PetscSynchronizedFPrintf() then it output the off process valu
added FILE* argument to PetscSynchronizedFlush() so it knows where to flush the off process values
Previously if process 0 did not call PetscSynchronizedFPrintf() then it output the off process values to stdout even if the file was not stdout. Also affected PetscViewerASCIISynchronizeFlush()
Reported-by: Randall Mackie <rlmackie862@gmail.com>
show more ...
|
| #
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
|
| #
c19eab39
|
| 06-Mar-2013 |
Richard Tran Mills <rmills@ornl.gov> |
Automerge.
Hg-commit: b6659d546870fb013f3da5bcd5066d1dc0dc329c
|
| #
296840b1
|
| 06-Mar-2013 |
Jed Brown <jed@59A2.org> |
Merge branch 'master' of gitifyhg::ssh://hg@bitbucket.org/BarryFSmith/petsc-dev-simp
Symbol visibility and namespacing.
C++ builds always set extern "C" and can be called from plain C. Most users w
Merge branch 'master' of gitifyhg::ssh://hg@bitbucket.org/BarryFSmith/petsc-dev-simp
Symbol visibility and namespacing.
C++ builds always set extern "C" and can be called from plain C. Most users will only want --with-clanguage=C++ for std::complex.
Hg-commit: f848d02318cae92d7b32037c7ee88f92dbe46347
show more ...
|
| #
8cc058d9
|
| 06-Mar-2013 |
Jed Brown <jed@59A2.org> |
Change all PETSC_EXTERN_C to PETSC_EXTERN
Hg-commit: 8d2ebbb193fb583bccc64015e35640c4e08c3426
|
| #
39d7646b
|
| 06-Mar-2013 |
Jed Brown <jed@59A2.org> |
Change all PETSC_EXTERN_C to PETSC_EXTERN
Hg-commit: ba0cf153561ff2dc521f42e94b7164fbe7b5d798
|
| #
99e0435e
|
| 05-Mar-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
updated from EXTERN_C_BEGIN/END through sys directory
Hg-commit: ee6b7ef2f48ce66402e7e807302de19506ce15df
|
| #
b04a062a
|
| 05-Feb-2013 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
commit after merge.
Hg-commit: e15fd985275e9e6c40407ae90b2d69ed97fbf48d
|
| #
299eca30
|
| 05-Feb-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
commit after merge
Hg-commit: b5179cc7865f723cd5e23a2244f6bcbc7b905437
|
| #
978fe322
|
| 04-Feb-2013 |
Karl Rupp <rupp@mcs.anl.gov> |
Removed remaining spaces in cast to pointer-type.
Hg-commit: dccb79187adf08b4501155bd6550e95ac2ab554c
|
| #
a297a907
|
| 29-Jan-2013 |
Karl Rupp <rupp@mcs.anl.gov> |
Uncrustified src/sys/*
Hg-commit: 9f71677807bad7b55428a6cc0f5ccc5052e91805
|
| #
6c2930d4
|
| 18-Sep-2012 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
Commit after merge
Hg-commit: 29c41d281e3ece3127c753661dccfd04e452b7f8
|