From ba0fe79c5fe0635867b8a70ec864d3d544f66096 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Sat, 11 Apr 2020 11:14:01 +0100 Subject: [PATCH] tutorials/.../DTCHull: Simplified and unified mesh setups This also restores the upstream refinement in the wave case so that the waves now correctly propagate to the hull --- .../multiphase/interFoam/RAS/DTCHull/Allclean | 4 +- .../multiphase/interFoam/RAS/DTCHull/Allmesh | 8 +- .../multiphase/interFoam/RAS/DTCHull/Allrun | 2 +- .../RAS/DTCHull/system/blockMeshDict | 8 +- .../system/refineMeshDict.orig} | 2 +- .../interFoam/RAS/DTCHull/system/topoSetDict | 82 +++++++++++++++++++ .../RAS/DTCHull/system/topoSetDict.1 | 32 -------- .../RAS/DTCHull/system/topoSetDict.2 | 32 -------- .../RAS/DTCHull/system/topoSetDict.3 | 32 -------- .../RAS/DTCHull/system/topoSetDict.4 | 32 -------- .../RAS/DTCHull/system/topoSetDict.5 | 32 -------- .../RAS/DTCHull/system/topoSetDict.6 | 32 -------- .../interFoam/RAS/DTCHullMoving/Allclean | 1 - .../interFoam/RAS/DTCHullMoving/Allmesh | 8 +- .../interFoam/RAS/DTCHullMoving/Allrun | 2 +- .../RAS/DTCHullMoving/system/blockMeshDict | 8 +- .../system/refineMeshDict.orig} | 0 .../RAS/DTCHullMoving/system/topoSetDict | 82 +++++++++++++++++++ .../RAS/DTCHullMoving/system/topoSetDict.1 | 32 -------- .../RAS/DTCHullMoving/system/topoSetDict.2 | 32 -------- .../RAS/DTCHullMoving/system/topoSetDict.3 | 32 -------- .../RAS/DTCHullMoving/system/topoSetDict.4 | 32 -------- .../RAS/DTCHullMoving/system/topoSetDict.5 | 32 -------- .../RAS/DTCHullMoving/system/topoSetDict.6 | 32 -------- .../interFoam/RAS/DTCHullWave/Allclean | 1 - .../interFoam/RAS/DTCHullWave/Allmesh | 8 +- .../interFoam/RAS/DTCHullWave/Allrun | 2 +- .../RAS/DTCHullWave/system/blockMeshDict | 8 +- .../RAS/DTCHullWave/system/controlDict | 4 +- .../system/refineMeshDict.orig} | 0 .../RAS/DTCHullWave/system/topoSetDict | 82 +++++++++++++++++++ .../RAS/DTCHullWave/system/topoSetDict.1 | 32 -------- .../RAS/DTCHullWave/system/topoSetDict.2 | 32 -------- .../RAS/DTCHullWave/system/topoSetDict.3 | 32 -------- .../RAS/DTCHullWave/system/topoSetDict.4 | 32 -------- .../RAS/DTCHullWave/system/topoSetDict.5 | 32 -------- .../RAS/DTCHullWave/system/topoSetDict.6 | 32 -------- 37 files changed, 277 insertions(+), 611 deletions(-) rename tutorials/multiphase/interFoam/RAS/{DTCHullWave/system/refineMeshDict => DTCHull/system/refineMeshDict.orig} (96%) create mode 100644 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6 rename tutorials/multiphase/interFoam/RAS/{DTCHull/system/refineMeshDict => DTCHullMoving/system/refineMeshDict.orig} (100%) create mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6 rename tutorials/multiphase/interFoam/RAS/{DTCHullMoving/system/refineMeshDict => DTCHullWave/system/refineMeshDict.orig} (100%) create mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.1 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.2 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.3 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.4 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.5 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.6 diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean index 359e234386..26ecdefad0 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean @@ -4,13 +4,11 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -# remove surface +# Remove surface rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1 cleanCase -rm constant/polyMesh/boundary > /dev/null 2>&1 -rm system/topoSetDict > /dev/null 2>&1 #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh b/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh index fcbd69e971..d1b0eb5267 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh @@ -13,11 +13,11 @@ runApplication blockMesh for i in 1 2 3 4 5 6 do - runApplication -s $i \ - topoSet -dict system/topoSetDict.${i} + foamDictionary system/refineMeshDict -entry set -set c${i} - runApplication -s $i \ - refineMesh -dict system/refineMeshDict -overwrite + runApplication -a topoSet + + runApplication -a refineMesh -dict system/refineMeshDict -overwrite done runApplication snappyHexMesh -overwrite diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun index 652426ec83..019517167b 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Mesh if necessary -if ! cloneMesh ../DTCHullMoving . && ! cloneMesh ../DTCHullWave . +if ! cloneMesh ../DTCHullMoving . && ! (isTest $@ && cloneMesh ../DTCHullWave .) then ./Allmesh fi diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict index 9e6f42708d..58e84e3501 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict @@ -28,10 +28,10 @@ vertices (16 0 -1) (-26 0 -1) - (-26 -19 0.185) - (16 -19 0.185) - (16 0 0.185) - (-26 0 0.185) + (-26 -19 0.188) + (16 -19 0.188) + (16 0 0.188) + (-26 0 0.188) (-26 -19 0.244) (16 -19 0.244) diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/refineMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict.orig similarity index 96% rename from tutorials/multiphase/interFoam/RAS/DTCHullWave/system/refineMeshDict rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict.orig index d85a027842..341d5de2c7 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/refineMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict.orig @@ -31,7 +31,7 @@ patchLocalCoeffs tan1 (1 0 0); } -directions ( tan1 tan2 ); +directions (tan1 tan2); useHexTopology no; diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict new file mode 100644 index 0000000000..c39df43591 --- /dev/null +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict @@ -0,0 +1,82 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object topoSetDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +actions +( + { + name c1; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-10 -6 -3) (10 0 3); + } + } + { + name c2; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-5 -3 -2.5) (9 0 2); + } + } + { + name c3; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-3 -1.5 -1) (8 0 1.5); + } + } + { + name c4; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-2 -1 -0.6) (7 0 1); + } + } + { + name c5; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-1 -0.6 -0.3) (6.5 0 0.8); + } + } + { + name c6; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-0.5 -0.55 -0.15) (6.25 0 0.65); + } + } +); + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1 deleted file mode 100644 index dfab923dbf..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-10 -6 -3) (10 0 3); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2 deleted file mode 100644 index 4356c182fc..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-5 -3 -2.5) (9 0 2); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3 deleted file mode 100644 index 63fb7f97f5..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-3 -1.5 -1) (8 0 1.5); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4 deleted file mode 100644 index d5dd15bc75..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-2 -1 -0.6) (7 0 1); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5 deleted file mode 100644 index a8ec025bf0..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-1 -0.6 -0.3) (6.5 0 0.8); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6 deleted file mode 100644 index aecdb00415..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-0.5 -0.55 -0.15) (6.25 0 0.65); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean index 1416cad21f..26ecdefad0 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean @@ -10,6 +10,5 @@ rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1 cleanCase -rm system/topoSetDict > /dev/null 2>&1 #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh index fcbd69e971..d1b0eb5267 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh @@ -13,11 +13,11 @@ runApplication blockMesh for i in 1 2 3 4 5 6 do - runApplication -s $i \ - topoSet -dict system/topoSetDict.${i} + foamDictionary system/refineMeshDict -entry set -set c${i} - runApplication -s $i \ - refineMesh -dict system/refineMeshDict -overwrite + runApplication -a topoSet + + runApplication -a refineMesh -dict system/refineMeshDict -overwrite done runApplication snappyHexMesh -overwrite diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun index f07bca0c11..256c79d2e8 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Mesh if necessary -if ! cloneMesh ../DTCHull . && ! cloneMesh ../DTCHullWave . +if ! cloneMesh ../DTCHull . && ! (isTest $@ && cloneMesh ../DTCHullWave .) then ./Allmesh fi diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict index 9e6f42708d..58e84e3501 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict @@ -28,10 +28,10 @@ vertices (16 0 -1) (-26 0 -1) - (-26 -19 0.185) - (16 -19 0.185) - (16 0 0.185) - (-26 0 0.185) + (-26 -19 0.188) + (16 -19 0.188) + (16 0 0.188) + (-26 0 0.188) (-26 -19 0.244) (16 -19 0.244) diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict.orig similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict rename to tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict.orig diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict new file mode 100644 index 0000000000..c39df43591 --- /dev/null +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict @@ -0,0 +1,82 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object topoSetDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +actions +( + { + name c1; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-10 -6 -3) (10 0 3); + } + } + { + name c2; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-5 -3 -2.5) (9 0 2); + } + } + { + name c3; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-3 -1.5 -1) (8 0 1.5); + } + } + { + name c4; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-2 -1 -0.6) (7 0 1); + } + } + { + name c5; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-1 -0.6 -0.3) (6.5 0 0.8); + } + } + { + name c6; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-0.5 -0.55 -0.15) (6.25 0 0.65); + } + } +); + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1 deleted file mode 100644 index dfab923dbf..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-10 -6 -3) (10 0 3); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2 deleted file mode 100644 index 4356c182fc..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-5 -3 -2.5) (9 0 2); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3 deleted file mode 100644 index 63fb7f97f5..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-3 -1.5 -1) (8 0 1.5); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4 deleted file mode 100644 index d5dd15bc75..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-2 -1 -0.6) (7 0 1); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5 deleted file mode 100644 index a8ec025bf0..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-1 -0.6 -0.3) (6.5 0 0.8); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6 deleted file mode 100644 index aecdb00415..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-0.5 -0.55 -0.15) (6.25 0 0.65); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean index 1416cad21f..26ecdefad0 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean @@ -10,6 +10,5 @@ rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1 cleanCase -rm system/topoSetDict > /dev/null 2>&1 #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh index fcbd69e971..d1b0eb5267 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh @@ -13,11 +13,11 @@ runApplication blockMesh for i in 1 2 3 4 5 6 do - runApplication -s $i \ - topoSet -dict system/topoSetDict.${i} + foamDictionary system/refineMeshDict -entry set -set c${i} - runApplication -s $i \ - refineMesh -dict system/refineMeshDict -overwrite + runApplication -a topoSet + + runApplication -a refineMesh -dict system/refineMeshDict -overwrite done runApplication snappyHexMesh -overwrite diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allrun index a4111e0e3d..974d9ad03b 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allrun +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allrun @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Mesh if necessary -if ! cloneMesh ../DTCHull . && ! cloneMesh ../DTCHullMoving . +if ! isTest $@ || ! cloneMesh ../DTCHull . && ! cloneMesh ../DTCHullMoving . then ./Allmesh fi diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/blockMeshDict index 9e6f42708d..58e84e3501 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/blockMeshDict @@ -28,10 +28,10 @@ vertices (16 0 -1) (-26 0 -1) - (-26 -19 0.185) - (16 -19 0.185) - (16 0 0.185) - (-26 0 0.185) + (-26 -19 0.188) + (16 -19 0.188) + (16 0 0.188) + (-26 0 0.188) (-26 -19 0.244) (16 -19 0.244) diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/controlDict b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/controlDict index b7b901cbd8..681acfc8e9 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/controlDict @@ -47,8 +47,8 @@ runTimeModifiable yes; adjustTimeStep yes; -maxCo 20; -maxAlphaCo 15; +maxCo 10; +maxAlphaCo 5; maxDeltaT 0.01; libs ("libwaves.so"); diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/refineMeshDict.orig similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict rename to tutorials/multiphase/interFoam/RAS/DTCHullWave/system/refineMeshDict.orig diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict new file mode 100644 index 0000000000..bfb5c4a5b9 --- /dev/null +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict @@ -0,0 +1,82 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object topoSetDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +actions +( + { + name c1; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-10 -6 -3) (16 0 3); + } + } + { + name c2; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-5 -3 -2.5) (16 0 2); + } + } + { + name c3; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-3 -1.5 -1) (16 0 1.5); + } + } + { + name c4; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-2 -1 -0.6) (16 0 1); + } + } + { + name c5; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-1 -0.6 -0.3) (6.5 0 0.8); + } + } + { + name c6; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + box (-0.5 -0.55 -0.15) (6.25 0 0.65); + } + } +); + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.1 deleted file mode 100644 index dfab923dbf..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.1 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-10 -6 -3) (10 0 3); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.2 deleted file mode 100644 index 4356c182fc..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.2 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-5 -3 -2.5) (9 0 2); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.3 b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.3 deleted file mode 100644 index 63fb7f97f5..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.3 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-3 -1.5 -1) (8 0 1.5); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.4 b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.4 deleted file mode 100644 index d5dd15bc75..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.4 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-2 -1 -0.6) (7 0 1); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.5 b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.5 deleted file mode 100644 index a8ec025bf0..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.5 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-1 -0.6 -0.3) (6.5 0 0.8); - } - } -); - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.6 b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.6 deleted file mode 100644 index aecdb00415..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.6 +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object topoSetDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (-0.5 -0.55 -0.15) (6.25 0 0.65); - } - } -); - -// ************************************************************************* //