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 ...

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

* knepley/feature-dt-fem: (123 commits)
SNES ex12: Fix buggy checkin
Builder: strip test output before comparing
PetscDua

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

* knepley/feature-dt-fem: (123 commits)
SNES ex12: Fix buggy checkin
Builder: strip test output before comparing
PetscDualSpace: Pointer check barfs for function pointer
Sys: Add ability to turn off CUBLAS initialization - This continually SEGVs on my Air
SNES ex62: Updated test output - Matrix now prints attached nullspace indicator - 3D tests are wierdly different, they need to be verified by hand
SNES ex12: Updated test output - Mostly for completed labels
SNES ex12/62: Changed to new DMPlexProjectFunction() interface - Took DM out of main struct
SNES ex12/62: Complete boundary label - Puts in edges in 3D - Perhaps should be moved to the creation routine
PetscDualSpace: Fixed orientation of reference tetrahedron - Now this does not match FIAT
PetscDualSpace: Fixed numDof for P0
PetscDualSpace: Added PetscDualSpaceApply() for the action of a functional - Declared PetscDualSpaceGetFunctional()
DMPlex: Updated ProjectFunction() to use PetscDualSpace for generic projection - Has not been tested with moment dofs - Accommodates vector functions
DMPlex: Added support for INSERT_BC_VALUES in VecSetClosure()
DMPlex: Fixed missing RestoreTransitiveClosure()
DMPlex: Fixed optimized portion of VecGetClosure() for NULL input array
DMPlex: Allow NULL array as input to DMPlexVecGetClosure()
DMPlex: Fix VecGetClosure() when the array is input
PetscFE: OpenCL is hardcoded for P0 coefficients right now
SNES ex12: Added test cases for variable coefficient Laplace - The P1 tests reproduce the analytic linear coefficient
PetscFE: Added auxiliary fields to PetscFEIntegrateJacobian() - Hooked it up to DMPlexComputeJacobian()
...

show more ...

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

removed MatType argument from DMCreateMatrix() and DMCreateColoring() since information is obtained from DM

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/plex-depth-label'

* knepley/plex-depth-label:
DMPlex: remove unused variables
DMPlex: Use BFS to calculate depth rather than crazy recursive scheme
DMPlex: Now use DMPlex

Merge branch 'knepley/plex-depth-label'

* knepley/plex-depth-label:
DMPlex: remove unused variables
DMPlex: Use BFS to calculate depth rather than crazy recursive scheme
DMPlex: Now use DMPlexGetDepthLabel() to interrogate point depths
DMPlex: Optimize depth retrieval by storing a pointer to the label - This is a little unsafe since someone could go in and create a new "depth" label out from under you

show more ...

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/feature-dm-clone'

* knepley/feature-dm-clone:
DMPlex: Removed unused variables
DM: Dammit, forgot declaration
DM: Small fix to DMClone for DMPlex
DM: Added specializati

Merge branch 'knepley/feature-dm-clone'

* knepley/feature-dm-clone:
DMPlex: Removed unused variables
DM: Dammit, forgot declaration
DM: Small fix to DMClone for DMPlex
DM: Added specialization for DMCreateSubDM() with a PetscSection - Replace DMPlex implementation - Is used by DMDA when a section is defined
DM: Fix DMDA clone - Made it work for all dimensions (which makes DMCreateSubDM() work) - Removed DMSetUp() which should be called by caller
DM: Added DMClone() which makes a shallow copy - This is very useful for DM since it can have a lot of associated data and is used as a building block for different problems - This replaces DMPlexClone()

show more ...

DM: Added a tolerance to DMPrintLocalVec()
- Also added member to DMPlex to store tolerance, use -dm_plex_print_tol to set

DMPlex+PetscFE: Moved integration functions from DMPlex to PetscFE
- Now PetscFE type indicates the integration method
- Added all machinery for PetscFE types

Merge branch 'knepley/opt-plex-depth' into knepley/plex-depth-label

Fixes build error due to missing depthLabel field in DM_Plex.

* knepley/opt-plex-depth:
DMPlex: Use BFS to calculate depth ra

Merge branch 'knepley/opt-plex-depth' into knepley/plex-depth-label

Fixes build error due to missing depthLabel field in DM_Plex.

* knepley/opt-plex-depth:
DMPlex: Use BFS to calculate depth rather than crazy recursive scheme
DMPlex: Optimize depth retrieval by storing a pointer to the label - This is a little unsafe since someone could go in and create a new "depth" label out from under you

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

show more ...

DM: Dammit, forgot declaration

DM: Small fix to DMClone for DMPlex

DM: Added DMClone() which makes a shallow copy
- This is very useful for DM since it can have a lot of associated data and is used as a building block for different problems
- This replaces DMPlexClo

DM: Added DMClone() which makes a shallow copy
- This is very useful for DM since it can have a lot of associated data and is used as a building block for different problems
- This replaces DMPlexClone()

show more ...

DMPlex: Optimize depth retrieval by storing a pointer to the label
- This is a little unsafe since someone could go in and create a new "depth" label out from under you

Merged petsc/petsc into rmills/petsc master.

DMPlex: clones are already setup

Merge branch 'knepley/fix-mat-chop' into master

* knepley/fix-mat-chop:
Mat: Changes to MatRestoreRow() broke MatChop()

Merge branch 'knepley/add-coords-dm-clone'

* knepley/add-coords-dm-clone:
DMPlex: fix 'else' formatting
DMPlex: DMSetCoordinates() does not allow NULL
DMPlex: DMPlexClone() now copies over coo

Merge branch 'knepley/add-coords-dm-clone'

* knepley/add-coords-dm-clone:
DMPlex: fix 'else' formatting
DMPlex: DMSetCoordinates() does not allow NULL
DMPlex: DMPlexClone() now copies over coordinates

show more ...

DMPlex: fix 'else' formatting

DMPlex: DMSetCoordinates() does not allow NULL

DMPlex: DMPlexClone() now copies over coordinates