diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/CH4 b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/CH4
index 6646bff3e1658538acbe445550b3e114c6d2e3be..fd69cfbb0a95df0637e3709fdb3aecdc7d704912 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/CH4
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/CH4
@@ -13,6 +13,7 @@ FoamFile
location "0";
object CH4;
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [ 0 0 0 0 0 0 0 ];
@@ -23,13 +24,13 @@ boundaryField
inletair
{
type fixedValue;
- value uniform 0;
+ value $internalField;
}
outlet
{
type inletOutlet;
- inletValue uniform 0;
- value uniform 0;
+ inletValue $internalField;
+ value $internalField;
}
walls
{
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2 b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2
index e97a13f925e304106e228b6d7b1da5c9f9078225..5cfc0750a90b5ebea95b569e96b1df64e71fac6c 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2
@@ -13,6 +13,7 @@ FoamFile
location "0";
object H2;
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [ 0 0 0 0 0 0 0 ];
@@ -23,13 +24,13 @@ boundaryField
inletair
{
type fixedValue;
- value uniform 0;
+ value $internalField;
}
outlet
{
type zeroGradient;
- inletValue uniform 0;
- value uniform 0;
+ inletValue $internalField;
+ value $internalField;
}
walls
{
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2O b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2O
index b74064a7ef422e9d0dd1b8df95a1bd3c0d0b94a1..501c31edbf1ce5c971cf43a9afd627c90a07ea2f 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2O
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2O
@@ -24,13 +24,13 @@ boundaryField
inletair
{
type fixedValue;
- value uniform 0;
+ value $internalField;
}
outlet
{
type zeroGradient;
- inletValue uniform 0;
- value uniform 0;
+ inletValue $internalField;
+ value $internalField;
}
walls
{
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/N2 b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/N2
index 5a42a569fd6dd9ab37355903bd7f2b0f3396fa74..d70446e30113505cdc59b341ae5381d63cbe1251 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/N2
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/N2
@@ -13,6 +13,7 @@ FoamFile
location "0";
object N2;
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [ 0 0 0 0 0 0 0 ];
@@ -23,13 +24,13 @@ boundaryField
inletair
{
type fixedValue;
- value uniform 0.7;
+ value $internalField;
}
outlet
{
type inletOutlet;
- inletValue uniform 0.7;
- value uniform 0.7;
+ inletValue $internalField;
+ value $internalField;
}
walls
{
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/O2 b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/O2
index 62fc3897e4b19a6d36dee9d4ea5562638705f043..c7eec8b9975e89d24f2c836370c486d9536c8f52 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/O2
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/O2
@@ -13,6 +13,7 @@ FoamFile
location "0";
object O2;
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [ 0 0 0 0 0 0 0 ];
@@ -23,13 +24,13 @@ boundaryField
inletair
{
type fixedValue;
- value uniform 0.3;
+ value $internalField;
}
outlet
{
type inletOutlet;
- inletValue uniform 0.3;
- value uniform 0.3;
+ inletValue $internalField;
+ value $internalField;
}
walls
{
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/T b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/T
index fc1a49a30fa97a318daa667996252ef3227a7232..577761dd47fadcf7d7f5f98e266ecbb675fb86c4 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/T
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/T
@@ -13,6 +13,7 @@ FoamFile
location "0";
object T;
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [ 0 0 0 1 0 0 0 ];
@@ -37,8 +38,8 @@ boundaryField
outlet
{
type inletOutlet;
- inletValue uniform 292;
- value uniform 292;
+ inletValue $internalField;
+ value $internalField;
}
walls
{
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/U b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/U
index 8493ebd635d78d03719da3694b15b4eb5369dc71..ee9354681b06cc34303bd7399e46caf4a37beca3 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/U
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/U
@@ -13,37 +13,36 @@ FoamFile
location "0";
object U;
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [ 0 1 -1 0 0 0 0 ];
-internalField uniform ( 0 0 0 );
+internalField uniform (0 0 0);
boundaryField
{
inletair
{
type flowRateInletVelocity;
- value uniform ( 0 0 0 );
+ value $internalField;
massFlowRate csvFile;
nHeaderLine 1;
refColumn 0;
componentColumns ( 1 );
separator ",";
mergeSeparators no;
- file "<constant>/inlet.csv";
-
-
+ file "<constant>/inlet.csv";
}
outlet
{
type pressureInletOutletVelocity;
- value uniform (0.0 0 0);
- inletValue uniform (0 0 0);
+ inletValue $internalField;
+ value $internalField;
}
walls
{
type fixedValue;
- value uniform ( 0 0 0 );
+ value $internalField;
}
}
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/Ydefault b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/Ydefault
index 707ef84052f210f15d215faf53341141f26193ad..7b36f3f2cd6de0b7b83ecfc435feae2c59ffa623 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/Ydefault
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/Ydefault
@@ -13,6 +13,7 @@ FoamFile
location "0";
object Ydefault;
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [ 0 0 0 0 0 0 0 ];
@@ -23,13 +24,13 @@ boundaryField
inletair
{
type fixedValue;
- value uniform 0;
+ value $internalField;
}
outlet
{
type inletOutlet;
- inletValue uniform 0;
- value uniform 0;
+ inletValue $internalField;
+ value $internalField;
}
walls
{
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/alphat b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/alphat
index b7d5ed0a4d7180b5a740e4605139e59be0709232..d0b1f8fdc7d97a8b8a22cb851fc57c0e97993364 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/alphat
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/alphat
@@ -13,6 +13,7 @@ FoamFile
location "0";
object alphat;
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [ 1 -1 -1 0 0 0 0 ];
@@ -23,18 +24,18 @@ boundaryField
inletair
{
type calculated;
- value uniform 0;
+ value $internalField;
}
outlet
{
type calculated;
- value uniform 0;
+ value $internalField;
}
walls
{
type compressible::alphatWallFunction;
Prt 0.85;
- value uniform 0;
+ value $internalField;
}
}
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/epsilon b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/epsilon
index d7a7e8af592d9782e12e6f124357aaaf98d742cc..68e4fdbf30975dd5dd643fcf6d046a135413153a 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/epsilon
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/epsilon
@@ -13,6 +13,7 @@ FoamFile
location "0";
object epsilon;
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [ 0 2 -3 0 0 0 0 ];
@@ -26,13 +27,13 @@ boundaryField
mixingLength 0.005;
phi phi;
k k;
- value uniform 200;
+ value $internalField;
}
outlet
{
type inletOutlet;
- inletValue uniform 200;
- value uniform 200;
+ inletValue $internalField;
+ value $internalField;
}
walls
{
@@ -40,7 +41,7 @@ boundaryField
Cmu 0.09;
kappa 0.41;
E 9.8;
- value uniform 200;
+ value $internalField;
}
}
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/k b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/k
index c0483677b8c78cc652f7aefa768105f9e027ea93..f3d7c496f99bbe1e534f362b0de11189f49d7ab6 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/k
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/k
@@ -13,6 +13,7 @@ FoamFile
location "0";
object k;
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [ 0 2 -2 0 0 0 0 ];
@@ -24,18 +25,18 @@ boundaryField
{
type turbulentIntensityKineticEnergyInlet;
intensity 0.02;
- value uniform 1;
+ value $internalField;
}
outlet
{
type zeroGradient;//inletOutlet;
- inletValue uniform 1;
- value uniform 1;
+ inletValue $internalField;
+ value $internalField;
}
walls
{
type kqRWallFunction;
- value uniform 1;
+ value $internalField;
}
}
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/nut b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/nut
index c8fb8bcbb9e159520bb2638fac652cb0a73256dc..271729cf2646ed0a506e41bb80e644cc2d499a8c 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/nut
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/nut
@@ -24,12 +24,12 @@ boundaryField
inletair
{
type calculated;
- value uniform 0;
+ value $internalField;
}
outlet
{
type calculated;
- value uniform 0;
+ value $internalField;
}
walls
{
@@ -37,7 +37,7 @@ boundaryField
Cmu 0.09;
kappa 0.41;
E 9.8;
- value uniform 0;
+ value $internalField;
}
}
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/p b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/p
index 2ae5c64b26d722d0e6ce7d1b3a391bb75c9ce396..b651e96601e0fed95b1e2823c9f6e300674a60c4 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/p
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/p
@@ -13,6 +13,7 @@ FoamFile
location "0";
object p;
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [ 1 -1 -2 0 0 0 0 ];
@@ -31,7 +32,7 @@ boundaryField
choked true;
relax 0.1;
M 0.3;
- value uniform 250000;
+ value $internalField;
}
walls
{
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/chemistryProperties b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/chemistryProperties
index db74c415b829eaf5b86a9b4e0f71eb697d901ee0..5d33d3898294da873c57bd8a6d1b720d3088eeec 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/chemistryProperties
@@ -7,12 +7,13 @@
\*---------------------------------------------------------------------------*/
FoamFile
{
- version 2;
- format ascii;
- class dictionary;
- location "constant";
- object chemistryProperties;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object chemistryProperties;
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
chemistryType
{
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/blockMeshDict b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/blockMeshDict
index 15a3591475c097c1487b624ead82b349621f154a..bf075f965a87dd4a867ab8187cff24bdee34c8dd 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/blockMeshDict
@@ -20,15 +20,15 @@ vertices
(
(0.00 0.25 0) // 0
(1.00 0.25 0) // 1
- (1.25 0.00 -0.6) // 2
- (2.25 0.00 -0.6) // 3
+ (1.25 0.00 -0.6) // 2
+ (2.25 0.00 -0.6) // 3
(2.50 0.25 0) // 4
- (4.00 0.35 0.2) // 5
+ (4.00 0.35 0.2) // 5
- (4.00 0.45 0.2) // 6
+ (4.00 0.45 0.2) // 6
(2.50 0.75 0) // 7
- (2.25 1.00 -0.6) // 8
- (1.25 1.00 -0.6) // 9
+ (2.25 1.00 -0.6) // 8
+ (1.25 1.00 -0.6) // 9
(1.00 0.75 0) // 10
(0.00 0.75 0) // 11
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict
index 2e1180245e5cf3b4c3aa364b5b5f6b92e2b2fa81..2e6953ef933016936b16c0c86fe5065d4164d423 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict
@@ -1,4 +1,4 @@
-;/*--------------------------------*- C++ -*----------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1812 |
@@ -7,12 +7,13 @@
\*---------------------------------------------------------------------------*/
FoamFile
{
- version 2;
- format ascii;
- class dictionary;
- location "system";
- object controlDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object controlDict;
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
application reactingFoam;
@@ -20,7 +21,7 @@ startFrom startTime;
startTime 0;
-stopAt writeNow; //endTime;
+stopAt endTime;
endTime 1;
@@ -51,17 +52,4 @@ maxCo 0.3;
maxDeltaT 0.25;
-functions
-{
- ywalls
- {
- type writeObjects;
- libs ("libutilityFunctionObjects.so");
- objects (ywalls);
- writeOption anyWrite;
- }
-}
-
-
-
// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSchemes b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSchemes
index fc6abf5b80acf239c25fe33a390aea9f94a4c58d..860245a9063bb2c4a493e68becfc3a3e43d1c04e 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSchemes
@@ -7,12 +7,13 @@
\*---------------------------------------------------------------------------*/
FoamFile
{
- version 2;
- format ascii;
- class dictionary;
- location "system";
- object fvSchemes;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSchemes;
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSolution b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSolution
index f450da2bc02bd148254b48264193b22b48e1a7c6..620265a5c59ace8a8204f6749a05389c4e3e9a50 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSolution
@@ -7,12 +7,13 @@
\*---------------------------------------------------------------------------*/
FoamFile
{
- version 2;
- format ascii;
- class dictionary;
- location "system";
- object fvSolution;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{