Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

applications/solvers/heatTransfer/chtMultiRegionFoam/Allwclean

+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wclean
+wclean chtMultiRegionSimpleFoam
+
+# ----------------------------------------------------------------- end-of-file

applications/solvers/heatTransfer/chtMultiRegionFoam/Allwmake

+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wmake
+wmake chtMultiRegionSimpleFoam
+
+# ----------------------------------------------------------------- end-of-file

applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/Make/files → applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/files

-derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C
 chtMultiRegionSimpleFoam.C
 
 EXE = $(FOAM_APPBIN)/chtMultiRegionSimpleFoam

applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/Make/options → applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options

 EXE_INC = \
     /* -DFULLDEBUG -O0 -g */ \
+    -I.. \
+    -I../derivedFvPatchFields \
     -Ifluid \
     -Isolid \
     -I$(LIB_SRC)/finiteVolume/lnInclude \