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

src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C

@@ -1168,7 +1168,7 @@ void Foam::fvMatrix<Type>::operator*=
 }
 
 
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 template<class Type>
 void Foam::checkMethod
@@ -1297,7 +1297,27 @@ Foam::lduMatrix::solverPerformance Foam::solve(const tmp<fvMatrix<Type> >& tfvm)
 }
 
 
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+template<class Type>
+Foam::tmp<Foam::fvMatrix<Type> > Foam::correction
+(
+    const fvMatrix<Type>& A
+)
+{
+    return A - (A & A.psi());
+}
+
+
+template<class Type>
+Foam::tmp<Foam::fvMatrix<Type> > Foam::correction
+(
+    const tmp<fvMatrix<Type> >& tA
+)
+{
+    return tA - (tA() & tA().psi());
+}
+
+
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==

src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H

@@ -547,6 +547,18 @@ template<class Type>
 lduMatrix::solverPerformance solve(const tmp<fvMatrix<Type> >&);
 
 
+//- Return the correction form of the given matrix
+//  by subtracting the matrix multiplied by the current field
+template<class Type>
+tmp<fvMatrix<Type> > correction(const fvMatrix<Type>&);
+
+
+//- Return the correction form of the given temporary matrix
+//  by subtracting the matrix multiplied by the current field
+template<class Type>
+tmp<fvMatrix<Type> > correction(const tmp<fvMatrix<Type> >&);
+
+
 // * * * * * * * * * * * * * * * Global operators  * * * * * * * * * * * * * //
 
 template<class Type>

src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C

@@ -45,37 +45,20 @@ void Foam::coordinateRotation::calcTransform
     const axisOrder& order
 )
 {
-    const scalar orthogonalityError = 1.0e-8;
-
     vector a = axis1 / mag(axis1);
     vector b = axis2;
 
     // Absorb minor nonorthogonality into axis2
     b = b - (b & a)*a;
 
-    if (mag(b) < orthogonalityError)
+    if (mag(b) < SMALL)
     {
-        FatalErrorIn
-        (
-            "coordinateRotation::calcTransform()"
-        )
+        FatalErrorIn("coordinateRotation::calcTransform()")
             << "axis1, axis2 appear co-linear: "
             << axis1 << ", " << axis2 << endl
             << abort(FatalError);
     }
 
-    // this error check is probably no longer required
-    if (mag(a & b)/(mag(a)*mag(b)) >= orthogonalityError)
-    {
-        FatalErrorIn
-        (
-            "coordinateRotation::calcTransform()"
-        )
-            << "coordinate system nonorthogonality " << nl
-            << "mag(axis1 & axis2) = " << mag(a & b)
-            << abort(FatalError);
-    }
-
     b = b / mag(b);
     vector c = a ^ b;
 
@@ -102,10 +85,7 @@ void Foam::coordinateRotation::calcTransform
             break;
 
         default:
-            FatalErrorIn
-            (
-                "coordinateRotation::calcTransform()"
-            )
+            FatalErrorIn("coordinateRotation::calcTransform()")
                 << "programmer error" << endl
                 << abort(FatalError);
             break;
@@ -241,4 +221,5 @@ void Foam::coordinateRotation::operator=(const dictionary& rhs)
     calcTransform(axis1, axis2, order);
 }
 
+
 // ************************************************************************* //

src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C

@@ -218,7 +218,7 @@ Foam::laminarFlameSpeedModels::Gulders::operator()() const
             dimensionedScalar
             (
                 hhuCombustionThermo_.lookup("stoichiometricAirFuelMassRatio")
-            )*ft/(scalar(1) - ft)
+            )*ft/((1 + SMALL) - ft)
         );
     }
     else