Merge branch 'master' into barry/dmvecmattypes
possible some messed up manual merges!

Conflicts:
src/dm/impls/mesh/examples/tutorials/ex4f90.F
src/dm/impls/mesh/mesh.c
src/dm/impls/mesh/meshcreat

Merge branch 'master' into barry/dmvecmattypes
possible some messed up manual merges!

Conflicts:
src/dm/impls/mesh/examples/tutorials/ex4f90.F
src/dm/impls/mesh/mesh.c
src/dm/impls/mesh/meshcreate.c
src/dm/impls/mesh/section.c
src/snes/examples/tutorials/ex10.c
src/snes/examples/tutorials/ex12.c
src/snes/examples/tutorials/ex52.c
src/snes/examples/tutorials/ex62.c
src/snes/utils/mesh/dmmeshsnes.c

show more ...

Merge branch 'master' into barry/wirth-fusion-materials

Conflicts:
src/ts/examples/tutorials/advection-diffusion-reaction/ex10.c

Merge remote-tracking branch 'remotes/origin/knepley/feature-plex-generic-distribute' into shri/projects-dmcircuit

DMPlex: Remove warning in submesh code

Merge branch 'barry/dmvecmattypes' into barry/saws

Needed to work with version of PETSc that did not have constant calls to VecSetFromOptions() etc

Conflicts:
src/ksp/ksp/interface/ams/kspams.c
s

Merge branch 'barry/dmvecmattypes' into barry/saws

Needed to work with version of PETSc that did not have constant calls to VecSetFromOptions() etc

Conflicts:
src/ksp/ksp/interface/ams/kspams.c
src/snes/impls/composite/snescomposite.c
src/snes/impls/gs/snesgs.c
src/snes/impls/nasm/nasm.c
src/snes/impls/ngmres/snesngmres.c

show more ...

removed use of VecSetFromOptions() all over the placed, instead use MatGetVecs() or use dm->vectype to determine type
added DMGetVecType() and DMGetMatTYpe()

Merge branch 'master' into knepley/feature-plex-refine-3d

* master: (71 commits)
Sys: revert packed PetscMalloc to PetscMallocN in PetscCommBuildTwoSided_Allreduce
SNESMonitorCancel: enable fort

Merge branch 'master' into knepley/feature-plex-refine-3d

* master: (71 commits)
Sys: revert packed PetscMalloc to PetscMallocN in PetscCommBuildTwoSided_Allreduce
SNESMonitorCancel: enable fortran interface
PetscSection: Added docs for Fortran binding for VecSetValuesSection()
Vec: Removed old F90 binding for PetscSection
bgq: fix deadlock on bgq due to inconsistant values returned by getpwuid(getuid()) on runs with 256nodes [or 4096 cores]. This fix removes the reliance on PetscGetHomeDirectory() returning 'same' value across nodes. [using the fact that PetscOptionsInsertFile() uses HOMEDIR from node-0 only]
DMPlex: change order of assignment to appease -Wmaybe-initialized (gcc-4.8.1)
DMPlex: Fix 64-bit int problem in VTK
Mat: Fix for PetscSparseDenseMaxDot() for complex
Vec: Correct VecUniqueEntries() for 64-bit indices
MatSeqAIJGetArrayF90: add man pages and fix typo in MatDense version
SF docs: add link to summary page and fix title
Doc: Fixed DM code in manual
metis/parmetis: update to metis-5.1.0/parmetis-4.0.3 Also update the test output as the partitioning appears to have changed.
DMPlex: remove unused variables
blaslapack: update f,f2c tarballs to 3.4.2 version
DMPlex ex5: Added test for 2 face cohesive submesh - Fixed old tests for cohesive cell orientation
DMPlex: Put in depth label optimization
DMPlex: Fix flipping of fault normal
DMPlex: We label cells with only vertices on the fault, but they have no cone replacement
DMPlex: Fix translation to cohesive edges in 3D - They are labeled by the vertices they connect
...

Conflicts:
include/petscdmplex.h

show more ...

Merge branch 'master' into knepley/feature-dt-fem

* master: (51 commits)
Sys: revert packed PetscMalloc to PetscMallocN in PetscCommBuildTwoSided_Allreduce
SNESMonitorCancel: enable fortran inte

Merge branch 'master' into knepley/feature-dt-fem

