Merge branch 'master' into shri/ts-is-for-differential-variables

Conflicts:
include/petsc-private/tsimpl.h
src/ts/impls/eimex/eimex.c
src/ts/interface/ts.c

Merge branch 'master' into jed/chem
Note merging a branch with good stuff in it for a year and a half is insane!

Conflicts:
src/ts/examples/tutorials/makefile
src/ts/interface/ts.c

Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection

Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c

Merge branch 'master' into barry/saws-options-merge-master

Totally confusing manual merge, could be wrong

Conflicts:
include/petscoptions.h
src/dm/impls/da/dacreate.c
src/sys/objects/aoptions.c

Merge branch 'master' into barry/saws-options-merge-master

Totally confusing manual merge, could be wrong

Conflicts:
include/petscoptions.h
src/dm/impls/da/dacreate.c
src/sys/objects/aoptions.c
src/sys/threadcomm/interface/threadcomm.c

show more ...

Merge branch 'master' into pr252/dmay/PetscViewerBinarySkipHeaderVecViewLoad
Manual merge of makefile

Conflicts:
src/sys/classes/viewer/examples/tutorials/makefile

Merge branch 'master' of bitbucket.org:petsc/petsc into mark/gamg-crs-ksp2

manual merge of conflict

Three directory namespace changes for better --prefix install support

1) include/finclude becomes include/petsc-finclude
2) include/mpiuni becomes include/petsc-mpiuni
3) conf (both $PETSC_DIR/conf

Three directory namespace changes for better --prefix install support

1) include/finclude becomes include/petsc-finclude
2) include/mpiuni becomes include/petsc-mpiuni
3) conf (both $PETSC_DIR/conf and $PETSC_DIR/$PETSC_ARCH/conf become) lib/petsc-conf

show more ...

backout all chmod stuff in bf971ba58125
[but keep diffs to src/mat/impls/aij/mpi/mpimatmatmult.c ]

Hg-commit: 4a812fc1f35496ce2717c7da9ef12ffabbd13258

removed a spurious call to MatSetBlockSize.

Hg-commit: bf971ba58125bd8cf7ceb2a9d0f5cdf27c27cc6a

Merge

Hg-commit: f997b2abc12025b16065184c2bb279689bbd06ac

Rename include/private/ to include/petsc-private/

Hg-commit: 9a1730720b0d9756437b40462617551504641ade

commit after merge

Hg-commit: d540875a63b3c979c82b6a7fa7f062571e906d10

Mass revert file modes that were made executable in f6e61ee9c329

Hg-commit: 116d90d0b66125cee0db3e7351047057e756baf5

Merge

Hg-commit: ee8d91ae0580d1d4fa92be38a18d40c838b9a257

changed MatMatMult to MatTranposeMatMult.

Hg-commit: f6e61ee9c329774cd5343eea1ee6b7432be17c3f

Merge

Hg-commit: 9c9e2b0243eedf0151e3676f8f4ccde9f7b93898

merge TrMalloc/MEMALIGN updates

Hg-commit: e66e6e0b392d0e3456a0c4fdee411b9bff8fd74a

removed PETSC_ARCH/conf/base and
added support for not setting PETSC_ARCH and PETSC_DIR with --prefix option

Hg-commit: e478f4df238e5763b64567336d7cf94ca5d89d58

commit aFTERmerge

Hg-commit: 45a698803bd457bdc2ba32be5035e710250a5320

Merge

Hg-commit: 89a88a4570a641b3af1b53853d576da3947e5ca7

changed bmake/common everywhere to conf
fixed a little more for new install system

Hg-commit: 1aa781ff09e652ebafd6f016d84e88c15ea650f1

bk-changeset-1.3592
barrysmith@barrysmith-57.mcs.anl.gov|ChangeSet|20051013181204|54791
ChangeSet
1.3592 05/10/13 13:12:04 barrysmith@barrysmith-57.mcs.anl.gov +38 -0
move src/ksp/pc/pcimpl.h inc

bk-changeset-1.3592
barrysmith@barrysmith-57.mcs.anl.gov|ChangeSet|20051013181204|54791
ChangeSet
1.3592 05/10/13 13:12:04 barrysmith@barrysmith-57.mcs.anl.gov +38 -0
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/vec/vec/interface/vector.c
1.142 05/10/13 13:11:52 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ts/impls/implicit/sundials/sundials.h
1.17 05/10/13 13:11:52 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/docs/website/documentation/changes/231.html
1.49 05/10/13 13:11:52 barrysmith@barrysmith-57.mcs.anl.gov +188 -142
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/sys/viewer/impls/mathematica/mathematica.c
1.40 05/10/13 13:11:51 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/sys/objects/aoptions.c
1.39 05/10/13 13:11:50 barrysmith@barrysmith-57.mcs.anl.gov +101 -6
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/snes/utils/damg.c
1.55 05/10/13 13:11:50 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/makefile
1.8 05/10/13 13:11:50 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/interface/precon.c
1.65 05/10/13 13:11:50 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/interface/pcset.c
1.27 05/10/13 13:11:50 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/interface/pcregis.c
1.37 05/10/13 13:11:49 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/tfs/tfs.c
1.7 05/10/13 13:11:49 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/spai/ispai.c
1.34 05/10/13 13:11:49 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/sor/sor.c
1.33 05/10/13 13:11:49 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/shell/shellpc.c
1.34 05/10/13 13:11:49 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/redundant/redundant.c
1.26 05/10/13 13:11:49 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/prometheus/petscprom.c
1.9 05/10/13 13:11:48 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/pbjacobi/pbjacobi.c
1.21 05/10/13 13:11:48 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/none/none.c
1.10 05/10/13 13:11:48 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/ml/ml.c
1.24 05/10/13 13:11:48 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/mg/mgimpl.h
1.14 05/10/13 13:11:47 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/mat/pcmat.c
1.12 05/10/13 13:11:46 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/ksp/pcksp.c
1.27 05/10/13 13:11:46 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/jacobi/jacobi.c
1.20 05/10/13 13:11:46 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/is/pcis.h
1.12 05/10/13 13:11:46 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/hypre/hyppilut.c
1.79 05/10/13 13:11:46 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/fieldsplit/fieldsplit.c
1.27 05/10/13 13:11:45 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/factor/lu/lu.c
1.46 05/10/13 13:11:45 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/factor/ilu/ilu.c
1.59 05/10/13 13:11:45 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/factor/icc/icc.h
1.9 05/10/13 13:11:45 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/factor/factor.c
1.9 05/10/13 13:11:45 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/factor/cholesky/cholesky.c
1.43 05/10/13 13:11:44 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/eisens/eisen.c
1.28 05/10/13 13:11:44 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/composite/composite.c
1.33 05/10/13 13:11:44 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/bjacobi/bjacobi.h
1.8 05/10/13 13:11:44 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/bjacobi/bjacobi.c
1.50 05/10/13 13:11:43 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/ksp/pc/impls/asm/asm.c
1.51 05/10/13 13:11:43 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/docs/website/documentation/changes/index.html
1.21 05/10/13 13:11:43 barrysmith@barrysmith-57.mcs.anl.gov +124 -2
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/docs/tex/manual/developers.tex
1.13 05/10/13 13:11:42 barrysmith@barrysmith-57.mcs.anl.gov +1 -1
move src/ksp/pc/pcimpl.h include/private/pcimpl.h

src/docs/website/documentation/changes/231.html
1.48 05/10/13 09:19:38 barrysmith@barrysmith-57.mcs.anl.gov +0 -0
bk cp src/docs/website/documentation/changes/230.html src/docs/website/documentation/changes/231.html

src/docs/website/documentation/changes/230.html
1.47 05/05/04 23:02:51 knepley@khan.(none) +0 -0
Auto merged

