| #
3aa2d9e3
|
| 15-Aug-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/fix-nonew-notcollective/maint' into jed/mat-assembly-perf
Jed this fucking 6+ month running thing in next that is not in master is a royal fucking pain in the ass and an abuse of
Merge branch 'barry/fix-nonew-notcollective/maint' into jed/mat-assembly-perf
Jed this fucking 6+ month running thing in next that is not in master is a royal fucking pain in the ass and an abuse of git. I think it is not justified to ever have anything in next for more than a few weeks at most. Either take it out of next if it is broken or put it in master if it is not broken. Hanging around in next but not master for ever is not a good policy.
show more ...
|
| #
e1b06f76
|
| 20-May-2015 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'master' into knepley/solkx
* master: (6933 commits) Bib: Added reference Includegraph: Updated for compatibility with new folder layout. Add SNESLineSearchReason to fortran inclu
Merge branch 'master' into knepley/solkx
* master: (6933 commits) Bib: Added reference Includegraph: Updated for compatibility with new folder layout. Add SNESLineSearchReason to fortran includes Also truncate names to fit 32 char fortran limit fix compile warnings /usr/home/balay/petsc.clone-2/src/vec/vec/interface/vector.c:1944: warning: division by zero in '1.0e+0 / 0.' /usr/home/balay/petsc.clone-2/src/ksp/ksp/interface/itfunc.c:508: warning: 'vec_rhs' may be used uninitialized in this function updated output for new trust region initial size initial size of the trust region is set as a percent of the norm of the initial guess, it should not be related to the initial norm of the function (which is kind of nuts). The default bounds for SNESVISetVariableBounds() in the manual page were reversed from correct values Bib: Added refs Bib: Update MPICH webpage Plex: Forgot to close file removed nonexistent ex46f from makefile test rule Revert "fixed bad merge into master" fixed bad merge into master fix memory leak in mkl_pardiso fix some formatting in mkl_pardiso code mv runex111 from TESTEXAMPLES_C to TESTEXAMPLES_DATAFILESPATH Mat+Doc: More Fortran docs Plex ex3: Run tests with the correct number of field components Bib: Added TetGen cite parmetis: make sure 'ldd libparmetis.so' points to the correct libmetis.so that its linked with. small fix as reported by the nightly test ...
Conflicts: config/builder.py
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
|
| #
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
|
| #
8506f42d
|
| 20-Oct-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
update PETSc iOS simulator to use 64 arch exclusively
boy the xcode options for architectures are a confusing mess
|
| #
609885f5
|
| 13-Jul-2014 |
Stefano Zampini <stefano.zampini@gmail.com> |
Merge branch 'stefano_zampini/pcbddc-primalfixes' into stefano_zampini/pcbddc_deluxe
|
| #
f446f392
|
| 02-Jul-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'maint'
|
| #
0568d0aa
|
| 02-Jul-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/fix-ios' into maint
|
| #
89518752
|
| 30-Jun-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
both OSX and iOS build .dmg distribution files and examples Currently OSX distributes the release version and iOS the simulator version eventually each will distribute both
|
| #
70d20fab
|
| 30-Jun-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
added installer for iOS including examples new location for Frameworks and examples to distinquish between iOS and OSX and debug and optimized
|
| #
40bd4608
|
| 30-Jun-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/fix-ios'
|
| #
268de7ff
|
| 30-Jun-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
should not have any header paths in the project to PETSc tree
|
| #
fce0c873
|
| 30-Jun-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
starting code for making iOS framework (uses static library!) moved iOS project examples into proper subdirectories
|