* master: (51 commits)
Sys: revert packed PetscMalloc to PetscMallocN in PetscCommBuildTwoSided_Allreduce
SNESMonitorCancel: enable fortran interface
PetscSection: Added docs for Fortran binding for VecSetValuesSection()
Vec: Removed old F90 binding for PetscSection
bgq: fix deadlock on bgq due to inconsistant values returned by getpwuid(getuid()) on runs with 256nodes [or 4096 cores]. This fix removes the reliance on PetscGetHomeDirectory() returning 'same' value across nodes. [using the fact that PetscOptionsInsertFile() uses HOMEDIR from node-0 only]
DMPlex: change order of assignment to appease -Wmaybe-initialized (gcc-4.8.1)
metis/parmetis: update to metis-5.1.0/parmetis-4.0.3 Also update the test output as the partitioning appears to have changed.
DMPlex: remove unused variables
blaslapack: update f,f2c tarballs to 3.4.2 version
DMPlex ex5: Added test for 2 face cohesive submesh - Fixed old tests for cohesive cell orientation
DMPlex: Put in depth label optimization
DMPlex: Fix flipping of fault normal
DMPlex: We label cells with only vertices on the fault, but they have no cone replacement
DMPlex: Fix translation to cohesive edges in 3D - They are labeled by the vertices they connect
DMPlex: Added flip argument to DMPlexLabelCohesiveComplete() to reverse submesh normal - Fixed ex5 test
DMPlex ex5: Fixed existing tests and added two cohesive cell test - Fixed tests for new cohesive cell orientation
DMPlex: Propagate orientation information to the submesh properly
DMPlex: Orientation of cohesive cell should come from face to which it is attached
DMPlex: Added subdm argument to DMPlexLabelCohesiveComplete() - Use the subdm for orientation information so we replace vertices all on the same side
DMPlex: Fix DMPlexOrient() for submeshes - Need to also reverse cone orientation of cells attached to fault faces when we flip them
...

Conflicts:
config/builder.py
include/petsc-private/dmpleximpl.h
include/petscdm.h
src/dm/impls/plex/plex.c
src/dm/impls/plex/plexfem.c
src/dm/interface/dlregisdmdm.c
src/snes/examples/tutorials/ex52.c
src/snes/examples/tutorials/output/ex12_10.out
src/snes/examples/tutorials/output/ex12_11.out
src/snes/examples/tutorials/output/ex12_5.out
src/snes/examples/tutorials/output/ex12_6.out
src/snes/examples/tutorials/output/ex12_7.out
src/snes/examples/tutorials/output/ex12_8.out
src/snes/examples/tutorials/output/ex12_9.out

show more ...

Merge branch 'knepley/fix-plex-submesh-orient'

* knepley/fix-plex-submesh-orient:
DMPlex ex5: Added test for 2 face cohesive submesh - Fixed old tests for cohesive cell orientation
DMPlex: Put i

Merge branch 'knepley/fix-plex-submesh-orient'

* knepley/fix-plex-submesh-orient:
DMPlex ex5: Added test for 2 face cohesive submesh - Fixed old tests for cohesive cell orientation
DMPlex: Put in depth label optimization
DMPlex: Fix flipping of fault normal
DMPlex: We label cells with only vertices on the fault, but they have no cone replacement
DMPlex: Fix translation to cohesive edges in 3D - They are labeled by the vertices they connect
DMPlex: Added flip argument to DMPlexLabelCohesiveComplete() to reverse submesh normal - Fixed ex5 test
DMPlex ex5: Fixed existing tests and added two cohesive cell test - Fixed tests for new cohesive cell orientation
DMPlex: Propagate orientation information to the submesh properly
DMPlex: Orientation of cohesive cell should come from face to which it is attached
DMPlex: Added subdm argument to DMPlexLabelCohesiveComplete() - Use the subdm for orientation information so we replace vertices all on the same side
DMPlex: Fix DMPlexOrient() for submeshes - Need to also reverse cone orientation of cells attached to fault faces when we flip them
DMPlex: Propagate orientations in cohesive cell creation - Also fix hybrid bounds

Conflicts:
src/dm/impls/plex/plexsubmesh.c

show more ...

Merge branch 'knepley/fix-plex-parallel'

* knepley/fix-plex-parallel:
DMPlex: Fixed creation of global sections - The size of neg[] must be all of nroots instead of pEnd-pStart
DMPlex: Fixed coh

