From 7d4aa48b80f1223f5528484063d7974ef3259498 Mon Sep 17 00:00:00 2001
From: Sergio Ferraris <sergio@tom.emea.sgi.com>
Date: Fri, 4 Nov 2011 16:33:31 +0000
Subject: [PATCH] ENH: Up to date of flamePropagationWithObstacles tutorial
---
.../flamePropagationWithObstacles/0/Aw | 2 +-
.../PDRFoam/flamePropagationWithObstacles/0/B | 2 +-
.../flamePropagationWithObstacles/0/CR | 2 +-
.../flamePropagationWithObstacles/0/CT | 2 +-
.../flamePropagationWithObstacles/0/Lobs | 2 +-
.../flamePropagationWithObstacles/0/Nv | 2 +-
.../flamePropagationWithObstacles/0/betav | 2 +-
.../flamePropagationWithObstacles/0/nsv | 2 +-
.../flamePropagationWithObstacles/Allrun | 2 +-
.../constant/combustionProperties | 4 +-
.../constant/dynamicMeshDict | 2 +-
.../makeBlockedFaceSet.setSet | 5 --
.../system/controlDict | 2 +-
.../system/fvSolution | 12 +--
.../system/topoSetDict | 78 +++++++++++++++++++
15 files changed, 97 insertions(+), 24 deletions(-)
delete mode 100644 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/makeBlockedFaceSet.setSet
create mode 100644 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Aw b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Aw
index b1fadc15ce9..e5e0911e9cb 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Aw
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Aw
@@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 -1 0 0 0 0 0 ];
-internalField nonuniform List<scalar>
+internalField nonuniform List<scalar>
8025
(
18.372496
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/B b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/B
index 36d82661f71..4793d50c0cd 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/B
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/B
@@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 0 0 0 0 0 0 ];
-internalField nonuniform List<symmTensor>
+internalField nonuniform List<symmTensor>
8025
(
(1.785697 0 0 1.785697 0 1.875)
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CR b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CR
index d9467c2c04c..36370abb071 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CR
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CR
@@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 -1 0 0 0 0 0 ];
-internalField nonuniform List<symmTensor>
+internalField nonuniform List<symmTensor>
8025
(
(98.997697 0 0 77.711245 0 30.754852)
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CT b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CT
index 87e81e854cc..7f56d2448fe 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CT
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CT
@@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 -1 0 0 0 0 0 ];
-internalField nonuniform List<symmTensor>
+internalField nonuniform List<symmTensor>
8025
(
(4.501854 0 0 3.437531 0 1.537743)
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Lobs b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Lobs
index aed6568b3b3..4cf81b466db 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Lobs
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Lobs
@@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 1 0 0 0 0 0 ];
-internalField nonuniform List<scalar>
+internalField nonuniform List<scalar>
8025
(
0.2
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Nv b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Nv
index d7a94bccad2..1419a66c0ab 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Nv
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Nv
@@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 0 0 0 0 0 0 ];
-internalField nonuniform List<scalar>
+internalField nonuniform List<scalar>
8025
(
2.019581
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/betav b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/betav
index 5fe2c71640e..ac9e44a6736 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/betav
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/betav
@@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 0 0 0 0 0 0 ];
-internalField nonuniform List<scalar>
+internalField nonuniform List<scalar>
8025
(
0
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/nsv b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/nsv
index 1f641062f6c..dff73e4e86a 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/nsv
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/nsv
@@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 0 0 0 0 0 0 ];
-internalField nonuniform List<symmTensor>
+internalField nonuniform List<symmTensor>
8025
(
(0.634791 0 0 0.634791 0 0.03)
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun
index 036fff2ae01..52c5edf8a8b 100755
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun
@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # run from this directory
runApplication blockMesh
runApplication changeDictionary
-runApplication setSet -batch makeBlockedFaceSet.setSet
+runApplication topoSet
runApplication PDRMesh
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties
index 72b4b1cc2f4..6234ec106ea 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties
@@ -28,10 +28,10 @@ ignitionSites
{
location (1.5 1.5 0.5);
- diameter 0.005;
+ diameter 0.1;
start 1E-05;
duration 0.05;
- strength 10.0;
+ strength 60.0;
}
);
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict
index ae82e055c42..cf9a03199e1 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict
@@ -52,7 +52,7 @@ dynamicRefineFvMeshCoeffs
// gets estimated from an interpolated volVectorField ('velocity')
// First is name of the flux to adapt, second is velocity that will
// be interpolated and inner-producted with the face area vector.
- correctFluxes ((phi U));
+ correctFluxes ((phi rhoU) (phi_0 none));
}
// ************************************************************************* //
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/makeBlockedFaceSet.setSet b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/makeBlockedFaceSet.setSet
deleted file mode 100644
index ec9f9c36980..00000000000
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/makeBlockedFaceSet.setSet
+++ /dev/null
@@ -1,5 +0,0 @@
-faceSet blockedFacesSet new boxToFace (1 1 0.99) (2 2 1)
-cellSet blockedCellsSet new boxToCell (2.4 2.4 0) (3 3 1)
-cellSet blockedCellsSet add boxToCell (0 0 0) (0.6 0.6 1)
-faceSet blockedFacesSet add cellToFace blockedCellsSet all
-faceSet coupledFacesSet new boxToFace (1.0 1.99 0) (2.0 2.09 0.6)
\ No newline at end of file
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict
index 2698787f9cd..c7732fbc512 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict
@@ -47,7 +47,7 @@ runTimeModifiable yes;
adjustTimeStep yes;
-maxCo 0.3;
+maxCo 0.2;
maxDeltaT 1;
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution
index c39926cbae1..5436ce7c1a8 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 2.0.0 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -22,13 +22,13 @@ solvers
solver PCG;
preconditioner DIC;
tolerance 1e-05;
- relTol 0.1;
+ relTol 0.01;
};
rhoFinal
{
$rho;
- tolerance 1e-05;
+ tolerance 1e-06;
relTol 0;
};
@@ -37,7 +37,7 @@ solvers
solver PCG;
preconditioner DIC;
tolerance 1e-6;
- relTol 0.1;
+ relTol 0.01;
};
pFinal
@@ -51,7 +51,7 @@ solvers
{
solver PBiCG;
preconditioner DILU;
- tolerance 1e-05;
+ tolerance 1e-06;
relTol 0.1;
}
@@ -59,7 +59,7 @@ solvers
{
solver PBiCG;
preconditioner DILU;
- tolerance 1e-05;
+ tolerance 1e-06;
relTol 0;
}
}
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
new file mode 100644
index 00000000000..ac79a24be00
--- /dev/null
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
@@ -0,0 +1,78 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 2.0.0 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object topoSetDict.1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name blockedFacesSet;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (1 1 0.99) (2 2 1);
+ }
+ }
+
+ {
+ name blockedCellsSet;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceInfo
+ {
+ box (2.4 2.4 0) (3 3 1);
+ }
+ }
+
+ {
+ name blockedCellsSet;
+ type cellSet;
+ action add;
+ source boxToCell;
+ sourceInfo
+ {
+ box (0 0 0) (0.6 0.6 1);
+ }
+ }
+
+ {
+ name blockedFacesSet;
+ type faceSet;
+ action add;
+ source cellToFace;
+ sourceInfo
+ {
+ set blockedCellsSet;
+ option all;
+ }
+ }
+
+ {
+ name coupledFacesSet;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (1.0 1.99 0) (2.0 2.09 0.6);
+ }
+ }
+
+);
+
+// ************************************************************************* //
--
GitLab