| #
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
|
| #
909a08a4
|
| 28-Nov-2014 |
Michael Lange <michael.lange@imperial.ac.uk> |
Merge branch 'master' into mlange/refactor-plex-distribute
Conflicts:
src/dm/impls/plex/examples/tests/output/ex12_1.out
src/dm/impls/plex/examples/tests/output/ex12_2.out
|
| #
f66eea08
|
| 14-Nov-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
some updates for building Apple installers
|
| #
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
|
| #
5ce846c0
|
| 19-Oct-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
add Swift module for PETSc
|
| #
b59f628e
|
| 19-Oct-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
use xcode for building iOS dynamic library (framework)
update opengles for new objective C rules
|
| #
44b85a23
|
| 17-Oct-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Updates for iOS 8.0 builds
|
| #
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
|
| #
d9dc08c3
|
| 02-Jul-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
completed tools for generating OSX and iOS installers
Note iOS framework not tested on iOS device
|
| #
821251a9
|
| 28-Jun-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/fix-ios'
|
| #
bcd1c4ac
|
| 28-Jun-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
more missing files for iOS graphics updates to get the OpenGL working
|
| #
a95d84e0
|
| 27-Jun-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
many fixes to build on Ios
-include ios project file that never properly got in repository
-remove lots of dead Tao code that was not handled by any compiler
-cleanup directions for ios builds
|
| #
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
|
| #
33be3048
|
| 25-Aug-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
updates for opengl es
Hg-commit: 846c421b72fcde67fdb779bc8125035c5fbc5f2e
|
| #
f72c6c23
|
| 25-Aug-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
updated OpenGL calls to 21st century; why didn't someone tell me they had all be deprecated?
Hg-commit: 14fcc81bc41514511304df8b420bfa83c93d78eb
|
| #
525d6f2e
|
| 01-Aug-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
finished updating and testing systems/Apple iOS and OSX in new organization
Hg-commit: ea7891c0d4cef097c2d61e1e59607ee6cbdb04c8
|