diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C index 990b1c086d..3808629f54 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C +++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C @@ -263,6 +263,8 @@ void changeFrontBackPatches int main(int argc, char *argv[]) { #include "addRegionOption.H" + #include "addDictOption.H" + #include "setRootCase.H" #include "createTimeExtruded.H" @@ -282,12 +284,16 @@ int main(int argc, char *argv[]) << runTimeExtruded.timeName() << nl << endl; } + const word dictName + ( + args.optionLookupOrDefault("dict", "extrudeMeshDict") + ); IOdictionary dict ( IOobject ( - "extrudeMeshDict", + dictName, runTimeExtruded.system(), runTimeExtruded, IOobject::MUST_READ_IF_MODIFIED diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh b/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh index 97900ec6cd..da05bdf812 100755 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh @@ -9,9 +9,8 @@ runApplication blockMesh echo "Creating channel" i=1 while [ "$i" -lt 3 ] ; do - cp system/extrudeMeshDict.${i} system/extrudeMeshDict echo "Running extrudeMesh, instance" ${i} - extrudeMesh > log.extrudeMesh.${i} + extrudeMesh -dict extrudeMeshDict.${i} > log.extrudeMesh.${i} i=$((i + 1)) done diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict deleted file mode 100644 index 3f8ae76fde..0000000000 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict +++ /dev/null @@ -1,37 +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; - object extrudeProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -constructFrom mesh; -sourceCase "$FOAM_CASE"; -sourcePatches (outlet); - -flipNormals false; - -extrudeModel linearDirection; - -nLayers 40; -expansionRatio 1.0; - -linearDirectionCoeffs -{ - axisPt (0 0 0); - direction (1 -0.2 -0.03); - thickness 40; -} - -mergeFaces false; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //