| #
255664f4
|
| 12-Apr-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/fix-directory-layout'
|
| #
af0996ce
|
| 11-Apr-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
updated PETSc directory layout to match standard packaging strategies
include/petsc finclude,private,mpiuni lib/petsc conf bin/petsc*
|
| #
5a4ab5ab
|
| 02-Apr-2015 |
Toby Isaac <tisaac@ices.utexas.edu> |
Merge branch 'master' into tisaac/dmforest
If we're going to start developing on this again, the recent changes to the location of configuration files will make it annoying to switch to and from thi
Merge branch 'master' into tisaac/dmforest
If we're going to start developing on this again, the recent changes to the location of configuration files will make it annoying to switch to and from this branch. Matt's and my fixes in DMPlex will also be relevant.
* master: (1557 commits) MatLoad_MPIDense() always allocated array space even if it was previously provided Clarified lumping options for PCFieldSplitSchurPreType SELFP. fixed up PetscInfo in GAMG TSErrorWeightedNorm[2|Infinity]: API changes MatLoad_SeqDense() always allocated new space for the data even if the user already provided it Fixed DMCompositeGetAccessArray() to support readonly vectors Fix obviously-wrong aspects of documentation on SNESVINEWTONRSLS and SNESVINEWTONSSLS. fixed example to compile - demonstrates a bug var name 'len' was F90 key word For user provided Jacobian functions they should always assembly into the second matrix, the one from which the preconditioner is built because the first may be used as matrix-free with -snes_mf_operator Suggest --with-64-bit-indices if users mistakenly use --with-64bit-indices Fix configure logging of integer size. missing underscore in #define of vecgetarrayread translation of fortran stub for VECGETARRAYREAD updated test output files to reflect differences introduced previously in PCView output -ksp_type preonly does not support -ksp_monitor_short so remove from test line to prevent extranious warning output missing CHKERRQ; and ugly double declaration of ierr Plex ex3: For want of a semicolon, the kingdom was lost MatSetValuesMPISBAIJ will now print correct global indices when error generated due to new nonzero location completed basic use of MatSetValuesBlocked_SeqBAIJ_Inlined() by MatSetValuesBlocked_MPIBAIJ() to allow proper global indices being printed when error generated by new nonzero locations. Added inline version of MatSetValuesBlocked_SeqBAIJ() to be used by MatSetValuesBlocked_MPIBAIJ() to print error message for nonzero block with global indices ...
show more ...
|
| #
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
|
| #
4e7385fa
|
| 16-Feb-2015 |
Stefano Zampini <stefano.zampini@gmail.com> |
Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection
Conflicts: src/ksp/pc/impls/bddc/bddcprivate.c
|
| #
a197972a
|
| 11-Feb-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/saws-options-merge-master
Totally confusing manual merge, could be wrong
Conflicts: include/petscoptions.h src/dm/impls/da/dacreate.c src/sys/objects/aoptions.c
Merge branch 'master' into barry/saws-options-merge-master
Totally confusing manual merge, could be wrong
Conflicts: include/petscoptions.h src/dm/impls/da/dacreate.c src/sys/objects/aoptions.c src/sys/threadcomm/interface/threadcomm.c
show more ...
|
| #
50705773
|
| 10-Feb-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into pr252/dmay/PetscViewerBinarySkipHeaderVecViewLoad Manual merge of makefile
Conflicts: src/sys/classes/viewer/examples/tutorials/makefile
|
| #
3fe9ae9b
|
| 15-Jan-2015 |
Mark Adams <mfadams@lbl.gov> |
Merge branch 'master' of bitbucket.org:petsc/petsc into mark/gamg-crs-ksp2
|
| #
fe998a80
|
| 13-Jan-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
manual merge of conflict
|
| #
d3c8c067
|
| 01-Jan-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Three directory namespace changes for better --prefix install support
1) include/finclude becomes include/petsc-finclude 2) include/mpiuni becomes include/petsc-mpiuni 3) conf (both $PETSC_DIR/conf
Three directory namespace changes for better --prefix install support
1) include/finclude becomes include/petsc-finclude 2) include/mpiuni becomes include/petsc-mpiuni 3) conf (both $PETSC_DIR/conf and $PETSC_DIR/$PETSC_ARCH/conf become) lib/petsc-conf
show more ...
|
| #
b015001c
|
| 28-May-2014 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'master' into prbrune/snes-fascontinuation
* master: (855 commits) fix for moab example had wrong blocksize of mapping docs:remove src/docs/doxygen/manual [per Barry's instructions]
Merge branch 'master' into prbrune/snes-fascontinuation
* master: (855 commits) fix for moab example had wrong blocksize of mapping docs:remove src/docs/doxygen/manual [per Barry's instructions] gfortran: remove 132 char limit from f90 free-form SNES: Set up matrix-free *after* copying the user Jacobian to snes->pc DMPlex-Gmsh: Use trueNumCells when building the coordinate section Sys: Got guard logic reversed Sys: The #define guard for PetscMalloc*() must match the one for PetscFree*() PetscFV: I hate fucking complex removed ltog scatter from DMDA since functionality can be obtained with gtol scatter and less memory fix test of DMLocalToGlobalBegin/End and add actual test cases improve object memory logging for DA, ISLocalToGlobal and ISBLOCK lower high water mark of constructing parallel scatter by allocating only as much room in svalues as needed owner in VecScatter construction is the rank, therefor can use PetscMPIInt to hold it do not PetscInt another reuse of allocated array in 2d/3d DMDA create improved high water mark of DMDASetups by implementing and using PETSC_USE_POINTER for ISCreateBlock() PetscFV: Another complex fix DMPlex+TS: Fixing types ISIdentity() was wrong for block IS! Indices are NOT scaled by bs PetscFV: Straighten out complex types TS ex11: Fix casts and remove unused variable ...
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 ...
|
| #
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
|
| #
926cf534
|
| 23-Mar-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/google'
|
| #
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
|
| #
b967cddf
|
| 28-Feb-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
first implementation of SSL and access to google apps
|
| #
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 ...
|
| #
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
|