TUT: incompressible: clean up tutorials

tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/Urel

@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/epsilon

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      epsilon;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/k

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/nut

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/p

@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/SRFPimpleFoam/rotor2D/Allclean

@@ -1,8 +1,8 @@
 #!/bin/sh
-cd "${0%/*}" || exit    # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
-m4 system/blockMeshDict.m4 > system/blockMeshDict
+cleanCase0
-blockMesh > log.blockMesh 2>&1
 
 #------------------------------------------------------------------------------

tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun

@@ -3,7 +3,11 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
-./makeMesh
+restore0Dir
+
+m4 system/blockMeshDict.m4 > system/blockMeshDict
+blockMesh > log.blockMesh 2>&1
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/SRFProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      SRFProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/transportProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,4 +18,5 @@ transportModel  Newtonian;
 
 nu              1e-05;
 
+
 // ************************************************************************* //

tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties

@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RAS;
+simulationType      RAS;
 
 RAS
 {

tutorials/incompressible/SRFPimpleFoam/rotor2D/system/controlDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -49,4 +48,5 @@ adjustTimeStep  no;
 
 maxCo           0.5;
 
+
 // ************************************************************************* //

tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSchemes

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,9 +27,13 @@ gradSchemes
 divSchemes
 {
     default         none;
+
     div(phi,Urel)   Gauss limitedLinearV 1;
-    div(phi,k)      Gauss limitedLinear 1;
+
-    div(phi,epsilon) Gauss limitedLinear 1;
+    turbulence      Gauss limitedLinear 1;
+    div(phi,k)      $turbulence;
+    div(phi,epsilon) $turbulence;
+
     div((nuEff*dev2(T(grad(Urel))))) Gauss linear;
 }
 

tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      Urel;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,15 +27,18 @@ boundaryField
         relative        no;
         value           uniform (0 0 0);
     }
+
     outlet
     {
         type            pressureInletOutletVelocity;
         value           $internalField;
     }
+
     innerWall
     {
         type            noSlip;
     }
+
     outerWall
     {
         type            SRFVelocity;
@@ -44,10 +46,12 @@ boundaryField
         relative        no;
         value           uniform (0 0 0);
     }
+
     cyclic_half0
     {
         type            cyclic;
     }
+
     cyclic_half1
     {
         type            cyclic;

tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      epsilon;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,25 +25,30 @@ boundaryField
         type            fixedValue;
         value           uniform 14.855;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 14.855;
     }
+
     innerWall
     {
         type            epsilonWallFunction;
         value           uniform 14.855;
     }
+
     outerWall
     {
         type            epsilonWallFunction;
         value           uniform 14.855;
     }
+
     cyclic_half0
     {
         type            cyclic;
     }
+
     cyclic_half1
     {
         type            cyclic;

tutorials/incompressible/SRFSimpleFoam/mixer/0/k

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,26 +25,31 @@ boundaryField
         type            fixedValue;
         value           uniform 0.375;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 0.375;
     }
+
     innerWall
     {
         type            kqRWallFunction;
         value           uniform 0.375;
     }
+
     outerWall
     {
         type            kqRWallFunction;
         value           uniform 0.375;
     }
+
     cyclic_half0
     {
         type            cyclic;
         value           uniform 0.375;
     }
