manual merge of conflict

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

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

Merge branch 'barry/fix-options-default'

Conflicts:
src/ksp/ksp/examples/tutorials/ex52.c

update use of PetscOptionsBool() to not rely on default setting automatically

Merge branch 'maint'

fixed -log_trace crashes
tried to do a strncpy of zero which crashed PetscStrncpy()
updated PetscStrncpy() to handle n of 0 or 1

Reported-by: Tobin Isaac <tisaac@ices.utexas.edu>

fix: c++ compile error with isnormal() when both <math.h> and <complex> are used.
Implemented by removing PetscScalar and using PETSC_SKIP_COMPLEX.
This also removes common code between PetscIsInfOrN

fix: c++ compile error with isnormal() when both <math.h> and <complex> are used.
Implemented by removing PetscScalar and using PETSC_SKIP_COMPLEX.
This also removes common code between PetscIsInfOrNanScalar() and PetscIsInfOrNanReal() etc..

show more ...

Fix FIXCHAR() so that it only accesses properly initialized memory, not one past the string length
fix example that uses sizeof incorrectly and now ignore petscpclose() error code since it is trigger

Fix FIXCHAR() so that it only accesses properly initialized memory, not one past the string length
fix example that uses sizeof incorrectly and now ignore petscpclose() error code since it is triggered on apple

Reported-by: Randall Mackie <rlmackie862@gmail.com>

show more ...

improve the memory usage of PCGAMGCreateGraph()

Sys: Made a simple two-int hash
- Someone should remove that other IJ crap