Merge branch 'madams/mat-residual'

* madams/mat-residual:
refactored residuals by adding a 'residual' method to Mat

refactored residuals by adding a 'residual' method to Mat

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 'master' of bitbucket.org:petsc/petsc

Merge branch 'barry/improve-memory-logging'

Conflicts:
src/ksp/pc/impls/redundant/redundant.c
src/mat/interface/matnull.c

Merge branch 'hzhang/mattransposematmult'

Conflicts:
src/mat/examples/tests/makefile

add MatTransposeMatMult_MPIAIJ_MPIDense

logging memory now credits to all ancestors

Merge bug fix/patch releases up to 3.2-p7 into maint-3.2

* commit 'a9157d915ed96804280c3dc077186a2a633fd603': (157 commits)
Fix PyPI download URL to help pip figure out the release version
#1109

Merge bug fix/patch releases up to 3.2-p7 into maint-3.2

* commit 'a9157d915ed96804280c3dc077186a2a633fd603': (157 commits)
Fix PyPI download URL to help pip figure out the release version
#110990 fix timestamp order for .so vs .a during 'make install'
Update FFTW download
Increase patchlevel to 3.2-p7
...

show more ...

Merged petsc/petsc into rmills/petsc master

Merge branch 'barry/rm-xxxregisterdynamic'

* barry/rm-xxxregisterdynamic:
Registration: remove stale 'XXRegisterDynamic)' entries in man pages
TS examples: fix use of PetscFunctionList and add t

Merge branch 'barry/rm-xxxregisterdynamic'

* barry/rm-xxxregisterdynamic:
Registration: remove stale 'XXRegisterDynamic)' entries in man pages
TS examples: fix use of PetscFunctionList and add to nightlies
Changes: Note updates to XRegisterDynamic/PetscObjectComposeFunctionDynamic
PetscObjectComposeFunctionDynamic: remove stale docs and usage
developers.tex: remove complications from function composition with dlls
removed string version of function name for XXXRegister(), PetscFunctionListAdd() and PetscObjectComposeFunction()
changes: document PetscFunctionListAdd() API change
developers.tex: update documentation of PetscObjectComposeFunction
removed path and MPI_Comm arguments from PetscFunctionListFind/Add()
removed path argument to XXXInitializePackage() and XXXRegister()
removed XXXRegisterDynamic() but kept the APIs for everything else underneath the same phase I of the update to handling registering function pointers

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

removed string version of function name for XXXRegister(), PetscFunctionListAdd() and PetscObjectComposeFunction()

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

Warnings: clean compile with gcc-4.8 at -Wextra -Wno-unused-parameter

* Mostly fills out some ops struct declarations. Reformatted so Emacs
can help with alignment. Squelch whitespace in diff to s

Warnings: clean compile with gcc-4.8 at -Wextra -Wno-unused-parameter

* Mostly fills out some ops struct declarations. Reformatted so Emacs
can help with alignment. Squelch whitespace in diff to see useful
changes.

* Use struct instead of casting to data pointer (void*) when serializing
function pointers.

* strcasecmp is in strings.h

show more ...

Merge branch 'master' into jed/ts-eimex

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

Conflicts:
src/ts/interface/tsregall.c

Automerge.

Hg-commit: b6659d546870fb013f3da5bcd5066d1dc0dc329c

Merge branch 'master' of gitifyhg::ssh://hg@bitbucket.org/BarryFSmith/petsc-dev-simp

Symbol visibility and namespacing.

C++ builds always set extern "C" and can be called from plain C. Most
users w

Merge branch 'master' of gitifyhg::ssh://hg@bitbucket.org/BarryFSmith/petsc-dev-simp

Symbol visibility and namespacing.

C++ builds always set extern "C" and can be called from plain C. Most
users will only want --with-clanguage=C++ for std::complex.


Hg-commit: f848d02318cae92d7b32037c7ee88f92dbe46347

show more ...

Change all PETSC_EXTERN_C to PETSC_EXTERN

Hg-commit: 8d2ebbb193fb583bccc64015e35640c4e08c3426