Merge branch 'master' into stefano_zampini/feature-pcbddc-saddlepoint

Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bddc.c

Merge branch 'master' into stefano_zampini/feature-pcbddc-saddlepoint

Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bddc.c
src/ksp/pc/impls/bddc/bddcfetidp.c
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcschurs.c
src/mat/impls/is/matis.c
src/mat/impls/is/matis.h

show more ...

Merge branch 'balay/fix-PetscInt-scanf/maint' into knepley/feature-plex-particle-example

This merge is done to be able to use 'PetscInt_FMT' in data_bucket.c

Merge branch 'maint'

Fixed a variety of issues related to iOS builds

Some developers did not properly use relative paths for private include files
file that is not normally compiled had errors due to outdated API in it

Fixed a variety of issues related to iOS builds

Some developers did not properly use relative paths for private include files
file that is not normally compiled had errors due to outdated API in it (why is it compiled with iOS?)
some iOS build scripts had outdated paths for various items
iSO version of makeall implicitly assumed PETSC_DIR had been set (OSX version previously fixed by Satish Balay)

Reported-by: Francisco Schuetze <fjschuetze@gmail.com>

show more ...

Merge branch 'barry/fix-nonew-notcollective/maint' into jed/mat-assembly-perf

Jed this fucking 6+ month running thing in next that is not in master is a royal fucking pain in the ass and
an abuse of

Merge branch 'barry/fix-nonew-notcollective/maint' into jed/mat-assembly-perf

Jed this fucking 6+ month running thing in next that is not in master is a royal fucking pain in the ass and
an abuse of git. I think it is not justified to ever have anything in next for more than a few weeks at most.
Either take it out of next if it is broken or put it in master if it is not broken. Hanging around in next but
not master for ever is not a good policy.

show more ...

Merge branch 'master' into knepley/solkx

* master: (6933 commits)
Bib: Added reference
Includegraph: Updated for compatibility with new folder layout.
Add SNESLineSearchReason to fortran inclu

Merge branch 'master' into knepley/solkx

* master: (6933 commits)
Bib: Added reference
Includegraph: Updated for compatibility with new folder layout.
Add SNESLineSearchReason to fortran includes Also truncate names to fit 32 char fortran limit
fix compile warnings /usr/home/balay/petsc.clone-2/src/vec/vec/interface/vector.c:1944: warning: division by zero in '1.0e+0 / 0.' /usr/home/balay/petsc.clone-2/src/ksp/ksp/interface/itfunc.c:508: warning: 'vec_rhs' may be used uninitialized in this function
updated output for new trust region initial size
initial size of the trust region is set as a percent of the norm of the initial guess, it should not be related to the initial norm of the function (which is kind of nuts).
The default bounds for SNESVISetVariableBounds() in the manual page were reversed from correct values
Bib: Added refs
Bib: Update MPICH webpage
Plex: Forgot to close file
removed nonexistent ex46f from makefile test rule
Revert "fixed bad merge into master"
fixed bad merge into master
fix memory leak in mkl_pardiso fix some formatting in mkl_pardiso code
mv runex111 from TESTEXAMPLES_C to TESTEXAMPLES_DATAFILESPATH
Mat+Doc: More Fortran docs
Plex ex3: Run tests with the correct number of field components
Bib: Added TetGen cite
parmetis: make sure 'ldd libparmetis.so' points to the correct libmetis.so that its linked with.
small fix as reported by the nightly test
...

Conflicts:
config/builder.py

show more ...

Merge branch 'master' into tisaac/dmforest

If we're going to start developing on this again, the recent changes to the
location of configuration files will make it annoying to switch to and from
thi

Merge branch 'master' into tisaac/dmforest

If we're going to start developing on this again, the recent changes to the
location of configuration files will make it annoying to switch to and from
this branch. Matt's and my fixes in DMPlex will also be relevant.

* master: (1557 commits)
MatLoad_MPIDense() always allocated array space even if it was previously provided
Clarified lumping options for PCFieldSplitSchurPreType SELFP.
fixed up PetscInfo in GAMG
TSErrorWeightedNorm[2|Infinity]: API changes
MatLoad_SeqDense() always allocated new space for the data even if the user already provided it
Fixed DMCompositeGetAccessArray() to support readonly vectors
Fix obviously-wrong aspects of documentation on SNESVINEWTONRSLS and SNESVINEWTONSSLS.
fixed example to compile - demonstrates a bug
var name 'len' was F90 key word
For user provided Jacobian functions they should always assembly into the second matrix, the one from which the preconditioner is built because the first may be used as matrix-free with -snes_mf_operator
Suggest --with-64-bit-indices if users mistakenly use --with-64bit-indices
Fix configure logging of integer size.
missing underscore in #define of vecgetarrayread translation of fortran stub for VECGETARRAYREAD
updated test output files to reflect differences introduced previously in PCView output
-ksp_type preonly does not support -ksp_monitor_short so remove from test line to prevent extranious warning output
missing CHKERRQ; and ugly double declaration of ierr
Plex ex3: For want of a semicolon, the kingdom was lost
MatSetValuesMPISBAIJ will now print correct global indices when error generated due to new nonzero location
completed basic use of MatSetValuesBlocked_SeqBAIJ_Inlined() by MatSetValuesBlocked_MPIBAIJ() to allow proper global indices being printed when error generated by new nonzero locations.
Added inline version of MatSetValuesBlocked_SeqBAIJ() to be used by MatSetValuesBlocked_MPIBAIJ() to print error message for nonzero block with global indices
...

show more ...

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 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' into mlange/refactor-plex-distribute

Conflicts:
src/dm/impls/plex/examples/tests/output/ex12_1.out
src/dm/impls/plex/examples/tests/output/ex12_2.out

some updates for building Apple installers

updates for iOS 8.0

Updates for iOS 8.0 builds

Merge branch 'stefano_zampini/pcbddc-primalfixes' into stefano_zampini/pcbddc_deluxe

Merge branch 'maint'

Merge branch 'barry/fix-ios' into maint

completed tools for generating OSX and iOS installers
Note iOS framework not tested on iOS device