createNonConformalCouples: Put non-conformal couple settings in a sub dictionary

Settings for the individual non-conformal couples can now be put in a
"nonConformalCouples" sub-dictionary of the
system/createNonConformalCouplesDict. For example:

    fields  no;

    nonConformalCouples // <-- new sub-dictionary
    {
        nonConformalCouple_none
        {
            patches         (nonCouple1 nonCouple2);
            transform       none;
        }

        nonConformalCouple_30deg
        {
            patches         (nonCoupleBehind nonCoupleAhead);
            transform       rotational;
            rotationAxis    (-1 0 0);
            rotationCentre  (0 0 0);
            rotationAngle   30;
        }
    }

This permits settings to be #include-d from files that themselves
contain sub-dictionaries without the utility treating those
sub-dictionaries as if they specify a non-conformal coupling. It also
makes the syntax more comparable to that of createBafflesDict.

The new "nonConformalCouples" sub-dictionary is optional, so this change
is backwards compatible. The new syntax is recommended, however, and all
examples have been changed accordingly.
This commit is contained in:
Will Bainbridge
2022-08-10 14:12:02 +01:00
parent 65b7979147
commit b1d6e64d02
5 changed files with 112 additions and 97 deletions

View File

@ -14,56 +14,59 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
nonConformalCoupleIn0
nonConformalCouples
{
patches (nonCoupleIn1 nonCoupleIn2);
transform none;
nonConformalCoupleIn0
{
patches (nonCoupleIn1 nonCoupleIn2);
transform none;
}
nonConformalCoupleIn30
{
$nonConformalCoupleIn0;
transform rotational;
rotationAxis (-1 0 0);
rotationCentre (0 0 0);
rotationAngle 30;
}
nonConformalCoupleIn60 { $nonConformalCoupleIn30; rotationAngle 60; }
nonConformalCoupleIn90 { $nonConformalCoupleIn30; rotationAngle 90; }
nonConformalCoupleIn120 { $nonConformalCoupleIn30; rotationAngle 120; }
nonConformalCoupleIn150 { $nonConformalCoupleIn30; rotationAngle 150; }
nonConformalCoupleIn180 { $nonConformalCoupleIn30; rotationAngle 180; }
nonConformalCoupleIn210 { $nonConformalCoupleIn30; rotationAngle 210; }
nonConformalCoupleIn240 { $nonConformalCoupleIn30; rotationAngle 240; }
nonConformalCoupleIn270 { $nonConformalCoupleIn30; rotationAngle 270; }
nonConformalCoupleIn300 { $nonConformalCoupleIn30; rotationAngle 300; }
nonConformalCoupleIn330 { $nonConformalCoupleIn30; rotationAngle 330; }
nonConformalCoupleOut0
{
patches (nonCoupleOut1 nonCoupleOut2);
transform none;
}
nonConformalCoupleOut30
{
patches (nonCoupleOut1 nonCoupleOut2);
transform rotational;
rotationAxis (-1 0 0);
rotationCentre (0 0 0);
rotationAngle -30;
}
nonConformalCoupleOut60 { $nonConformalCoupleOut30; rotationAngle -60; }
nonConformalCoupleOut90 { $nonConformalCoupleOut30; rotationAngle -90; }
nonConformalCoupleOut120 { $nonConformalCoupleOut30; rotationAngle -120; }
nonConformalCoupleOut150 { $nonConformalCoupleOut30; rotationAngle -150; }
nonConformalCoupleOut180 { $nonConformalCoupleOut30; rotationAngle -180; }
nonConformalCoupleOut210 { $nonConformalCoupleOut30; rotationAngle -210; }
nonConformalCoupleOut240 { $nonConformalCoupleOut30; rotationAngle -240; }
nonConformalCoupleOut270 { $nonConformalCoupleOut30; rotationAngle -270; }
nonConformalCoupleOut300 { $nonConformalCoupleOut30; rotationAngle -300; }
nonConformalCoupleOut330 { $nonConformalCoupleOut30; rotationAngle -330; }
}
nonConformalCoupleIn30
{
$nonConformalCoupleIn0;
transform rotational;
rotationAxis (-1 0 0);
rotationCentre (0 0 0);
rotationAngle 30;
}
nonConformalCoupleIn60 { $nonConformalCoupleIn30; rotationAngle 60; }
nonConformalCoupleIn90 { $nonConformalCoupleIn30; rotationAngle 90; }
nonConformalCoupleIn120 { $nonConformalCoupleIn30; rotationAngle 120; }
nonConformalCoupleIn150 { $nonConformalCoupleIn30; rotationAngle 150; }
nonConformalCoupleIn180 { $nonConformalCoupleIn30; rotationAngle 180; }
nonConformalCoupleIn210 { $nonConformalCoupleIn30; rotationAngle 210; }
nonConformalCoupleIn240 { $nonConformalCoupleIn30; rotationAngle 240; }
nonConformalCoupleIn270 { $nonConformalCoupleIn30; rotationAngle 270; }
nonConformalCoupleIn300 { $nonConformalCoupleIn30; rotationAngle 300; }
nonConformalCoupleIn330 { $nonConformalCoupleIn30; rotationAngle 330; }
nonConformalCoupleOut0
{
patches (nonCoupleOut1 nonCoupleOut2);
transform none;
}
nonConformalCoupleOut30
{
patches (nonCoupleOut1 nonCoupleOut2);
transform rotational;
rotationAxis (-1 0 0);
rotationCentre (0 0 0);
rotationAngle -30;
}
nonConformalCoupleOut60 { $nonConformalCoupleOut30; rotationAngle -60; }
nonConformalCoupleOut90 { $nonConformalCoupleOut30; rotationAngle -90; }
nonConformalCoupleOut120 { $nonConformalCoupleOut30; rotationAngle -120; }
nonConformalCoupleOut150 { $nonConformalCoupleOut30; rotationAngle -150; }
nonConformalCoupleOut180 { $nonConformalCoupleOut30; rotationAngle -180; }
nonConformalCoupleOut210 { $nonConformalCoupleOut30; rotationAngle -210; }
nonConformalCoupleOut240 { $nonConformalCoupleOut30; rotationAngle -240; }
nonConformalCoupleOut270 { $nonConformalCoupleOut30; rotationAngle -270; }
nonConformalCoupleOut300 { $nonConformalCoupleOut30; rotationAngle -300; }
nonConformalCoupleOut330 { $nonConformalCoupleOut30; rotationAngle -330; }
// ************************************************************************* //