Merge branch 'master' into this one.

Merge branch 'jed/gitlab-ci'

fix petsc4py for --package-prefix-hash

And Packages installed after PETSc (like petsc4py) should not go in package-prefix-hash

Merged in psanan/man-pages-remove-keywords (pull request #1717)

Man pages: Remove .keywords fields

Approved-by: BarryFSmith <bsmith@mcs.anl.gov>

Man pages: remove .keywords: fields

This field is recognized by doctext from Sowing (http://wgropp.cs.illinois.edu/projects/software/sowing/doctext/node20.htm#Node20),
but it doesn't seem to be unif

Man pages: remove .keywords: fields

This field is recognized by doctext from Sowing (http://wgropp.cs.illinois.edu/projects/software/sowing/doctext/node20.htm#Node20),
but it doesn't seem to be uniformly used or maintained.

Thus, remove all .keywords: fields, and a following blank line, if present.

This is accomplished with GNU sed (gsed on OS X), with the following commands.
*Warning* that this type of command can corrupt a .git directory,
so be cautious in reusing or modifying these commands. They first look
for and delete matching lines with a following line consisting of only whitespace,
and then delete any remaining matching lines.

find src/ -type f -exec gsed -i '/keywords:/ {N; /\n\s*$/d}' {} +
find src/ -type f -exec gsed -i '/keywords:/d' {} +
find include/ -type f -exec gsed -i '/keywords:/ {N; /\n\s*$/d}' {} +
find include/ -type f -exec gsed -i '/keywords:/d' {} +

Hints on the sed command obtained from: https://unix.stackexchange.com/questions/100754/how-to-delete-a-specific-line-and-the-following-blank-line-using-gnu-sed

show more ...

Merge from master

Merged petsc/petsc into master

Merge branch 'master' into knepley/fix-superdm-is

* master: (455 commits)
bib: spell out some names for format consistency with related refs
bib: two 2018 pubs now appeared
cleaning up analyze

Merge branch 'master' into knepley/fix-superdm-is

* master: (455 commits)
bib: spell out some names for format consistency with related refs
bib: two 2018 pubs now appeared
cleaning up analyzer warnings
compile fixes (workarround PGI bug?):
undoing the branch's changes to leastsquares outputs
more fixes for complex builds
compile error fix for complex builds
1) Look for 64 bit integer MKL BLAS if 64 bit indices are used with PETSc 2) Fix Pardiso code to only compile pardiso_init64 when needed, otherwise can generate warnings/errors
jenkins: run 'cleantest' before 'allgtest-tap' - an attempt to fix errors of type:
cuda: protect cuda includes
fix cuda warnings.
fix complex compile error
Revert "Improved polymorphism of interfaces for MatSetValuesBlocked()"
Bib: Updated ref
Doc: More function documentation
petscvec: move PetscSFCreateFromZero from vscat to vec sources
Fixed an uninitialized variable and got rid of an unused one.
memleak fixed and output files updated
fixing build errors on some archs
Mat: obey options prefix of Mat in MatNullSpaceTest
...

Conflicts:
include/petsc/private/dmpleximpl.h
src/dm/interface/dmi.c

show more ...

Merge branch 'master' into knepley/feature-pc-patch

* master: (281 commits)
compile fixes (workarround PGI bug?):
1) Look for 64 bit integer MKL BLAS if 64 bit indices are used with PETSc 2) Fix

Merge branch 'master' into knepley/feature-pc-patch

* master: (281 commits)
compile fixes (workarround PGI bug?):
1) Look for 64 bit integer MKL BLAS if 64 bit indices are used with PETSc 2) Fix Pardiso code to only compile pardiso_init64 when needed, otherwise can generate warnings/errors
jenkins: run 'cleantest' before 'allgtest-tap' - an attempt to fix errors of type:
cuda: protect cuda includes
fix cuda warnings.
fix complex compile error
Revert "Improved polymorphism of interfaces for MatSetValuesBlocked()"
Bib: Updated ref
Doc: More function documentation
petscvec: move PetscSFCreateFromZero from vscat to vec sources
Mat: obey options prefix of Mat in MatNullSpaceTest
Plex+SNES: Must pass user context through
vscat: move ftn-custom to correct location remove custom vecscatterdestroy_()
vscat: move interface routines to correct location
vscat: delete dead code
fix compile error
FE: Correct coordinates in IntegrateBd
Bib: Added refs
SNES ex17: 3D tests must require a 3D grid generator
Plex+TS: We cannot run the check with the same vector that is the TS solution
...

Conflicts:
include/petsc/private/dmpleximpl.h
src/docs/website/documentation/changes/dev.html
src/snes/examples/tutorials/ex13.c
src/snes/utils/dmplexsnes.c

show more ...

Merge branch 'master' into arcowie-rem/feature-error-logging

