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

applications/solvers/combustion/XiFoam/bEqn.H

@@ -30,7 +30,7 @@ if (ign.ignited())
     n /= mgb;
 
 
-#   include "StCorr.H"
+    #include "StCorr.H"
 
     // Calculate turbulent flame speed flux
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -58,7 +58,7 @@ if (ign.ignited())
 
     // Add ignition cell contribution to b-equation
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#   include "ignite.H"
+    #include "ignite.H"
 
 
     // Solve for b
@@ -134,7 +134,7 @@ if (ign.ignited())
             (sigmas*SuInf*(Su0 - SuInf) + sqr(SuMin)*sigmaExt)
            /(sqr(Su0 - SuInf) + sqr(SuMin));
 
-        solve
+        fvScalarMatrix SuEqn
         (
             fvm::ddt(rho, Su)
           + fvm::div(phi + phiXi, Su, "div(phiXi,Su)")
@@ -144,6 +144,9 @@ if (ign.ignited())
           - fvm::SuSp(rho*(sigmas + Rc), Su)
         );
 
+        SuEqn.relax();
+        SuEqn.solve();
+
         // Limit the maximum Su
         // ~~~~~~~~~~~~~~~~~~~~
         Su.min(SuMax);
@@ -196,7 +199,7 @@ if (ign.ignited())
 
         // Solve for the flame wrinkling
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        solve
+        fvScalarMatrix XiEqn
         (
             fvm::ddt(rho, Xi)
           + fvm::div(phi + phiXi, Xi, "div(phiXi,Xi)")
@@ -215,6 +218,8 @@ if (ign.ignited())
             )
         );
 
+        XiEqn.relax();
+        XiEqn.solve();
 
         // Correct boundedness of Xi
         // ~~~~~~~~~~~~~~~~~~~~~~~~~

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 \