From 4ccd9a3adebd4c10dd416b818bc0a8f007bd68da Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 2 Nov 2011 12:41:58 +0000
Subject: [PATCH] ENH: Updated tutorials using field sources

---
 .../constant/energySourceProperties           | 22 -----
 .../constant/momentumSourceProperties         | 23 -----
 .../constant/sourcesProperties}               |  7 +-
 .../constant/energySourceProperties           | 22 -----
 .../constant/momentumSourceProperties         | 23 -----
 .../constant/sourcesProperties}               |  7 +-
 .../constant/energySourceProperties           | 31 -------
 .../constant/sourcesProperties}               | 30 +++----
 .../filter/constant/energySourceProperties    | 34 --------
 .../filter/constant/momentumSourceProperties  | 35 --------
 .../filter/constant/sourcesProperties         | 87 +++++++++++++++++++
 .../constant/energySourceProperties           | 22 -----
 .../constant/momentumSourceProperties         | 23 -----
 .../constant/sourcesProperties}               |  7 +-
 14 files changed, 108 insertions(+), 265 deletions(-)
 delete mode 100644 tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/energySourceProperties
 delete mode 100644 tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/momentumSourceProperties
 rename tutorials/lagrangian/{porousExplicitSourceReactingParcelFoam/verticalChannel/constant/massSourceProperties => LTSReactingParcelFoam/counterFlowFlame2D/constant/sourcesProperties} (93%)
 delete mode 100644 tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/energySourceProperties
 delete mode 100644 tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/momentumSourceProperties
 rename tutorials/lagrangian/LTSReactingParcelFoam/{counterFlowFlame2D/constant/massSourceProperties => verticalChannel/constant/sourcesProperties} (93%)
 delete mode 100644 tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/energySourceProperties
 rename tutorials/lagrangian/{porousExplicitSourceReactingParcelFoam/filter/constant/massSourceProperties => coalChemistryFoam/simplifiedSiwek/constant/sourcesProperties} (73%)
 delete mode 100644 tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/energySourceProperties
 delete mode 100644 tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/momentumSourceProperties
 create mode 100644 tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/sourcesProperties
 delete mode 100644 tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/energySourceProperties
 delete mode 100644 tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/momentumSourceProperties
 rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel/constant/massSourceProperties => porousExplicitSourceReactingParcelFoam/verticalChannel/constant/sourcesProperties} (93%)

diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/energySourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/energySourceProperties
deleted file mode 100644
index b551f35f228..00000000000
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/energySourceProperties
+++ /dev/null
@@ -1,22 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      energySourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    // none
-);
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/momentumSourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/momentumSourceProperties
deleted file mode 100644
index c9cf6ca3fe1..00000000000
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/momentumSourceProperties
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      momentumSourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    // none
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/massSourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/sourcesProperties
similarity index 93%
rename from tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/massSourceProperties
rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/sourcesProperties
index 11811461db1..8aedc2c3067 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/massSourceProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/sourcesProperties
@@ -11,13 +11,10 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      massSourcesProperties;
+    object      sourcesProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-(
-    // none
-);
-
+// none
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/energySourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/energySourceProperties
deleted file mode 100644
index b551f35f228..00000000000
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/energySourceProperties
+++ /dev/null
@@ -1,22 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      energySourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    // none
-);
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/momentumSourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/momentumSourceProperties
deleted file mode 100644
index c9cf6ca3fe1..00000000000
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/momentumSourceProperties
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      momentumSourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    // none
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/massSourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/sourcesProperties
similarity index 93%
rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/massSourceProperties
rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/sourcesProperties
index 11811461db1..8aedc2c3067 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/massSourceProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/sourcesProperties
@@ -11,13 +11,10 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      massSourcesProperties;
+    object      sourcesProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-(
-    // none
-);
-
+// none
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/energySourceProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/energySourceProperties
deleted file mode 100644
index b10138820a1..00000000000
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/energySourceProperties
+++ /dev/null
@@ -1,31 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      energySourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    source1
-    {
-        active          true;
-        timeStart       0.15;
-        duration        0.2;
-        selectionMode   cellSet;
-        volumeMode      absolute;
-        fieldData       20000;
-        cellSet         ignitionCells;
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/massSourceProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/sourcesProperties
similarity index 73%
rename from tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/massSourceProperties
rename to tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/sourcesProperties
index 30c8a7de3ab..0c93adb6322 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/massSourceProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/sourcesProperties
@@ -11,28 +11,28 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      massSourcesProperties;
+    object      sourcesProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-(
-    source1
+source1
+{
+    type            scalarExplicitSource;
+    active          true;
+    timeStart       0.15;
+    duration        0.2;
+    selectionMode   cellSet;
+    cellSet         ignitionCells;
+
+    scalarExplicitSourceCoeffs
     {
-        active          true;
-        timeStart       0.2;
-        duration        2.0;
-        selectionMode   points;
         volumeMode      absolute;
         fieldData
-        (
-            (H2O 1e-4) // kg/s
-        );
-        points
-        (
-            (2.75 0.5 0)
-        );
+        {
+            hs              20000;
+        }
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/energySourceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/energySourceProperties
deleted file mode 100644
index 7bb14d03712..00000000000
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/energySourceProperties
+++ /dev/null
@@ -1,34 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      energySourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    source1
-    {
-        active          true;
-        timeStart       0.2;
-        duration        2.0;
-        selectionMode   points;
-        volumeMode      absolute;
-        fieldData       10;
-        points
-        (
-            (2.75 0.5 0)
-        );
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/momentumSourceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/momentumSourceProperties
deleted file mode 100644
index e28bdc85524..00000000000
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/momentumSourceProperties
+++ /dev/null
@@ -1,35 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      momentumSourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    source1
-    {
-        active          true;
-        timeStart       0.2;
-        duration        2.0;
-        selectionMode   points;
-        volumeMode      absolute;
-        fieldData       (0 0.005 0);
-        points
-        (
-            (2.75 0.5 0)
-        );
-    }
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/sourcesProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/sourcesProperties
new file mode 100644
index 00000000000..c725f62098f
--- /dev/null
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/sourcesProperties
@@ -0,0 +1,87 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      sourcesProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+massSource1
+{
+    type            scalarExplicitSource;
+    active          true;
+    timeStart       0.2;
+    duration        2.0;
+    selectionMode   points;
+    points
+    (
+        (2.75 0.5 0)
+    );
+
+    scalarExplicitSourceCoeffs
+    {
+        volumeMode      absolute;
+        fieldData
+        {
+            H2O         1e-4; // kg/s
+        }
+    }
+}
+
+
+momentumSource1
+{
+    type            vectorExplicitSource;
+    active          true;
+    timeStart       0.2;
+    duration        2.0;
+    selectionMode   points;
+    points
+    (
+        (2.75 0.5 0)
+    );
+
+    vectorExplicitSourceCoeffs
+    {
+        volumeMode      absolute;
+        fieldData
+        {
+            U           (0 0.005 0);
+        }
+    }
+}
+
+
+energySource1
+{
+    type            scalarExplicitSource;
+    active          true;
+    timeStart       0.2;
+    duration        2.0;
+    selectionMode   points;
+    points
+    (
+        (2.75 0.5 0)
+    );
+
+    scalarExplicitSourceCoeffs
+    {
+        volumeMode      absolute;
+        fieldData
+        {
+            hs          10;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/energySourceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/energySourceProperties
deleted file mode 100644
index b551f35f228..00000000000
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/energySourceProperties
+++ /dev/null
@@ -1,22 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      energySourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    // none
-);
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/momentumSourceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/momentumSourceProperties
deleted file mode 100644
index c9cf6ca3fe1..00000000000
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/momentumSourceProperties
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      momentumSourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    // none
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/massSourceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/sourcesProperties
similarity index 93%
rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/massSourceProperties
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/sourcesProperties
index 11811461db1..8aedc2c3067 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/massSourceProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/sourcesProperties
@@ -11,13 +11,10 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      massSourcesProperties;
+    object      sourcesProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-(
-    // none
-);
-
+// none
 
 // ************************************************************************* //
-- 
GitLab