Merge branch 'jed/promote-examples-tests-tutorials' [petsc/petsc!2610]

* jed/promote-examples-tests-tutorials:
Promote examples/{tests,tutorials}/ to {tests,tutorials}/

Promote examples/{tests,tutorials}/ to {tests,tutorials}/

This shortens paths and improves consistency between test target names
and paths to the source and output files. Most of the work was
compl

Promote examples/{tests,tutorials}/ to {tests,tutorials}/

This shortens paths and improves consistency between test target names
and paths to the source and output files. Most of the work was
completed by this script, followed by mild cleanup of nonconforming
cases.

for makefile in `git ls-files 'src/*makefile'`; do
if rg -q 'DIRS.*\bexamples\b' $makefile; then
base=$(dirname $makefile)
dirs=$(cd $base/examples && ls -d tests tutorials 2>/dev/null | xargs echo)
perl -pi -e "s#^(DIRS.*)\bexamples\b#\1${dirs}#" $makefile
git rm $base/examples/makefile
for t in $dirs; do
git mv $base/examples/$t $base/
perl -pi -e "s#^(LOCDIR[[:space:]]*=).*#\1 $base/$t/#" $base/$t
done
fi
done

git grep -l -E -z 'examples/(tutorials|tests)' | xargs -0 perl -pi -e 's#examples/(tutorials|tests)#\1#g'
git checkout @ \
src/docs/website/documentation/changes/ \
src/benchmarks/results/

show more ...

Merge commit 'd47bf9aaf1e5266cc3f0ff499f934c85788965a9' into jed/fix-matcreatempibaij/maint

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

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

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 'tisaac/dmplex-stable-tet-refinement' into tisaac/plex-feature-tree-fv

This feature branch also changed the topology of nonconforming examples:
I am merging so that I can make the regre

Merge branch 'tisaac/dmplex-stable-tet-refinement' into tisaac/plex-feature-tree-fv

This feature branch also changed the topology of nonconforming examples:
I am merging so that I can make the regression output that should be
correct in master and next

* tisaac/dmplex-stable-tet-refinement: (594 commits)
plex: added tet shape regression test
plexrefine: remove replaced code
plex: update test output for new tet refinement order
plex: fix tet refinement for stable element shape
DMPlex: added test of shape quality to ex1
Better to use the proper error handling version of PetscViewerASCIIGetStdout() instead of PETSC_VIEWER_STDOUT_()
Generate a very useful error message if PetscLogView(), PetscLogEventGetPerfInfo() or PetscLogEventGetFlops() is called with a preceeding call to PetscLogBegin() and friends (also -log_summary which triggers a PetscLogBegin())
fix compile warnings
Plex: Fix bug with bcComps initialization
Turn off elemental shared libraries if --with-shared-libraries=0 is used
Bib: Added refs
Bib: Fixed a bunch of errors
add warning/error flag for '-mat_superlu_dist_parsymbfact' when MatInputMode=GLOBAL
makefile: fix format
tests: add back ex6f, runex6f targets - that got removed in 2f1d3d565a6a43067e6df75b043e6343b05fcd1d
accessing option that may never have been set
typo in DMNetworkSetNumVariables() reported by Sean Shahkarami
superlu_dist: update to using latest 4.1 version
fix compile warnings
Generate an error message when trying to overwrite default options of CN and BEULER
...

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 'mat-increaseoverlap' of ssh://bitbucket.org/Fande-Kong/petsc into pr332/master/Fande-Kong/mat-increaseoverlap-scalable

Merge remote-tracking branch 'petsc/master' into pcgasm-increaseoverlap

Merge remote-tracking branch 'petsc/master' into matpartitioning-hierach

Merge remote-tracking branch 'petsc/master' into mat-increaseoverlap

Merge branch 'master' into knepley/feature-snes-deflation

* master: (239 commits)
Bib: Moved entry
revert sources to dev - reset PETSC_VERSION_RELEASE - reset changes/dev.html - enable cuda in c

Merge branch 'master' into knepley/feature-snes-deflation

* master: (239 commits)
Bib: Moved entry
revert sources to dev - reset PETSC_VERSION_RELEASE - reset changes/dev.html - enable cuda in configure
release: set v3.6 strings
doc: add PCGAMGSetReuseInterpolation() to changes file
fix: workarround static initialization issue (perhaps compiler bug) on opensolaris c/complex build
fix: ex40,ex41 errors in src/ts/examples/tutorials/ on bsd with c++/complex Perhaps this code nees a separate section when 'enorm == 0) - as pow(0,-0.33) = inf.
manual: fix format
more changes..
PCGASM/MatGetSubMatricesMPI() changes in dev.html.
changes: more updates
Add size checks for static arrays of assumed max size [-Warray-bounds]
Doc: Update to Changes
configure: default to useThreads= 0as the useThreads=1 code currently prints output in jumbled order [producing hard to read configure.log]
Delete PETSc viewer attribute if none are left on the linked list instead of putting an empty attribute
MatGetSubMatricesMPI_MPIAIJ(): guard for an empty B-matrix when delogging memory in MatSetSeqMats().
PCBDDC: fix typos in the specification of MPI operation
MPIU_SUM was used with MPIU_INT when it should only be used with MPIU_REAL or MPIU_SCALAR
fixed bad PetscPrintf() formatting in two examples
Plex: In pointwise callbacks, use embedding dimension
updates for generating Apple installations due to changes in locations of include files
...

show more ...

Merge branch 'master' into mesgarnejad/feature-plex-globaltonatural

* master: (219 commits)
revert sources to dev - reset PETSC_VERSION_RELEASE - reset changes/dev.html - enable cuda in configure

Merge branch 'master' into mesgarnejad/feature-plex-globaltonatural

* master: (219 commits)
revert sources to dev - reset PETSC_VERSION_RELEASE - reset changes/dev.html - enable cuda in configure
release: set v3.6 strings
doc: add PCGAMGSetReuseInterpolation() to changes file
fix: workarround static initialization issue (perhaps compiler bug) on opensolaris c/complex build
fix: ex40,ex41 errors in src/ts/examples/tutorials/ on bsd with c++/complex Perhaps this code nees a separate section when 'enorm == 0) - as pow(0,-0.33) = inf.
manual: fix format
more changes..
PCGASM/MatGetSubMatricesMPI() changes in dev.html.
changes: more updates
Add size checks for static arrays of assumed max size [-Warray-bounds]
Doc: Update to Changes
configure: default to useThreads= 0as the useThreads=1 code currently prints output in jumbled order [producing hard to read configure.log]
Delete PETSc viewer attribute if none are left on the linked list instead of putting an empty attribute
MatGetSubMatricesMPI_MPIAIJ(): guard for an empty B-matrix when delogging memory in MatSetSeqMats().
PCBDDC: fix typos in the specification of MPI operation
MPIU_SUM was used with MPIU_INT when it should only be used with MPIU_REAL or MPIU_SCALAR
fixed bad PetscPrintf() formatting in two examples
Plex: In pointwise callbacks, use embedding dimension
updates for generating Apple installations due to changes in locations of include files
configure: do not fail when checking MPICH version [similar to 2cadc8fc42fbad3c229d43b955581b8d29e02ad6 ]
...

show more ...

Merge branch 'master' of bitbucket.org:petsc/petsc

Merge branch 'barry/fix-apple-install'

updates for generating Apple installations due to changes in locations of include files

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

Merge branch 'master' of bitbucket.org:petsc/petsc

Minor OSX framework stuff