Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.C

@@ -100,7 +100,7 @@ tmp<volScalarField> kkLOmega::fTaul
                     lambdaEff*omega_
                   + dimensionedScalar
                     (
-                        "ROTVSMALL",
+                        "ROOTVSMALL",
                         dimLength*inv(dimTime),
                         ROOTVSMALL
                     )
@@ -194,6 +194,7 @@ tmp<volScalarField> kkLOmega::gammaNAT
     );
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 kkLOmega::kkLOmega
@@ -670,7 +671,7 @@ void kkLOmega::correct()
         alphaT(lambdaEff, fv(sqr(fw)*kt_/nu()/(omega_ + omegaMin_)), ktS)
     );
 
-    // By pass s0urce term divided by kl_
+    // By pass source term divided by kl_
 
     const dimensionedScalar fwMin("SMALL", dimless, ROOTVSMALL);
 

src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.H

@@ -136,6 +136,7 @@ class kkLOmega
             const volScalarField& fNatCrit
         ) const;
 
+
 protected:
 
     // Protected data

tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre

@@ -4,6 +4,10 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
+# copy propeller surface from resources folder
+cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
+
+
 # - meshing
 
 runApplication blockMesh

tutorials/incompressible/pimpleFoam/TJunction/0/p

@@ -22,14 +22,13 @@ boundaryField
 {
     inlet
     {
-        //type            totalPressure;
-        //p0              uniform 40;
-
-        type            timeVaryingTotalPressure;
+        type            uniformTotalPressure;
+        pressure        table
+        (
+            (0 10)
+            (1 40)
+        );
         p0              40; // only used for restarts
-        outOfBounds     clamp;
-        fileName        "$FOAM_CASE/constant/p0vsTime";
-
         U               U;
         phi             phi;
         rho             none;

tutorials/incompressible/pimpleFoam/TJunction/constant/p0vsTime

@@ -1,4 +0,0 @@
-(
-    (0 10)
-    (1 40)
-)

tutorials/incompressible/pimpleFoam/TJunctionFan/0/p

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -23,50 +22,37 @@ boundaryField
 {
     inlet
     {
-        type            timeVaryingTotalPressure;
+        type            uniformTotalPressure;
+        pressure        table
+        (
+            (0 10)
+            (1 40)
+        );
+        p0              40; // only used for restarts
+        U               U;
+        phi             phi;
         rho             none;
         psi             none;
         gamma           1;
-        p0              40;
-        fileName        "$FOAM_CASE/constant/p0vsTime";
-        outOfBounds     clamp;
         value           uniform 40;
     }
+
     outlet1
     {
         type            fixedValue;
         value           uniform 10;
     }
+
     outlet2
     {
         type            fixedValue;
         value           uniform 0;
     }
-    baffles
-    {
-        type            zeroGradient;
-    }
-    fan_half0
-    {
-        type            fan;
-        patchType       cyclic;
-        jump            uniform 0;
-        f               2(100 -0.1);
-        value           uniform 0;
-    }
-    fan_half1
-    {
-        type            fan;
-        patchType       cyclic;
-        jump            uniform 0;
-        f               2(100 -0.1);
-        value           uniform 0;
-    }
+
     defaultFaces
     {
         type            zeroGradient;
     }
 }
 
-
 // ************************************************************************* //

tutorials/incompressible/pimpleFoam/TJunctionFan/constant/p0vsTime

@@ -1,4 +0,0 @@
-(
-    (0 10)
-    (1 40)
-)

tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allclean

@@ -4,6 +4,9 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+# remove surface
+\rm -f constant/triSurface/motorBike.obj.gz
+
 rm -rf 0 > /dev/null 2>&1
 
 cleanCase

tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun

@@ -4,6 +4,8 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
+# copy motorbike surface from resources folder
+cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
 
 # Make dummy 0 directory
 mkdir 0

tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/triSurface/README

@@ -0,0 +1,4 @@
+Folder to house tri-surfaces
+
+The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
+folder

tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/snappyHexMeshDict

@@ -28,7 +28,7 @@ addLayers       false;
 // - to 'snap' the mesh boundary to the surface
 geometry
 {
-    motorBike.stl
+    motorBike.obj
     {
         type triSurfaceMesh;
         name motorBike;

tutorials/incompressible/potentialFreeSurfaceFoam/oscillatingBox/extractHeightData

@@ -1,2 +1,3 @@
+#!/bin/sh
 awk '{print $1 " " $4}' poolHeight/0/faceSource.dat > poolHeight_vs_time
 

tutorials/incompressible/simpleFoam/motorBike/Allclean

@@ -3,6 +3,9 @@
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+# remove surface
+\rm -f constant/triSurface/motorBike.obj.gz
+
 rm -rf 0 > /dev/null 2>&1
 
 cleanCase

tutorials/incompressible/simpleFoam/motorBike/Allrun

@@ -2,6 +2,9 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
+# copy motorbike surface from resources folder
+cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
+
 cp -r 0.org 0 > /dev/null 2>&1
 
 runApplication blockMesh

tutorials/incompressible/simpleFoam/motorBike/constant/triSurface/README

@@ -0,0 +1,4 @@
+Folder to house tri-surfaces
+
+The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
+folder

tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict

@@ -28,7 +28,7 @@ addLayers       true;
 // - to 'snap' the mesh boundary to the surface
 geometry
 {
-    motorBike.stl
+    motorBike.obj
     {
         type triSurfaceMesh;
         name motorBike;