| #
f9185b66
|
| 13-Apr-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into pr192/Fande-Kong/scalable-matincreaseoverlap/master
Needed to merge master to update to new calling sequence PetscCommBuildTwoSided
|
| #
66d7bb0d
|
| 12-Apr-2015 |
semihozmen <semihozmen@gmail.com> |
Merged petsc/petsc into master
|
| #
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 ...
|
| #
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 ...
|
| #
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
|
| #
ab15ae43
|
| 03-Mar-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'master' into knepley/feature-plex-fas
* master: (863 commits) Revert "mpich: use latest mpich tarball with gcov but use '--enable-coverage' mpich configure option." MatCreateTransp
Merge branch 'master' into knepley/feature-plex-fas
* master: (863 commits) Revert "mpich: use latest mpich tarball with gcov but use '--enable-coverage' mpich configure option." MatCreateTranspose: fix for lazy block size mpich: use latest mpich tarball with gcov but use '--enable-coverage' mpich configure option. configure: add FC_DEFINE_FLAG to petscvariables added a citation for pounders, Stefan finally came through update to latest netcdf fixes bug that did not allow building on recent Mac OS X DMPlex: Fixes for CGNS - Fixed loop bounds since CGNS uses closed intervals - Bug with mixed cell types - Typo with coordinates final updates from nightly tests fix for countcfunction removed outdated docs and comments on MatStructure usage removed SAME_PRECONDITIONER since no longer used removed unneed use of MatStructure in Schur complement matrix removed MatStructure arguments from Tao fixes for Sundials and fun3d cannot use MPIU_SUM for integer arrays inplace ILU factorization must update state of inplace matrix to prevent infinite recursion of updating PC fixes for BDDC by the way not having BDDC always in the testing is going to lead to trouble the compute Jacobian functions for SNES and TS now do not take a MatStructure flag KSPSetOperators() no longer has the MatStructure argument. The Mat objects now track that information themselves. Use KPS/PCSetReusePreconditioner() to prevent the recomputation of the preconditioner if the operator changed in the way that SAME_PRECONDITIONER did with KSPSetOperators() tracks when Mat's have a change in nonzero structure this information can be used by PC to determine how preconditioners must be rebuilt currently only does an error check if the user said same nonzero pattern but actually changed the pattern completed cleanup of removal of matrix pointers to compute jacobian routines makefile: Added 'make includegraph' to create an inclusion dependency graph. Contrib: Updated include-graph.sh script to ignore *.hh files ...
Conflicts: src/dm/dt/interface/dt.c
show more ...
|
| #
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
|
| #
a7b5fb5f
|
| 08-Feb-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'balay/tao-to-petsc'
Conflicts: src/snes/impls/fas/fasfunc.c src/snes/impls/fas/fasgalerkin.c
|