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

tutorials/Alltest

@@ -158,7 +158,7 @@ cp ${MAIN_CONTROL_DICT} ${MAIN_CONTROL_DICT}.org
 
 sed \
 -e s/"\(fvSchemes[ \t]*\)\([0-9]\);"/"\1 1;"/g \
--e s/"\(fvSolution[ \t]*\)\([0-9]\);"/"\1 1;"/g \
+-e s/"\(solution[ \t]*\)\([0-9]\);"/"\1 1;"/g \
 ${MAIN_CONTROL_DICT}.org > ${MAIN_CONTROL_DICT}
 
 echo "Copying the tutorials"

tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     rhoPorousSimpleFoam;
+application     porousSimpleFoam;
 
 startFrom       startTime;
 

tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut

@@ -23,25 +23,25 @@ boundaryField
 {
     front
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     back
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     wall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     porosityWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 

tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     rhoPorousSimpleFoam;
+application     porousSimpleFoam;
 
 startFrom       startTime;
 

tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes

@@ -53,8 +53,7 @@ laplacianSchemes
 
 snGradSchemes
 {
-    default         none;
-    snGrad(p)       corrected;
+    default         corrected;
 }
 
 fluxRequired

tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict

@@ -51,6 +51,11 @@ maxCo           0.2;
 
 maxDeltaT       0.025;
 
-libs            ("libincompressibleRASModels.so" "libfvMotionSolvers.so");
+libs
+(
+    "libincompressibleRASModels.so"
+    "libfvMotionSolvers.so"
+    "libforces.so"
+);
 
 // ************************************************************************* //

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/dynamicMeshDict

@@ -19,10 +19,10 @@ dynamicFvMesh   solidBodyMotionFvMesh;
 
 solidBodyMotionFvMeshCoeffs
 {
-    solidBodyMotionFunction SKA;
-    SKACoeffs
+    solidBodyMotionFunction tabulated6DoFMotion;
+    tabulated6DoFMotionCoeffs
     {
-        CofG            ( 0 0 0 );
+        CofG            (0 0 0);
         timeDataFileName "constant/6DoF.dat";
     }
 }