From 475ac59f677989f6c01507f67cd30ba80d9198f4 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 7 Sep 2010 13:59:31 +0100
Subject: [PATCH] ENH: Tutorial updates

---
 .../constant/thermophysicalProperties         | 33 +++++++++++--------
 .../filter/constant/thermophysicalProperties  | 25 +++++++++-----
 .../filter/system/controlDict                 |  2 +-
 .../constant/thermophysicalProperties         | 24 +++++++++-----
 .../constant/thermophysicalProperties         | 24 +++++++++-----
 .../constant/thermophysicalProperties         | 22 ++++++++-----
 6 files changed, 80 insertions(+), 50 deletions(-)

diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
index 090d27fcbf5..e8a86473f7d 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
@@ -25,22 +25,27 @@ foamChemistryFile "$FOAM_CASE/chemkin/foam.inp";
 
 inertSpecie     N2;
 
-liquidComponents
-(
-    H2O
-);
-
-H2O             H2O defaultCoeffs;
-
-solidComponents
-(
-    C
-    ash
-);
+liquids
+{
+    liquidComponents
+    (
+        H2O
+    );
 
-C               C defaultCoeffs;
+    H2O             H2O defaultCoeffs;
+}
 
-ash             ash defaultCoeffs;
+solids
+{
+    solidComponents
+    (
+        C
+        ash
+    );
+
+    C               C defaultCoeffs;
+    ash             ash defaultCoeffs;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties
index ffec9c39166..973c9212700 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties
@@ -23,18 +23,25 @@ foamChemistryFile "$FOAM_CASE/constant/reactions";
 
 foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly";
 
-liquidComponents
-(
-    H2O
-);
-H2O             H2O defaultCoeffs;
+liquids
+{
+    liquidComponents
+    (
+        H2O
+    );
 
-solidComponents
-(
-);
+    H2O             H2O defaultCoeffs;
+}
+
+solids
+{
+    solidComponents
+    (
+    );
+}
 
-inertSpecie     N2;
 
+inertSpecie     N2;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
index 63e614a6b65..8aa86473df3 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs            ("libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so" "libradiation.so");
+libs            ("libOpenFOAM.so" "libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so" "libradiation.so");
 
 application     porousExplicitSourceReactingParcelFoam;
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermophysicalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermophysicalProperties
index 4847dbabb0d..271188f6f89 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermophysicalProperties
@@ -23,18 +23,24 @@ foamChemistryFile "$FOAM_CASE/constant/reactions";
 
 foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly";
 
-liquidComponents
-(
-    H2O
-);
+inertSpecie     air;
 
-H2O             H2O defaultCoeffs;
+liquids
+{
+    liquidComponents
+    (
+        H2O
+    );
 
-solidComponents
-(
-);
+    H2O             H2O defaultCoeffs;
+}
 
-inertSpecie      air;
+solids
+{
+    solidComponents
+    (
+    );
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index 4847dbabb0d..271188f6f89 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -23,18 +23,24 @@ foamChemistryFile "$FOAM_CASE/constant/reactions";
 
 foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly";
 
-liquidComponents
-(
-    H2O
-);
+inertSpecie     air;
 
-H2O             H2O defaultCoeffs;
+liquids
+{
+    liquidComponents
+    (
+        H2O
+    );
 
-solidComponents
-(
-);
+    H2O             H2O defaultCoeffs;
+}
 
-inertSpecie      air;
+solids
+{
+    solidComponents
+    (
+    );
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
index acfbe00bcea..bddd3c54584 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
@@ -23,17 +23,23 @@ foamChemistryFile "$FOAM_CASE/chemkin/foam.inp";
 
 foamChemistryThermoFile "$FOAM_CASE/chemkin/foam.dat";
 
-liquidComponents
-(
-    H2O
-);
+inertSpecie     N2;
 
-solidComponents
-();
+liquids
+{
+    liquidComponents
+    (
+        H2O
+    );
 
-inertSpecie     N2;
+    H2O             H2O defaultCoeffs;
+}
 
-H2O             H2O defaultCoeffs;
+solids
+{
+    solidComponents
+    ();
+}
 
 
 // ************************************************************************* //
-- 
GitLab