Merge commit 'origin/master' into olesenm

src/finiteVolume/fields/fvPatchFields/derived/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C

@@ -112,7 +112,7 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
 
     const dictionary& turbulenceCoeffs = turbulenceProperties.subDict
     (
-        word(turbulenceProperties.lookup("turbulenceModel")) + "Coeffs"
+        word(turbulenceProperties.lookup("RASmodel")) + "Coeffs"
     );
 
     scalar Cmu = dimensionedScalar(turbulenceCoeffs.lookup("Cmu")).value();

src/finiteVolume/fields/fvPatchFields/derived/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C

@@ -117,7 +117,7 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
 
     const dictionary& turbulenceCoeffs = turbulenceProperties.subDict
     (
-        word(turbulenceProperties.lookup("turbulenceModel")) + "Coeffs"
+        word(turbulenceProperties.lookup("RASmodel")) + "Coeffs"
     );
 
     scalar Cmu = dimensionedScalar(turbulenceCoeffs.lookup("Cmu")).value();

tutorials/engineFoam/kivaTest/Allrun

@@ -25,7 +25,7 @@ restartApplication ()
     fi
 }
 
-runKivaToFoam . $case/otape17
+runKivaToFoam . otape17
 cp system/controlDict.1st system/controlDict
 runApplication $application
 cp system/controlDict.2nd system/controlDict

tutorials/interDyMFoam/Allrun

@@ -0,0 +1,12 @@
+#!/bin/sh
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Get application name from directory
+application=`basename $PWD`
+
+(cd damBreakWithObstacle && runApplication blockMesh)
+(cd damBreakWithObstacle && runApplication setSet -batch createObstacle.setSet)
+(cd damBreakWithObstacle && runApplication subsetMesh c0 -patch walls)
+(cd damBreakWithObstacle && runApplication setFields -latestTime)
+(cd damBreakWithObstacle && runApplication $application)

tutorials/interDyMFoam/damBreakWithObstacle/Allrun

@@ -1,12 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application=`basename $PWD`
-
-runApplication blockMesh
-runApplication setSet -batch createObstacle.setSet
-runApplication subsetMesh c0 -patch walls
-runApplication setFields -latestTime
-runApplication $application

tutorials/mhdFoam/hartmann/system/sampleDict

@@ -25,20 +25,24 @@ FoamFile
 
 interpolationScheme cellPoint;
 
-writeFormat     raw;
+setFormat     raw;
 
-sampleSets      
+sets      
 (
-    uniform 
+    line_centreProfile 
     {
-        name            centreProfile;
+        type            uniform;
-        axis            y;
+
+        axis            distance;
         start           (10.001 -1 0.01);
         end             (10.001 1 0.01);
         nPoints         100;
     }
 );
 
+surfaces
+();
+
 fields          
 (
     U.component(0)