| #
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
|
| #
69c6db66
|
| 27-Jan-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/experiment'
|
| #
8c34d3f5
|
| 20-Jan-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
simplify option object names
|
| #
e55864a3
|
| 08-Nov-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
moved PetscOptionsObject from global variable to local variable in functions
|
| #
72e51967
|
| 30-Nov-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/remove-unneeded-paren-petscmalloc'
Conflicts:
src/mat/impls/baij/seq/baij.c
|
| #
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
|
| #
854ce69b
|
| 15-Nov-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
convert some PetscMalloc() to PetscMalloc1()
remove unneeded () in first argument to PetscMalloc/Calloc1()
fixes for MATLAB examples
|
| #
81e08676
|
| 11-Nov-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/dynamic-matsolverpackageregister'
Conflicts:
src/mat/impls/aij/seq/seqcusparse/aijcusparse.cu
|
| #
f896727a
|
| 11-Nov-2014 |
Karl Rupp <rupp@iue.tuwien.ac.at> |
Merge branch 'dmeiser/pullrequest-fix-dmda-cusparse'
dmeiser/pullrequest-fix-dmda-cusparse:
The general problem addressed here is that multiple calls to
MatAssemblyBegin() / MatAssemblyEnd() pai
Merge branch 'dmeiser/pullrequest-fix-dmda-cusparse'
dmeiser/pullrequest-fix-dmda-cusparse:
The general problem addressed here is that multiple calls to
MatAssemblyBegin() / MatAssemblyEnd() pairs on the same matrix
were treated as an error.
Conflicts:
src/ksp/ksp/examples/tutorials/makefile
src/mat/impls/aij/seq/seqcusparse/aijcusparse.cu
show more ...
|
| #
1f0d623c
|
| 10-Nov-2014 |
Karl Rupp <rupp@iue.tuwien.ac.at> |
Merge branch 'dmeiser/pullrequest-fix-PetscOptionsEnum2'
dmeiser/pullrequest-fix-PetscOptionsEnum2:
The currently set value for the various options is used
rather than a hard wired value.
Conflic
Merge branch 'dmeiser/pullrequest-fix-PetscOptionsEnum2'
dmeiser/pullrequest-fix-PetscOptionsEnum2:
The currently set value for the various options is used
rather than a hard wired value.
Conflicts:
src/mat/impls/aij/seq/seqcusp/aijcusp.cu
show more ...
|
| #
29b38603
|
| 10-Nov-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
properly extern "C"ing MatSolverPackage registration functions
|
| #
0f39cd5a
|
| 08-Nov-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
cleanup for cuda builds where nvcc is not in the path
fixes for cusparse solver with new organization of registration of solver packages
|
| #
42c9c57c
|
| 07-Nov-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Moved registration of MatSolverPackages out of MatCreate_XXX routines into standalone system, this allows
1) more precise error message when a requested solver is not found
2) easier to add new solve
Moved registration of MatSolverPackages out of MatCreate_XXX routines into standalone system, this allows
1) more precise error message when a requested solver is not found
2) easier to add new solvers without touching basic PETSc matrix implementation files and the possibility of adding new solvers to the library after PETSc is installed or even at run time
show more ...
|
| #
ce814652
|
| 15-Oct-2014 |
Dominic Meiser <dmeiser@txcorp.com> |
Release resources before resetting for aijcusparse matrices.
This fixes src/ksp/ksp/examples/tutorials/ex46.c with -mat_type
aijcusparse.
|
| #
ab25e6cb
|
| 15-Oct-2014 |
Dominic Meiser <dmeiser@txcorp.com> |
Simplify resource deallocation in MatSeqAIJCUSPARSE_Destroy.
|
| #
7f756511
|
| 15-Oct-2014 |
Dominic Meiser <dmeiser@txcorp.com> |
Add functions for deallocating aijcusparse data structures.
|
| #
56df9bba
|
| 16-Oct-2014 |
Karl Rupp <rupp@iue.tuwien.ac.at> |
Merge branch 'dmeiser/pullrequest-fix-cusp-bjacobi2' (pull request #178)
* dmeiser/pullrequest-fix-cusp-bjacobi2:
small bug fixes and typos,
test cases that exercise the bjacobi preconditioner w
Merge branch 'dmeiser/pullrequest-fix-cusp-bjacobi2' (pull request #178)
* dmeiser/pullrequest-fix-cusp-bjacobi2:
small bug fixes and typos,
test cases that exercise the bjacobi preconditioner with cusp and cusparse solvers,
removal of cudaMemcpyAsync (and the cudaHostRegister/cudaHostUnregister),
and replacement of VecGetArray/VecSetArray calls in PCApply_BJacobi_Singleblock
with a new vector method VecGetLocalVector
Conflicts:
include/petsc-private/vecimpl.h
src/vec/vec/impls/seq/seqcusp/veccusp.cu
src/vec/vec/utils/vpscat.h
show more ...
|
| #
a183c035
|
| 13-Oct-2014 |
Dominic Meiser <dmeiser@txcorp.com> |
Use current value for default in PetscOptionsEnum().
In options handling for matrices of type:
seqcusp
seqcusparse
mpicusp
mpicusparse
|
| #
523b314c
|
| 13-Oct-2014 |
Dominic Meiser <dmeiser@txcorp.com> |
Whitespace.
|
| #
6b64847d
|
| 13-Oct-2014 |
Dominic Meiser <dmeiser@txcorp.com> |
Use current value for default in PetscOptionsEnum().
In options handling for matrices of type:
seqcusp
seqcusparse
mpicusp
mpicusparse
|
| #
ee2838f6
|
| 30-Sep-2014 |
Toby Isaac <tisaac@ices.utexas.edu> |
Merge branch 'tisaac/feature-fe-geom-dim' into tisaac/plex-flexible-projection
Use the new PetscFECellGeom
Conflicts:
include/petscdmplex.h
include/petscfe.h
src/dm/impls/plex/plexfem.c
|
| #
ca3142fd
|
| 26-Sep-2014 |
Mark Adams <mfadams@lbl.gov> |
Merge branch 'master' of bitbucket.org:petsc/petsc into mark/ex49-bs
|