Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

tutorials/DNS/dnsFoam/boxTurb16/Allrun

@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application="dnsFoam"
+# Get application name
+application=`getApplication`
 
 runApplication blockMesh
 runApplication boxTurb

tutorials/DNS/dnsFoam/boxTurb16/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     dnsFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/basic/laplacianFoam/flange/Allrun

@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application directory
-application="laplacianFoam"
+# Get application name
+application=`getApplication`
 
 runAnsysToFoam()
 {

tutorials/basic/laplacianFoam/flange/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     laplacianFoam;
+
 startFrom       latestTime;
 
 startTime       0;

tutorials/basic/potentialFoam/cylinder/Allrun

@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="potentialFoam"
+application=`getApplication`
 
 runApplication blockMesh
 runApplication $application

tutorials/basic/potentialFoam/cylinder/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     potentialFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/basic/potentialFoam/pitzDaily/Allrun

@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="potentialFoam"
+application=`getApplication`
 
 runApplication blockMesh
 runApplication $application

tutorials/basic/potentialFoam/pitzDaily/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     potentialFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     scalarTransportFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/combustion/XiFoam/les/pitzDaily/constant/g

@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }

tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     XiFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g

@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }

tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     XiFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/combustion/XiFoam/ras/Allrun

@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
+# Set application name
 application="XiFoam"
 
 setControlDict () {

tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g

@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }

tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     XiFoam;
+
 startFrom       latestTime;
 
 startTime       0;

tutorials/combustion/dieselFoam/aachenBomb/constant/g

@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      binary;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }

tutorials/combustion/dieselFoam/aachenBomb/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     dieselFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/combustion/engineFoam/kivaTest/Allrun

@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application="engineFoam"
+# Get application name
+application=`getApplication`
 
 runKivaToFoam ()
 {

tutorials/combustion/engineFoam/kivaTest/constant/g

@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }

tutorials/combustion/engineFoam/kivaTest/system/controlDict

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-applicationClass engineFoam;
+application     engineFoam;
 
 startFrom       startTime;
 

tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-applicationClass engineFoam;
+application     engineFoam;
 
 startFrom       startTime;
 

tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-applicationClass engineFoam;
+application     engineFoam;
 
 startFrom       startTime;
 

tutorials/compressible/rhoCentralFoam/Allrun

@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application=${PWD##*/}
+# Get application name
+application="rhoCentralFoam"
 
 cases=" \
 shockTube \

tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoCentralFoam;
+
 startFrom       latestTime;
 
 startTime       0;

tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoCentralFoam;
+
 startFrom       latestTime;
 
 startTime       0.005;

tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoCentralFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoCentralFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoCentralFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoCentralFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoPimpleFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoPisoFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoPisoFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoPorousSimpleFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoPorousSimpleFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoSonicFoam;
+
 startFrom       latestTime;
 
 startTime       0;

tutorials/compressible/rhoSonicFoam/shockTube/Allrun

@@ -1,9 +1,10 @@
 #!/bin/sh
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application="rhoSonicFoam"
+# Get application name
+application=`getApplication`
 
 runApplication blockMesh
 runApplication setFields

tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoSonicFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/compressible/rhopSonicFoam/shockTube/Allrun

@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="rhopSonicFoam"
+application=`getApplication`
 
 runApplication blockMesh
 runApplication setFields

tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhopSonicFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhopSonicFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/compressible/sonicFoam/Allrun

@@ -1,5 +0,0 @@
-#!/bin/sh
-set -x
-
-(cd laminar && ./Allrun)
-(cd ras && ./Allrun)

tutorials/compressible/sonicFoam/laminar/Allrun

@@ -1,22 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application=sonicFoam
-
-cases=" \
-forwardStep \
-shockTube \
-"
-for case in $cases
-do
-    (cd $case && runApplication blockMesh)
-#
-    if [ "$case" = "shockTube" ] ; then
-        (cd $case && ./Allrun)
-    else
-        (cd $case && runApplication $application)
-    fi
-#
-done

tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     sonicFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/compressible/sonicFoam/laminar/shockTube/Allrun

@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="sonicFoam"
+application=`getApplication`
 
 runApplication blockMesh
 runApplication setFields

tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     sonicFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/compressible/sonicFoam/ras/Allrun

@@ -1,29 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application=${PWD##*/}
-
-runStarToFoam ()
-{
-    if [ -f log.starToFoam ] ; then
-        echo "starToFoam already run on $PWD: remove log file to run"
-    else
-        echo "starToFoam: converting mesh $1"
-        starToFoam $1 > log.starToFoam 2>&1
-    fi
-}
-
-# Do prism
-(cd prism && foamRunTutorials)
-
-# Special handling for nacaAirfoil
-cd nacaAirfoil
-    runStarToFoam prostar/nacaAirfoil
-    mv constant/polyMesh/boundary temp
-    sed -e s/"\([\t ]*type[\t ]*\)symmetryPlane"/"\1empty"/g \
-        temp > constant/polyMesh/boundary
-    rm temp
-    runApplication $application
-cd ..

tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun

@@ -0,0 +1,23 @@
+#!/bin/sh
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Get application name
+application=`getApplication`
+
+runStarToFoam ()
+{
+    if [ -f log.starToFoam ] ; then
+        echo "starToFoam already run on $PWD: remove log file to run"
+    else
+        echo "starToFoam: converting mesh $1"
+        starToFoam $1 > log.starToFoam 2>&1
+    fi
+}
+
+runStarToFoam prostar/nacaAirfoil
+mv constant/polyMesh/boundary temp
+sed -e s/"\([\t ]*type[\t ]*\)symmetryPlane"/"\1empty"/g \
+    temp > constant/polyMesh/boundary
+rm temp
+runApplication $application

tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes

@@ -2,11 +2,7 @@ nacaAirfoil
 ~~~~~~~~~~~
 * large domain with airfoil section near centre
 * extremely non-orthogonal, highly skew mesh refined around the airfoil
-* running at Mach 1.78 
+* running at Mach 1.78
 * limited 0.5 on all laplacianSchemes because the mesh is so poor
-* run to t = 0.02 with nextWrite; change to stopAt endTime to continue running 
-* deltaT can be increased later in the run to 2e-07 
-
-prism
-~~~~~
-* run to t = 0.0014 for convergence 
+* run to t = 0.02 with nextWrite; change to stopAt endTime to continue running
+* deltaT can be increased later in the run to 2e-07

tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     sonicFoam;
+
 startFrom       latestTime;
 
 startTime       0;

tutorials/compressible/sonicFoam/ras/prism/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     sonicFoam;
+
 startFrom       latestTime;
 
 startTime       0;

tutorials/compressible/sonicLiquidFoam/Allrun

@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application=${PWD##*/}
+# Set application name
+application="sonicLiquidFoam"
 
 setDecompressionTankFine ()
 {

tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     sonicLiquidFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     dsmcFoam;
+
 startFrom       startTime;
 
 startTime       0;

tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     dsmcFoam;
+
 startFrom       startTime;
 
 startTime       0;