diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions index 4ee86ef7fe..9973503e52 100644 --- a/bin/tools/CleanFunctions +++ b/bin/tools/CleanFunctions @@ -52,7 +52,7 @@ cleanTimeDirectories() rm -rf ./${timeDir} ./-${timeDir} > /dev/null 2>&1 zeros="0$zeros" done - rm -rf ./[1-9]* ./-[1-9]* ./log ./log.* ./log-* ./logSummary.* ./.fxLock ./*.xml ./ParaView* ./paraFoam* ./*.OpenFOAM ./.setSet > /dev/null 2>&1 + rm -rf ./[1-9]* ./-[1-9]* ./log ./log.* ./log-* ./logSummary.* ./.fxLock ./*.xml ./ParaView* ./paraFoam* ./*.OpenFOAM ./*.blockMesh ./.setSet > /dev/null 2>&1 } diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean b/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean index 3c5bcd0a28..e9710c501f 100755 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean @@ -7,5 +7,6 @@ cd ${0%/*} || exit 1 # run from this directory cleanCase \rm -rf 0 -\rm -f constant/triSurface*.eMesh* +\rm -r constant/extendedFeatureEdgeMesh/ +\rm -f constant/triSurface/*.eMesh* diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre index b5423180b6..e2e3a1f1bf 100755 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre @@ -10,8 +10,7 @@ cp -rf 0.org 0 runApplication blockMesh # create the set for the obstacles -runApplication setSet -batch createObstacle.setSet -mv log.setSet log.setSet1 +runApplication topoSet # create the obstacles - add obstacle patches to wallFilm patch runApplication subsetMesh c0 -patch wallFilm -overwrite diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/topoSetDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/topoSetDict new file mode 100644 index 0000000000..57fd283dde --- /dev/null +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/topoSetDict @@ -0,0 +1,72 @@ +/*--------------------------------*- 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 topoSetDict; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +actions +( + { + name c0; + type cellSet; + action clear; + } + { + name c0; + type cellSet; + action invert; + } + { + name c0; + type cellSet; + action delete; + source boxToCell; + sourceInfo + { + box (0.4 0.1 0.1) (0.6 0.3 0.3); + } + } + { + name c0; + type cellSet; + action delete; + source boxToCell; + sourceInfo + { + box (0.4 0.1 0.4) (0.6 0.3 0.6); + } + } + { + name c0; + type cellSet; + action delete; + source boxToCell; + sourceInfo + { + box (0.4 0.4 0.1) (0.6 0.6 0.3); + } + } + { + name c0; + type cellSet; + action delete; + source boxToCell; + sourceInfo + { + box (0.4 0.4 0.4) (0.6 0.6 0.6); + } + } +); + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre index d9b17ad097..3ab62f90f5 100755 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre @@ -5,8 +5,9 @@ cp -rf 0.org 0 runApplication blockMesh -runApplication setSet -batch wallFilmRegion.setSet -mv log.setSet log.wallFilmRegion.setSet +#runApplication setSet -batch wallFilmRegion.setSet +#mv log.setSet log.wallFilmRegion.setSet +runApplication topoSet -dict system/wallFilmRegion.topoSet runApplication extrudeToRegionMesh -overwrite diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion.topoSet b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion.topoSet new file mode 100644 index 0000000000..f29cde9eb1 --- /dev/null +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion.topoSet @@ -0,0 +1,42 @@ +/*--------------------------------*- 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 topoSetDict; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +actions +( + { + name wallFilmFaces; + type faceSet; + action new; + source patchToFace; + sourceInfo + { + name filmWalls; + } + } + { + name wallFilmFaces; + type faceZoneSet; + action new; + source setToFaceZone; + sourceInfo + { + faceSet wallFilmFaces; + } + } +); + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre index bbae3db32c..6924ed9001 100755 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre @@ -5,13 +5,17 @@ cp -rf 0.org 0 runApplication blockMesh -runApplication setSet -batch wallFilmRegion.setSet -mv log.setSet log.wallFilmRegion.setSet +#runApplication setSet -batch wallFilmRegion.setSet +#mv log.setSet log.wallFilmRegion.setSet +runApplication topoSet -dict system/wallFilmRegion.topoSet +mv log.topoSet log.wallFilmRegion.topoSet runApplication extrudeToRegionMesh -overwrite -runApplication setSet -region wallFilmRegion -batch createWallFilmRegionPatches.setSet -mv log.setSet log.createWallFilmRegionPatches.setSet +#runApplication setSet -region wallFilmRegion -batch createWallFilmRegionPatches.setSet +#mv log.setSet log.createWallFilmRegionPatches.setSet +runApplication topoSet -region wallFilmRegion -dict system/createWallFilmRegionPatches.topoSet +mv log.topoSet log.createWallFilmRegionPatches.topoSet runApplication createPatch -region wallFilmRegion -overwrite diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion.topoSet b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion.topoSet new file mode 100644 index 0000000000..f29cde9eb1 --- /dev/null +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion.topoSet @@ -0,0 +1,42 @@ +/*--------------------------------*- 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 topoSetDict; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +actions +( + { + name wallFilmFaces; + type faceSet; + action new; + source patchToFace; + sourceInfo + { + name filmWalls; + } + } + { + name wallFilmFaces; + type faceZoneSet; + action new; + source setToFaceZone; + sourceInfo + { + faceSet wallFilmFaces; + } + } +); + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet new file mode 100644 index 0000000000..85cb149bf4 --- /dev/null +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet @@ -0,0 +1,62 @@ +/*--------------------------------*- 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 topoSetDict; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +actions +( + { + name sideFaces1; + type faceSet; + action new; + source boxToFace; + sourceInfo + { + box (-0.00001 -0.00001 -1) (0.10001 0.00001 1); + } + } + { + name sideFaces2; + type faceSet; + action new; + source boxToFace; + sourceInfo + { + box ( 0.09999 -0.00001 -1) (0.10001 0.05001 1); + } + } + { + name sideFaces3; + type faceSet; + action new; + source boxToFace; + sourceInfo + { + box (-0.00001 0.04999 -1) (1.00001 0.05001 1); + } + } + { + name sideFaces4; + type faceSet; + action new; + source boxToFace; + sourceInfo + { + box (-0.00001 -0.00001 -1) (0.00001 0.05001 1); + } + } +); + +// ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun index 4dff677039..3c68954487 100755 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun @@ -6,7 +6,8 @@ cd ${0%/*} || exit 1 # run from this directory cp -r 0.org 0 > /dev/null 2>&1 runApplication blockMesh -runApplication setSet -batch createObstacle.setSet +#runApplication setSet -batch createObstacle.setSet +runApplication topoSet runApplication subsetMesh -overwrite c0 -patch walls runApplication setFields runApplication `getApplication` diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary index 8122fa3f3a..a30f90f8fb 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary @@ -21,13 +21,13 @@ FoamFile { type patch; nFaces 1024; - startFace 95232; + startFace 93568; } walls { type wall; - nFaces 5120; - startFace 96256; + nFaces 5376; + startFace 94592; } ) diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/topoSetDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/topoSetDict new file mode 100644 index 0000000000..75ff45bc12 --- /dev/null +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/topoSetDict @@ -0,0 +1,42 @@ +/*--------------------------------*- 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 topoSetDict; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +actions +( + { + name c0; + type cellSet; + action clear; + } + { + name c0; + type cellSet; + action invert; + } + { + name c0; + type cellSet; + action delete; + source boxToCell; + sourceInfo + { + box (0.375 0.375 0) (0.625 0.625 0.25); + } + } +); + +// ************************************************************************* //