* master: (249 commits)
Bib: Added refs
Netcdf should always build netcdf-4 (needed for example by exodusii.
trivial fixes of incor

Merge branch 'master' into arcowie-rem/feature-error-logging

* master: (249 commits)
Bib: Added refs
Netcdf should always build netcdf-4 (needed for example by exodusii.
trivial fixes of incorrect formatting in SNES linesearch routines
ISSetBlockSize_General: removed blockwise contiguity check.
netcdf: set zlib as optional dependency corretly [wrt --enable-netcdf-4] - otherwise netcdf configure errors out
config prefix: avoid ad-hoc path substitutions
config/install: no need to rename paths for installBinDir
rules: fix path in (evidently unimportant) uncrustify target
config pkgconfig: use ${prefix} in PETSc.pc and do not modify in install
fix gcov obj path
Improved polymorphism of interfaces for MatSetValuesBlocked()
-options_table was changed to options_view in 2014 but documentation was not updated to reflect it
configure: fix F2003 test
Dev manual: remove duplicate entry
Plex test ex5: Removed "future" test, as it resulted in issues in the nightly tests.
Some minor typos in TS
Add ADIOS2.py which I forgot to git add in the past
Plex ex5: Disable test
Doc: Added note for interface change
KSPLSQRMonitorDefault fixed for quad precision
...

show more ...

Merge branch 'master' into knepley/feature-plex-functionals

* master: (984 commits)
netcdf: set zlib as optional dependency corretly [wrt --enable-netcdf-4] - otherwise netcdf configure errors out

Merge branch 'master' into knepley/feature-plex-functionals

* master: (984 commits)
netcdf: set zlib as optional dependency corretly [wrt --enable-netcdf-4] - otherwise netcdf configure errors out
fix gcov obj path
-options_table was changed to options_view in 2014 but documentation was not updated to reflect it
configure: fix F2003 test
Dev manual: remove duplicate entry
Plex test ex5: Removed "future" test, as it resulted in issues in the nightly tests.
Some minor typos in TS
Add ADIOS2.py which I forgot to git add in the past
Plex ex5: Disable test
Doc: Added note for interface change
KSPLSQRMonitorDefault fixed for quad precision
Tao: Added alternative output for chwirut2 test.
TS ex45,ex46: Removed overly refined tests for faster nightly tests.
KSP ex72: Fixed needlessly long-running PCTFS tests.
SNES ex56: Reduced test size to speed up nightly test suite.
KSPSolve_LSQR: don't compute unused norm of rhs
SNES ex13: Reduced problem sizes for nightly tests.
PetscOptionsDeprecated(): fix for NULL prefix
PetscOptionsDeprecated(): add option to print additional info
SNES ex12: Reduced sizes for BDDC tests.
...

show more ...

Merge branch 'master' into knepley/feature-plex-elasticity-test

* master: (1553 commits)
-options_table was changed to options_view in 2014 but documentation was not updated to reflect it
config

Merge branch 'master' into knepley/feature-plex-elasticity-test

* master: (1553 commits)
-options_table was changed to options_view in 2014 but documentation was not updated to reflect it
configure: fix F2003 test
Plex test ex5: Removed "future" test, as it resulted in issues in the nightly tests.
Some minor typos in TS
Add ADIOS2.py which I forgot to git add in the past
Plex ex5: Disable test
Doc: Added note for interface change
KSPLSQRMonitorDefault fixed for quad precision
Tao: Added alternative output for chwirut2 test.
TS ex45,ex46: Removed overly refined tests for faster nightly tests.
KSP ex72: Fixed needlessly long-running PCTFS tests.
SNES ex56: Reduced test size to speed up nightly test suite.
KSPSolve_LSQR: don't compute unused norm of rhs
SNES ex13: Reduced problem sizes for nightly tests.
PetscOptionsDeprecated(): fix for NULL prefix
PetscOptionsDeprecated(): add option to print additional info
SNES ex12: Reduced sizes for BDDC tests.
PetscFileRetrieve(): Suppress output to STDERR when downloading a file.
MatMatMult: Fixed unused variable pN.
DMDestroy: Guard call to dm->ops->destroy * Similar guards are in place in many other methods (IS,Vec,Mat) and permit the DM to be destroyed even if DMSetType() was never called.
...

show more ...

Merge branch 'master' into knepley/feature-plex-parallel-submesh

* master: (2931 commits)
remove N in docs for SNESQN
replaced test tolerance with PETSC_SQRT_MACHINE_EPSILON
fortran: PetscComp

Merge branch 'master' into knepley/feature-plex-parallel-submesh

* master: (2931 commits)
remove N in docs for SNESQN
replaced test tolerance with PETSC_SQRT_MACHINE_EPSILON
fortran: PetscComplex type is missing from fortran
initialize variables so that static analyzer doesn't mistakenly think they are used uninitialized.
Move access of prefix until it is actually used
Remove DMDASplitComm2d(), used in one example that was not tested
Functions that do not return PetscErrorCode should not use PetscFunctionBegin/End paradgm
remove unneeded reassignment of same value
Missing CHKERRQ(); Mostly in Tao code
Remove clang static analyser warning about passing NULL variable to strncat()
missing newline in -ts_monitor_extreme
minor fixes for integer counters
Configure: Deal with '__func__' in C89 builds with newer Clang and GCC.
Jenkinsfile: Increased timeout for tests to 5 minutes.
3.9 changes: further clarify removal of -pc_factor_mat_solver_package
Options deprecations: add "PETSc" to inline warning
removing unused variable
MatShift support added to MATSUBMAT. Mimics MATSHELL functionality. Needed for matrix-free Hessians in TAO Newton-Line-Search methods.
Add -ts_monitor_extreme
Dev manual: add note on deprecating options database keys
...

Conflicts:
src/dm/impls/plex/examples/tests/ex4.c

show more ...

Merge branch 'master' into knepley/fix-plex-submesh-projection

* master: (425 commits)
remove N in docs for SNESQN
replaced test tolerance with PETSC_SQRT_MACHINE_EPSILON
fortran: PetscComplex

Merge branch 'master' into knepley/fix-plex-submesh-projection

* master: (425 commits)
remove N in docs for SNESQN
replaced test tolerance with PETSC_SQRT_MACHINE_EPSILON
fortran: PetscComplex type is missing from fortran
initialize variables so that static analyzer doesn't mistakenly think they are used uninitialized.
Move access of prefix until it is actually used
Remove DMDASplitComm2d(), used in one example that was not tested
Functions that do not return PetscErrorCode should not use PetscFunctionBegin/End paradgm
remove unneeded reassignment of same value
Missing CHKERRQ(); Mostly in Tao code
Remove clang static analyser warning about passing NULL variable to strncat()
missing newline in -ts_monitor_extreme
minor fixes for integer counters
Configure: Deal with '__func__' in C89 builds with newer Clang and GCC.
Jenkinsfile: Increased timeout for tests to 5 minutes.
3.9 changes: further clarify removal of -pc_factor_mat_solver_package
Options deprecations: add "PETSc" to inline warning
removing unused variable
MatShift support added to MATSUBMAT. Mimics MATSHELL functionality. Needed for matrix-free Hessians in TAO Newton-Line-Search methods.
Add -ts_monitor_extreme
Dev manual: add note on deprecating options database keys
...

Conflicts:
src/dm/impls/plex/examples/tests/ex4.c

show more ...

Merged petsc/petsc into master

Merge branch 'maint'

Merge remote-tracking branch 'origin/dalcinl/fix-python3/maint' into maint

PYTHON_LIB: remove hakey code for OSX and replace with more general code

PetscPythonFindLibrary: swap cmd1 and cmd3 - so that the most common usage use tried first
[the updated cmd1 works with most python2 and python3 installs]

Fix Python initialization

* Cannot pass NULL for argv in Python 3, IMHO there is a null deref
bug in Python/pathconfig.c at _PyPathConfig_ComputeArgv0().
* Initialize empty sys.argv for both Pytho

Fix Python initialization

* Cannot pass NULL for argv in Python 3, IMHO there is a null deref
bug in Python/pathconfig.c at _PyPathConfig_ComputeArgv0().
* Initialize empty sys.argv for both Python 2 and Python 3.
If this ever proves to be a problem, in the Python 3 case we should call
PetscGetArgs(&argc,&argv) and then C90 mbstowcs() to convert each entry
of argv from char* to wchar_t*.

show more ...

Merge branch 'master' into knepley/feature-snes-ex13-spectral

* master: (2350 commits)
migrate warning fix from next-tmp
Revert "Remove dead code."
clarifying comment in the code
Remove dead

Merge branch 'master' into knepley/feature-snes-ex13-spectral

* master: (2350 commits)
migrate warning fix from next-tmp
Revert "Remove dead code."
clarifying comment in the code
Remove dead code.
Add JuMP citation
Copyedits and updates to developers manual
Add more protection to intrinsics
MPI: protect arguments in MPI macros
Add the missing conditionals for 64-bit build
Plex+VTK: Fix field type determination
Fix bug in name cleanup
Bib: Added ref
Plex+VTK: Fix field type determination
Plex: Updated test output - I am now hating this shit
forgot to save file after moving prototypes to petscsys.h
update Apple example project settings per Xcode
Two functions should actually be public, used, for example from Apple MacOS and iOS programs
includes should always be included relative to include directory
Apple removed old locations of docsets
SNES ex12: Updated test output
...

Conflicts:
src/snes/examples/tutorials/ex13.c

show more ...

Merge branch 'barry/ksp/tests-to-new-harness'

cleanup code to determine location of Python dynamic library

Commit-type: style-fix

Apparently no single way to obtain Python dynamic library name

missing closing ' in python command

Commit-type: bug-fix