Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

src/postProcessing/functionObjects/forces/forces/forces.C

@@ -428,36 +428,43 @@ void Foam::forces::write()
                 Info<< "forces output:" << nl
                     << "    forces(pressure, viscous)" << fm.first() << nl
                     << "    moment(pressure, viscous)" << fm.second() << nl;
+            }
 
-                forcesFilePtr_() << obr_.time().value() << tab << fm;
+            forcesFilePtr_() << obr_.time().value() << tab << fm;
 
-                if (localSystem_)
+            if (localSystem_)
+            {
+                forcesMoments fmLocal;
+
+                fmLocal.first().first() =
+                    coordSys_.localVector(fm.first().first());
+
+                fmLocal.first().second() =
+                    coordSys_.localVector(fm.first().second());
+
+                fmLocal.second().first() =
+                    coordSys_.localVector(fm.second().first());
+
+                fmLocal.second().second() =
+                    coordSys_.localVector(fm.second().second());
+
+                forcesFilePtr_() << tab << fmLocal;
+
+                if (log_)
                 {
-                    forcesMoments fmLocal;
-
-                    fmLocal.first().first() =
-                        coordSys_.localVector(fm.first().first());
-
-                    fmLocal.first().second() =
-                        coordSys_.localVector(fm.first().second());
-
-                    fmLocal.second().first() =
-                        coordSys_.localVector(fm.second().first());
-
-                    fmLocal.second().second() =
-                        coordSys_.localVector(fm.second().second());
-
-                    forcesFilePtr_() << tab << fmLocal;
-
-
                     Info<< "  local:" << nl
                         << "    forces(pressure, viscous)" << fmLocal.first()
                         << nl
                         << "    moment(pressure, viscous)" << fmLocal.second()
                         << nl;
                 }
+            }
 
-                forcesFilePtr_() << endl;
+
+            forcesFilePtr_() << endl;
+
+            if (log_)
+            {
                 Info<< endl;
             }
         }

src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C

@@ -49,7 +49,8 @@ const ThermoType& Foam::multiComponentMixture<ThermoType>::constructSpeciesData
 template<class ThermoType>
 void Foam::multiComponentMixture<ThermoType>::correctMassFractions()
 {
-    volScalarField Yt("Yt", Y_[0]);
+        // It changes Yt patches to "calculated"
+    volScalarField Yt("Yt", 1.0*Y_[0]);
 
     for (label n=1; n<Y_.size(); n++)
     {

tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/N2

@@ -21,32 +21,27 @@ boundaryField
 {
     top
     {
-        type            inletOutlet;
+        type            calculated;
-        inletValue      $internalField;
-        value           $internalField;
     }
 
     ground
     {
-        type            zeroGradient;
+        type            calculated;
     }
 
     sides
     {
-        type            inletOutlet;
+        type            calculated;
-        inletValue      $internalField;
-        value           $internalField;
     }
 
     burner
     {
-        type            fixedValue;
+        type            calculated;
-        value           uniform 0;
     }
 
     "(region0_to.*)"
     {
-        type            zeroGradient;
+        type            calculated;
     }
 }
 

tutorials/combustion/fireFoam/les/smallPoolFire2D/0/N2

@@ -23,24 +23,19 @@ boundaryField
 {
     outlet
     {
-        type            inletOutlet;
+        type            calculated;
-        inletValue      $internalField;
-        value           $internalField;
     }
     sides
     {
-        type            inletOutlet;
+        type            calculated;
-        inletValue      $internalField;
-        value           $internalField;
     }
     base
     {
-        type            zeroGradient;
+        type            calculated;
     }
     inlet
     {
-        type            fixedValue;
+        type            calculated;
-        value           uniform 0;
     }
     frontBack
     {

tutorials/combustion/fireFoam/les/smallPoolFire3D/0/N2

@@ -23,24 +23,19 @@ boundaryField
 {
     outlet
     {
-        type            inletOutlet;
+        type            calculated;
-        inletValue      $internalField;
-        value           $internalField;
     }
     sides
     {
-        type            inletOutlet;
+        type            calculated;
-        inletValue      $internalField;
-        value           $internalField;
     }
     base
     {
-        type            zeroGradient;
+        type            calculated;
     }
     inlet
     {
-        type            fixedValue;
+        type            calculated;
-        value           uniform 0;
     }
 }
 

tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2

@@ -23,20 +23,15 @@ boundaryField
 {
     fuel
     {
-        type            fixedValue;
+        type            calculated;
-        value           uniform 0.0;
     }
     air
     {
-        type            fixedValue;
+        type            calculated;
-        value           uniform 0.77;
     }
     outlet
     {
-        type            inletOutlet;
+        type            calculated;
-        inletValue      uniform 0.77;
-        value           uniform 0.77;
-
     }
     frontAndBack
     {