Merge branch 'knepley/fix-plex-parallel'

* knepley/fix-plex-parallel:
DMPlex: Fixed creation of global sections - The size of neg[] must be all of nroots instead of pEnd-pStart
DMPlex: Fixed cohesive submesh SF - I misclassified points which were not owned in the original mesh, but are owned in the submesh
DMPlex: Fixed bug with cohesive submesh SF - Needed to put in owned subpoints since they do not come from leaves OR from the original mesh
DMPlex: Fix out of bounds access for empty mesh
DMPlex: Fixed creation of PetscSF in DMPlexCreateCohesiveSubmesh_Uninterpolated() - Could not assume that original owner of subvertex owned it in submesh because it might have no subcells - Needed to redetermine ownership of subpoints
Plex VTK: Handle missing submesh pieces in parallel
DMPlex: Initializeremote locations when calculating SF for submesh
DMPlex: FIxed hang in DMPlexCreateCohesiveSubmesh()
DMPlex: Added PetscSF creation to DMPlexCreateCohesiveSubmesh_Uninterpolated() - Added DMPlexFilterPoint_Internal() - Still need this for the interpolated variant
DMPlex: Remove dead code
DMPlex: Removed aggressive checks for cohesive cells - How should we handle extraction in parallel?
PetscSection: PetscSectionCreateSubmeshSection() now can take an empty IS
DMPlex: Allow submesh creation with empty mesh and empty label
DMPlex: Allow DMPlexOrient() of empty mesh

Conflicts:
src/dm/impls/plex/plexsubmesh.c

show more ...

DMPlex: change order of assignment to appease -Wmaybe-initialized (gcc-4.8.1)

Merge branch 'master' into knepley/feature-dt-fem

* master: (211 commits)
Mat ex170: Comments
VTK: Small fix to error message (.vts to .vtu)
VTK: Small fix to error message
Fixed bib entries

Merge branch 'master' into knepley/feature-dt-fem

* master: (211 commits)
Mat ex170: Comments
VTK: Small fix to error message (.vts to .vtu)
VTK: Small fix to error message
Fixed bib entries
Bib: Updates
AO: fix erroneous processing of -ao_view and factor into AOViewFromOptions
doc: fix named argument in {Vec,Mat,DM}ViewFromOptions
Sys: add PetscDataTypeFromString() and test code
Mat: Should say that it has a nullspace in MatView()
parms: update tarball with fix for namespace conflict with metis
fix citation 'Golub_Varga_1961'
parmetis: update tarball to parmetis-4.0.2-p5 which fixes an install issue with cygwin
Sys Logging: revert parent traversal
fixed hdf5.py so that if self.libraries.compression is None the code still runs correctly
DMDA: fix bad cast of DM_DA to PetscObject
MatClique: follow DistMultiVec API changes
MatClique: remove unused variables
config cmakeboot: add C++ flags any time compiler is available
config OpenMP: check for C++ flag any time the compiler is available
replaced all left-over uses of a single PetscMalloc() to allocated multiple arrays: replaced with PetscMallocN() The only ones left are when the second array is set into the first array and one ugly usage in the MUMPS interface that cannot be easily fixed
...

Conflicts:
config/builder.py
src/dm/impls/plex/plexgeometry.c

show more ...

Merge branch 'master' into knepley/feature-plex-refine-3d

* master: (273 commits)
Mat ex170: Comments
VTK: Small fix to error message (.vts to .vtu)
VTK: Small fix to error message
Fixed bib

Merge branch 'master' into knepley/feature-plex-refine-3d

* master: (273 commits)
Mat ex170: Comments
VTK: Small fix to error message (.vts to .vtu)
VTK: Small fix to error message
Fixed bib entries
Bib: Updates
AO: fix erroneous processing of -ao_view and factor into AOViewFromOptions
doc: fix named argument in {Vec,Mat,DM}ViewFromOptions
Sys: add PetscDataTypeFromString() and test code
Mat: Should say that it has a nullspace in MatView()
parms: update tarball with fix for namespace conflict with metis
fix citation 'Golub_Varga_1961'
parmetis: update tarball to parmetis-4.0.2-p5 which fixes an install issue with cygwin
Sys Logging: revert parent traversal
fixed hdf5.py so that if self.libraries.compression is None the code still runs correctly
DMDA: fix bad cast of DM_DA to PetscObject
MatClique: follow DistMultiVec API changes
MatClique: remove unused variables
config cmakeboot: add C++ flags any time compiler is available
config OpenMP: check for C++ flag any time the compiler is available
replaced all left-over uses of a single PetscMalloc() to allocated multiple arrays: replaced with PetscMallocN() The only ones left are when the second array is set into the first array and one ugly usage in the MUMPS interface that cannot be easily fixed
...

