| #
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
|
| #
8abd42f6
|
| 05-Feb-2015 |
Stefano Zampini <stefano.zampini@gmail.com> |
Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection
|
| #
26d129d8
|
| 29-Jan-2015 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'knepley/fix-plex-1d-refinement'
* knepley/fix-plex-1d-refinement:
Plex ex4: Added 1D tests
Plex: Fix vertex numbering for 1D refinement Reported-by: Lawrence Mitchell <lawrence.mit
Merge branch 'knepley/fix-plex-1d-refinement'
* knepley/fix-plex-1d-refinement:
Plex ex4: Added 1D tests
Plex: Fix vertex numbering for 1D refinement Reported-by: Lawrence Mitchell <lawrence.mitchell@imperial.ac.uk>
show more ...
|
| #
2ed5862e
|
| 26-Jan-2015 |
Matthew G. Knepley <knepley@gmail.com> |
Plex: Fix vertex numbering for 1D refinement
Reported-by: Lawrence Mitchell <lawrence.mitchell@imperial.ac.uk>
|
| #
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
|
| #
b6c7cae9
|
| 22-Jan-2015 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'knepley/fix-plex-refine-check'
* knepley/fix-plex-refine-check:
Plex: Check for interpolated mesh only if depth != -1 Reported-by: Lawrence Mitchell <lawrence.mitchell@imperial.ac.uk>
|
| #
1e573d11
|
| 20-Jan-2015 |
Matthew G. Knepley <knepley@gmail.com> |
Plex: Check for interpolated mesh only if depth != -1
Reported-by: Lawrence Mitchell <lawrence.mitchell@imperial.ac.uk>
|
| #
4653a54d
|
| 26-Dec-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/ksp-converged-reason-viewer
Conflicts:
src/sys/objects/options.c
|
| #
d83387d8
|
| 26-Dec-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'knepley/fix-plex-refinement-check'
* knepley/fix-plex-refinement-check:
Plex Refinement: Fix check of topological dimension which was embedding dimension
Plex: Refinement only work
Merge branch 'knepley/fix-plex-refinement-check'
* knepley/fix-plex-refinement-check:
Plex Refinement: Fix check of topological dimension which was embedding dimension
Plex: Refinement only works for interpolated meshes
show more ...
|
| #
20fa7edd
|
| 26-Dec-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'icl/lawrence/dmplex-1d-refinement'
* icl/lawrence/dmplex-1d-refinement:
PetscFE: Use enum for cell refiner
Plex Refinment: Fixed error check
Plex Refinment: Fixed coordinate crea
Merge branch 'icl/lawrence/dmplex-1d-refinement'
* icl/lawrence/dmplex-1d-refinement:
PetscFE: Use enum for cell refiner
Plex Refinment: Fixed error check
Plex Refinment: Fixed coordinate creation
Plex Refinment: Replaced ints with enums
DMPlex: support uniform refinement of intervals
DMPlex: make CellRefiner an enum rather than PetscInt
show more ...
|
| #
a57030b0
|
| 24-Dec-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Plex Refinement: Fix check of topological dimension which was embedding dimension
|
| #
ad23a238
|
| 23-Dec-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Plex: Refinement only works for interpolated meshes
|
| #
1e317b1d
|
| 23-Dec-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Plex Refinment: Fixed error check
|
| #
383c10e6
|
| 23-Dec-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Plex Refinment: Fixed coordinate creation
|
| #
6c0c04f5
|
| 23-Dec-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Plex Refinment: Replaced ints with enums
|
| #
0314a74c
|
| 08-Dec-2014 |
Lawrence Mitchell <lawrence.mitchell@imperial.ac.uk> |
DMPlex: support uniform refinement of intervals
Somewhat cargo-culted from the existing 2D simplex code.
|
| #
9b1a0e7f
|
| 08-Dec-2014 |
Lawrence Mitchell <lawrence.mitchell@imperial.ac.uk> |
DMPlex: make CellRefiner an enum rather than PetscInt
|
| #
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
|
| #
bdcddefd
|
| 03-Nov-2014 |
Hong Zhang <hzhang@mcs.anl.gov> |
Merge branch 'master' of bitbucket.org:petsc/petsc
|
| #
c8054cc4
|
| 29-Oct-2014 |
Matt Knepley <knepley@gmail.com> |
Merged in mlange/fix-plex-distributed-refine (pull request #220)
Plex: Test and fix parallel refinement
|
| #
2bc5314c
|
| 21-Oct-2014 |
Michael Lange <michael.lange@imperial.ac.uk> |
Plex: Ensure refined label is created with same number of strata
This fixes a corner case where empty label strata cause failures during
parallel refinement. Thanks to Lawrence Mitchell for providin
Plex: Ensure refined label is created with same number of strata
This fixes a corner case where empty label strata cause failures during
parallel refinement. Thanks to Lawrence Mitchell for providing this patch.
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 ...
|