From db8ba80ae449fb5b68bf2e819d65d537e30babba Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 14 Dec 2018 11:20:31 +0100
Subject: [PATCH] TUT: update old keywords

---
 .../combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U | 2 +-
 .../constant/radiationProperties                          | 6 +++---
 .../oppositeBurningPanels/constant/radiationProperties    | 2 +-
 .../LES/smallPoolFire2D/constant/radiationProperties      | 8 ++++----
 .../LES/smallPoolFire3D/constant/radiationProperties      | 8 ++++----
 .../reactingFoam/RAS/membrane/system/setFieldsDict        | 2 +-
 .../laminar/sineWaveDamping/system/fvOptions              | 2 +-
 .../iglooWithFridges/system/snappyHexMeshDict             | 2 +-
 .../thermocoupleTestCase/constant/radiationProperties     | 2 +-
 .../hotRadiationRoomFvDOM/constant/radiationProperties    | 8 ++++----
 tutorials/mesh/blockMesh/sphere/system/blockMeshDict      | 2 +-
 tutorials/mesh/blockMesh/sphere7/system/blockMeshDict     | 2 +-
 .../blockMesh/sphere7ProjectedEdges/system/blockMeshDict  | 4 ++--
 .../mesh/snappyHexMesh/flange/system/snappyHexMeshDict    | 2 +-
 .../system/snappyHexMeshDict                              | 2 +-
 .../laminar/depthCharge2D/system/setFieldsDict            | 2 +-
 .../discInConstantFlow/system/setAlphaFieldDict           | 2 +-
 .../discInConstantFlowCyclicBCs/system/setAlphaFieldDict  | 2 +-
 .../discInReversedVortexFlow/system/setAlphaFieldDict     | 2 +-
 .../system/setAlphaFieldDict                              | 2 +-
 .../sphereInReversedVortexFlow/system/setAlphaFieldDict   | 2 +-
 .../interIsoFoam/standingWave/system/setAlphaFieldDict    | 2 +-
 .../cavitatingBullet/system/snappyHexMeshDict             | 2 +-
 23 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U
