From ca492058d8fb9c92ceb212fcfbece70b7e2a4510 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 9 May 2011 17:53:19 +0100
Subject: [PATCH] ENH: Updated cloud tutorials

---
 .../verticalChannel/constant/reactingCloud1Properties | 11 ++++++-----
 .../simplifiedSiwek/constant/coalCloud1Properties     |  6 ++++--
 .../constant/limestoneCloud1Properties                |  6 ++++--
 .../hopperEmptying/constant/kinematicCloudProperties  |  8 ++++++--
 .../constant/kinematicCloudProperties                 |  6 ++++--
 .../filter/constant/reactingCloud1Properties          | 10 +++++++---
 .../parcelInBox/constant/reactingCloud1Properties     |  8 ++++++--
 .../verticalChannel/constant/reactingCloud1Properties | 10 +++++++---
 .../cylinder/constant/reactingCloud1Properties        |  6 ++++--
 .../hotBoxes/constant/reactingCloud1Properties        |  6 ++++--
 .../splashPanel/constant/reactingCloud1Properties     |  6 ++++--
 .../evaporationTest/constant/reactingCloud1Properties |  8 ++++++--
 12 files changed, 62 insertions(+), 29 deletions(-)

diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 2215e348f71..24bf767369a 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -110,13 +110,10 @@ subModels
 
     surfaceReactionModel none;
 
-    postProcessingModel particleTracks;
-
     surfaceFilmModel none;
 
     radiation       off;
 
-
     patchInjectionCoeffs
     {
         massFlowRate    0.8e-03;
@@ -190,14 +187,18 @@ subModels
         enthalpyTransfer enthalpyDifference;
         activeLiquids   ( H2O );
     }
+}
 
-    patchPostProcessingCoeffs
+
+cloudFunctions
+{
+    patchPostProcessing
     {
         maxStoredParcels 100;
         patches         ( outlet );
     }
 
-    particleTracksCoeffs
+    particleTracks
     {
         trackInterval   5;
         maxSamples      1000000;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index bf74ccebdb5..e964b64233a 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -103,8 +103,6 @@ subModels
 
     surfaceReactionModel COxidationKineticDiffusionLimitedRate;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     radiation       on;
@@ -195,4 +193,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
index d58f7af8a9a..a15680a79e8 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
@@ -85,8 +85,6 @@ subModels
 
     heatTransferModel RanzMarshall;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     radiation       on;
@@ -125,4 +123,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/kinematicCloudProperties
index 4376f6ce5aa..253b3324601 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/kinematicCloudProperties
@@ -42,6 +42,7 @@ solution
     }
 }
 
+
 constantProperties
 {
     parcelTypeId    1;
@@ -56,6 +57,7 @@ constantProperties
     constantVolume  false;
 }
 
+
 subModels
 {
     particleForces
@@ -72,8 +74,6 @@ subModels
 
     heatTransferModel none;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     collisionModel pairCollision;
@@ -129,4 +129,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/kinematicCloudProperties
index 15f9068b615..93315fbd630 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/kinematicCloudProperties
@@ -65,8 +65,6 @@ subModels
 
     heatTransferModel none;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     collisionModel pairCollision;
@@ -140,4 +138,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
index 8a67b373e70..4eaea3d71aa 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
@@ -50,6 +50,7 @@ solution
     }
 }
 
+
 constantProperties
 {
     parcelTypeId    1;
@@ -78,6 +79,7 @@ constantProperties
     constantVolume  false;
 }
 
+
 subModels
 {
     particleForces
@@ -98,8 +100,6 @@ subModels
 
     phaseChangeModel liquidEvaporation;
 
-    postProcessingModel patchPostProcessing;
-
     devolatilisationModel none;
 
     surfaceReactionModel none;
@@ -160,8 +160,12 @@ subModels
 
         activeLiquids   ( H2O );
     }
+}
+
 
-    patchPostProcessingCoeffs
+cloudFunctions
+{
+    patchPostProcessing
     {
         maxStoredParcels 20;
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
index b903f6642fe..a20d3d8bf21 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
@@ -50,6 +50,7 @@ solution
     }
 }
 
+
 constantProperties
 {
     parcelTypeId    1;
@@ -78,6 +79,7 @@ constantProperties
     constantVolume  false;
 }
 
+
 subModels
 {
     particleForces
@@ -102,8 +104,6 @@ subModels
 
     surfaceReactionModel none;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     radiation       off;
@@ -165,4 +165,8 @@ subModels
 }
 
 
+clousFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 46558640694..759cfa28742 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -50,6 +50,7 @@ solution
     }
 }
 
+
 constantProperties
 {
     parcelTypeId    1;
@@ -78,6 +79,7 @@ constantProperties
     constantVolume  false;
 }
 
+
 subModels
 {
     particleForces
@@ -102,8 +104,6 @@ subModels
 
     surfaceReactionModel none;
 
-    postProcessingModel patchPostProcessing;
-
     surfaceFilmModel none;
 
     radiation       off;
@@ -183,8 +183,12 @@ subModels
 
         activeLiquids   ( H2O );
     }
+}
+
 
-    patchPostProcessingCoeffs
+cloudFunctions
+{
+    patchPostProcessing
     {
         maxStoredParcels 100;
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties
index b4e73e234ef..2a1d0f940a2 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties
@@ -95,8 +95,6 @@ subModels
 
     phaseChangeModel none;
 
-    postProcessingModel none;
-
     surfaceFilmModel thermoSurfaceFilm;
 
     radiation       off;
@@ -134,4 +132,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
index e9f1c791af1..1a1a6ff1d8d 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
@@ -95,8 +95,6 @@ subModels
 
     phaseChangeModel none;
 
-    postProcessingModel none;
-
     surfaceFilmModel thermoSurfaceFilm;
 
     radiation       off;
@@ -160,4 +158,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties
index 269063a1682..a26564ebb29 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties
@@ -95,8 +95,6 @@ subModels
 
     phaseChangeModel none;
 
-    postProcessingModel none;
-
     surfaceFilmModel thermoSurfaceFilm;
 
     radiation       off;
@@ -140,4 +138,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
index f93637094d0..3c5ec0512d9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
@@ -50,6 +50,7 @@ solution
     }
 }
 
+
 constantProperties
 {
     parcelTypeId    1;
@@ -75,6 +76,7 @@ constantProperties
     constantVolume  false;
 }
 
+
 subModels
 {
     particleForces
@@ -95,8 +97,6 @@ subModels
 
     phaseChangeModel liquidEvaporation;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     radiation       off;
@@ -149,4 +149,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
-- 
GitLab