includeEtcEntry: New dictionary include directive: #includeEtc "etcFile"

Description
    Specify an etc file to include when reading dictionaries, expects a
    single string to follow.

    Searches for files from user/group/shipped directories.
    The search scheme allows for version-specific and
    version-independent files using the following hierarchy:
    - \b user settings:
      - ~/.OpenFOAM/\<VERSION\>
      - ~/.OpenFOAM/
    - \b group (site) settings (when $WM_PROJECT_SITE is set):
      - $WM_PROJECT_SITE/\<VERSION\>
      - $WM_PROJECT_SITE
    - \b group (site) settings (when $WM_PROJECT_SITE is not set):
      - $WM_PROJECT_INST_DIR/site/\<VERSION\>
      - $WM_PROJECT_INST_DIR/site/
    - \b other (shipped) settings:
      - $WM_PROJECT_DIR/etc/

    An example of the \c \#includeEtc directive:
    \verbatim
        #includeEtc "etcFile"
    \endverbatim

    The usual expansion of environment variables and other constructs is
    retained.
This commit is contained in:
Henry
2015-04-26 10:44:11 +01:00
parent 091b6bc857
commit 0fe1967c22
72 changed files with 380 additions and 69 deletions

View File

@ -38,7 +38,7 @@ boundaryField
staticWalls { $:wall.T; }
movingWalls { $staticWalls; }
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
}
// ************************************************************************* //

View File

@ -39,7 +39,7 @@ boundaryField
staticWalls { $:wall.U; }
movingWalls { $:movingWall.U; }
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
}
// ************************************************************************* //

View File

@ -28,7 +28,7 @@ boundaryField
movingWalls { $:wall.alphat; }
staticWalls { $movingWalls; }
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
}

View File

@ -39,7 +39,7 @@ boundaryField
staticWalls { $:wall.epsilon; }
movingWalls { $staticWalls; }
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
}
// ************************************************************************* //

View File

@ -39,7 +39,7 @@ boundaryField
staticWalls { $:wall.k; }
movingWalls { $staticWalls; }
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
}
// ************************************************************************* //

View File

@ -28,7 +28,7 @@ boundaryField
movingWalls { $:wall.nut; }
staticWalls { $movingWalls; }
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
}
// ************************************************************************* //

View File

@ -28,7 +28,7 @@ boundaryField
staticWalls { $:wall.p; }
movingWalls { $staticWalls; }
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
}
// ************************************************************************* //

View File

@ -21,7 +21,7 @@ internalField uniform 265;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
wall
{

View File

@ -21,7 +21,7 @@ internalField uniform (0 0 0);
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
wall
{

View File

@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
wall
{

View File

@ -22,7 +22,7 @@ internalField uniform 0.01;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
wall
{

View File

@ -22,7 +22,7 @@ internalField uniform 0.1;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
wall
{

View File

@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
wall
{

View File

@ -21,7 +21,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
wall
{

View File

@ -21,7 +21,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
wall
{

View File

@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Include defaults parameters from master dictionary
#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
#includeEtc "caseDicts/meshQualityDict"
// ************************************************************************* //

View File

@ -22,7 +22,7 @@ internalField uniform (0.1 0 0);
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
floor
{

View File

@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
floor
{

View File

@ -22,7 +22,7 @@ internalField uniform 0.01;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
floor
{

View File

@ -22,7 +22,7 @@ internalField uniform 0.1;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
floor
{

View File

@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
floor
{

View File

@ -22,7 +22,7 @@ internalField uniform 101325;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
floor
{

View File

@ -22,7 +22,7 @@ internalField uniform 101325;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
floor
{

View File

@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Include defaults parameters from master dictionary
#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
#includeEtc "caseDicts/meshQualityDict"
// ************************************************************************* //

View File

@ -22,7 +22,7 @@ internalField uniform (0 0 0);
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 0.0495;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 0.06;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "$WM_PROJECT_DIR/etc/caseDicts/foamyHexMeshDict"
#includeEtc "caseDicts/foamyHexMeshDict"
geometry
{

View File

@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Include defaults parameters from master dictionary
#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
#includeEtc "caseDicts/meshQualityDict"
// ************************************************************************* //

View File

@ -24,7 +24,7 @@ internalField uniform $flowVelocity;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
#include "include/fixedInlet"

View File

@ -23,7 +23,7 @@ internalField uniform $turbulentKE;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
//- Define inlet conditions
#include "include/fixedInlet"

View File

@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
frontAndBack
{

View File

@ -23,7 +23,7 @@ internalField uniform $turbulentOmega;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
#include "include/fixedInlet"

View File

@ -23,7 +23,7 @@ internalField uniform $pressure;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Include defaults parameters from master dictionary
#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
#includeEtc "caseDicts/meshQualityDict"
//- minFaceWeight (0 -> 0.5)
minFaceWeight 0.02;

View File

@ -21,7 +21,7 @@ internalField uniform (1 0 0);
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 1;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 1;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -21,7 +21,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -21,7 +21,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -267,7 +267,7 @@ addLayersControls
// where to undo.
meshQualityControls
{
#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
#includeEtc "caseDicts/meshQualityDict"
// Advanced

View File

@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Include defaults parameters from master dictionary
#include "$WM_PROJECT_DIR/etc/caseDicts/foamyHexMeshDict"
#includeEtc "caseDicts/foamyHexMeshDict"
geometry
{

View File

@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Include defaults parameters from master dictionary
#include "$WM_PROJECT_DIR/etc/caseDicts/foamyHexMeshDict"
#includeEtc "caseDicts/foamyHexMeshDict"
// Any scalar with a name <name>Coeff specifies a value that will be implemented
// as a faction of the target cell size

View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "$WM_PROJECT_DIR/etc/caseDicts/foamyHexMeshDict"
#includeEtc "caseDicts/foamyHexMeshDict"
geometry
{

View File

@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Include defaults parameters from master dictionary
#include "$WM_PROJECT_DIR/etc/caseDicts/foamyHexMeshDict"
#includeEtc "caseDicts/foamyHexMeshDict"
geometry
{

View File

@ -16,7 +16,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Include defaults parameters from master dictionary
#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
#includeEtc "caseDicts/meshQualityDict"
// ************************************************************************* //

View File

@ -25,7 +25,7 @@ internalField uniform ($mUmean 0 0);
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 0.00015;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 5e-07;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 2;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform (0 0 0);
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -25,7 +25,7 @@ internalField uniform ($mUmean 0 0);
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 0.00015;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 5e-07;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 2;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform (0 0 0);
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform (0 0 0);
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 1;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 0.0495;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 0.06;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{

View File

@ -22,7 +22,7 @@ internalField uniform 1e5;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
#includeEtc "caseDicts/setConstraintTypes"
inlet
{