GIT: merge conflict resolution

2025-11-28 03:28:01 +00:00 · 2013-01-21 16:48:22 +00:00
parent c71cfa3d3b b8bace6cd8
commit 03ee3a5046
57 changed files with 2608 additions and 1901 deletions
--- 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);
+            }
        }
    }
 }