index 5fab1504c17..9a44a1dfde6 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U
@@ -26,7 +26,7 @@ boundaryField
     inlet
     {
         type            cylindricalInletVelocity;
-        centre          (-0.64 0.5 0);
+        origin          (-0.64 0.5 0);
         axis            (1 0 0);
         axialVelocity   40;
         radialVelocity  20;
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/radiationProperties
index 43c856e38de..49a09e93a1b 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/radiationProperties
@@ -22,10 +22,10 @@ radiationModel  fvDOM;
 
 fvDOMCoeffs
 {
-    nPhi    2;           // azimuthal angles in PI/2 on X-Y.(from Y to X)
-    nTheta  2;           // polar angles in PI (from Z to X-Y plane)
-    convergence 1e-2;   // convergence criteria for radiation iteration
+    nPhi    2;          // azimuthal angles in PI/2 on X-Y.(from Y to X)
+    nTheta  2;          // polar angles in PI (from Z to X-Y plane)
     maxIter 3;          // maximum number of iterations
+    tolerance 1e-2;     // convergence criteria for radiation iteration
 }
 
 // Number of flow iterations per radiation iteration
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/radiationProperties
index 089d6ccc102..ca010d787b5 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/radiationProperties
@@ -24,8 +24,8 @@ fvDOMCoeffs
 {
     nPhi    3;          // azimuthal angles in PI/2 on X-Y.(from Y to X)
     nTheta  6;          // polar angles in PI (from Z to X-Y plane)
-    convergence 0.05;   // convergence criteria for radiation iteration
     maxIter 3;          // maximum number of iterations
+    tolerance 0.05;     // convergence criteria for radiation iteration
 }
 
 // Number of flow iterations per radiation iteration
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/radiationProperties
index d8c0f2a17bf..fc86791c062 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/radiationProperties
@@ -21,10 +21,10 @@ radiationModel  fvDOM;
 
 fvDOMCoeffs
 {
-    nPhi        4;          // azimuthal angles in PI/2 on X-Y.(from Y to X)
-    nTheta      0;          // polar angles in PI (from Z to X-Y plane)
-    convergence 1e-2;       // convergence criteria for radiation iteration
-    maxIter     4;          // maximum number of iterations
+    nPhi        4;      // azimuthal angles in PI/2 on X-Y.(from Y to X)
+    nTheta      0;      // polar angles in PI (from Z to X-Y plane)
+    maxIter     4;      // maximum number of iterations
+    tolerance   1e-2;   // convergence criteria for radiation iteration
 }
 
 // Number of flow iterations per radiation iteration
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/radiationProperties
index e136399c03c..e2fb8e1f4fb 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/radiationProperties
@@ -22,10 +22,10 @@ radiationModel  fvDOM;
 
 fvDOMCoeffs
 {
-    nPhi        2;          // azimuthal angles in PI/2 on X-Y.(from Y to X)
-    nTheta      2;          // polar angles in PI (from Z to X-Y plane)
-    convergence 1e-1;       // convergence criteria for radiation iteration
-    maxIter     1;          // maximum number of iterations
+    nPhi        2;      // azimuthal angles in PI/2 on X-Y.(from Y to X)
+    nTheta      2;      // polar angles in PI (from Z to X-Y plane)
+    maxIter     1;      // maximum number of iterations
+    tolerance   1e-1;   // convergence criteria for radiation iteration
 }
 
 // Number of flow iterations per radiation iteration
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/system/setFieldsDict b/tutorials/combustion/reactingFoam/RAS/membrane/system/setFieldsDict
index 3bb4eaa054a..7d1177ed5b0 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/system/setFieldsDict
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/system/setFieldsDict
@@ -28,7 +28,7 @@ regions
 (
     zoneToCell
     {
-        name pipe;
+        zone pipe;
         fieldValues
         (
             volScalarFieldValue CH4 $:pipe.CH4
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvOptions b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvOptions
index e32ddf7fc6d..ca3d4a962dd 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvOptions
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvOptions
@@ -25,7 +25,7 @@ acousticDampingSource
         timeStart        0.004;
         duration         1000.0;
         selectionMode    all;
-        centre           (-1.25 0 0);
+        origin           (-1.25 0 0);
         radius1          1.2;
         radius2          1.65;
         frequency        3000;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
index 84656980b7b..0db3cac801f 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
@@ -31,7 +31,7 @@ geometry
     igloo
     {
         type    sphere;
-        centre  (3 3 0);
+        origin  (3 3 0);
         radius  4;
     }
 
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/radiationProperties b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/radiationProperties
index 8d019757a31..4fa6102c2ce 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/radiationProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/radiationProperties
@@ -23,8 +23,8 @@ fvDOMCoeffs
 {
     nPhi        3;
     nTheta      5;
-    convergence 1e-3;
     maxIter     10;
+    tolerance   1e-3;
 }
 
 // Number of flow iterations per radiation iteration
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties
index 7b08f080b5d..cfc052c88ef 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties
@@ -21,10 +21,10 @@ radiationModel  fvDOM;
 
 fvDOMCoeffs
 {
-    nPhi        3;          // azimuthal angles in PI/2 on X-Y.(from Y to X)
-    nTheta      5;          // polar angles in PI (from Z to X-Y plane)
-    convergence 1e-3;   // convergence criteria for radiation iteration
-    maxIter     10;         // maximum number of iterations
+    nPhi        3;      // azimuthal angles in PI/2 on X-Y.(from Y to X)
+    nTheta      5;      // polar angles in PI (from Z to X-Y plane)
+    maxIter     10;     // maximum number of iterations
+    tolerance   1e-3;   // convergence criteria for radiation iteration
 }
 
 // Number of flow iterations per radiation iteration
diff --git a/tutorials/mesh/blockMesh/sphere/system/blockMeshDict b/tutorials/mesh/blockMesh/sphere/system/blockMeshDict
index a3957ac87bb..96c6d3ad098 100644
--- a/tutorials/mesh/blockMesh/sphere/system/blockMeshDict
+++ b/tutorials/mesh/blockMesh/sphere/system/blockMeshDict
@@ -19,7 +19,7 @@ geometry
     sphere
     {
         type   sphere;
-        centre (0 0 0);
+        origin (0 0 0);
         radius 1;
     }
 }
diff --git a/tutorials/mesh/blockMesh/sphere7/system/blockMeshDict b/tutorials/mesh/blockMesh/sphere7/system/blockMeshDict
index 82adcbfda08..5f7a88f5f28 100644
--- a/tutorials/mesh/blockMesh/sphere7/system/blockMeshDict
+++ b/tutorials/mesh/blockMesh/sphere7/system/blockMeshDict
@@ -21,7 +21,7 @@ geometry
     sphere
     {
         type   sphere;
-        centre (0 0 0);
+        origin (0 0 0);
         radius 1;
     }
 }
diff --git a/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/blockMeshDict b/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/blockMeshDict
index ca2cf53ad2e..afa5aa0cf5c 100644
--- a/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/blockMeshDict
+++ b/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/blockMeshDict
@@ -21,14 +21,14 @@ geometry
     sphere
     {
         type   sphere;
-        centre (0 0 0);
+        origin (0 0 0);
         radius 1;
     }
 
     innerSphere
     {
         type   sphere;
-        centre (0 0 0);
+        origin (0 0 0);
         radius 0.5;
     }
 }
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict
index fbddfc06e6b..34c628ecad5 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict
@@ -39,7 +39,7 @@ geometry
     refineHole
     {
         type    sphere;
-        centre  (0 0 -0.012);
+        origin  (0 0 -0.012);
         radius  0.003;
     }
 }
diff --git a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/snappyHexMeshDict
index b83aa6b7128..71c4c0d6807 100644
--- a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/snappyHexMeshDict
@@ -31,7 +31,7 @@ geometry
     igloo
     {
         type searchableSphere;
-        centre (3 3 0);
+        origin (3 3 0);
         radius 4;
     }
 
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
index ee905dc545e..6113499681f 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
@@ -27,7 +27,7 @@ regions
 (
     sphereToCell
     {
-        centre  (0.5 0.5 0);
+        origin  (0.5 0.5 0);
         radius  0.1;
 
         fieldValues
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/setAlphaFieldDict
index 47deec020a3..bf999be3fbf 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/setAlphaFieldDict
@@ -19,6 +19,6 @@ field           alpha.water;
 type            cylinder;
 radius          0.25;
 direction       (0 1 0);
-centre          (0.5 0 0.5);
+origin          (0.5 0 0.5);
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/setAlphaFieldDict
index fca367851c6..e22bb3f0a50 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/setAlphaFieldDict
@@ -19,6 +19,6 @@ field     "alpha.water";
 type      cylinder;
 direction (0 1 0);
 radius    0.15;
-centre    (.5 0 .75);
+origin    (0.5 0 0.75);
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/setAlphaFieldDict
index f2f1246d60a..9f0f61c4722 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/setAlphaFieldDict
@@ -19,6 +19,6 @@ field       "alpha.water";
 type        cylinder;
 radius      0.15;
 direction   (0 1 0);
-centre      (0.5 0 0.75);
+origin      (0.5 0 0.75);
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setAlphaFieldDict
index cd5429e580c..05376bfb22f 100644
--- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setAlphaFieldDict
@@ -19,6 +19,6 @@ field           alpha.water;
 type            cylinder;
 radius          0.15;
 direction       (0 1 0);
-centre          (0.5 0 0.75);
+origin          (0.5 0 0.75);
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/setAlphaFieldDict
index 0b4308eb3ac..071803f4af5 100644
--- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/setAlphaFieldDict
@@ -18,6 +18,6 @@ FoamFile
 field       "alpha.water";
 type        sphere;
 radius      0.15;
-centre      (0.35 0.35 0.35);
+origin      (0.35 0.35 0.35);
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/standingWave/system/setAlphaFieldDict
index 15f17161c07..f05bc4c7dec 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/standingWave/system/setAlphaFieldDict
@@ -19,7 +19,7 @@ field       alpha.water;
 type        sin;
 direction   (1 0 0);
 up          (0 0 1);
-centre      (-0.5 0 0.5);
+origin      (-0.5 0 0.5);
 period      2;
 amplitude   0.05;
 
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
index 96f64946509..bb65da9e623 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
@@ -46,7 +46,7 @@ geometry
     refinement1
     {
         type   sphere;
-        centre (0 0 0.0025);
+        origin (0 0 0.0025);
         radius 0.0075;
     }
 
-- 
GitLab