| #
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'
|
| #
584b3052
|
| 24-Jan-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'tisaac/feature-gamg-extensible' into barry/experiment
Conflicts:
src/ksp/pc/impls/gamg/gamg.h
|
| #
ff86c2c9
|
| 15-Jan-2015 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'mlange/feature-plex-gmsh-fortran'
* mlange/feature-plex-gmsh-fortran:
SF: Activate Fortran wrapper for PetscSFDestroy()
Plex-Gmsh: Loosen the version requirement for .msh files
P
Merge branch 'mlange/feature-plex-gmsh-fortran'
* mlange/feature-plex-gmsh-fortran:
SF: Activate Fortran wrapper for PetscSFDestroy()
Plex-Gmsh: Loosen the version requirement for .msh files
Plex-Gmsh: Add custom Fortran wrapper for DMPlexCreateGmshFromFile
show more ...
|
| #
e55864a3
|
| 08-Nov-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
moved PetscOptionsObject from global variable to local variable in functions
|
| #
d36d33e4
|
| 13-Jan-2015 |
Matthew G. Knepley <knepley@gmail.com> |
SF: Activate Fortran wrapper for PetscSFDestroy()
|
| #
b513d47e
|
| 30-Nov-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'maint'
|
| #
60263706
|
| 24-Nov-2014 |
Jed Brown <jed@jedbrown.org> |
SF: fix man page description of options database keys
|
| #
fd874b26
|
| 15-Oct-2014 |
Jed Brown <jed@jedbrown.org> |
Merge branch 'tisaac/fix-sf-nroots-nleaves-switch'
Fixes SF tests that were broken in 60a1948e59517edd57.
* tisaac/fix-sf-nroots-nleaves-switch:
SF: fix recent changes that switched nroots to nle
Merge branch 'tisaac/fix-sf-nroots-nleaves-switch'
Fixes SF tests that were broken in 60a1948e59517edd57.
* tisaac/fix-sf-nroots-nleaves-switch:
SF: fix recent changes that switched nroots to nleaves.
show more ...
|
| #
1c6a2fcd
|
| 14-Oct-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'master' into knepley/fix-plex-examples-refinement
* master: (62 commits)
Plex+Label: Fix logic for label distribution - It is restrictive now, but doing it right would mean a ton of
Merge branch 'master' into knepley/fix-plex-examples-refinement
* master: (62 commits)
Plex+Label: Fix logic for label distribution - It is restrictive now, but doing it right would mean a ton of infrastructure I think
Plex ex12: Fix output after label distribution fix
Plex: Only call SetFromOptions() after Distribute, since we cannot avoid it
TS ex11: Since DMPlexDistribute() calls SetFromOptions(), do not call it again, and cleaned up tests
Plex+FV: If using FVM adjacency, do not create ghost cells for faces in the overlap, or set BC on them
Plex: If using FVM adjacency, we must include the closure in the overlap
Plex+Label: All processes with a valid label should participate in label distribution - Formerly it was just proc 0
Plex: Add check that parallel renumbering fully covers the cone points
Plex: For one level adjacency, include the point itself since this makes sense when looking in parallel from the overlap
Plex: Cannot Malloc2() the arrays passed to PetscSFSetGraph()
Plex: Preallocation fixes for indegree > 1 - Again this should be rewritten
SNES ex62: Changes to output for fixes with quads
Plex+Label: Set default output flag to PETSC_TRUE
Plex ex1: Fixed LaTeX output
Plex ex12: Fixed overlap test
Plex: Fixed incorrect usage of PetscSFGatherBegin/End() in preallocation - This should be rewritten using new style
PetscSF: Incorrect check for computed degrees
Builder: Fix bad search and replace
Configure: Fix for Barry's change to organization - I do not know what happened here
Builder: Fix for Barry's change
...
Conflicts:
src/snes/examples/tutorials/ex12.c
show more ...
|
| #
3c6abd6b
|
| 14-Oct-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'mlange/feature-parallel-distribute'
* mlange/feature-parallel-distribute: (33 commits)
Plex+Label: Fix logic for label distribution - It is restrictive now, but doing it right would
Merge branch 'mlange/feature-parallel-distribute'
* mlange/feature-parallel-distribute: (33 commits)
Plex+Label: Fix logic for label distribution - It is restrictive now, but doing it right would mean a ton of infrastructure I think
Plex ex12: Fix output after label distribution fix
Plex: Only call SetFromOptions() after Distribute, since we cannot avoid it
TS ex11: Since DMPlexDistribute() calls SetFromOptions(), do not call it again, and cleaned up tests
Plex+FV: If using FVM adjacency, do not create ghost cells for faces in the overlap, or set BC on them
Plex: If using FVM adjacency, we must include the closure in the overlap
Plex+Label: All processes with a valid label should participate in label distribution - Formerly it was just proc 0
Plex: Add check that parallel renumbering fully covers the cone points
Plex: For one level adjacency, include the point itself since this makes sense when looking in parallel from the overlap
Plex: Cannot Malloc2() the arrays passed to PetscSFSetGraph()
Plex: Preallocation fixes for indegree > 1 - Again this should be rewritten
SNES ex62: Changes to output for fixes with quads
Plex ex1: Fixed LaTeX output
Plex ex12: Fixed overlap test
Plex: Fixed incorrect usage of PetscSFGatherBegin/End() in preallocation - This should be rewritten using new style
PetscSF: Incorrect check for computed degrees
Builder: Fix for Barry's change
PetscSF: Fixes for sparse leaves - When sf->mine exists, the leaves can be numbered non-sequentially. This causes allocation based upon sf->nleaves to underallocate. Replacing sf->nleaves with the maximum leaf number is sufficient in this case.
Plex: Fix leaks
Configure: How did this break?
...
Conflicts:
config/builder.py
show more ...
|
| #
298d6b40
|
| 14-Oct-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'knepley/feature-parallel-partition'
* knepley/feature-parallel-partition:
Plex: Silence compiler warning
Plex: Needs custom Fortran binding
Plex: Fix distribution for meshes with
Merge branch 'knepley/feature-parallel-partition'
* knepley/feature-parallel-partition:
Plex: Silence compiler warning
Plex: Needs custom Fortran binding
Plex: Fix distribution for meshes without coordinates
Plex ex12: Added test from Michael
Plex: Added methods to support distributed overlap calculation - Added DMPlexCreateTwoSidedProcessSF() - Added DMPlexDistributeOwnership() - Added DMPlexCreateOverlap()
PetscSF: Fix ComputeDegree and GetMultiSF for sparse SFs
Plex: Added DMPlexDistributeFieldIS() - Small doc fix
Plex: DMPlexCreateProcessSF() is now documented and the outputs are optional - The root space is also correct
PetscSF: The declaration of PetscSFNode should be in the types header
Plex ex12: Add overlap
Plex ex12: Added test for parallel partitioning
SNES ex12: Misspelling
Plex ex1: Typo
Plex: Fix LaTeX mesh output
Conflicts:
include/petscdmplex.h
show more ...
|
| #
803bd9e8
|
| 13-Oct-2014 |
Matthew G. Knepley <knepley@gmail.com> |
PetscSF: Incorrect check for computed degrees
|
| #
9837ea96
|
| 09-Oct-2014 |
Matthew G. Knepley <knepley@gmail.com> |
PetscSF: Fixes for sparse leaves
- When sf->mine exists, the leaves can be numbered non-sequentially. This causes allocation based upon sf->nleaves to underallocate.
Replacing sf->nleaves with the ma
PetscSF: Fixes for sparse leaves
- When sf->mine exists, the leaves can be numbered non-sequentially. This causes allocation based upon sf->nleaves to underallocate.
Replacing sf->nleaves with the maximum leaf number is sufficient in this case.
show more ...
|
| #
38e7336f
|
| 08-Oct-2014 |
Toby Isaac <tisaac@ices.utexas.edu> |
SF: fix recent changes that switched nroots to nleaves.
This caused lots of tests to fail with sefaults.
|
| #
4b561960
|
| 08-Oct-2014 |
Michael Lange <michael.lange@imperial.ac.uk> |
Merge branch 'knepley/feature-parallel-partition' into mlange/feature-parallel-distribute
Conflicts:
include/petscdmplex.h
|
| #
60a1948e
|
| 01-Oct-2014 |
Michael Lange <michael.lange@imperial.ac.uk> |
PetscSF: Fix ComputeDegree and GetMultiSF for sparse SFs
|
| #
92c494f3
|
| 23-May-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/saws-options
|
| #
95ecbf38
|
| 18-May-2014 |
Stefano Zampini <stefano.zampini@gmail.com> |
Merge branch 'master' into stefano_zampini/pcbddc-multilevel-improvement
Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bdd
Merge branch 'master' into stefano_zampini/pcbddc-multilevel-improvement
Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bddcprivate.c
show more ...
|
| #
9c925a2c
|
| 18-Mar-2014 |
Shri <abhyshr@mcs.anl.gov> |
Merge branch 'master' into shri/ts-events
Conflicts:
src/ts/interface/ts.c
|
| #
5f6acfaf
|
| 18-Mar-2014 |
Shri <abhyshr@mcs.anl.gov> |
Merge branch 'master' into shri/feature-dm-circuit
Conflicts:
src/dm/impls/makefile
|
| #
1d763ceb
|
| 17-Mar-2014 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'master' into prbrune/matcoloring-greedy
|