diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict deleted file mode 100644 index ea9fb0d682..0000000000 --- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict +++ /dev/null @@ -1,462 +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; - object changeDictionaryDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -p -{ - boundaryField - { - blockedFaces - { - type zeroGradient; - } - baffleWall - { - type zeroGradient; - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} - -U -{ - boundaryField - { - blockedFaces - { - type fixedValue; - value uniform (0 0 0); - } - baffleWall - { - type activePressureForceBaffleVelocity; - cyclicPatch baffleCyclic_half0; - orientation 1; - openingTime 0.01; - maxOpenFractionDelta 0.1; - openFraction 0; - minThresholdValue 8000; - forceBased 0; - value uniform (0 0 0); - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} - -epsilon -{ - boundaryField - { - blockedFaces - { - type epsilonWallFunction; - value uniform 0.1; - } - baffleWall - { - type epsilonWallFunction; - value uniform 1e-5; - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} - -k -{ - boundaryField - { - blockedFaces - { - type kqRWallFunction; - value uniform 1.5; - } - baffleWall - { - type kqRWallFunction; - value uniform 1.5; - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} - -Su -{ - boundaryField - { - blockedFaces - { - type zeroGradient; - } - baffleWall - { - type zeroGradient; - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} - -Xi -{ - boundaryField - { - blockedFaces - { - type zeroGradient; - value uniform 1; - } - baffleWall - { - type zeroGradient; - value uniform 1; - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} - -T -{ - boundaryField - { - blockedFaces - { - type zeroGradient; - value uniform 300; - } - baffleWall - { - type zeroGradient; - value uniform 300; - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} - -Tu -{ - boundaryField - { - blockedFaces - { - type zeroGradient; - value uniform 300; - } - baffleWall - { - type zeroGradient; - value uniform 300; - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} - -b -{ - boundaryField - { - blockedFaces - { - type zeroGradient; - value uniform 1; - } - baffleWall - { - type zeroGradient; - value uniform 1; - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} - -ft -{ - boundaryField - { - blockedFaces - { - type zeroGradient; - } - baffleWall - { - type zeroGradient; - value uniform 0.06024096; - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} - -Aw -{ - boundaryField - { - blockedFaces - { - type zeroGradient; - value uniform 0.0; - } - baffleWall - { - type zeroGradient; - value uniform 0.0; - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} -B -{ - boundaryField - { - blockedFaces - { - type zeroGradient; - value uniform (0 0 0 0 0 0); - } - baffleWall - { - type zeroGradient; - value uniform (0 0 0 0 0 0); - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} -betav -{ - boundaryField - { - blockedFaces - { - type zeroGradient; - value uniform 0; - } - baffleWall - { - type zeroGradient; - value uniform 0; - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} -CR -{ - boundaryField - { - blockedFaces - { - type zeroGradient; - value uniform (0 0 0 0 0 0); - } - baffleWall - { - type zeroGradient; - value uniform (0 0 0 0 0 0); - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} -CT -{ - boundaryField - { - blockedFaces - { - type zeroGradient; - value uniform (0 0 0 0 0 0); - } - baffleWall - { - type zeroGradient; - value uniform (0 0 0 0 0 0); - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} -Nv -{ - boundaryField - { - blockedFaces - { - type zeroGradient; - value uniform 0; - } - baffleWall - { - type zeroGradient; - value uniform 0; - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} -nsv -{ - boundaryField - { - blockedFaces - { - type zeroGradient; - value uniform (0 0 0 0 0 0); - } - baffleWall - { - type zeroGradient; - value uniform (0 0 0 0 0 0); - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} -Lobs -{ - boundaryField - { - blockedFaces - { - type zeroGradient; - value uniform 0; - } - baffleWall - { - type zeroGradient; - value uniform 0; - } - baffleCyclic_half0 - { - type cyclic; - } - baffleCyclic_half1 - { - type cyclic; - } - } -} - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O index d186711d7f..96698035d4 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O @@ -25,7 +25,8 @@ boundaryField { type zeroGradient; } - wallFilm + + "(region0_to.*)" { type zeroGradient; } diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2 index 7fc516bc43..3f8bb48f23 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2 +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2 @@ -25,7 +25,8 @@ boundaryField { type zeroGradient; } - wallFilm + + "(region0_to.*)" { type zeroGradient; } diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2 index 233715e3ab..dd1c12987f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2 +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2 @@ -25,7 +25,8 @@ boundaryField { type zeroGradient; } - wallFilm + + "(region0_to.*)" { type zeroGradient; } diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T index 55fee017e5..2c53dd92cf 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T @@ -26,14 +26,14 @@ boundaryField type fixedValue; value uniform 300; } - wallFilm + + "(region0_to.*)" { - type zeroGradient; -// type mapped; -// field Tsf; -// average 300; -// setAverage no; -// value uniform 300; + type mapped; + field Tsf; + average 300; + setAverage no; + value uniform 300; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U index c123729036..7ac6fab561 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U @@ -26,15 +26,15 @@ boundaryField type uniformFixedValue; uniformValue (0 0 0); } - wallFilm + + "(region0_to.*)" { - type uniformFixedValue; - uniformValue (0 0 0); -// type mapped; -// field Usf; -// average (0 0 0); -// setAverage no; -// value uniform (0 0 0); + type mapped; + uniformValue constant (0 0 0); + value uniform (0 0 0); + field Usf; + average (0 0 0); + setAverage no; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat index 5e7440c9e3..21674669c2 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat @@ -27,7 +27,8 @@ boundaryField Prt 0.85; value uniform 0; } - wallFilm + + "(region0_to.*)" { type alphatFilmWallFunction; B 5.5; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon index e73cabb04b..662e77e149 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon @@ -26,10 +26,11 @@ boundaryField type epsilonWallFunction; value uniform 1e-7; } - wallFilm + + "(region0_to.*)" { type epsilonWallFunction; - value uniform 1e-7; + value uniform 1e-07; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv index d1baf0bd37..f2177baecb 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv @@ -26,10 +26,11 @@ boundaryField type calculated; value uniform 0; } - wallFilm + + "(region0_to.*)" { type convectiveHeatTransfer; - L 1.0; + L 1; value uniform 0; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k index 01d40325b5..298a929df3 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k @@ -26,10 +26,11 @@ boundaryField type kqRWallFunction; value uniform 1e-5; } - wallFilm + + "(region0_to.*)" { type kqRWallFunction; - value uniform 1e-5; + value uniform 1e-05; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut index e985d6e5f2..bd7d2a95b7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut @@ -26,7 +26,8 @@ boundaryField type nutkWallFunction; value uniform 0; } - wallFilm + + "(region0_to.*)" { type nutkFilmWallFunction; B 5.5; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p index 1db2c0020a..8c4debf1d3 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p @@ -26,10 +26,11 @@ boundaryField type calculated; value $internalField; } - wallFilm + + "(region0_to.*)" { type calculated; - value $internalField; + value uniform 100000; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh index df06f47fd0..27bb8026d9 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh @@ -26,9 +26,11 @@ boundaryField type fixedFluxPressure; value uniform 100000; } - wallFilm + + "(region0_to.*)" { type fixedFluxPressure; + gradient uniform 0; value uniform 100000; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun index fa03916aba..5a14a641d1 100755 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun @@ -6,6 +6,10 @@ cd ${0%/*} || exit 1 # Run from this directory ./Allrun.pre +cp -rf 0.orig 0 + application=$(getApplication) runApplication $application + +#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel index 3690fb7d1b..b659d3fee0 100755 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel @@ -15,3 +15,5 @@ runParallel $application runApplication -s primaryRegion reconstructPar runApplication -s wallFilmRegion reconstructPar -region wallFilmRegion + +#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun.pre b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun.pre index 68b9e2a0ef..c8d4217fcb 100755 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun.pre +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun.pre @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -cp -rf 0.orig 0 +rm -rf 0 # create the underlying block mesh runApplication blockMesh @@ -21,9 +21,6 @@ runApplication ./patchifyObstacles # Create the wall film region via extrusion runApplication extrudeToRegionMesh -overwrite -# Fine tuning of U and T boundary conditions -runApplication changeDictionary - # Copy the system settings over to the wall film region rm -rf system/wallFilmRegion cp -r system/wallFilmRegion.orig system/wallFilmRegion @@ -33,3 +30,5 @@ find ./0 -maxdepth 1 -type f -exec \ paraFoam -touch paraFoam -touch -region wallFilmRegion + +#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/changeDictionaryDict deleted file mode 100644 index 15e462fbf3..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/changeDictionaryDict +++ /dev/null @@ -1,69 +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; - object changeDictionaryDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -T -{ - boundaryField - { - wallFilm - { - type mapped; - field Tsf; - average 300; - setAverage no; - value uniform 300; - } - } -} - -U -{ - boundaryField - { - wallFilm - { - type mapped; - field Usf; - average (0 0 0); - setAverage no; - value uniform (0 0 0); - } - } -} - -"nut" -{ - boundaryField - { - wallFilm - { - value uniform 0; - } - } -} - -"alphat" -{ - boundaryField - { - wallFilm - { - value uniform 0; - } - } -} - -// ************************************************************************* //