Conflicts:
include/petscdmplex.h

show more ...

Merge branch 'master' into knepley/feature-dmda-section

* master: (287 commits)
Mat ex170: Comments
VTK: Small fix to error message (.vts to .vtu)
VTK: Small fix to error message
Fixed bib e

Merge branch 'master' into knepley/feature-dmda-section

* master: (287 commits)
Mat ex170: Comments
VTK: Small fix to error message (.vts to .vtu)
VTK: Small fix to error message
Fixed bib entries
Bib: Updates
AO: fix erroneous processing of -ao_view and factor into AOViewFromOptions
doc: fix named argument in {Vec,Mat,DM}ViewFromOptions
Sys: add PetscDataTypeFromString() and test code
Mat: Should say that it has a nullspace in MatView()
parms: update tarball with fix for namespace conflict with metis
fix citation 'Golub_Varga_1961'
parmetis: update tarball to parmetis-4.0.2-p5 which fixes an install issue with cygwin
Sys Logging: revert parent traversal
fixed hdf5.py so that if self.libraries.compression is None the code still runs correctly
DMDA: fix bad cast of DM_DA to PetscObject
MatClique: follow DistMultiVec API changes
MatClique: remove unused variables
config cmakeboot: add C++ flags any time compiler is available
config OpenMP: check for C++ flag any time the compiler is available
replaced all left-over uses of a single PetscMalloc() to allocated multiple arrays: replaced with PetscMallocN() The only ones left are when the second array is set into the first array and one ugly usage in the MUMPS interface that cannot be easily fixed
...

show more ...

Merge branch 'knepley/plex-submesh-cohesive'

* knepley/plex-submesh-cohesive:
DMPlex: Fix hybrid bounds for interpolated mesh with cohesive cells
DMPlex: Fixes for cohesive label reconstruction

Merge branch 'knepley/plex-submesh-cohesive'

* knepley/plex-submesh-cohesive:
DMPlex: Fix hybrid bounds for interpolated mesh with cohesive cells
DMPlex: Fixes for cohesive label reconstruction - Do not put cohesive edges in labels - Do not reconstruct "depth" label
DMPlex: Now a label can be used to restrict the points for a cohesive submesh - Added label and value arguments to DMPlexCreateCohesiveSubmesh()

show more ...

Merge branch 'knepley/fix-3d-orientation'

* knepley/fix-3d-orientation:
DMPlex: Fix initialization for DMPlexVecGetClosure()
DMPlex: fix argument to DMPlexVecRestoreClosure
DMPlex: Fix orienta

Merge branch 'knepley/fix-3d-orientation'

* knepley/fix-3d-orientation:
DMPlex: Fix initialization for DMPlexVecGetClosure()
DMPlex: fix argument to DMPlexVecRestoreClosure
DMPlex: Fix orientation for VTU output
plex: remove unused variable
DMPlex: Fixed orientation conversion for VTK
DMPlex: Fixed field interpolation in tetrahedra and hexahedra for new orientation
DMPlex: Fixed face definition in tetrahedra and hexahedra for new orientation
DMPlex: Fixed point location in hexahedrons for new orientation
DMPlex: Added generic DMPlexInvertCell() to aid in changing orientation to the internal convention

show more ...

DMPlex: Put in depth label optimization

DMPlex: Fix flipping of fault normal

DMPlex: We label cells with only vertices on the fault, but they have no cone replacement

DMPlex: Fix translation to cohesive edges in 3D
- They are labeled by the vertices they connect

DMPlex: Added flip argument to DMPlexLabelCohesiveComplete() to reverse submesh normal
- Fixed ex5 test

DMPlex: Propagate orientation information to the submesh properly

DMPlex: Orientation of cohesive cell should come from face to which it is attached

DMPlex: Added subdm argument to DMPlexLabelCohesiveComplete()
- Use the subdm for orientation information so we replace vertices all on the same side

DMPlex: Propagate orientations in cohesive cell creation
- Also fix hybrid bounds