Merge branch 'maint'

Conflicts:
src/mat/impls/baij/seq/baij.h
src/mat/impls/sbaij/mpi/mpisbaij.c
src/mat/impls/sbaij/seq/sbaij.h

baij: move 'seqbaij' prototypes required by mpibaij.c to baij.h
This fixes link failure with VS2005 cl

libpetsc.lib(mpibaij.o) : error LNK2019: unresolved external symbol "int __cdecl MatRestoreRow_

baij: move 'seqbaij' prototypes required by mpibaij.c to baij.h
This fixes link failure with VS2005 cl

libpetsc.lib(mpibaij.o) : error LNK2019: unresolved external symbol "int __cdecl MatRestoreRow_SeqBAIJ(struct _p_Mat *,int,int *,int * * const,class std::complex<double> * * const)" (?MatRestoreRow_SeqBAIJ@@YAHPEAU_p_Mat@@HPEAHQEAPEAHQEAPEAV?$complex@N@std@@@Z) referenced in function MatCreateMPIMatConcatenateSeqMat_MPIBAIJ

show more ...

Added VecLockPush() and VecLockPop() to make vector read only
Used VecLockPush() and VecLockPop() in a couple of key locations; PCApply(), KSPSolve(), MatMult()
Fixed many uses of VecGetArray() to Ve

Added VecLockPush() and VecLockPop() to make vector read only
Used VecLockPush() and VecLockPop() in a couple of key locations; PCApply(), KSPSolve(), MatMult()
Fixed many uses of VecGetArray() to VecGetArrayRead()
Added VecGet/RestoreArrayPair() for commonly occuring pattern
Added const to many locations driven by use of VecGetArrayRead()

show more ...

Merge branch 'maint'

MatView() with some matrix formats and ASCII_MATLAB did not print correct matrix name

Reported-by: Michael Souza <souza.michael@gmail.com>

manual merge of conflict

mv include/finclude to include/petsc-finclude for namespacing in installs

-ksp_richardson_scale was ignored when PCApplyRichardson() was used
Fix: turn off PCApplyRichardson() when scale is not 1 and print PetscInfo warning

Reported-by: Mark Adams <mfadams@lbl.gov>

Fixed

-ksp_richardson_scale was ignored when PCApplyRichardson() was used
Fix: turn off PCApplyRichardson() when scale is not 1 and print PetscInfo warning

Reported-by: Mark Adams <mfadams@lbl.gov>

Fixed missing carriage return in uses of PetscInfo() and missing ierr CHKERRQ() usage

show more ...

Merge branch 'barry/remove-unneeded-paren-petscmalloc'

Conflicts:
src/mat/impls/baij/seq/baij.c

Merge remote-tracking branch 'lawrence/fix-baij-threads'

* lawrence/fix-baij-threads:
Fix buffer overrun in threaded MatZeroEntries_SeqBAIJ

Merge branch 'barry/fix-matsetsize-matload' into maint

Merge branch 'barry/fix-memoryallocation-matsor-seqbaij'

Merge branch 'barry/fix-matsetsize-matload'

Conflicts:
src/mat/examples/tests/makefile

if () test was on wrong work array

convert some PetscMalloc() to PetscMalloc1()
remove unneeded () in first argument to PetscMalloc/Calloc1()
fixes for MATLAB examples

Memory allocation error where space is allocated MatMult_SeqBAIJ with a space shorter than that needed in MatSOR_SeqBAIJ

Reported-by: Stephan Kramer <s.kramer@imperial.ac.uk>

bugfix of MatAXPY() with case SUBSET_NONZERO_PATTERN for sbaij matrix, see report by Jose Roman, Nov 11, 2014
This is on master branch (same fix was done on maint) to avoid too much conflict with mai

bugfix of MatAXPY() with case SUBSET_NONZERO_PATTERN for sbaij matrix, see report by Jose Roman, Nov 11, 2014
This is on master branch (same fix was done on maint) to avoid too much conflict with maint

show more ...

bugfix of MatAXPY() with case SUBSET_NONZERO_PATTERN for sbaij matrix, see report by Jose Roman, Nov 11, 2014

Allow setting the matrix block size with MatSetBlockSize() before calling MatLoad()

Reported-by: Steena M <stm8086@yahoo.com>

Moved registration of MatSolverPackages out of MatCreate_XXX routines into standalone system, this allows
1) more precise error message when a requested solver is not found
2) easier to add new solve

Moved registration of MatSolverPackages out of MatCreate_XXX routines into standalone system, this allows
1) more precise error message when a requested solver is not found
2) easier to add new solvers without touching basic PETSc matrix implementation files and the possibility of adding new solvers to the library after PETSc is installed or even at run time

show more ...

Merge branch 'hzhang/mat-redundant_sbaij'

call MatDestroy_Redundant from MatDestroy() instead of from MatDestroy_XXX()

Merge branch 'hzhang/mataxpy-subsetcleanup'

Merge branch 'barry/add-some-matsolveforward-back'

Fix buffer overrun in threaded MatZeroEntries_SeqBAIJ

rmap->trstarts counts rows in the matrix, but a->i only has nrows/bs
entries. Fix start and end indexing by dividing by the block size.

While

Fix buffer overrun in threaded MatZeroEntries_SeqBAIJ

rmap->trstarts counts rows in the matrix, but a->i only has nrows/bs
entries. Fix start and end indexing by dividing by the block size.

While we're here, update the sizeof call to use MatScalar rather than
PetscScalar.

show more ...