| #
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 ...
|
| #
ea739ef6
|
| 12-Sep-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'knepley/feature-quadrature-fortran'
* knepley/feature-quadrature-fortran:
Plex: Added FEM geometry into example
DMDT: Add to petsc.h90
DMDT: Fixed Fortran line length problems
Merge branch 'knepley/feature-quadrature-fortran'
* knepley/feature-quadrature-fortran:
Plex: Added FEM geometry into example
DMDT: Add to petsc.h90
DMDT: Fixed Fortran line length problems
DMDT: Fixed Fortran HIDE includes
Plex: Fortran bindings for geometry fixed
PetscFE: Fortran bindings
PetscDT: Added F90 headers
PetscDS: Added Fortran wrappers for tabulation
Quadrature: Added Fortran bindings
show more ...
|
| #
40d8ff71
|
| 04-Sep-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Quadrature: Added Fortran bindings
|