src/docs/website/documentation/changes/230.html
1.45.1.1 05/05/04 21:08:13 knepley@khan.(none) +1 -0
Another change

src/docs/website/documentation/changes/230.html
1.46 05/05/04 16:57:16 balay@asterix.mcs.anl.gov +7 -1
update about removal of PetscSetCommWorld()

src/docs/website/documentation/changes/230.html
1.45 05/04/25 15:04:27 knepley@khan.(none) +1 -0
Changed order of VecSetRandom arguments

src/docs/website/documentation/changes/230.html
1.44 05/04/25 14:08:47 balay@asterix.mcs.anl.gov +5 -0
add info about python bindings

src/docs/website/documentation/changes/230.html
1.43 05/04/25 13:06:06 balay@asterix.mcs.anl.gov +157 -109
update changes file with 2.3.0 release info

src/docs/website/documentation/changes/230.html
1.42 05/04/25 12:51:35 balay@asterix.mcs.anl.gov +0 -0
Rename: src/docs/website/documentation/changes/222.html -> src/docs/website/documentation/changes/230.html

src/docs/website/documentation/changes/222.html
1.41 05/03/29 10:26:33 Kris@p4buschel.home.net +1 -0
Add MatConvert interface change to changes

src/docs/website/documentation/changes/222.html
1.40 05/03/17 15:37:12 knepley@khan.(none) +8 -0
Interface fixes

src/docs/website/documentation/changes/222.html
1.39 05/03/15 18:34:36 knepley@khan.(none) +5 -2
Fixed MatCreate
Fixed SNESSolve

src/docs/website/documentation/changes/222.html
1.38 05/03/12 15:35:37 knepley@khan.(none) +26 -1
Lots of interface changes

src/docs/website/documentation/changes/222.html
1.37 05/02/26 20:58:02 barrysmith@barry-smiths-computer.local +5 -0
PC_ in front of all MG functions

src/docs/website/documentation/changes/222.html
1.36 05/01/26 10:04:48 barrysmith@barry-smiths-computer.local +1 -0
Added PCShellSet/GetContext() and removed context argument to setting Apply and
ApplyRichardson

src/docs/website/documentation/changes/222.html
1.35 05/01/25 15:15:49 barrysmith@barrysmith-57.mcs.anl.gov +1 -0
change SNESxxxLineSearchyyy routines to SNESLineSearchxxxyyy

src/docs/website/documentation/changes/222.html
1.34 05/01/24 21:34:26 barrysmith@barry-smiths-computer.local +2 -0
changes/additions for SNESSetLineSearchCheck()

src/docs/website/documentation/changes/222.html
1.33 05/01/23 18:43:40 barrysmith@barry-smiths-computer.local +4 -2
*** empty log message ***

src/docs/website/documentation/changes/222.html
1.32 05/01/17 19:48:12 barrysmith@barry-smiths-computer.local +1 -0
MGxxx -> PCMGxxx

src/docs/website/documentation/changes/222.html
1.31 05/01/10 09:36:44 hzhang@harley.mcs.anl.gov +10 -8
update web site - ml interface is added to petsc-2.2.2

src/docs/website/documentation/changes/222.html
1.30 05/01/06 14:38:32 barrysmith@barrysmith-57.mcs.anl.gov +0 -0
Auto merged

src/docs/website/documentation/changes/222.html
1.28.1.1 05/01/05 13:31:59 Kris@p4buschel. +0 -0
Auto merged

src/docs/website/documentation/changes/222.html
1.29 05/01/05 13:41:31 barrysmith@barrysmith-57.mcs.anl.gov +5 -0
PCMG more defaults and reference counting

src/docs/website/documentation/changes/222.html
1.27.1.1 05/01/04 10:07:38 Kris@p4buschel. +1 -0
Added "petscdmmg.h" to changes.

src/docs/website/documentation/changes/222.html
1.28 05/01/03 16:14:06 barrysmith@barry-smiths-computer.local +2 -0
support for computing coarser matrices automatically via Galerkin for MG

