diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Aw b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Aw index b1fadc15ce..e5e0911e9c 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 +internalField nonuniform List 8025 ( 18.372496 diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/B b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/B index 36d82661f7..4793d50c0c 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 +internalField nonuniform List 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 d9467c2c04..36370abb07 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 +internalField nonuniform List 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 87e81e854c..7f56d2448f 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 +internalField nonuniform List 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 aed6568b3b..4cf81b466d 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 +internalField nonuniform List 8025 ( 0.2 diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Nv b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Nv index d7a94bccad..1419a66c0a 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 +internalField nonuniform List 8025 ( 2.019581 diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/betav b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/betav index 5fe2c71640..ac9e44a673 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 +internalField nonuniform List 8025 ( 0 diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/nsv b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/nsv index 1f641062f6..dff73e4e86 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 +internalField nonuniform List 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 036fff2ae0..52c5edf8a8 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 72b4b1cc2f..6234ec106e 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 ae82e055c4..cf9a03199e 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 ec9f9c3698..0000000000 --- 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 2698787f9c..c7732fbc51 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 c39926cbae..5436ce7c1a 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 0000000000..ac79a24be0 --- /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); + } + } + +); + +// ************************************************************************* //