| #
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
|
| #
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
|
| #
b486a86a
|
| 13-Oct-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'master' into knepley/fix-configure-petsc-dep
* master: (210 commits) error out on special cases where DMLocalToGlobal_DA won't work remove unneed uses of local DM vectors and DMLoc
Merge branch 'master' into knepley/fix-configure-petsc-dep
* master: (210 commits) error out on special cases where DMLocalToGlobal_DA won't work remove unneed uses of local DM vectors and DMLocalToGlobalBegin/End in examples removed to prevent cut and paste repeats of their use openmpi: update to version 1.8.3 added more movies and pubs more movies MatGetDiagonalBlock() can be called before matrix is assembled added a couple more movies/images PetscLogEventGetId() was missing public prototype simply output from make streams benchmark test c2html: fixup so that C2HTML make variable is set [similar to cmake.py] chaco: current blas test does'nt work with Cray CC [which automatically links with blas] and linux - where -lm needs to be listed explicitly. Switch the test to check if we are using PETSc modifled chaco builddist: always install c2html/sowing argonne logo for users manual cover Remove PETSC_HAVE_CUSP_SMOOTHED_AGGREGATION, use PETSC_HAVE_CUSP instead. mpich: use older tarball with cygwin/gnu compilers updated information about packages PETSc can use in users manual Updated users manual to latest ANL Report format requirements mpich: update to mpich-3.1.3.tar.gz - remove -download-mpich-mpe [mpich no longer packages mpe] - remove -download-mpich-shared. It was added as a split from --with-mpi-shared to --known-mpi-shared and --download-mpich-shared in 50237a55163f90ac7341b723c6422dfa1dbce792 removing this gives back the control of shared=0/1 to package.py - remove download_solaris as the new tarball works with both gcov and on solaris - remove MPICHInstall() [and use GNUPackage.Install()] as the new tarball fixes 'make clean' requiring sudo added more images and PETSc pubs Doc: More refs ...
show more ...
|
| #
d1d0ca2f
|
| 10-Oct-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/remove-sidl'
|
| #
9d310bb7
|
| 01-Oct-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
reorge of PETSc "utilities" config files into "options" since all of these are user setable options
|