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

tutorials/MRFSimpleFoam/mixerVessel2D/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application simpleFoam;
 
 startFrom       startTime;
 

tutorials/XiFoam/moriyoshiHomogeneous/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application XiFoam;
 
 startFrom       latestTime;
 

tutorials/Xoodles/pitzDaily/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application Xoodles;
 
 startFrom       startTime;
 

tutorials/Xoodles/pitzDaily3D/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application Xoodles;
 
 startFrom       startTime;
 

tutorials/boundaryFoam/boundaryLaunderSharma/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application boundaryFoam;
 
 startFrom       startTime;
 

tutorials/boundaryFoam/boundaryWallFunctions/system/controlDict

@@ -15,7 +15,6 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Foam Application Class
-application boundaryFoam;
 
 // Start point of run
 startFrom       startTime;

tutorials/bubbleFoam/bubbleColumn/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application bubbleFoam;
 
 startFrom       startTime;
 

tutorials/buoyantFoam/hotRoom/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application buoyantFoam;
 
 startFrom       startTime;
 

tutorials/buoyantSimpleFoam/hotRoom/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application buoyantSimpleFoam;
 
 startFrom       latestTime;
 

tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     buoyantSimpleRadiationFoam;
 
 startFrom       latestTime;
 

tutorials/cavitatingFoam/les/throttle/constant/turbulenceProperties

@@ -14,6 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType laminar;
+simulationType  LESModel;
 
 // ************************************************************************* //

tutorials/cavitatingFoam/ras/throttle/constant/turbulenceProperties

@@ -14,9 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//simulationType       laminar;
-//simulationType       RASModel;
-simulationType       LESModel;
-
+simulationType  RASModel;
 
 // ************************************************************************* //

tutorials/channelFoam/channel395/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application channelOodles;
 
 startFrom       startTime;
 

tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties

@@ -0,0 +1,19 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  RASModel;
+
+// ************************************************************************* //

tutorials/chtMultiRegionFoam/multiRegionHeater/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     chtMultiRegionFoam;
 
 startFrom       latestTime;
 

tutorials/compressibleInterFoam/depthCharge2D/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application lesInterFoam;
 
 startFrom       latestTime;
 

tutorials/compressibleInterFoam/depthCharge3D/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application lesInterFoam;
 
 startFrom       latestTime;
 

tutorials/dieselFoam/aachenBomb/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application    dieselFoam;
 
 startFrom           startTime;
 

tutorials/dnsFoam/boxTurb16/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application dnsFoam;
 
 startFrom       startTime;
 

tutorials/electrostaticFoam/chargedWire/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application electrostaticFoam;
 
 startFrom       startTime;
 

tutorials/engineFoam/kivaTest/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-applicationClass engineFoam;
 
 startFrom       startTime;
 

tutorials/financialFoam/europeanCall/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application financialFoam;
 
 startFrom       startTime;
 

tutorials/icoDyMFoam/movingCone/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application icoFoamAutoMotion;
 
 startFrom       startTime;
 

tutorials/icoFoam/cavity/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application icoFoam;
 
 startFrom       startTime;
 

tutorials/icoFoam/cavityClipped/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application icoFoam;
 
 startFrom       startTime;
 

tutorials/icoFoam/cavityGrade/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application icoFoam;
 
 startFrom       startTime;
 

tutorials/icoFoam/elbow/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application icoFoam;
 
 startFrom       latestTime;
 

tutorials/interDyMFoam/damBreakWithObstacle/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application interFoam;
 
 startFrom       latestTime;
 

tutorials/interDyMFoam/sloshingTank2D/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     sloshingFoam;
 
 startFrom       startTime;
 

tutorials/interDyMFoam/sloshingTank2D3DoF/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     sloshingFoam;
 
 startFrom       startTime;
 

tutorials/interDyMFoam/sloshingTank3D/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     sloshingFoam;
 
 startFrom       startTime;
 

tutorials/interDyMFoam/sloshingTank3D3DoF/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     sloshingFoam;
 
 startFrom       startTime;
 

tutorials/interDyMFoam/sloshingTank3D6DoF/system/controlDict

@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     sloshingFoam;
 
 startFrom       startTime;
 

tutorials/interFoam/Allrun

@@ -3,50 +3,46 @@
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name from directory
-application=${PWD##*/}
+application="interFoam"
 
-setDamBreakFine ()
+laminarCases="damBreak"
+rasCases="damBreak"
+lesCases="nozzleFlow2D"
+
+computeCase()
 {
-    blockMeshDict="constant/polyMesh/blockMeshDict"
-    controlDict="system/controlDict"
-    sed \
-    -e s/"23 8"/"46 10"/g \
-    -e s/"19 8"/"40 10"/g \
-    -e s/"23 42\(.*\) 1 1)"/"46 76\1 2 1)"/g \
-    -e s/"4 42\(.*\) 1 1)"/"4 76\1 2 1)"/g \
-    -e s/"19 42\(.*\) 1 1)"/"40 76\1 2 1)"/g \
-    $blockMeshDict > temp.$$
-    mv temp.$$ $blockMeshDict
-    sed \
-    -e s/"\(deltaT[ \t]*\) 0.001;"/"\1 5e-04;"/g \
-    -e s/"\(endTime[ \t]*\) 1;"/"\1 0.4;"/g \
-    $controlDict > temp.$$
-    mv temp.$$ $controlDict
+    if [ -f Allrun ] ; then
+        ./Allrun
+    else
+        runApplication blockMesh
+        runApplication changeDictionary
+        runApplication $application
+    fi
 }
 
-# Do damBreak
-cd damBreak
-    runApplication blockMesh
-    runApplication setFields
-    runApplication $application
+cd laminar
+for case in $laminarCases
+do
+    cd $case
+    computeCase
+    cd ..
+done
 cd ..
 
-# Clone case
-cloneCase damBreak damBreakFine
-
-cd damBreakFine
-    # Modify case
-    setDamBreakFine
-    cp ../damBreak/0/alpha1.org 0/alpha1
-    # And execute
-    runApplication blockMesh
-    runApplication setFields
-    runApplication decomposePar
-    hostname > system/machines
-    runParallel $application 4 system/machines
-    runApplication reconstructPar
+cd ras
+for case in $rasCases
+do
+    cd $case
+    computeCase
+    cd ..
+done
 cd ..
 
-cd nozzleFlow2D
-    ./Allrun
+cd les
+for case in $lesCases
+do
+    cd $case
+    computeCase
+    cd ..
+done
 cd ..