src/docs/website/documentation/changes/222.html
1.27 04/11/29 15:32:12 hzhang@harley.mcs.anl.gov +2 -2
rename
-pc_factor_shiftnonzero by -pc_factor_shift_nonzero
-pc_factor_shiftpd by -pc_factor_shift_positive_definite

src/docs/website/documentation/changes/222.html
1.26 04/11/10 20:17:39 barrysmith@barry-smiths-computer.local +1 -0
*** empty log message ***

src/docs/website/documentation/changes/222.html
1.25 04/11/08 14:51:17 hzhang@harley.mcs.anl.gov +6 -1
record the API changes made with pc and mat

src/docs/website/documentation/changes/222.html
1.24 04/11/07 22:03:15 barrysmith@barry-smiths-computer.local +6 -0
reorganized PetscTrXXX, -trmalloc, PetscGetResidentSetSize(), -get_resident_set_size
API

src/docs/website/documentation/changes/222.html
1.23 04/10/08 21:49:37 barrysmith@barry-smiths-computer.local +6 -0
*** empty log message ***

src/docs/website/documentation/changes/222.html
1.22 04/08/25 13:51:59 barrysmith@barrysmith-57.mcs.anl.gov +37 -58
reorder for nonzeros along diagonal as function call

src/docs/website/documentation/changes/222.html
1.21 04/08/25 13:40:47 barrysmith@barrysmith-57.mcs.anl.gov +0 -0
bk cp 221.html 222.html

src/docs/website/documentation/changes/221.html
1.20 04/08/15 11:44:01 barrysmith@barry-smiths-computer.local +9 -2
PetscInt stuff

src/docs/website/documentation/changes/221.html
1.19 04/08/15 10:41:27 barrysmith@barry-smiths-computer.local +8 -3
updated changes

src/docs/website/documentation/changes/221.html
1.18 04/08/01 18:41:45 barrysmith@barry-smiths-computer.local +5 -2
*** empty log message ***

src/docs/website/documentation/changes/221.html
1.17 04/07/03 17:23:56 victorle@tibook500ve.cs.utk.edu +6 -1
IScreateGeneralWithArray added;
ISSum syntax changed, ISExtend removed.

src/docs/website/documentation/changes/221.html
1.16 04/06/22 21:59:20 barrysmith@barry-smiths-computer.local +1 -0
addition of CSR preallocation

src/docs/website/documentation/changes/221.html
1.15 04/06/01 15:12:04 barrysmith@barrysmith-57.mcs.anl.gov +3 -0
*** empty log message ***

src/docs/website/documentation/changes/221.html
1.14 04/05/26 11:24:08 barrysmith@barrysmith-57.mcs.anl.gov +0 -1
remove presentations from website

src/docs/website/documentation/changes/221.html
1.13 04/05/14 22:41:30 barrysmith@barry-smiths-computer.local +0 -0
mvdir

src/docs/website/documentation/changes/231.html
1.12 04/04/06 16:29:48 barrysmith@barrysmith-57.mcs.anl.gov +1 -0
MatIsSymmetric(), MatIsTranspose() now take tol

src/docs/website/documentation/changes/231.html
1.11 04/04/01 17:50:25 barrysmith@barry-smiths-computer.local +2 -1
VecConvertMPIToAll() and VecConvertMPIToZero() have been replaced with
VecScatterCreateToAll() and VecScatterCreateToZero()

src/docs/website/documentation/changes/231.html
1.10 04/03/27 11:38:49 barrysmith@barry-smiths-computer.local +3 -3
removal of null space in preconditioner is now handled by
KSP instead of PC

src/docs/website/documentation/changes/231.html
1.9 04/03/21 20:48:43 barrysmith@barry-smiths-computer.local +6 -1
drop KSPSetRhs/Solution() and add right hand side and solution to
KSPSolve()

