From 9692a52e3aa7114ff55dc7c74b5a9f9b745c4175 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Mon, 21 Jan 2013 12:37:54 +0000
Subject: [PATCH] ENH: Update tutorials using coordinate systems for porosity
 models

---
 .../angledDuct/system/fvOptions               | 12 +++++--
 .../porosityProperties => system/fvOptions}   | 34 ++++++++++++------
 .../ras/angledDuct/system/fvSolution          |  4 +--
 .../mixerVessel2D/constant/porosityProperties | 10 ++++--
 .../porosityProperties => system/fvOptions}   | 35 +++++++++++++------
 .../constant/porosityProperties               | 10 ++++--
 .../system/fvOptions                          | 12 +++++--
 .../constant/porosityProperties               | 10 ++++--
 .../filter/constant/porosityProperties        | 10 ++++--
 9 files changed, 99 insertions(+), 38 deletions(-)
 rename tutorials/compressible/rhoPimpleFoam/ras/angledDuct/{constant/porosityProperties => system/fvOptions} (51%)
 rename tutorials/compressible/rhoPimplecFoam/angledDuct/{constant/porosityProperties => system/fvOptions} (51%)

diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/fvOptions b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/fvOptions
index 246601aa168..2fd3242b6db 100644
--- a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/fvOptions
+++ b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/fvOptions
@@ -33,12 +33,18 @@ porosity1
 
             coordinateSystem
             {
-                e1  (0.70710678 0.70710678 0);
-                e2  (0 0 1);
+                type    cartesian;
+                origin  (0 0 0);
+                coordinateRotation
+                {
+                    type    axesRotation;
+                    e1  (0.70710678 0.70710678 0);
+                    e2  (0 0 1);
+                }
             }
         }
     }
 }
 
 
-************************************************************************* //
+//************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/porosityProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvOptions
similarity index 51%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/porosityProperties
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvOptions
index 650f01268ca..2fd3242b6db 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/porosityProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvOptions
@@ -10,29 +10,41 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
-    object      porosityProperties;
+    location    "system";
+    object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 porosity1
 {
-    type            DarcyForchheimer;
-    active          yes;
+    type            explicitPorositySource;
+    active          true;
+    selectionMode   cellZone;
     cellZone        porosity;
 
-    DarcyForchheimerCoeffs
+    explicitPorositySourceCoeffs
     {
-        d   d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
-        f   f [0 -1 0 0 0 0 0] (0 0 0);
+        type            DarcyForchheimer;
 
-        coordinateSystem
+        DarcyForchheimerCoeffs
         {
-            e1  (0.70710678 0.70710678 0);
-            e2  (0 0 1);
+            d   d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
+            f   f [0 -1 0 0 0 0 0] (0 0 0);
+
+            coordinateSystem
+            {
+                type    cartesian;
+                origin  (0 0 0);
+                coordinateRotation
+                {
+                    type    axesRotation;
+                    e1  (0.70710678 0.70710678 0);
+                    e2  (0 0 1);
+                }
+            }
         }
     }
 }
 
 
-// ************************************************************************* //
+//************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
index 084c382e84f..d87df4b4926 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
@@ -57,7 +57,7 @@ PIMPLE
     nCorrectors     1;
     nNonOrthogonalCorrectors 0;
     rhoMin          rhoMin [ 1 -3 0 0 0 ] 0.5;
-    rhoMax          rhoMax [ 1 -3 0 0 0 ] 2.0;
+    rhoMax          rhoMax [ 1 -3 0 0 0 ] 1.5;
 
     residualControl
     {
@@ -76,7 +76,7 @@ relaxationFactors
     fields
     {
         "p.*"           0.3;
-        "rho.*"         1;
+        "rho.*"         0.01;
     }
     equations
     {
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/porosityProperties b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/porosityProperties
index 1a76ef1d80b..6c2f939ea68 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/porosityProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/porosityProperties
@@ -28,8 +28,14 @@ porosity1
 
         coordinateSystem
         {
-            e1  (1 0 0);
-            e2  (0 1 0);
+            type    cartesian;
+            origin  (0 0 0);
+            coordinateRotation
+            {
+                type    axesRotation;
+                e1  (1 0 0);
+                e2  (0 1 0);
+            }
         }
     }
 }
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/porosityProperties b/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvOptions
similarity index 51%
rename from tutorials/compressible/rhoPimplecFoam/angledDuct/constant/porosityProperties
rename to tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvOptions
index 22add8ff299..3cb9357ca0e 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/porosityProperties
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvOptions
@@ -10,28 +10,41 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
-    object      porosityProperties;
+    location    "system";
+    object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 porosity1
 {
-    type            DarcyForchheimer;
-    active          yes;
+    type            explicitPorositySource;
+    active          false;
+    selectionMode   cellZone;
     cellZone        porosity;
 
-    DarcyForchheimerCoeffs
+    explicitPorositySourceCoeffs
     {
-        d   d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
-        f   f [0 -1 0 0 0 0 0] (0 0 0);
+        type            DarcyForchheimer;
 
-        coordinateSystem
+        DarcyForchheimerCoeffs
         {
-            e1  (0.70710678 0.70710678 0);
-            e2  (0 0 1);
+            d   d [0 -2 0 0 0 0 0] (5e5 -1000 -1000);
+            f   f [0 -1 0 0 0 0 0] (0 0 0);
+
+            coordinateSystem
+            {
+                type    cartesian;
+                origin  (0 0 0);
+                coordinateRotation
+                {
+                    type    axesRotation;
+                    e1      (0.70710678 0.70710678 0);
+                    e2      (0 0 1);
+                }
+            }
         }
     }
 }
 
-// ************************************************************************* //
+
+//************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porosityProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porosityProperties
index 650f01268ca..9795d83b85c 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porosityProperties
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porosityProperties
@@ -28,8 +28,14 @@ porosity1
 
         coordinateSystem
         {
-            e1  (0.70710678 0.70710678 0);
-            e2  (0 0 1);
+            type    cartesian;
+            origin  (0 0 0);
+            coordinateRotation
+            {
+                type    axesRotation;
+                e1  (0.70710678 0.70710678 0);
+                e2  (0 0 1);
+            }
         }
     }
 }
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvOptions b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvOptions
index d75a43c5650..5aee15c82d4 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvOptions
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvOptions
@@ -51,12 +51,18 @@ porosity1
 
             coordinateSystem
             {
-                e1  (0.70710678 0.70710678 0);
-                e2  (0 0 1);
+                type    cartesian;
+                origin  (0 0 0);
+                coordinateRotation
+                {
+                    type    axesRotation;
+                    e1  (0.70710678 0.70710678 0);
+                    e2  (0 0 1);
+                }
             }
         }
     }
 }
 
 
-************************************************************************* //
+//************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porosityProperties b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porosityProperties
index 650f01268ca..80421b7786f 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porosityProperties
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porosityProperties
@@ -28,8 +28,14 @@ porosity1
 
         coordinateSystem
         {
-            e1  (0.70710678 0.70710678 0);
-            e2  (0 0 1);
+            type    cartesian;
+            origin  (0 0 0);
+            coordinateRotation
+            {
+                type    axesRotation;
+                e1      (0.70710678 0.70710678 0);
+                e2      (0 0 1);
+            }
         }
     }
 }
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/porosityProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/porosityProperties
index 93c4de650d3..af10f81b168 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/porosityProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/porosityProperties
@@ -28,8 +28,14 @@ filter1
 
         coordinateSystem
         {
-            e1  (1 0 0);
-            e2  (0 1 0);
+            type    cartesian;
+            origin  (0 0 0);
+            coordinateRotation
+            {
+                type    axesRotation;
+                e1      (1 0 0);
+                e2      (0 1 0);
+            }
         }
     }
 }
-- 
GitLab