Merge remote-tracking branch 'origin/maint'

Merge branch 'patch-1' into 'maint'

SNES+Doc: Fix declaration for SNESObjectiveFunction()

See merge request petsc/petsc!2736

SNES+Doc: Fix declaration for SNESObjectiveFunction()
Reported-by: Thomas Vasileiou <vathomas@zoho.com>

Merge branch 'dalcinl/fix-headers' [PR #1897]

* dalcinl/fix-headers:
Minor fixes to headers.

Fix a bunch of PetscValidPointer() -> PetscValidXXXPointer()

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 commit 'd47bf9aaf1e5266cc3f0ff499f934c85788965a9' into jed/fix-matcreatempibaij/maint

Obtain changed (v3.5) handling of MatMPIBAIJSetPreallocationCSR to match
documentation.

Merge branch 'master' into knepley/feature-plex-sphere-mesh

* master: (2633 commits)
Bib: Added ref
SNES ex56: Update test output
add a citation to petsc.bib
Plex: Initialize variables
ini

Merge branch 'master' into knepley/feature-plex-sphere-mesh

* master: (2633 commits)
Bib: Added ref
SNES ex56: Update test output
add a citation to petsc.bib
Plex: Initialize variables
initialize ap as complained by the nightly tests
Plex ex3: Update to new point function API
initialize some variables as complained by nightly tests
SNES ex12: Mix misnaming Nf --> Nc
update tests
add tests
add MatView_SeqXAIJ_ASCII_structonly(); enable A->structure_only in MatSetValuesBlocked_SeqBAIJ
typo
fill-in some references
Bib: Fixed ref
Plex: Added PLY to file support
Plex: Adding PLY support
PetscDS: Turn off Fortran bindings for Constants
Plex tests: Updated to new point function API
SNES ex56: Moved tests to new format
DM: Allow field projection functions to take an array of scalars - This will allow us to pass in user data to kernels without void *, more efficiency than aux fields
...

Conflicts:
config/builder.py
include/petscdmplex.h
src/dm/impls/plex/examples/tests/ex1.c
src/dm/impls/plex/plexcreate.c
src/dm/impls/plex/plexgmsh.c
src/snes/examples/tutorials/ex63.c

show more ...

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

* master: (1379 commits)
Minor fixes for tchem examples due to changes in PETSc infrastructure
update webpage about API changes

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

* master: (1379 commits)
Minor fixes for tchem examples due to changes in PETSc infrastructure
update webpage about API changes
add help menu for MatCreateSubMatricesMPI()
rename struct Mat_SubMat -> Mat_SubSppt
add a little information to the manual about using tchem
rename MatCreateSubMatrixComposite -> MatCreateSubMatrixVirtual; Mat_SubMatrix -> Mat_SubVirtual
need to protect the \ passed on the makefile on my Mac
Bib: Updated ref
update src/mat/examples/tests/output/ex23_#.out
rename MatGetSubMat -> MatCreateSubMat
Mark MatCreateMPIAIJWithSplitArrays() and MatMPIAIJSetPreallocationCSR() with MAT_NO_OFF_PROC_ENTRIES
superlu: libray is installed in PREFIX/lib64 - fix this to use PREFIX/lib
backport fixes cc105cc3 2b35c90a - required for 3bf428d - that was backported from master - 80c96bb
'echo -n' fails on opensolaris/osx - so avoid using it.
fix diffs in nightlybuilds due to options in ~/.petscrc
add Kelley03 to src/docs/tex/petsc.bib
build: determine moudles, mpi.h used during buildtime and print in 'info'
fix analyzer warnings
fix build failure on opensolaris - where -lm from flibs is removed due to -lm in cxxlibs. But then - only flib gets used for some configure tests [blaslapack, parms]
config: prefer __restrict over C99 restrict keyword
...

show more ...

Merge branch 'barry/remove-funct'

Remove the use and definition of __FUNCT__ throughout the code

Since all modern C/C++ compilers provide this functionality we no longer need to provide it manually in PETSc
Time: 1.5 hours
Thanks-t

Remove the use and definition of __FUNCT__ throughout the code

Since all modern C/C++ compilers provide this functionality we no longer need to provide it manually in PETSc
Time: 1.5 hours
Thanks-to: Andreas Mang <andreas@ices.utexas.edu>

show more ...

Merge branch 'master' into barry/add-pcfieldsplit-logevent

Merge branch 'master' into barry/add-pcreset-hypre-for-master

Needed to move PCDestroy_HYPRE() added to master to PCReset_HYPRE() since that was introduced
as a bug fix for maint

Merge branch 'master' into barry-allow-vecset-nan-3.6

Merge branch 'master' into shri/add-tsevent-to-powergrid-examples

Merge branch 'master' into pr263/PierreBdR/ts-domain-error-in-stage/master

Merge branch 'master' into barry/always-mark-floats

Needed to merge in master to resolve conflicts that will appear when this branch is merged with master

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

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

Merge branch 'master' into tisaac/dmforest

Get 3.6.2 patches

* master: (1360 commits)
remove nasty memory leak with CUDA code when using block Jacobi with multiple blocks per process
print abs

Merge branch 'master' into tisaac/dmforest

Get 3.6.2 patches

* master: (1360 commits)
remove nasty memory leak with CUDA code when using block Jacobi with multiple blocks per process
print abs in Fortran test example in order to have same result with real and complex builds
changed outdate mpirun and -np to mpiexec and -n
force sqrt to be taken in the precision of PetscReal in fortran examples
continuation line too soon for some compilers
stop configure if user selected C++ clanguage, single precision, complex combination since we do not support it
fixes for Fortran examples to compile cleanly in single precision that do not involve complex numbers
fixes to Fortran examples to compile cleanly in single precision complex
fix previous mistake
must cast 1. to PetscScalar before dividing by a PetscScalar (C++ complex class is terrible)
must cast 0.0 to PetscScalar before comparison with a PetscScalar
changed order of suggested locations of downloadable PETSc to Barry's preference
Increase patchlevel to 3.6.2
remove debug print statement from two commits before
remove debug print statements I accidently left in the last commit
PetscDraw: Fix dummy definition of PetscDrawCollective{Begin|End}()
remove cleanupMumps flag from MatDestroy_Mumps() it should always free the memory it allocated Bug detected while adding features to libMesh
improved viewing of fractional counts in xml nested log viewing fixed bug in output of doubles to xml nested log files
chombo: build only libs - not examples
fix typo. 'gcc-4.8 --with-cxx-dialect=C++11' gives a warning with this line - even though its in a #ifdef thats never enabled.
...

show more ...

Merge branch 'barry/xml-nested-logging'

improved viewing of fractional counts in xml nested log viewing
fixed bug in output of doubles to xml nested log files

added SNESObjectiveFunction evaluation for logging. This issue was

Reported-by

improved viewing of fractional counts in xml nested log viewing
fixed bug in output of doubles to xml nested log files

added SNESObjectiveFunction evaluation for logging. This issue was

Reported-by: Ed Bueler <elbueler@alaska.edu>

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

directory layout changed again: merging to switching branches back and forth
doesn't cause reconfigure to have a hard time

* master: (357 commits)
remov

Merge branch 'master' into tisaac/dmforest

directory layout changed again: merging to switching branches back and forth
doesn't cause reconfigure to have a hard time

* master: (357 commits)
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
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
add a test for MatPtAP()
small cleanup; add tests
cleanup MatPtAPSymbolic_MPIAIJ_MPIAIJ()
Fix nonzerostate tracking in all MATMPI types.
update location of test matrices in faq.html file
unused variable still declared
Fix for MatLoad_MPIDense() from sparsely stored matrix also fix for MatLoad_MPIDense_DenseInFile() when matrix has not had its local sizes preset by user
Preserve the B nonzerostate during disassembly.
TSEvent: Fix arch-mswin nightly errors due to declaring variables in the middle of a function.
Fix error in parallel loading of dense format matrix
removed KSPSetNullSpace() since mat already carries that information and having two locations for it is confusing, unnecessary and prone to error added MatSetTransposeNullSpace() for providing the null space of the transpose of the matrix and added support in KSPSolve() to remove this null space from the right handside of the linear system thus making the system consistent.
...

show more ...