+
     cyclic_half1
     {
         type            cyclic;

tutorials/incompressible/SRFSimpleFoam/mixer/0/nut

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,26 +25,31 @@ boundaryField
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     innerWall
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     outerWall
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     cyclic_half0
     {
         type            cyclic;
         value           uniform 0;
     }
+
     cyclic_half1
     {
         type            cyclic;

tutorials/incompressible/SRFSimpleFoam/mixer/0/omega

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      omega;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,26 +25,31 @@ boundaryField
         type            fixedValue;
         value           uniform 3.5;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 3.5;
     }
+
     innerWall
     {
         type            omegaWallFunction;
         value           uniform 3.5;
     }
+
     outerWall
     {
         type            omegaWallFunction;
         value           uniform 3.5;
     }
+
     cyclic_half0
     {
         type            cyclic;
         value           uniform 3.5;
     }
+
     cyclic_half1
     {
         type            cyclic;

tutorials/incompressible/SRFSimpleFoam/mixer/0/p

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,23 +24,28 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            fixedValue;
         value           uniform 0;
     }
+
     innerWall
     {
         type            zeroGradient;
     }
+
     outerWall
     {
         type            zeroGradient;
     }
+
     cyclic_half0
     {
         type            cyclic;
     }
+
     cyclic_half1
     {
         type            cyclic;

tutorials/incompressible/SRFSimpleFoam/mixer/constant/SRFProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      SRFProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/incompressible/SRFSimpleFoam/mixer/constant/transportProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,4 +18,5 @@ transportModel  Newtonian;
 
 nu              1.5e-05;
 
+
 // ************************************************************************* //

tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties

@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RAS;
+simulationType      RAS;
 
 RAS
 {

tutorials/incompressible/SRFSimpleFoam/mixer/system/blockMeshDict

@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      blockMeshDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 scale   0.1;
@@ -153,4 +152,5 @@ mergeMatchPairs
 (
 );
 
+
 // ************************************************************************* //

tutorials/incompressible/SRFSimpleFoam/mixer/system/controlDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -29,13 +28,17 @@ gradSchemes
 divSchemes
 {
     default         none;
+
     div(phi,Urel)   bounded Gauss linearUpwind limited;
-    div(phi,k)      bounded Gauss upwind;
+
-    div(phi,epsilon) bounded Gauss upwind;
+    turbulence      bounded Gauss upwind;
-    div(phi,omega)  bounded Gauss upwind;
+    div(phi,k)      $turbulence;
-    div(phi,R)      bounded Gauss upwind;
+    div(phi,epsilon) $turbulence;
+    div(phi,omega)  $turbulence;
+    div(phi,nuTilda) $turbulence;
+    div(phi,R)      $turbulence;
     div(R)          Gauss linear;
-    div(phi,nuTilda) bounded Gauss upwind;
+
     div((nuEff*dev2(T(grad(Urel))))) Gauss linear;
 }
 
@@ -56,7 +59,7 @@ snGradSchemes
 
 wallDist
 {
-    method meshWave;
+    method          meshWave;
 }
 
 

tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/U

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/Ua

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      Ua;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/nuTilda

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nuTilda;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/nuaTilda

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nuTilda;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/nut

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/p

@@ -48,4 +48,5 @@ boundaryField
     #include "include/frontBackUpperPatches"
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/pa

@@ -48,4 +48,5 @@ boundaryField
     #include "include/frontBackUpperPatches"
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/Allrun

@@ -9,7 +9,7 @@ decompDict="-decomposeParDict system/decomposeParDict.20"
 # unset decompDict
 
 # copy motorbike surface from resources directory
-\cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
+cp -f "$FOAM_TUTORIALS"/resources/geometry/motorBike.obj.gz constant/triSurface/
 runApplication surfaceFeatureExtract
 
 runApplication blockMesh

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/constant/transportProperties

@@ -18,4 +18,5 @@ transportModel  Newtonian;
 
 nu              1.5e-05;
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/constant/turbulenceProperties

@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RAS;
+simulationType          RAS;
 
 RAS
 {
@@ -25,4 +25,5 @@ RAS
     printCoeffs         on;
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/blockMeshDict

@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      blockMeshDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 scale   1;
@@ -83,4 +82,5 @@ boundary
     }
 );
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/fvSolution

@@ -16,7 +16,7 @@ FoamFile
 
 solvers
 {
-    "p|pa"
+    "(p|pa)"
     {
         solver          GAMG;
         smoother        GaussSeidel;
@@ -37,7 +37,7 @@ solvers
         $p;
     }
 
-    "U|Ua|nuTilda|nuaTilda|yWall|da"
+    "(U|Ua|nuTilda|nuaTilda|yWall|da)"
     {
         solver          smoothSolver;
         smoother        GaussSeidel;
@@ -75,4 +75,5 @@ cache
     grad(U);
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/optimisationDict

@@ -120,4 +120,5 @@ optimisation
     }
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/U

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,16 +24,19 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            fixedValue;
         value           uniform ( 0 0 0 );
     }
+
     pressure
     {
         type            fixedValue;
         value           uniform ( 0 0 0 );
     }
+
     inlet
     {
         type            freestream;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/Ua

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      Ua;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,16 +24,19 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            adjointWallVelocity;
         value           uniform ( 0 0 0 );
     }
+
     pressure
     {
         type            adjointWallVelocity;
         value           uniform ( 0 0 0 );
     }
+
     inlet
     {
         type            adjointFarFieldVelocity;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/p

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,14 +24,17 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            zeroGradient;
     }
+
     pressure
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            outletInlet;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/pa

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      pa;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,14 +24,17 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            zeroGradient;
     }
+
     pressure
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            adjointFarFieldPressure;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/Allclean

@@ -3,6 +3,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
-cleanCase
+cleanCase0
 
 #------------------------------------------------------------------------------

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/Allrun

@@ -3,10 +3,14 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
-resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources
+resourcesDir="$FOAM_TUTORIALS"/incompressible/adjointOptimisationFoam/resources
+
+cp -rf "$resourcesDir"/meshes/naca0012/polyMesh/ constant/
+
+restore0Dir
 
-\cp -r $resourcesDir/meshes/naca0012/polyMesh constant
 runApplication decomposePar
+
 runParallel $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/constant/transportProperties

@@ -16,6 +16,7 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 6.e-03;
+nu              6.e-03;
+
 
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/constant/turbulenceProperties

@@ -16,4 +16,5 @@ FoamFile
 
 simulationType  laminar;
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/controlDict

@@ -44,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/decomposeParDict

@@ -16,11 +16,12 @@ FoamFile
 
 numberOfSubdomains 4;
 
-method          hierarchical;
+method             hierarchical;
 
 coeffs
 {
-    n               (2 2 1);
+    n              (2 2 1);
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/fvSolution

@@ -21,21 +21,23 @@ SIMPLE
 
 solvers
 {
-    "p.*|pa.*"
+    "(p|pa).*"
     {
         solver           PCG;
         preconditioner   DIC;
         tolerance        1e-9;
         relTol           0.01;
     };
-    "m|ma"
+
+    "(m|ma)"
     {
         solver           PCG;
         preconditioner   DIC;
         tolerance        1e-9;
         relTol           0.01;
     };
-    "U.*|Ua.*"
+
+    "(U|Ua).*"
     {
         solver           PBiCGStab;
         preconditioner   DILU;
@@ -58,4 +60,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/optimisationDict

@@ -102,4 +102,5 @@ optimisation
     }
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/U

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,16 +24,19 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            fixedValue;
         value           uniform ( 0 0 0 );
     }
+
     pressure
     {
         type            fixedValue;
         value           uniform ( 0 0 0 );
     }
+
     inlet
     {
         type            freestream;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/Ua

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      Ua;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,16 +24,19 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            adjointWallVelocity;
         value           uniform ( 0 0 0 );
     }
+
     pressure
     {
         type            adjointWallVelocity;
         value           uniform ( 0 0 0 );
     }
+
     inlet
     {
         type            adjointFarFieldVelocity;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/p

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,14 +24,17 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            zeroGradient;
     }
+
     pressure
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            outletInlet;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/pa

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      pa;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,14 +24,17 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            zeroGradient;
     }
+
     pressure
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            adjointFarFieldPressure;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/Allclean

@@ -3,6 +3,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
-cleanCase
+cleanCase0
 
 #------------------------------------------------------------------------------

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/Allrun

@@ -3,10 +3,14 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
-resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources
+resourcesDir="$FOAM_TUTORIALS"/incompressible/adjointOptimisationFoam/resources
+
+cp -rf "$resourcesDir"/meshes/naca0012/polyMesh/ constant/
+
+restore0Dir
 
-\cp -r $resourcesDir/meshes/naca0012/polyMesh constant
 runApplication decomposePar
+
 runParallel $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/constant/transportProperties

@@ -16,6 +16,7 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 6.e-03;
+nu              6.e-03;
+
 
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/constant/turbulenceProperties

@@ -16,4 +16,5 @@ FoamFile
 
 simulationType  laminar;
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/controlDict

@@ -44,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/decomposeParDict

@@ -16,11 +16,12 @@ FoamFile
 
 numberOfSubdomains 4;
 
-method          hierarchical;
+method             hierarchical;
 
 coeffs
 {
-    n               (2 2 1);
+    n              (2 2 1);
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/fvSolution

@@ -21,21 +21,23 @@ SIMPLE
 
 solvers
 {
-    "p.*|pa.*"
+    "(p|pa).*"
     {
         solver           PCG;
         preconditioner   DIC;
         tolerance        1e-9;
         relTol           0.01;
     };
-    "m|ma"
+
+    "(m|ma)"
     {
         solver           PCG;
         preconditioner   DIC;
         tolerance        1e-9;
         relTol           0.01;
     };
-    "U.*|Ua.*"
+
+    "(U|Ua).*"
     {
         solver           PBiCGStab;
         preconditioner   DILU;
@@ -58,4 +60,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/optimisationDict

@@ -102,4 +102,5 @@ optimisation
     }
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/U

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,16 +24,19 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            fixedValue;
         value           uniform ( 0 0 0 );
     }
+
     pressure
     {
         type            fixedValue;
         value           uniform ( 0 0 0 );
     }
+
     inlet
     {
         type            freestream;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/Ua

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      Ua;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,16 +24,19 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            adjointWallVelocity;
         value           uniform ( 0 0 0 );
     }
+
     pressure
     {
         type            adjointWallVelocity;
         value           uniform ( 0 0 0 );
     }
+
     inlet
     {
         type            adjointFarFieldVelocity;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/p

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,14 +24,17 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            zeroGradient;
     }
+
     pressure
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            outletInlet;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/pa

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      pa;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,14 +24,17 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            zeroGradient;
     }
+
     pressure
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            adjointFarFieldPressure;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/Allclean

@@ -3,6 +3,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
-cleanCase
+cleanCase0
 
 #------------------------------------------------------------------------------

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/Allrun

@@ -3,10 +3,14 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
-resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources
+resourcesDir="$FOAM_TUTORIALS"/incompressible/adjointOptimisationFoam/resources
+
+cp -rf "$resourcesDir"/meshes/naca0012/polyMesh/ constant/
+
+restore0Dir
 
-\cp -r $resourcesDir/meshes/naca0012/polyMesh constant
 runApplication decomposePar
+
 runParallel $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/constant/adjointRASProperties

@@ -19,4 +19,6 @@ adjointRASModel   adjointLaminar;
 adjointTurbulence on;
 
 printCoeffs       off;
+
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/constant/transportProperties

@@ -16,6 +16,7 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 6.e-03;
+nu              6.e-03;
+
 
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/constant/turbulenceProperties

@@ -16,4 +16,5 @@ FoamFile
 
 simulationType  laminar;
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/controlDict

@@ -44,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/decomposeParDict

@@ -16,11 +16,12 @@ FoamFile
 
 numberOfSubdomains 4;
 
-method          hierarchical;
+method             hierarchical;
 
 coeffs
 {
-    n               (2 2 1);
+    n              (2 2 1);
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/fvSolution

@@ -21,21 +21,23 @@ SIMPLE
 
 solvers
 {
-    "p.*|pa.*"
+    "(p|pa).*"
     {
         solver           PCG;
         preconditioner   DIC;
         tolerance        1e-9;
         relTol           0.01;
     };
-    "m|ma"
+
+    "(m|ma)"
     {
         solver           PCG;
         preconditioner   DIC;
         tolerance        1e-9;
         relTol           0.01;
     };
-    "U.*|Ua.*"
+
+    "(U|Ua).*"
     {
         solver           PBiCGStab;
         preconditioner   DILU;
@@ -58,4 +60,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/optimisationDict

@@ -104,4 +104,5 @@ optimisation
     }
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/U

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,16 +24,19 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            fixedValue;
         value           uniform ( 0 0 0 );
     }
+
     pressure
     {
         type            fixedValue;
         value           uniform ( 0 0 0 );
     }
+
     inlet
     {
         type            freestream;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/Ua

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      Ua;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,16 +24,19 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            adjointWallVelocity;
         value           uniform ( 0 0 0 );
     }
+
     pressure
     {
         type            adjointWallVelocity;
         value           uniform ( 0 0 0 );
     }
+
     inlet
     {
         type            adjointFarFieldVelocity;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nuTilda

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nuTilda;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,16 +24,19 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            fixedValue;
         value           uniform 0;
     }
+
     pressure
     {
         type            fixedValue;
         value           uniform 0;
     }
+
     inlet
     {
         type            inletOutlet;
@@ -43,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nuaTilda

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nuaTilda;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,16 +24,19 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            fixedValue;
         value           uniform 0;
     }
+
     pressure
     {
         type            fixedValue;
         value           uniform 0;
     }
+
     inlet
     {
         type            adjointFarFieldNuaTilda;
@@ -42,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nut

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,16 +24,19 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            nutUSpaldingWallFunction;
         value           uniform 0;
     }
+
     pressure
     {
         type            nutUSpaldingWallFunction;
         value           uniform 0;
     }
+
     inlet
     {
         type            calculated;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/p

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,14 +24,17 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            zeroGradient;
     }
+
     pressure
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            outletInlet;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/pa

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      pa;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,14 +24,17 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            zeroGradient;
     }
+
     pressure
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            adjointFarFieldPressure;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/Allclean

@@ -3,6 +3,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
-cleanCase
+cleanCase0
 
 #------------------------------------------------------------------------------

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/Allrun

@@ -3,10 +3,14 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
-resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources
+resourcesDir="$FOAM_TUTORIALS"/incompressible/adjointOptimisationFoam/resources
+
+cp -rf "$resourcesDir"/meshes/naca0012/polyMesh/ constant/
+
+restore0Dir
 
-\cp -r $resourcesDir/meshes/naca0012/polyMesh constant
 runApplication decomposePar
+
 runParallel $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/constant/adjointRASProperties

@@ -25,4 +25,5 @@ adjointSpalartAllmarasCoeffs
 
 adjointTurbulence on;
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/constant/transportProperties

@@ -16,6 +16,7 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1.e-05;
+nu              1.e-05;
+
 
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/constant/turbulenceProperties

@@ -14,15 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RAS;
+simulationType      RAS;
 
 RAS
 {
-    RASModel            SpalartAllmaras;
+    RASModel        SpalartAllmaras;
 
-    turbulence          on;
+    turbulence      on;
 
-    printCoeffs         on;
+    printCoeffs     on;
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/controlDict

@@ -44,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/decomposeParDict

@@ -16,11 +16,12 @@ FoamFile
 
 numberOfSubdomains 4;
 
-method          hierarchical;
+method             hierarchical;
 
 coeffs
 {
-    n               (2 2 1);
+    n              (2 2 1);
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/fvSolution

@@ -21,21 +21,23 @@ SIMPLE
 
 solvers
 {
-    "p.*|pa.*"
+    "(p|pa).*"
     {
         solver           PCG;
         preconditioner   DIC;
         tolerance        1e-9;
         relTol           0.01;
     };
-    "m|ma"
+
+    "(m|ma)"
     {
         solver           PCG;
         preconditioner   DIC;
         tolerance        1e-9;
         relTol           0.01;
     };
-    "U.*|Ua.*|nuTilda.*|nuaTilda.*|yWall|da"
+
+    "(U.*|Ua.*|nuTilda.*|nuaTilda.*|yWall|da)"
     {
         solver           PBiCGStab;
         preconditioner   DILU;
@@ -62,4 +64,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/optimisationDict

@@ -128,4 +128,5 @@ optimisation
     }
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/U

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,16 +24,19 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            fixedValue;
         value           uniform ( 0 0 0 );
     }
+
     pressure
     {
         type            fixedValue;
         value           uniform ( 0 0 0 );
     }
+
     inlet
     {
         type            freestream;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/Ua

@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2012                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    object      Ua;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 1 -1 0 0 0 0 ];
+
+internalField   uniform ( 0 0 0 );
+
+boundaryField
+{
+    frontBack
+    {
+        type            empty;
+    }
+
+    suction
+    {
+        type            adjointWallVelocity;
+        value           uniform ( 0 0 0 );
+    }
+
+    pressure
+    {
+        type            adjointWallVelocity;
+        value           uniform ( 0 0 0 );
+    }
+
+    inlet
+    {
+        type            adjointFarFieldVelocity;
+        value           uniform ( 0 0 0 );
+    }
+}
+
+
+// ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/nuTilda

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nuTilda;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,16 +24,19 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            fixedValue;
         value           uniform 0;
     }
+
     pressure
     {
         type            fixedValue;
         value           uniform 0;
     }
+
     inlet
     {
         type            inletOutlet;
@@ -43,4 +45,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/nuaTilda

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nuaTilda;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,16 +24,19 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            fixedValue;
         value           uniform 0;
     }
+
     pressure
     {
         type            fixedValue;
         value           uniform 0;
     }
+
     inlet
     {
         type            adjointFarFieldNuaTilda;
@@ -42,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/nut

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,16 +24,19 @@ boundaryField
     {
         type            empty;
     }
+
     suction
     {
         type            nutUSpaldingWallFunction;
         value           uniform 0;
     }
+
     pressure
     {
         type            nutUSpaldingWallFunction;
         value           uniform 0;
     }
+
     inlet
     {
         type            calculated;

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/p

@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2012                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -2 0 0 0 0 ];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    frontBack
+    {
+        type            empty;
+    }
+
+    suction
+    {
+        type            zeroGradient;
+    }
+
+    pressure
+    {
+        type            zeroGradient;
+    }
+
+    inlet
+    {
+        type            outletInlet;
+        outletValue     uniform 0;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/pa

@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2012                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      pa;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -2 0 0 0 0 ];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    frontBack
+    {
+        type            empty;
+    }
+
+    suction
+    {
+        type            zeroGradient;
+    }
+
+    pressure
+    {
+        type            zeroGradient;
+    }
+
+    inlet
+    {
+        type            adjointFarFieldPressure;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //

tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0/Ua

@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2012                                 |
-|   \\  /    A nd           | Website:  www.openfoam.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volVectorField;
-    location    "0";
-    object      Ua;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 0 1 -1 0 0 0 0 ];
-
-internalField   uniform ( 0 0 0 );
-
-boundaryField
-{
-    frontBack
-    {
-        type            empty;
-    }
-    suction
-    {
-        type            adjointWallVelocity;
-        value           uniform ( 0 0 0 );
-    }
-    pressure
-    {
-        type            adjointWallVelocity;
-        value           uniform ( 0 0 0 );
-    }
-    inlet
-    {
-        type            adjointFarFieldVelocity;
-        value           uniform ( 0 0 0 );
-    }
-}
-
-
-// ************************************************************************* //