ENH: Multiple commits - lumped due to git index file corruption

- Re-located mapped point patches
- Updated mapped patch write
- deprecated directMapped in favour of mapped
- updated resulting dependancies - apps/libs/tuts

applications/solvers/multiphase/multiphaseEulerFoam/Allwmake

@@ -3,8 +3,8 @@ cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 wmake libso phaseModel
-wmake libso interfacialModels
 wmake libso multiphaseSystem
+wmake libso interfacialModels
 wmake libso kineticTheoryModels
 wmake
 

applications/solvers/multiphase/multiphaseEulerFoam/Make/options

@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -ggdb3 \
     -IphaseModel/lnInclude \
     -ImultiphaseSystem/lnInclude \
     /*-IkineticTheoryModels/lnInclude*/ \

applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H

@@ -33,7 +33,7 @@ forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
             + (alpha/phase.rho())*fluid.Svm(phase)
         )
     );
-    mrfZones.addCoriolis(alpha, UEqns[phasei]);
+    mrfZones.addCoriolis(UEqns[phasei]);
     UEqns[phasei].relax();
 
     phasei++;

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options

@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -ggdb3 \
     -I../phaseModel/lnInclude \
     -I../interfacialModels/lnInclude \
     -IalphaContactAngle \

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C

@@ -56,6 +56,9 @@ void Foam::multiphaseSystem::calcAlphas()
 
 void Foam::multiphaseSystem::solveAlphas()
 {
+    word alphaScheme("div(phi,alpha)");
+    word alpharScheme("div(phirb,alpha)");
+
     surfaceScalarField phic(mag(phi_/mesh_.magSf()));
 
     PtrList<surfaceScalarField> phiAlphaCorrs(phases_.size());
@@ -64,7 +67,6 @@ void Foam::multiphaseSystem::solveAlphas()
     forAllIter(PtrDictionary<phaseModel>, phases_, iter)
     {
         phaseModel& phase1 = iter();
-        volScalarField& alpha1 = phase1;
 
         phase1.phiAlpha() =
             dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0);
@@ -78,7 +80,7 @@ void Foam::multiphaseSystem::solveAlphas()
                 (
                     phi_,
                     phase1,
-                    "div(phi," + alpha1.name() + ')'
+                    alphaScheme
                 )
             )
         );
@@ -88,7 +90,6 @@ void Foam::multiphaseSystem::solveAlphas()
         forAllIter(PtrDictionary<phaseModel>, phases_, iter2)
         {
             phaseModel& phase2 = iter2();
-            volScalarField& alpha2 = phase2;
 
             if (&phase2 == &phase1) continue;
 
@@ -99,16 +100,11 @@ void Foam::multiphaseSystem::solveAlphas()
                *nHatf(phase1, phase2)
             );
 
-            word phirScheme
-            (
-                "div(phir," + alpha2.name() + ',' + alpha1.name() + ')'
-            );
-
             phiAlphaCorr += fvc::flux
             (
-                -fvc::flux(-phir, phase2, phirScheme),
+                -fvc::flux(-phir, phase2, alpharScheme),
                 phase1,
-                phirScheme
+                alpharScheme
             );
         }