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

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

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 '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/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: Fix orientation for VTU output

Merged petsc/petsc into rmills/petsc master.

Merge branch 'jed/plexvtu-cell-without-vertex'

* jed/plexvtu-cell-without-vertex:
DMPlex: fix VTU writing cell fields without similar vertex field

Merge branch 'jed/plexvtu-fields'

* jed/plexvtu-fields:
DMPlex: fix VTU viewer when field/components have not been defined

DMPlex: fix VTU writing cell fields without similar vertex field

DMPlex: fix VTU viewer when field/components have not been defined

The parent commit added support for writing field/component names, but was
broken when only the number of dofs is stated. Now when

DMPlex: fix VTU viewer when field/components have not been defined

The parent commit added support for writing field/component names, but was
broken when only the number of dofs is stated. Now when the user does not
specify field names, use

{VecName}{Cell_or_Point}Field0.{i} for i in 0:bs

show more ...

Merge branch 'jed/plexvtu-fields'

* jed/plexvtu-fields:
DMPlex: teach VTU output about field names and components
TS ex11: set field names and number of components

DMPlex: teach VTU output about field names and components

Schema is "${ObjectName}${FieldName}.${Component}". For example

SolutionDensity.0
SolutionMomentum.0
SolutionMomentum.1
SolutionMo

DMPlex: teach VTU output about field names and components

Schema is "${ObjectName}${FieldName}.${Component}". For example

SolutionDensity.0
SolutionMomentum.0
SolutionMomentum.1
SolutionMomentum.2
SolutionEnergy.0

show more ...

Merged petsc/petsc into rmills/petsc master

Merge branch 'barry/rm-xxxregisterdynamic' into jed/ts-eimex

PetscObjectComposeFunctionDynamic() and TSRegisterDynamic() were
replaced by PetscObjectComposeFunction() and TSRegister(), both of which

Merge branch 'barry/rm-xxxregisterdynamic' into jed/ts-eimex

PetscObjectComposeFunctionDynamic() and TSRegisterDynamic() were
replaced by PetscObjectComposeFunction() and TSRegister(), both of which
drop the string name argument.

* barry/rm-xxxregisterdynamic: (82 commits)
...

Conflicts:
src/ts/interface/tsregall.c

show more ...

Merge branch 'master' into barry/ams

Conflicts:
include/petscviewer.h
src/sys/classes/viewer/interface/viewreg.c
src/sys/threadcomm/interface/threadcomm.c

Merge branch 'master' of bitbucket.org:petsc/petsc into knepley/plex

Merged in jed/fix-plex (pull request #9)

DMPlex: label distribution and vertex viewing

DMPlexVTKWriteAll_VTU: fix writing vertex data

Merge branch 'master' into jed/ts-eimex

Sync to include Git conversion, PETSC_EXTERN, and minor API changes.

Conflicts:
src/ts/interface/tsregall.c

come on guys, you cannot not use the dm in these names

Hg-commit: f08a6c3836185c079437e00e68391c6dc56eb899

added PetscObjectComm() and used it to replace (((PetscObject)obj)->comm)

Hg-commit: 3da37c458124ad48ae939f4e9823e4430ee0b8be

removed PETSC_NULL from C and Fortran (except declaration in C for backward compatibility). Kept PETSC_NULL_xxx for Fortran
Fixed a few bugs where PETSC_NULL had been used incorrectly.

Hg-commit: 05

removed PETSC_NULL from C and Fortran (except declaration in C for backward compatibility). Kept PETSC_NULL_xxx for Fortran
Fixed a few bugs where PETSC_NULL had been used incorrectly.

Hg-commit: 054705a517d7f4388a8a084415d7478cbe95dff4

show more ...

commit after merge

Hg-commit: 1fa981254c79c783277e37654668dfe698cddf41