diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 5c4e5aa6b4d4cb501811c4758b9390e23c0d27fb..6b271cfc1d0e5493b23288cc125d2a431d1b3653 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -174,6 +174,7 @@ $(functionEntries)/calcEntry/calcEntry.C
$(functionEntries)/codeStream/codeStream.C
$(functionEntries)/functionEntry/functionEntry.C
$(functionEntries)/includeEntry/includeEntry.C
+$(functionEntries)/includeEtcEntry/includeEtcEntry.C
$(functionEntries)/includeIfPresentEntry/includeIfPresentEntry.C
$(functionEntries)/inputModeEntry/inputModeEntry.C
$(functionEntries)/removeEntry/removeEntry.C
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C
new file mode 100644
index 0000000000000000000000000000000000000000..f16e159c7fe3d637343cf9005d922e33769b1f07
--- /dev/null
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C
@@ -0,0 +1,176 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "includeEtcEntry.H"
+#include "dictionary.H"
+#include "IFstream.H"
+#include "addToMemberFunctionSelectionTable.H"
+#include "stringOps.H"
+#include "OSspecific.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+const Foam::word Foam::functionEntries::includeEtcEntry::typeName
+(
+ Foam::functionEntries::includeEtcEntry::typeName_()
+);
+
+// Don't lookup the debug switch here as the debug switch dictionary
+// might include includeEtcEntry
+int Foam::functionEntries::includeEtcEntry::debug(0);
+
+bool Foam::functionEntries::includeEtcEntry::report(false);
+
+
+namespace Foam
+{
+namespace functionEntries
+{
+ addToMemberFunctionSelectionTable
+ (
+ functionEntry,
+ includeEtcEntry,
+ execute,
+ dictionaryIstream
+ );
+
+ addToMemberFunctionSelectionTable
+ (
+ functionEntry,
+ includeEtcEntry,
+ execute,
+ primitiveEntryIstream
+ );
+}
+}
+
+// * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * //
+
+Foam::fileName Foam::functionEntries::includeEtcEntry::includeEtcFileName
+(
+ const fileName& f,
+ const dictionary& dict
+)
+{
+ fileName fName(f);
+
+ // Substitute dictionary and environment variables.
+ // Allow empty substitutions.
+ stringOps::inplaceExpand(fName, dict, true, true);
+
+ if (fName.empty() || fName.isAbsolute())
+ {
+ return fName;
+ }
+ else
+ {
+ // Search the etc directories for the file
+ return findEtcFile(fName);
+ }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+bool Foam::functionEntries::includeEtcEntry::execute
+(
+ dictionary& parentDict,
+ Istream& is
+)
+{
+ const fileName rawFName(is);
+ const fileName fName
+ (
+ includeEtcFileName(rawFName, parentDict)
+ );
+ IFstream ifs(fName);
+
+ if (ifs)
+ {
+ if (Foam::functionEntries::includeEtcEntry::report)
+ {
+ Info<< fName << endl;
+ }
+ parentDict.read(ifs);
+ return true;
+ }
+ else
+ {
+ FatalIOErrorIn
+ (
+ "functionEntries::includeEtcEntry::includeEtcEntry"
+ "(dictionary& parentDict, Istream&)",
+ is
+ ) << "Cannot open etc file "
+ << (ifs.name().size() ? ifs.name() : rawFName)
+ << " while reading dictionary " << parentDict.name()
+ << exit(FatalIOError);
+
+ return false;
+ }
+}
+
+
+bool Foam::functionEntries::includeEtcEntry::execute
+(
+ const dictionary& parentDict,
+ primitiveEntry& entry,
+ Istream& is
+)
+{
+ const fileName rawFName(is);
+ const fileName fName
+ (
+ includeEtcFileName(rawFName, parentDict)
+ );
+ IFstream ifs(fName);
+
+ if (ifs)
+ {
+ if (Foam::functionEntries::includeEtcEntry::report)
+ {
+ Info<< fName << endl;
+ }
+ entry.read(parentDict, ifs);
+ return true;
+ }
+ else
+ {
+ FatalIOErrorIn
+ (
+ "functionEntries::includeEtcEntry::includeEtcEntry"
+ "(dictionary& parentDict, primitiveEntry&, Istream&)",
+ is
+ ) << "Cannot open etc file "
+ << (ifs.name().size() ? ifs.name() : rawFName)
+ << " while reading dictionary " << parentDict.name()
+ << exit(FatalIOError);
+
+ return false;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H
new file mode 100644
index 0000000000000000000000000000000000000000..cf0f7f3588800be57d2495424594516d574e13ea
--- /dev/null
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H
@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::functionEntries::includeEtcEntry
+
+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.
+
+See Also
+ findEtcFile, fileName, string::expand()
+
+SourceFiles
+ includeEtcEntry.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef includeEtcEntry_H
+#define includeEtcEntry_H
+
+#include "functionEntry.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace functionEntries
+{
+
+/*---------------------------------------------------------------------------*\
+ Class includeEtcEntry Declaration
+\*---------------------------------------------------------------------------*/
+
+class includeEtcEntry
+:
+ public functionEntry
+{
+ // Private Member Functions
+
+ //- Disallow default bitwise copy construct
+ includeEtcEntry(const includeEtcEntry&);
+
+ //- Disallow default bitwise assignment
+ void operator=(const includeEtcEntry&);
+
+ //- Expand include fileName and return
+ static fileName includeEtcFileName
+ (
+ const fileName&,
+ const dictionary&
+ );
+
+
+public:
+
+ // Static data members
+
+ //- Report which file is included to stdout
+ static bool report;
+
+
+ //- Runtime type information
+ ClassName("includeEtc");
+
+
+ // Member Functions
+
+ //- Execute the functionEntry in a sub-dict context
+ static bool execute(dictionary& parentDict, Istream&);
+
+ //- Execute the functionEntry in a primitiveEntry context
+ static bool execute
+ (
+ const dictionary& parentDict,
+ primitiveEntry&,
+ Istream&
+ );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace functionEntries
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/T b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/T
index 0e600f8b5933f04fcf3a6eb7b9485e3edf6c63cb..bbd52de121041113b46ad59324e3c588cbc59364 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/T
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/T
@@ -38,7 +38,7 @@ boundaryField
staticWalls { $:wall.T; }
movingWalls { $staticWalls; }
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
}
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/U b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/U
index ce4ec2f44233a1d6fcabd69d39ed0b53c4619c47..dc2686147fdf42df45e2f737a25f3b3450ccf845 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/U
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/U
@@ -39,7 +39,7 @@ boundaryField
staticWalls { $:wall.U; }
movingWalls { $:movingWall.U; }
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
}
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/alphat b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/alphat
index 2627b59e100c9627fefb1169b69ad43fbf18ca96..1589874959e0bfe70b096be4f38f5b6afb785502 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/alphat
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/alphat
@@ -28,7 +28,7 @@ boundaryField
movingWalls { $:wall.alphat; }
staticWalls { $movingWalls; }
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
}
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/epsilon b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/epsilon
index d9c4afaaca000f1a24f68d9a4516a5506b81b315..ac2973544194b71018d7da1f48b851f80d093786 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/epsilon
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/epsilon
@@ -39,7 +39,7 @@ boundaryField
staticWalls { $:wall.epsilon; }
movingWalls { $staticWalls; }
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
}
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/k b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/k
index 42d955afe155669a772dd54cec8a398d187cd93f..62a6c6a62cba6870110c4a348286b99454142157 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/k
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/k
@@ -39,7 +39,7 @@ boundaryField
staticWalls { $:wall.k; }
movingWalls { $staticWalls; }
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
}
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/nut b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/nut
index 1272c0822c99f36f9ff385a009c69ad96707afb1..bf4775a271b8e3bdebbe15008236988948371a20 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/nut
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/nut
@@ -28,7 +28,7 @@ boundaryField
movingWalls { $:wall.nut; }
staticWalls { $movingWalls; }
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
}
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/p b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/p
index b6f3c6b145137f7b4bb76560cdda9dae8a439eaf..dbb74a33630990d94835d767f1b0a66e525603f8 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/p
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/p
@@ -28,7 +28,7 @@ boundaryField
staticWalls { $:wall.p; }
movingWalls { $staticWalls; }
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
index 7e8969b3078e2322a1a0b322509d596eb333ca63..2e1c0701686cafaba68718f1181685361e1be0c7 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
@@ -21,7 +21,7 @@ internalField uniform 265;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
wall
{
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
index 03d53ee7ed6204637a49f2c048c169f6a52a7efb..8c96ab7f5f01145bbdc5f67248a69d3f7f4bba12 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
@@ -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
{
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
index 653366fac47d499beb844e7c8abfc19e8408ba94..0008a1123dac84ff88c1889e69d442c41212c64f 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
@@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
wall
{
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
index e36fe920fca9129567de3e086d9304c174333b7a..9737d5e7e5ef8f07a04cf30ce6dc5e0fe308350f 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
@@ -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
{
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
index 0d889ec8f851f20eb41b7231500003ea9474167a..1db0b544b63c910a973d1df71eb5354cfbd29833 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
@@ -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
{
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
index 42472f31f0e68965ee9a1ad13f6601fa5b0fccd3..3cde4853d60135ac6c0d8069b8d9d31614c3eac4 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
@@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
wall
{
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
index 5a2eb19619103fb42215271895f29e7570444dad..b128cf935db935315cf38901206ab1051d12a831 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
@@ -21,7 +21,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
wall
{
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
index 69ceeb45df80d6666aa57b7a0d5ace5a82eba0c2..31c0555bcf282db1c096e9e7b2d2caf0fc20f97b 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
@@ -21,7 +21,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
wall
{
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict
index fd0701a01c704bcee20a73b031ed27ce23023cf0..4dfba773e35e345ab262816b9aafa28b22179357 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict
@@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Include defaults parameters from master dictionary
-#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
+#includeEtc "caseDicts/meshQualityDict"
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U
index 94521707e2bad885cfcd41175f934f7909fadc39..7bcd3844cc227e4919ceb4205932125b19bc3c5f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U
@@ -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
{
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/alphat
index e0c1d0dfbead048eee4637b2986e04cf5735a784..b870a3b0f9225a1c89ef9688bc05c4b451ef8667 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/alphat
@@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
floor
{
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon
index e850a8a82f194cee8376713b43839b4960387a96..ddfe4474942e8ff9e4f99bd39865c33f36a57305 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon
@@ -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
{
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k
index e231033d12f977cc00d12ae83b064f383bdcbff7..4d4a90ccca5dfefb3a0e9b717d4d6e6d5dd65e1d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k
@@ -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
{
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/nut b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/nut
index 53df882276951f8be43d7f4afadac470247641bf..448198c9c2ee817b1c01b3c12e9af1fdac34947a 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/nut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/nut
@@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
floor
{
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p
index a18ef4e1807e504ba0c125a4e15b103d3e066972..9b7bfd7d53617d8e29500f27eb0fb1848672f867 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p
@@ -22,7 +22,7 @@ internalField uniform 101325;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
floor
{
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh
index ac641156fbcbecac521d981ec572a39424e05a99..b93e0275f1ea020a6ef59bb55d3ac95849a6c940 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh
@@ -22,7 +22,7 @@ internalField uniform 101325;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
floor
{
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/meshQualityDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/meshQualityDict
index fd0701a01c704bcee20a73b031ed27ce23023cf0..4dfba773e35e345ab262816b9aafa28b22179357 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/meshQualityDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/meshQualityDict
@@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Include defaults parameters from master dictionary
-#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
+#includeEtc "caseDicts/meshQualityDict"
// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U
index ab73efdb21dbbba808582f627c3fca692aca40cc..cea2ca0d79cfe7958295dc4aa3d2ad635a49e586 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U
@@ -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
{
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/epsilon b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/epsilon
index 9053f852183a4172c1c9622adc373acbddb30ff2..611e624d8ed181a1677a9babc7393ea214474be3 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/epsilon
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/epsilon
@@ -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
{
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/k b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/k
index 83b933726fc16a7a9839e3ba0ff463d436ebd0e3..6b5c178b6900b633c4bd8855f7f85b7bedf0891e 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/k
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/k
@@ -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
{
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/nut b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/nut
index 4918acab132154e689527aa45cceb941b4463879..366352e5f54d2c6ae36e2fb8df1839f91f6a8a74 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/nut
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/nut
@@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/p b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/p
index 4faf52a108b1fd28f9cc156a69698c2abfa45957..c34b9c9a4fc2e70de7bb2f461819c194127f2ee9 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/p
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/p
@@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict
index 7e43f6ea466e810ba06845dd8e35ee2d282e6803..d1b78f3df752f86cf201ba5ffc99faca4ba3af75 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "$WM_PROJECT_DIR/etc/caseDicts/foamyHexMeshDict"
+#includeEtc "caseDicts/foamyHexMeshDict"
geometry
{
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshQualityDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshQualityDict
index fd0701a01c704bcee20a73b031ed27ce23023cf0..4dfba773e35e345ab262816b9aafa28b22179357 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshQualityDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshQualityDict
@@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Include defaults parameters from master dictionary
-#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
+#includeEtc "caseDicts/meshQualityDict"
// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/U b/tutorials/incompressible/simpleFoam/motorBike/0.org/U
index fee3ec88b81f8729dc0e6b67a07a3385f0e525fc..9ce8375a2bba013bdca85cc5cf1ea233766f1cc8 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/U
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/U
@@ -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"
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/k b/tutorials/incompressible/simpleFoam/motorBike/0.org/k
index 301f8b579c183903925c73cd09dbb824793e3233..ab2ad5bf92330147d93fbf0d5227ebc9bae647a5 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/k
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/k
@@ -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"
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/nut b/tutorials/incompressible/simpleFoam/motorBike/0.org/nut
index c940f6b2d626139de3f580952b9a06b9c408d418..85100ea6cdd2d96357c0e8828c61787a88876285 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/nut
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/nut
@@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
frontAndBack
{
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/omega b/tutorials/incompressible/simpleFoam/motorBike/0.org/omega
index 7eff6c73556546386383963a0bcb40c7519b097e..bba267841703e1c932b204b983af796a9d5a4497 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/omega
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/omega
@@ -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"
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/p b/tutorials/incompressible/simpleFoam/motorBike/0.org/p
index 419e1a85d8844d6a27ad3ec5737f231a55d2a748..337a45eb11b2f55bd79f8531ef2661684076157b 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/p
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/p
@@ -23,7 +23,7 @@ internalField uniform $pressure;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/meshQualityDict b/tutorials/incompressible/simpleFoam/motorBike/system/meshQualityDict
index 2dbd166629b3f6103396a0e8b4768eac19250dd1..5de5b25817008ec945ecc48f618d77f160c2406b 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/meshQualityDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/meshQualityDict
@@ -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;
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U
index 5f5d56017facc15ae29d06d73941a1e369a62c9f..7ae235fa0975458da6222719cf231db325910dcb 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U
@@ -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
{
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon
index 84e17340fa2865292135d3e52269fb8b2d4a834b..ea5df05656ab0bd931e7a9d415593a34b3dadfb0 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon
@@ -22,7 +22,7 @@ internalField uniform 1;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k
index 6e56ce95f26b2511ef92073c4c9ef3abd6f6a4b9..dd90e1e55a7f89b4f44ebe36c7b3aeea172b697f 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k
@@ -22,7 +22,7 @@ internalField uniform 1;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nuTilda b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nuTilda
index 8a7557745ef6ccff3d3b1b45d590b6ef15f67f04..4bf99d876f2861b43ef7f4855709bf6b7434705f 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nuTilda
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nuTilda
@@ -21,7 +21,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut
index 82d8352b7d7f12526c88d39c601b8533fc4ab428..d397953c1d206a9e9d054a275d3d530c8a672ecb 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut
@@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/p b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/p
index 8766459626957a321dd9daab011bd2b38ac620d6..ddb179578cbae26595b056c67f390167adcb3833 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/p
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/p
@@ -21,7 +21,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict
index 5c6e07f9f26ec043f7a30ff6cb00c44eb1f00dab..59372f7327acbe76de318b448ca3e64b77fba3ea 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict
@@ -267,7 +267,7 @@ addLayersControls
// where to undo.
meshQualityControls
{
- #include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
+ #includeEtc "caseDicts/meshQualityDict"
// Advanced
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
index 9a1ae05312531e28bcf91d87f109647cc11889d6..5f399eb98a80cfb0f30d5b171ec357f32be58d3f 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
@@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Include defaults parameters from master dictionary
-#include "$WM_PROJECT_DIR/etc/caseDicts/foamyHexMeshDict"
+#includeEtc "caseDicts/foamyHexMeshDict"
geometry
{
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
index 12a0994df843eefe892a5dcfc1acde505d6d65e6..5b3c0ba8a381adbea080d313a75916588c8a8699 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
@@ -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
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict
index 3b8be387f064d540f7599768057fba17c481b57d..6ffc0dbcea0cd245564c4b46e62befc7e5cdecc3 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "$WM_PROJECT_DIR/etc/caseDicts/foamyHexMeshDict"
+#includeEtc "caseDicts/foamyHexMeshDict"
geometry
{
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict
index f73263a5aa869e9f5b720b5c786cb68d9a16a774..4eea925e0a6a361c9a883ebba0657b71739e76a6 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict
@@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Include defaults parameters from master dictionary
-#include "$WM_PROJECT_DIR/etc/caseDicts/foamyHexMeshDict"
+#includeEtc "caseDicts/foamyHexMeshDict"
geometry
{
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/flange/system/meshQualityDict
index 8351b3f374624cb9db1106baaeade956ed966a82..d06e1d63e2455df136a72251b8c7b4164c4df407 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/meshQualityDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/meshQualityDict
@@ -16,7 +16,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Include defaults parameters from master dictionary
-#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
+#includeEtc "caseDicts/meshQualityDict"
// ************************************************************************* //
diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/U b/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/U
index 507cfa947dfeb4d0cdad372c63bfe3b7fbab2bc0..36ca5c09f7182fd11fe3ccba3eb69a4583cddb61 100644
--- a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/U
+++ b/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/U
@@ -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
{
diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/alpha.water b/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/alpha.water
index 06ee368c9c465be3d27a64275f526dc8579549d2..48e62daa04d09cafb1e91a167fcf34e07e018200 100644
--- a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/alpha.water
+++ b/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/alpha.water
@@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/k b/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/k
index 392241cd6fab7ebb10949aa86708c01a83ab67f2..651840bed6d726d37e89b87185cd8c35e87d1578 100644
--- a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/k
+++ b/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/k
@@ -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
{
diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/nut b/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/nut
index 4abe529d46dc6bbb52ef8271573a7e4e08dcbad0..06c3a53b30c075d1733b8828523e0ada5a0e15d6 100644
--- a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/nut
+++ b/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/nut
@@ -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
{
diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/omega b/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/omega
index 0dde05c3ac12bac21468a89ae9ad27f5de8fbd7e..9edeb123bb1e487a28570770951519c1d29e0be6 100644
--- a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/omega
+++ b/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/omega
@@ -22,7 +22,7 @@ internalField uniform 2;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/p_rgh b/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/p_rgh
index 0c0eda7c6fac6426abdabb191b6918cc6ade01dd..5d264eace76b9d25efb2499244a5699399ac257e 100644
--- a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/p_rgh
+++ b/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/p_rgh
@@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/pointDisplacement b/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/pointDisplacement
index 350676e605bfc9e4a2dbdd28837663dadeef95ee..d8cf1d57ce8a602d663b96fc07ee7a87ae7c8a7b 100644
--- a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/pointDisplacement
+++ b/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/pointDisplacement
@@ -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
{
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/U b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/U
index 23017d2857df3a162d86963be52e95f637cc7b03..49416151d87e50f32e5672a380372022571d1266 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/U
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/U
@@ -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
{
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/alpha.water b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/alpha.water
index 06ee368c9c465be3d27a64275f526dc8579549d2..48e62daa04d09cafb1e91a167fcf34e07e018200 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/alpha.water
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/alpha.water
@@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/k b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/k
index 392241cd6fab7ebb10949aa86708c01a83ab67f2..651840bed6d726d37e89b87185cd8c35e87d1578 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/k
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/k
@@ -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
{
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/nut b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/nut
index 4abe529d46dc6bbb52ef8271573a7e4e08dcbad0..06c3a53b30c075d1733b8828523e0ada5a0e15d6 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/nut
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/nut
@@ -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
{
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/omega b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/omega
index 0dde05c3ac12bac21468a89ae9ad27f5de8fbd7e..9edeb123bb1e487a28570770951519c1d29e0be6 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/omega
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/omega
@@ -22,7 +22,7 @@ internalField uniform 2;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/p_rgh b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/p_rgh
index 0c0eda7c6fac6426abdabb191b6918cc6ade01dd..5d264eace76b9d25efb2499244a5699399ac257e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/p_rgh
@@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/pointDisplacement b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/pointDisplacement
index 350676e605bfc9e4a2dbdd28837663dadeef95ee..d8cf1d57ce8a602d663b96fc07ee7a87ae7c8a7b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/pointDisplacement
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/pointDisplacement
@@ -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
{
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U
index b8d2f2caa33d8e8aa273d9d0a964e96cdf3d012c..569f1d99df761e0961f2b5337d6ce7c37123985a 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U
@@ -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
{
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water
index 6d432ebc1320bfa4fec5b8c7ee7cdaeafeb6344e..32c29899e08e861731ff3e1a7f35f9d18f305962 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water
@@ -22,7 +22,7 @@ internalField uniform 1;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon
index 9053f852183a4172c1c9622adc373acbddb30ff2..611e624d8ed181a1677a9babc7393ea214474be3 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon
@@ -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
{
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k
index 83b933726fc16a7a9839e3ba0ff463d436ebd0e3..6b5c178b6900b633c4bd8855f7f85b7bedf0891e 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k
@@ -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
{
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut
index 4918acab132154e689527aa45cceb941b4463879..366352e5f54d2c6ae36e2fb8df1839f91f6a8a74 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut
@@ -22,7 +22,7 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh
index e89c0586e6556268587c32622808d9fd32fce173..03d383af53565c8d3220e7f6df9d00d8d60e408b 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh
@@ -22,7 +22,7 @@ internalField uniform 1e5;
boundaryField
{
//- Set patchGroups for constraint patches
- #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+ #includeEtc "caseDicts/setConstraintTypes"
inlet
{