Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-dev

etc/caseDicts/general/coordinateSystem/cartesianXY

+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      cartesianXY;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+type      cartesian;
+origin    (0 0 0);
+coordinateRotation
+{
+    type  axesRotation;
+    e1    $x;
+    e2    $y;
+}
+
+//************************************************************************* //

etc/caseDicts/general/coordinateSystem/cartesianXZ

+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      cartesianXZ;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+type      cartesian;
+origin    (0 0 0);
+coordinateRotation
+{
+    type  axesRotation;
+    e1    $x;
+    e3    $z;
+}
+
+//************************************************************************* //

etc/caseDicts/general/coordinateSystem/cartesianYZ

+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      cartesianYZ;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+type      cartesian;
+origin    (0 0 0);
+coordinateRotation
+{
+    type  axesRotation;
+    e2    $y;
+    e3    $z
+}
+
+//************************************************************************* //

etc/caseDicts/general/coordinateSystem/cylindrical

+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      cylindrical;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+type      cartesian;
+coordinateRotation
+{
+    type  localAxesRotation;
+    e3    $axis;
+}
+
+//************************************************************************* //

etc/caseDicts/general/fvOptions/porosity/porousZone

+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      porousZone;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+porousZone // Change to something more descriptive
+{
+    type           explicitPorositySource;
+    active         true;
+    selectionMode  cellZone;
+    cellZone       <cellZoneName>; // Specify the name of the cellZone
+
+    explicitPorositySourceCoeffs
+    {
+        type           DarcyForchheimer;
+
+        DarcyForchheimerCoeffs
+        {
+            // Negative coeffs are multiplied by largest positive coeff,
+            // taking the magnitude, e.g. for -1000, coeff = |1e7*-1000| = 1e10
+
+            d          [0 -2 0 0 0 0 0] (1e7 -1000 -1000);
+            f          [0 -1 0 0 0 0 0] (0 0 0);
+
+            coordinateSystem // Cartesian coordinates for the cellZone
+            {
+                x          (1 0 0);
+                y          (0 1 0);
+                #includeEtc "caseDicts/general/coordinateSystem/cartesianXY"
+            }
+        }
+
+        fixedCoeffCoeffs
+        {
+            alpha      [0 0 -1 0 0 0 0] (100 -1000 -1000);
+            beta       [0 -1 0 0 0 0 0] (0 0 0);
+            rhoRef     1.205;
+
+            coordinateSystem // Cylindrical coordinates for the cellZone
+            {
+                origin     (0 0 0);
+                axis       (0 0 1);
+                #includeEtc "caseDicts/general/coordinateSystem/cylindrical"
+            }
+        }
+    }
+}
+
+//************************************************************************** //