ENH: allow "<case>", "<system>" ... in the string expansions (issue #792)

- the expansions were previously required as slash to follow, but
  now either are possible.

    "<case>", "<case>/" both yield the same as "$FOAM_CASE" and
    will not have a trailing slash in the result. The expansion of
    "$FOAM_CASE/" will however have a trailing slash.

- adjust additional files using these expansions
This commit is contained in:
Mark Olesen
2018-04-11 23:10:49 +02:00
parent fc5895f1df
commit 5f88e4271e
15 changed files with 93 additions and 67 deletions

View File

@ -14,13 +14,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
constructFrom mesh;
sourceCase "$FOAM_CASE";
sourcePatches (outlet);
constructFrom mesh;
sourceCase "<case>";
sourcePatches (outlet);
flipNormals false;
flipNormals false;
extrudeModel linearDirection;
extrudeModel linearDirection;
nLayers 40;
expansionRatio 1.0;
@ -32,6 +32,6 @@ linearDirectionCoeffs
thickness 40;
}
mergeFaces false;
mergeFaces false;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -14,13 +14,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
constructFrom mesh;
sourceCase "$FOAM_CASE";
sourcePatches (outlet);
constructFrom mesh;
sourceCase "<case>";
sourcePatches (outlet);
flipNormals false;
flipNormals false;
extrudeModel linearDirection;
extrudeModel linearDirection;
nLayers 60;
expansionRatio 1.0;
@ -32,6 +32,6 @@ linearDirectionCoeffs
thickness 60;
}
mergeFaces false;
mergeFaces false;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -14,13 +14,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
constructFrom mesh;
sourceCase "$FOAM_CASE";
sourcePatches (outlet);
constructFrom mesh;
sourceCase "<case>";
sourcePatches (outlet);
flipNormals false;
flipNormals false;
extrudeModel linearDirection;
extrudeModel linearDirection;
nLayers 40;
expansionRatio 1.0;
@ -32,6 +32,6 @@ linearDirectionCoeffs
thickness 40;
}
mergeFaces false;
mergeFaces false;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //