From 7ad164d53570cb9996e535f197f988b9d6f0bf83 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Thu, 24 Mar 2022 14:07:16 +0000
Subject: [PATCH] TUT: Keyword updates

---
 .../pimpleFoam/laminar/inclinedPlaneFilm/0/U  |  4 +--
 .../pisoFoam/RAS/cavity/system/FOvalueAverage |  2 ++
 .../cyclone/constant/kinematicCloudProperties | 10 +++----
 .../constant/kinematicCloudProperties         | 28 +++++++++----------
 .../constant/coalCloud1Properties             |  2 +-
 .../constant/kinematicCloudProperties         |  2 +-
 .../constant/kinematicCloudProperties         | 10 +++----
 .../constant/reactingCloud1Properties         |  2 +-
 .../hotBoxes/constant/surfaceFilmProperties   |  6 ++--
 .../constant/surfaceFilmProperties            |  4 +--
 .../aachenBomb/constant/sprayCloudProperties  |  2 +-
 .../constant/kinematicCloudProperties         | 10 +++----
 12 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/U b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/U
index 742900bd6d0..7fa6aba0a40 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/U
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/U
@@ -72,8 +72,8 @@ boundaryField
                 {
                     minValue        50;
                     maxValue        100;
-                    expectation     75;
-                    variance        100;
+                    mu              75;
+                    sigma           100;
                 }
             }
         }
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOvalueAverage b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOvalueAverage
index 65b3e07b7c2..a36f03ea739 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOvalueAverage
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOvalueAverage
@@ -14,9 +14,11 @@ valueAverage1
     functionObject  momentum1;
     fields          (momentum_x momentum_y momentum_z);
 
+
     // Optional entries
     resetOnRestart  false;
     window          1;
+    windowType      exact;
 
     // Optional (inherited) entries
     writePrecision  10;
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
index 46210d00635..c2b729670df 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
@@ -78,13 +78,13 @@ subModels
             flowRateProfile constant 1;
             sizeDistribution
             {
-                type        normal;
+                type            normal;
                 normalDistribution
                 {
-                    expectation 100e-6;
-                    variance 25e-6;
-                    minValue 20e-6;
-                    maxValue 180e-6;
+                    mu              100e-6;
+                    sigma           25e-6;
+                    minValue        20e-6;
+                    maxValue        180e-6;
                 }
             }
         }
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
index ced26c1ebac..a1474005130 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
@@ -85,19 +85,19 @@ subModels
             parcelsPerSecond 1390885;
             sizeDistribution
             {
-                type        normal;
+                type            normal;
                 normalDistribution
                 {
-                    expectation 650e-6;
-                    variance 25e-6;
-                    minValue 500e-6;
-                    maxValue 800e-6;
+                    mu              650e-6;
+                    sigma           25e-6;
+                    minValue        500e-6;
+                    maxValue        800e-6;
                 }
             }
             flowRateProfile constant 1;
             massTotal       0;
-            SOI 0;
-            duration 60;
+            SOI             0;
+            duration        60;
         }
 
         model2
@@ -110,19 +110,19 @@ subModels
             parcelsPerSecond 1390885;
             sizeDistribution
             {
-                type        normal;
+                type            normal;
                 normalDistribution
                 {
-                    expectation 650e-6;
-                    variance 25e-6;
-                    minValue 500e-6;
-                    maxValue 800e-6;
+                    mu              650e-6;
+                    sigma           25e-6;
+                    minValue        500e-6;
+                    maxValue        800e-6;
                 }
             }
             flowRateProfile constant 1;
             massTotal       0;
-            SOI 0;
-            duration 60;
+            SOI             0;
+            duration        60;
         }
     }
 
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index 1a16e6f66e3..c3ef57106f5 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -93,7 +93,7 @@ subModels
                 {
                     minValue        5e-06;
                     maxValue        0.0005;
-                    d               5e-05;
+                    lambda          5e-05;
                     n               0.5;
                 }
             }
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/kinematicCloudProperties b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/kinematicCloudProperties
index f7a18916cd2..4aa2db3e534 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/kinematicCloudProperties
@@ -92,7 +92,7 @@ subModels
                 {
                     minValue        5e-04;
                     maxValue        0.0012;
-                    d               7.5e-05;
+                    lambda          7.5e-05;
                     n               0.5;
                 }
             }
diff --git a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/kinematicCloudProperties b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/kinematicCloudProperties
index ebe0bf4e5da..7a9e1bb1d86 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/kinematicCloudProperties
@@ -74,13 +74,13 @@ subModels
             flowRateProfile constant 1;
             sizeDistribution
             {
-                type        normal;
+                type            normal;
                 normalDistribution
                 {
-                    expectation 1e-3;
-                    variance 1e-4;
-                    minValue 1e-5;
-                    maxValue 2e-3;
+                    mu              1e-3;
+                    sigma           1e-4;
+                    minValue        1e-5;
+                    maxValue        2e-3;
                 }
             }
         }
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties
index b3b11a982c9..d9565a7d8e1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties
@@ -97,7 +97,7 @@ subModels
                 {
                     minValue        5e-04;
                     maxValue        0.0012;
-                    d               7.5e-05;
+                    lambda          7.5e-05;
                     n               0.5;
                 }
             }
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties
index 7021c62ba91..8aed39454ab 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties
@@ -75,8 +75,8 @@ thermoSingleLayerCoeffs
             {
                 minValue        50;
                 maxValue        100;
-                expectation     75;
-                variance        100;
+                mu              75;
+                sigma           100;
             }
         }
 
@@ -111,7 +111,7 @@ thermoSingleLayerCoeffs
             {
                 minValue        5e-04;
                 maxValue        0.0012;
-                d               7.5e-05;
+                lambda          7.5e-05;
                 n               0.5;
             }
         }
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties
index dc74e9b9c9f..d771a3b7d9d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties
@@ -56,8 +56,8 @@ kinematicSingleLayerCoeffs
             {
                 minValue        50;
                 maxValue        100;
-                expectation     75;
-                variance        100;
+                mu              75;
+                sigma           100;
             }
         }
 
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
index c370f19417f..78167a4536d 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
@@ -139,7 +139,7 @@ subModels
                 {
                     minValue        1e-06;
                     maxValue        0.00015;
-                    d               0.00015;
+                    lambda          0.00015;
                     n               3;
                 }
             }
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
index c66812c1a37..886491db76b 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
@@ -85,13 +85,13 @@ subModels
             flowRateProfile constant 1;
             sizeDistribution
             {
-                type        normal;
+                type            normal;
                 normalDistribution
                 {
-                    expectation 550e-6;
-                    variance 50e-6;
-                    minValue 400e-6;
-                    maxValue 800e-6;
+                    mu              550e-6;
+                    sigma           50e-6;
+                    minValue        400e-6;
+                    maxValue        800e-6;
                 }
             }
         }
-- 
GitLab