Merge branch 'hzhang/dmnetwork-netcoupling' into 'master'

Hzhang/dmnetwork netcoupling

See merge request petsc/petsc!3051

New design for the coupling of sub-dmnetowrks.
See email discussions on Nov 23, 2019, Subject: Re: petsc | DMNetwork: Update manual. (!2297)
See dev.html for changes made
using sf, DMNetworkVariables

New design for the coupling of sub-dmnetowrks.
See email discussions on Nov 23, 2019, Subject: Re: petsc | DMNetwork: Update manual. (!2297)
See dev.html for changes made
using sf, DMNetworkVariablesSetUp() handles shared vertex easily

show more ...

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 ...