Merge branch 'master' of ssh://homedm/home/dm2/henry/OpenFOAM/OpenFOAM-dev/

applications/test/fvc/Test-fvc.C

@@ -35,17 +35,18 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "setRootCase.H"
 
-#   include "setRootCase.H"
+    #include "createTime.H"
+    #include "createMesh.H"
 
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    volScalarField fx(pow(mesh.C().component(vector::X), 2));
+    volScalarField fx(pow(mesh.C().component(vector::X), 1));
     fx.write();
     volScalarField gradx4(fvc::grad(fx)().component(vector::X));
     gradx4.write();
 
+    Info<< fvc::snGrad(fx) - (mesh.Sf()/mesh.magSf())().component(vector::X) << endl;
+
     //volVectorField curlC(fvc::curl(1.0*mesh.C()));
     //curlC.write();
 

src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C

@@ -98,21 +98,8 @@ Foam::fv::correctedSnGrad<Type>::correction
         ssf.replace
         (
             cmpt,
-            mesh.nonOrthCorrectionVectors()
-          & linear
-            <
-                typename
-                outerProduct<vector, typename pTraits<Type>::cmptType>::type
-            >(mesh).interpolate
-            (
-                gradScheme<typename pTraits<Type>::cmptType>::New
-                (
-                    mesh,
-                    mesh.gradScheme("grad(" + ssf.name() + ')')
-                )()
-                //gaussGrad<typename pTraits<Type>::cmptType>(mesh)
-               .grad(vf.component(cmpt))
-            )
+            correctedSnGrad<typename pTraits<Type>::cmptType>(mesh)
+           .fullGradCorrection(vf.component(cmpt))
         );
     }