src/docs/website/documentation/changes/231.html
1.8 04/03/19 20:19:31 barrysmith@barry-smiths-computer.local +2 -1
added SNESSetRhs()

src/docs/website/documentation/changes/231.html
1.7 04/03/19 11:36:16 barrysmith@barry-smiths-computer.local +9 -6
MatGetSubmatrices() propagates symmetric flag

src/docs/website/documentation/changes/231.html
1.6 04/03/17 20:16:33 barrysmith@barry-smiths-computer.local +2 -0
*** empty log message ***

src/docs/website/documentation/changes/231.html
1.5 04/03/17 19:52:01 barrysmith@barry-smiths-computer.local +4 -0
added Vec/MatStashGetInfo()

src/docs/website/documentation/changes/231.html
1.4 04/03/10 20:29:09 barrysmith@barry-smiths-computer.local +8 -0
changed with-mpich/with-c-blas.... to download-....

src/docs/website/documentation/changes/231.html
1.3 04/03/10 15:56:38 barrysmith@barrysmith-57.mcs.anl.gov +6 -0
added DAGetInterpolation support for nonuniform DA grids
set with DASetCoordinates()

src/docs/website/documentation/changes/231.html
1.2 04/03/05 09:53:59 barrysmith@barrysmith-57.mcs.anl.gov +5 -32
changes for next release started

src/docs/website/documentation/changes/231.html
1.1 04/03/05 09:51:50 barrysmith@barrysmith-57.mcs.anl.gov +138 -0

src/docs/website/documentation/changes/231.html
1.0 04/03/05 09:51:50 barrysmith@barrysmith-57.mcs.anl.gov +0 -0
BitKeeper file /Users/barrysmith/petsc-dev/docs/website/documentation/changes/221.html


Hg-commit: 3484aaed74b69dc942ee03e3c477f1f68bb3241e

show more ...

bk-changeset-1.2276.1.39
knepley@khan.mcs.anl.gov|ChangeSet|20040606042322|09224
ChangeSet
1.2276.1.39 04/06/05 23:23:22 knepley@khan.mcs.anl.gov +1 -0
Merge bk://petsc@petsc.bkbits.net/petsc-dev

bk-changeset-1.2276.1.39
knepley@khan.mcs.anl.gov|ChangeSet|20040606042322|09224
ChangeSet
1.2276.1.39 04/06/05 23:23:22 knepley@khan.mcs.anl.gov +1 -0
Merge bk://petsc@petsc.bkbits.net/petsc-dev
into khan.mcs.anl.gov:/home/knepley/PETSc-dev/petsc-dev

src/ksp/ksp/impls/bcgsl/bcgsl.c
1.12 04/06/05 23:23:22 knepley@khan.mcs.anl.gov +0 -0
Auto merged


Hg-commit: 03697a773ebfcf556763dd482ec21d212df81adc

show more ...

bk-changeset-1.2281
Kris@mbuschel.|ChangeSet|20040605221103|34377
ChangeSet
1.2281 04/06/05 15:11:03 Kris@mbuschel. +3 -0
Merge bk://petsc@petsc.bkbits.net/petsc-dev
into mbuschel.:C:/home/Kris

bk-changeset-1.2281
Kris@mbuschel.|ChangeSet|20040605221103|34377
ChangeSet
1.2281 04/06/05 15:11:03 Kris@mbuschel. +3 -0
Merge bk://petsc@petsc.bkbits.net/petsc-dev
into mbuschel.:C:/home/Kris/petsc/petsc-dev

src/sys/src/dll/dl.c
1.25 04/06/05 15:11:02 Kris@mbuschel. +0 -0
Auto merged

python/PETSc/Configure.py
1.221 04/06/05 15:11:02 Kris@mbuschel. +0 -0
Auto merged

makefile
1.114 04/06/05 15:11:01 Kris@mbuschel. +0 -0
Auto merged


Hg-commit: 96d824178353de4a7b1d502c3cd44da6eb239379

show more ...