diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/constant/faMesh/faMeshDefinition b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faMeshDefinition similarity index 97% rename from tutorials/compressible/acousticFoam/obliqueAirJet/main/constant/faMesh/faMeshDefinition rename to tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faMeshDefinition index 1c7878defd4144f254e88dac980e7b48f0f44fc6..7bc2d201acae0c3aaa85e4cb1d2d3507a24b1c29 100644 --- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/constant/faMesh/faMeshDefinition +++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faMeshDefinition @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -polyMeshPatches 1(window); +polyMeshPatches ( window ); boundary { diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun-parallel b/tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun-parallel new file mode 100755 index 0000000000000000000000000000000000000000..3f019bcaa246a8435ee97246f38fb9fe96f11b24 --- /dev/null +++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun-parallel @@ -0,0 +1,14 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +runApplication blockMesh + +runApplication decomposePar + +runParallel makeFaMesh + +runParallel $(getApplication) + +#------------------------------------------------------------------------------ diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/constant/faMesh/faMeshDefinition b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faMeshDefinition similarity index 94% rename from tutorials/finiteArea/liquidFilmFoam/cylinder/constant/faMesh/faMeshDefinition rename to tutorials/finiteArea/liquidFilmFoam/cylinder/system/faMeshDefinition index 12c4767c8d128cad7fa7b3a50171d1bd251fb1ec..66da6e5c0e5d3e14aa40e0ead8b8599737b034f2 100644 --- a/tutorials/finiteArea/liquidFilmFoam/cylinder/constant/faMesh/faMeshDefinition +++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faMeshDefinition @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant/faMesh"; object faMeshDefinition; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -polyMeshPatches 1( film ); +polyMeshPatches ( film ); boundary { @@ -56,4 +55,11 @@ boundary } +defaultPatch +{ + name empty; + type empty; +} + + // ************************************************************************** // diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/constant/faMesh/faMeshDefinition b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faMeshDefinition similarity index 96% rename from tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/constant/faMesh/faMeshDefinition rename to tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faMeshDefinition index a9d4ea6d56081363cebae691a205237c534a5246..ce76df0f704fea266824e10d19cdb6a7bf8a32d5 100644 --- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/constant/faMesh/faMeshDefinition +++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faMeshDefinition @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -polyMeshPatches 1( outer ); +polyMeshPatches ( outer ); boundary { diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/Allrun-parallel b/tutorials/finiteArea/surfactantFoam/planeTransport/Allrun-parallel new file mode 100755 index 0000000000000000000000000000000000000000..93e66772a9e4956484ce22728b18bbafb7209795 --- /dev/null +++ b/tutorials/finiteArea/surfactantFoam/planeTransport/Allrun-parallel @@ -0,0 +1,19 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +runApplication blockMesh + +decompDict="-decomposeParDict system/decomposeParDict-procBoundary8" +fileHandler="-fileHandler collated" + +runApplication $decompDict decomposePar $fileHandler + +runParallel $decompDict makeFaMesh $fileHandler + +runParallel $decompDict $(getApplication) $fileHandler + +runApplication reconstructPar $fileHandler + +#------------------------------------------------------------------------------ diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/blockMeshDict b/tutorials/finiteArea/surfactantFoam/planeTransport/system/blockMeshDict index fabc18b264b1d93d6cfab4843e64d6cfd2b5d547..6f5e501b6bef578d56b41dc59fdb81b7912171e5 100644 --- a/tutorials/finiteArea/surfactantFoam/planeTransport/system/blockMeshDict +++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/blockMeshDict @@ -14,27 +14,44 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// A flat plate that is only partial covered by the finiteArea mesh. +// Depending on the decomposition, the outflow boundary may +// coincide with a processor patch. + scale 0.1; +height 0.1; +width 1; +len 3; +out 1; +out #eval{ $out + $len }; + +nx 60; +ny 20; +nz 1; +nout 20; + vertices ( - (0 0 0) - (3 0 0) - (3 1 0) - (0 1 0) - (0 0 0.1) - (3 0 0.1) - (3 1 0.1) - (0 1 0.1) -); + /* 0*/ (0 0 0) + /* 1*/ ($len 0 0) + /* 2*/ ($len $width 0) + /* 3*/ (0 $width 0) + /* 4*/ (0 0 $height) + /* 5*/ ($len 0 $height) + /* 6*/ ($len $width $height) + /* 7*/ (0 $width $height) -blocks -( - hex (0 1 2 3 4 5 6 7) (60 20 1) simpleGrading (1 1 1) + /* 8*/ ($out 0 0) + /* 9*/ ($out 1 0) + /*10*/ ($out 0 $height) + /*11*/ ($out 1 $height) ); -edges +blocks ( + hex (0 1 2 3 4 5 6 7) ($nx $ny $nz) grading (1 1 1) + hex (1 8 9 2 5 10 11 6) ($nout $ny $nz) grading (1 1 1) ); boundary @@ -44,7 +61,7 @@ boundary type patch; faces ( - (0 4 7 3) + (0 4 7 3) ); } @@ -53,8 +70,12 @@ boundary type wall; faces ( - (3 7 6 2) - (1 5 4 0) + (3 7 6 2) + (1 5 4 0) + + // outflow + (1 8 10 5) + (2 6 11 9) ); } @@ -63,7 +84,7 @@ boundary type patch; faces ( - (2 6 5 1) + (8 9 10 11) ); } @@ -73,6 +94,7 @@ boundary faces ( (0 3 2 1) + (1 8 9 2) ); } @@ -84,10 +106,15 @@ boundary (4 5 6 7) ); } -); -mergePatchPairs -( + outflow + { + type patch; + faces + ( + (5 10 11 6) + ); + } ); diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict b/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict index 792ca5965b6bd6145d7980fd2566eaa59204925c..bf5148c5d808cde097b94291c40d8f1e0da6d567 100644 --- a/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict +++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict-procBoundary4 b/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict-procBoundary4 new file mode 100644 index 0000000000000000000000000000000000000000..30e0dbd4ae6ea8e3763dbbc1cdee23298e270d3b --- /dev/null +++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict-procBoundary4 @@ -0,0 +1,28 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v2012 | +| \\ / A nd | Website: www.openfoam.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object decomposeParDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// With 4 divisions in x-direction (coincides with finiteArea boundary) + +numberOfSubdomains 4; + +method simple; + +coeffs +{ + n ( 4 1 1 ); +} + + +// ************************************************************************* // diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict-procBoundary8 b/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict-procBoundary8 new file mode 100644 index 0000000000000000000000000000000000000000..bc6a1ae7b79de5cb9a2c03b3d430b01314ade512 --- /dev/null +++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict-procBoundary8 @@ -0,0 +1,28 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v2012 | +| \\ / A nd | Website: www.openfoam.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object decomposeParDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// With 4 divisions in x-direction (coincides with finiteArea boundary) + +numberOfSubdomains 8; + +method simple; + +coeffs +{ + n ( 4 2 1 ); +} + + +// ************************************************************************* // diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/constant/faMesh/faMeshDefinition b/tutorials/finiteArea/surfactantFoam/planeTransport/system/faMeshDefinition similarity index 91% rename from tutorials/finiteArea/surfactantFoam/planeTransport/constant/faMesh/faMeshDefinition rename to tutorials/finiteArea/surfactantFoam/planeTransport/system/faMeshDefinition index de49f774744e4c64c66527ebd7369d53e2392a9e..9558287443a608ef2b1dda567ea742e6b8b84291 100644 --- a/tutorials/finiteArea/surfactantFoam/planeTransport/constant/faMesh/faMeshDefinition +++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/faMeshDefinition @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -polyMeshPatches 1( top ); +polyMeshPatches ( top ); boundary { @@ -28,7 +28,8 @@ boundary { type patch; ownerPolyPatch top; - neighbourPolyPatch outlet; + // neighbourPolyPatch outlet; + neighbourPolyPatch outflow; } bound { diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/faMesh/faMeshDefinition b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faMeshDefinition similarity index 100% rename from tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/faMesh/faMeshDefinition rename to tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faMeshDefinition diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/faMesh/faMeshDefinition b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faMeshDefinition similarity index 100% rename from tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/faMesh/faMeshDefinition rename to tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faMeshDefinition diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/faMesh/faMeshDefinition b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faMeshDefinition similarity index 100% rename from tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/faMesh/faMeshDefinition rename to tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faMeshDefinition