diff --git a/applications/test/string/Test-string.C b/applications/test/string/Test-string.C index c5e42fce01..6fe33b37d5 100644 --- a/applications/test/string/Test-string.C +++ b/applications/test/string/Test-string.C @@ -30,6 +30,7 @@ Description #include "stringOps.H" #include "dictionary.H" #include "IOstreams.H" +#include "OSspecific.H" #include "int.H" #include "uint.H" @@ -53,6 +54,8 @@ int main(int argc, char *argv[]) " or with '${__UNKNOWN:+unknown}' empty" ); + setEnv("FOAM_CASE", cwd(), true); + dictionary dict; dict.add("HOME", "myHome"); @@ -62,6 +65,38 @@ int main(int argc, char *argv[]) dict.add("FOAM_RUN", subDict); + // basic expansions + { + for + ( + const auto& cstr + : + { + "~OpenFOAM/controlDict", + "/controlDict", + + "$FOAM_CASE/test", + "/test", + + "$FOAM_CASE/constant/test", + "/constant/test", + "/test", + + "$FOAM_CASE/system/test", + "/system/test", + "/test", + } + ) + { + string input(cstr); + string output(stringOps::expand(input)); + + Info<<"input: " << input << nl + << "expand: " << output << nl << nl; + } + } + + // Test Foam::name with formatting string { word formatted = word::printf("formatted=<%X>", 0xdeadbeef); diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C index 181ab1a9dc..2d31027626 100644 --- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C +++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C @@ -34,15 +34,93 @@ License namespace Foam { -// Standard handling of "~/", "./" etc. -static void standardExpansions(std::string& s) + +// Expand a leading / +// Convenient for frequently used directories +// +// / => user/group/other OpenFOAM directory +// / => FOAM_CASE directory +// / => FOAM_CASE/constant directory +// / => FOAM_CASE/system directory +static void expandLeadingTag(std::string& s, const char b, const char e) +{ + if (s[0] != b) + { + return; + } + + auto delim = s.find(e); + if (delim == std::string::npos || s[++delim] != '/') + { + return; // Ignore if there is no '/' after + } + + const std::string tag(s, 1, delim-2); + fileName file(s.substr(delim + 1)); + + if (tag == "etc") + { + s = findEtcFile(file); + } + else if (tag == "case") + { + s = fileName(getEnv("FOAM_CASE"))/file; + } + else if (tag == "constant" || tag == "system") + { + s = fileName(Foam::getEnv("FOAM_CASE"))/tag/file; + } +} + + +// Expand a leading tilde +// ~/ => home directory +// ~OpenFOAM => user/group/other OpenFOAM directory +// ~user => home directory for specified user +static void expandLeadingTilde(std::string& s) +{ + if (s[0] != '~') + { + return; + } + + std::string user; + fileName file; + + const auto slash = s.find('/'); + if (slash == std::string::npos) + { + user = s.substr(1); + } + else + { + user = s.substr(1, slash - 1); + file = s.substr(slash + 1); + } + + // NB: be a bit lazy and expand ~unknownUser as an + // empty string rather than leaving it untouched. + // otherwise add extra test + + if (user == "OpenFOAM") + { + s = findEtcFile(file); + } + else + { + s = home(user)/file; + } +} + + +// Expand leading contents: "./", "~..", "/" +static void expandLeading(std::string& s) { if (s.empty()) { return; } - - if (s[0] == '.') + else if (s[0] == '.') { // Expand a lone '.' and an initial './' into cwd if (s.size() == 1) @@ -54,42 +132,17 @@ static void standardExpansions(std::string& s) s.std::string::replace(0, 1, cwd()); } } + else if (s[0] == '<') + { + expandLeadingTag(s, '<', '>'); + } else if (s[0] == '~') { - // Expand initial ~ - // ~/ => home directory - // ~OpenFOAM => site/user OpenFOAM configuration directory - // ~user => home directory for specified user - - string user; - fileName file; - - const auto slash = s.find('/'); - if (slash == std::string::npos) - { - user = s.substr(1); - } - else - { - user = s.substr(1, slash - 1); - file = s.substr(slash + 1); - } - - // NB: be a bit lazy and expand ~unknownUser as an - // empty string rather than leaving it untouched. - // otherwise add extra test - - if (user == "OpenFOAM") - { - s = findEtcFile(file); - } - else - { - s = home(user)/file; - } + expandLeadingTilde(s); } } -} + +} // end of namespace Foam //! \cond fileScope @@ -571,8 +624,7 @@ void Foam::stringOps::inplaceExpand } } - // Standard handling of "~/", "./" etc. - standardExpansions(s); + expandLeading(s); } @@ -869,8 +921,7 @@ void Foam::stringOps::inplaceExpand } } - // Standard handling of "~/", "./" etc. - standardExpansions(s); + expandLeading(s); } diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.H b/src/OpenFOAM/primitives/strings/stringOps/stringOps.H index f0a53ce08f..99af9f395f 100644 --- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.H +++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.H @@ -217,10 +217,15 @@ namespace stringOps // - "$VAR", "${VAR}" // -# current directory // - leading "./" : the current directory + // -# leading tag expansion for commonly used directories + // - / : user/group/other OpenFOAM directory + // - / : FOAM_CASE directory + // - / : FOAM_CASE/constant directory + // - / : FOAM_CASE/system directory // -# tilde expansion // - leading "~/" : home directory // - leading "~user" : home directory for specified user - // - leading "~OpenFOAM" : site/user OpenFOAM configuration directory + // - leading "~OpenFOAM" : user/group/other OpenFOAM directory // // Supports default and alternative values as per the POSIX shell. // \code @@ -252,10 +257,15 @@ namespace stringOps // - "$VAR", "${VAR}" // -# current directory // - leading "./" : the current directory + // -# leading tag expansion for commonly used directories + // - / : user/group/other OpenFOAM directory + // - / : FOAM_CASE directory + // - / : FOAM_CASE/constant directory + // - / : FOAM_CASE/system directory // -# tilde expansion // - leading "~/" : home directory // - leading "~user" : home directory for specified user - // - leading "~OpenFOAM" : site/user OpenFOAM configuration directory + // - leading "~OpenFOAM" : user/group/other OpenFOAM directory // // Supports default and alternative values as per the POSIX shell. // \code diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/extrudeMeshDict b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/extrudeMeshDict index 594cab7254..2b83052e17 100644 --- a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/extrudeMeshDict +++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/extrudeMeshDict @@ -118,10 +118,10 @@ sigmaRadialCoeffs offsetSurfaceCoeffs { // Surface that mesh has been meshed to - baseSurface "$FOAM_CASE/constant/triSurface/DTC-scaled-inflated.obj"; + baseSurface "/triSurface/DTC-scaled-inflated.obj"; // Surface to fill in to - offsetSurface "$FOAM_CASE/constant/triSurface/DTC-scaled.obj"; + offsetSurface "/triSurface/DTC-scaled.obj"; } diff --git a/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties index 36f3ff82c5..aa0967dda4 100644 --- a/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties +++ b/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties @@ -27,7 +27,7 @@ thermoType } chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo"; +foamChemistryFile "/reactions"; +foamChemistryThermoFile "/thermo"; // ************************************************************************* // diff --git a/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties index c39250d77b..12e6b0f813 100644 --- a/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties +++ b/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties @@ -26,8 +26,8 @@ thermoType specie specie; } -CHEMKINFile "$FOAM_CASE/chemkin/chem.inp"; -CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat"; -CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties"; +CHEMKINFile "/chemkin/chem.inp"; +CHEMKINThermoFile "/chemkin/therm.dat"; +CHEMKINTransportFile "/chemkin/transportProperties"; // ************************************************************************* // diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties index c39250d77b..12e6b0f813 100644 --- a/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties +++ b/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties @@ -26,8 +26,8 @@ thermoType specie specie; } -CHEMKINFile "$FOAM_CASE/chemkin/chem.inp"; -CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat"; -CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties"; +CHEMKINFile "/chemkin/chem.inp"; +CHEMKINThermoFile "/chemkin/therm.dat"; +CHEMKINTransportFile "/chemkin/transportProperties"; // ************************************************************************* // diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties index c39250d77b..12e6b0f813 100644 --- a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties +++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties @@ -26,8 +26,8 @@ thermoType specie specie; } -CHEMKINFile "$FOAM_CASE/chemkin/chem.inp"; -CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat"; -CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties"; +CHEMKINFile "/chemkin/chem.inp"; +CHEMKINThermoFile "/chemkin/therm.dat"; +CHEMKINTransportFile "/chemkin/transportProperties"; // ************************************************************************* // diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties index c39250d77b..12e6b0f813 100644 --- a/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties +++ b/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties @@ -26,8 +26,8 @@ thermoType specie specie; } -CHEMKINFile "$FOAM_CASE/chemkin/chem.inp"; -CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat"; -CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties"; +CHEMKINFile "/chemkin/chem.inp"; +CHEMKINThermoFile "/chemkin/therm.dat"; +CHEMKINTransportFile "/chemkin/transportProperties"; // ************************************************************************* // diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0/U b/tutorials/combustion/fireFoam/LES/compartmentFire/0/U index a7ce2c8afb..2740e5d087 100644 --- a/tutorials/combustion/fireFoam/LES/compartmentFire/0/U +++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0/U @@ -27,7 +27,7 @@ boundaryField massFlowRate tableFile; massFlowRateCoeffs { - file "$FOAM_CASE/constant/massLossRate"; + file "/massLossRate"; } value uniform (0 0 0); } diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermophysicalProperties index 4533ca2459..faff63cc57 100644 --- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermophysicalProperties @@ -33,9 +33,9 @@ fuel C7H16; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas"; +foamChemistryThermoFile "/thermo.compressibleGas"; dpdt no; diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties index 52449f12ea..f6f6f12522 100644 --- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties @@ -28,9 +28,9 @@ thermoType chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/pyrolysisRegion/reactions"; +foamChemistryFile "/pyrolysisRegion/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/pyrolysisRegion/thermo.solid"; +foamChemistryThermoFile "/pyrolysisRegion/thermo.solid"; gasThermoType { diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties index 0d67f9a8e2..8a5962922d 100644 --- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties @@ -32,9 +32,9 @@ fuel C3H8; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas"; +foamChemistryThermoFile "/thermo.compressibleGas"; liquids { diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties index efdd83e143..bad46b05a8 100644 --- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties @@ -28,9 +28,9 @@ thermoType chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/panelRegion/reactions"; +foamChemistryFile "/panelRegion/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/panelRegion/thermo.solid"; +foamChemistryThermoFile "/panelRegion/thermo.solid"; gasThermoType { diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermophysicalProperties index 1af9bfec63..9516956f2d 100644 --- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermophysicalProperties @@ -32,9 +32,9 @@ fuel C3H8; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas"; +foamChemistryThermoFile "/thermo.compressibleGas"; // ************************************************************************* // diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermophysicalProperties index efdd83e143..bad46b05a8 100644 --- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermophysicalProperties @@ -28,9 +28,9 @@ thermoType chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/panelRegion/reactions"; +foamChemistryFile "/panelRegion/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/panelRegion/thermo.solid"; +foamChemistryThermoFile "/panelRegion/thermo.solid"; gasThermoType { diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermophysicalProperties index f67fb01b78..94cf3a1d9c 100644 --- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermophysicalProperties @@ -33,8 +33,8 @@ fuel CH4; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas"; +foamChemistryThermoFile "/thermo.compressibleGas"; // ************************************************************************* // diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties index 736d9be78f..208b3c88ad 100644 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties @@ -32,9 +32,9 @@ fuel CH4; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas"; +foamChemistryThermoFile "/thermo.compressibleGas"; // ************************************************************************* // diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties.twoSteps b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties.twoSteps index 7e1c8dbc7c..05a39f4674 100644 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties.twoSteps +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties.twoSteps @@ -32,9 +32,9 @@ fuel CH4; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas"; +foamChemistryThermoFile "/thermo.compressibleGas"; // ************************************************************************* // diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermophysicalProperties index 736d9be78f..208b3c88ad 100644 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermophysicalProperties @@ -32,9 +32,9 @@ fuel CH4; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas"; +foamChemistryThermoFile "/thermo.compressibleGas"; // ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/thermophysicalProperties index 92d89e9c29..bbfbe4f9bc 100644 --- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/thermophysicalProperties +++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/thermophysicalProperties @@ -30,7 +30,7 @@ thermoType inertSpecie N2; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactionsGRI"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGasGRI"; +foamChemistryFile "/reactionsGRI"; +foamChemistryThermoFile "/thermo.compressibleGasGRI"; // ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/thermophysicalProperties index ef9ddce1df..5d938a80e8 100644 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/thermophysicalProperties +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/thermophysicalProperties @@ -29,7 +29,7 @@ thermoType inertSpecie N2; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactionsGRI"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGasGRI"; +foamChemistryFile "/reactionsGRI"; +foamChemistryThermoFile "/thermo.compressibleGasGRI"; // ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/RAS/chockedNozzle/0/T b/tutorials/combustion/reactingFoam/RAS/chockedNozzle/0/T index 4d697e45ed..3bae7d22bb 100644 --- a/tutorials/combustion/reactingFoam/RAS/chockedNozzle/0/T +++ b/tutorials/combustion/reactingFoam/RAS/chockedNozzle/0/T @@ -31,7 +31,7 @@ boundaryField componentColumns ( 2 ); separator ","; mergeSeparators no; - file "$FOAM_CASE/constant/inlet.csv"; + file "/inlet.csv"; } } outlet diff --git a/tutorials/combustion/reactingFoam/RAS/chockedNozzle/0/U b/tutorials/combustion/reactingFoam/RAS/chockedNozzle/0/U index 0d8dadfb98..3165ec122b 100644 --- a/tutorials/combustion/reactingFoam/RAS/chockedNozzle/0/U +++ b/tutorials/combustion/reactingFoam/RAS/chockedNozzle/0/U @@ -30,7 +30,7 @@ boundaryField componentColumns ( 1 ); separator ","; mergeSeparators no; - file "$FOAM_CASE/constant/inlet.csv"; + file "/inlet.csv"; } diff --git a/tutorials/combustion/reactingFoam/RAS/chockedNozzle/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/RAS/chockedNozzle/constant/thermophysicalProperties index bd3639697d..41d84abb3b 100644 --- a/tutorials/combustion/reactingFoam/RAS/chockedNozzle/constant/thermophysicalProperties +++ b/tutorials/combustion/reactingFoam/RAS/chockedNozzle/constant/thermophysicalProperties @@ -30,8 +30,8 @@ thermoType inertSpecie N2; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactionsGRI"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGasGRI"; +foamChemistryFile "/reactionsGRI"; +foamChemistryThermoFile "/thermo.compressibleGasGRI"; dpdt false; diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermophysicalProperties index 212fea0b01..d700eca5bf 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermophysicalProperties +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermophysicalProperties @@ -30,9 +30,9 @@ inertSpecie N2; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas"; +foamChemistryThermoFile "/thermo.compressibleGas"; // ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermophysicalProperties index 212fea0b01..d700eca5bf 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermophysicalProperties +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermophysicalProperties @@ -30,9 +30,9 @@ inertSpecie N2; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas"; +foamChemistryThermoFile "/thermo.compressibleGas"; // ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermophysicalProperties index 764f5e5626..b941902d4e 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermophysicalProperties +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermophysicalProperties @@ -29,8 +29,8 @@ thermoType inertSpecie N2; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactionsGRI"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGasGRI"; +foamChemistryFile "/reactionsGRI"; +foamChemistryThermoFile "/thermo.compressibleGasGRI"; // ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermophysicalProperties index 764f5e5626..b941902d4e 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermophysicalProperties +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermophysicalProperties @@ -29,8 +29,8 @@ thermoType inertSpecie N2; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactionsGRI"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGasGRI"; +foamChemistryFile "/reactionsGRI"; +foamChemistryThermoFile "/thermo.compressibleGasGRI"; // ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermophysicalProperties index 764f5e5626..b941902d4e 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermophysicalProperties +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermophysicalProperties @@ -29,8 +29,8 @@ thermoType inertSpecie N2; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactionsGRI"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGasGRI"; +foamChemistryFile "/reactionsGRI"; +foamChemistryThermoFile "/thermo.compressibleGasGRI"; // ************************************************************************* // diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/extrudeMeshDict b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/extrudeMeshDict index d6190ee7d8..d0927a1c15 100644 --- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/extrudeMeshDict +++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/extrudeMeshDict @@ -91,10 +91,10 @@ sigmaRadialCoeffs offsetSurfaceCoeffs { // Surface that mesh has been meshed to - baseSurface "$FOAM_CASE/constant/triSurface/DTC-scaled-inflated.obj"; + baseSurface "/triSurface/DTC-scaled-inflated.obj"; // Surface to fill in to - offsetSurface "$FOAM_CASE/constant/triSurface/DTC-scaled.obj"; + offsetSurface "/triSurface/DTC-scaled.obj"; } diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/T b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/T index 552161ffda..adea2bfa29 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/T +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/T @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "${FOAM_CASE}/constant/caseSettings" +#include "/caseSettings" dimensions [0 0 0 1 0 0 0]; diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/U b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/U index 38e7df71f1..5f6a138b3d 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/U +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/U @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "${FOAM_CASE}/constant/caseSettings" +#include "/caseSettings" dimensions [0 1 -1 0 0 0 0]; diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/alphat b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/alphat index e7bfc2ba8f..c671c7bb81 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/alphat +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/alphat @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "${FOAM_CASE}/constant/caseSettings" +#include "/caseSettings" dimensions [1 -1 -1 0 0 0 0]; diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/epsilon b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/epsilon index 0dc986ace4..450128554e 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/epsilon +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/epsilon @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "${FOAM_CASE}/constant/caseSettings" +#include "/caseSettings" dimensions [0 2 -3 0 0 0 0]; diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/k b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/k index 2fea11aca8..ce4361844b 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/k +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/k @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "${FOAM_CASE}/constant/caseSettings" +#include "/caseSettings" dimensions [0 2 -2 0 0 0 0]; diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/nut b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/nut index 7ca5ef71cb..dc12b48fb8 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/nut +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/nut @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "${FOAM_CASE}/constant/caseSettings" +#include "/caseSettings" dimensions [0 2 -1 0 0 0 0]; diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/p b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/p index 80701f202d..c1923f3007 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/p +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.orig/p @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "${FOAM_CASE}/constant/caseSettings" +#include "/caseSettings" dimensions [1 -1 -2 0 0 0 0]; diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/caseSettings b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/caseSettings index 3514186052..76fb68fa87 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/caseSettings +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/caseSettings @@ -36,6 +36,6 @@ meshMotionProperties omega 25; // rad/s } -#include "${FOAM_CASE}/constant/boundaryConditions" +#include "/boundaryConditions" // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/dynamicMeshDict b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/dynamicMeshDict index 7661b02be7..432de5e584 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/dynamicMeshDict +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/dynamicMeshDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "${FOAM_CASE}/constant/caseSettings" +#include "/caseSettings" dynamicFvMesh dynamicMotionSolverFvMesh; diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/abort b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/abort index 34ec5f4b51..b1bfa03ea6 100644 --- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/abort +++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/abort @@ -4,7 +4,7 @@ ABORT { type abort; libs ("libutilityFunctionObjects.so"); - //file "$FOAM_CASE/ABORT"; // default name + //file "/ABORT"; // default name // action writeNow; action nextWrite; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/externalCoupled b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/externalCoupled index 85e647d696..b8167b2655 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/externalCoupled +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/externalCoupled @@ -1,22 +1,18 @@ // -*- C++ -*- -// control for external coupled simulation +// Control for external coupled simulation externalCoupled { - // Where to load it from (if not already in solver) - libs ("libfieldFunctionObjects.so"); - - type externalCoupled; + type externalCoupled; + libs ("libfieldFunctionObjects.so"); + log true; // Directory to use for communication - commsDir "${FOAM_CASE}/comms"; + commsDir "/comms"; // Does external process start first initByExternal true; - // Additional output - log true; - regions { // Region name (wildcards allowed) diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict index ee2da935e8..037126c039 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict @@ -73,14 +73,14 @@ functions writeControl timeStep; writeInterval 1; region cabin; - fileToUpdate "$FOAM_CASE/system/solverControls"; + fileToUpdate "/solverControls"; timeVsFile ( - ( 1 "$FOAM_CASE/system/solverControls.0" ) - ( 5 "$FOAM_CASE/system/solverControls.5") - ( 20 "$FOAM_CASE/system/solverControls.20") - ( 60 "$FOAM_CASE/system/solverControls.60") + ( 1 "/solverControls.0" ) + ( 5 "/solverControls.5" ) + ( 20 "/solverControls.20") + ( 60 "/solverControls.60") ); } } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/externalCoupled b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/externalCoupled index 7e820e9d19..4fba386774 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/externalCoupled +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/externalCoupled @@ -1,14 +1,14 @@ // -*- C++ -*- -// control for external coupled simulation +// Control for external coupled simulation externalCoupled { - libs ("libfieldFunctionObjects.so"); - type externalCoupled; + libs ("libfieldFunctionObjects.so"); + log true; // Directory to use for communication - commsDir "${FOAM_CASE}/comms"; + commsDir "/comms"; // Does external process start first initByExternal true; @@ -16,9 +16,6 @@ externalCoupled // Frequency of coupling calcFrequency 4; - // Additional output - log true; - regions { // Region name (wildcards allowed) diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/system/lumpedPointMovement b/tutorials/incompressible/lumpedPointMotion/building/steady/system/lumpedPointMovement index 3950ff4771..f1b33cbbfd 100644 --- a/tutorials/incompressible/lumpedPointMotion/building/steady/system/lumpedPointMovement +++ b/tutorials/incompressible/lumpedPointMotion/building/steady/system/lumpedPointMovement @@ -69,7 +69,7 @@ communication inputFormat dictionary; outputFormat dictionary; - debugTable "$FOAM_CASE/output.txt"; + debugTable "/output.txt"; } // ************************************************************************* // diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/extrudeMeshDict b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/extrudeMeshDict index 594cab7254..2b83052e17 100644 --- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/extrudeMeshDict +++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/extrudeMeshDict @@ -118,10 +118,10 @@ sigmaRadialCoeffs offsetSurfaceCoeffs { // Surface that mesh has been meshed to - baseSurface "$FOAM_CASE/constant/triSurface/DTC-scaled-inflated.obj"; + baseSurface "/triSurface/DTC-scaled-inflated.obj"; // Surface to fill in to - offsetSurface "$FOAM_CASE/constant/triSurface/DTC-scaled.obj"; + offsetSurface "/triSurface/DTC-scaled.obj"; } diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p index ea32989157..0385dfc8d0 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p +++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p @@ -28,7 +28,7 @@ boundaryField direction in; readerType openFoam; hasHeaderLine true; - file "$FOAM_CASE/constant/FluxVsdP.dat"; + file "/FluxVsdP.dat"; //nonDimensional true; //rpm 300; //dm 2e-2; diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing index 49249da73b..914272fc32 100644 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing @@ -73,7 +73,7 @@ postPro1 surface1 { type geometry; - files ("$FOAM_CASE/constant/triSurface/motorBike.obj.gz"); + files ("/triSurface/motorBike.obj.gz"); renderMode phong; representation surface; edgeColour (0 0 0); diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties index 22fca74432..9f48ef62fd 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties @@ -28,9 +28,9 @@ thermoType chemistryReader foamChemistryReader; -foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat"; +foamChemistryThermoFile "/foam.dat"; -foamChemistryFile "$FOAM_CASE/constant/foam.inp"; +foamChemistryFile "/foam.inp"; inertSpecie N2; diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties index 368498bf6f..4fcdab9268 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties @@ -30,9 +30,9 @@ inertSpecie N2; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas"; +foamChemistryThermoFile "/thermo.compressibleGas"; // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties index 3fc2b53740..96143d80d5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties @@ -28,9 +28,9 @@ thermoType chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/foam.inp"; +foamChemistryFile "/foam.inp"; -foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat"; +foamChemistryThermoFile "/foam.dat"; inertSpecie N2; diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties index 56d265f7aa..e28291ef2a 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties @@ -30,9 +30,9 @@ dpdt no; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly"; +foamChemistryThermoFile "/thermo.incompressiblePoly"; liquids { diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties index 3fc2b53740..96143d80d5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties @@ -28,9 +28,9 @@ thermoType chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/foam.inp"; +foamChemistryFile "/foam.inp"; -foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat"; +foamChemistryThermoFile "/foam.dat"; inertSpecie N2; diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties index 35221a4868..12a8f798a9 100644 --- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties @@ -30,9 +30,9 @@ dpdt no; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly"; +foamChemistryThermoFile "/thermo.incompressiblePoly"; inertSpecie air; diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties index 3fc2b53740..96143d80d5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties @@ -28,9 +28,9 @@ thermoType chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/foam.inp"; +foamChemistryFile "/foam.inp"; -foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat"; +foamChemistryThermoFile "/foam.dat"; inertSpecie N2; diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties index 3fc2b53740..96143d80d5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties @@ -28,9 +28,9 @@ thermoType chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/foam.inp"; +foamChemistryFile "/foam.inp"; -foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat"; +foamChemistryThermoFile "/foam.dat"; inertSpecie N2; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties index 35221a4868..12a8f798a9 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties @@ -30,9 +30,9 @@ dpdt no; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly"; +foamChemistryThermoFile "/thermo.incompressiblePoly"; inertSpecie air; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties index 55d27c3aae..732cda5c1c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties @@ -28,9 +28,9 @@ thermoType chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly"; +foamChemistryThermoFile "/thermo.incompressiblePoly"; inertSpecie air; diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties index b24a54ff0d..af90379972 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties @@ -28,9 +28,9 @@ thermoType chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly"; +foamChemistryThermoFile "/thermo.incompressiblePoly"; inertSpecie air; diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties index ab96654d5a..1acbc88536 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties @@ -26,9 +26,9 @@ thermoType specie specie; } -CHEMKINFile "$FOAM_CASE/chemkin/chem.inp"; -CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat"; -CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties"; +CHEMKINFile "/chemkin/chem.inp"; +CHEMKINThermoFile "/chemkin/therm.dat"; +CHEMKINTransportFile "/chemkin/transportProperties"; newFormat yes; diff --git a/tutorials/mesh/parallel/filter/constant/thermophysicalProperties b/tutorials/mesh/parallel/filter/constant/thermophysicalProperties index 56d265f7aa..e28291ef2a 100644 --- a/tutorials/mesh/parallel/filter/constant/thermophysicalProperties +++ b/tutorials/mesh/parallel/filter/constant/thermophysicalProperties @@ -30,9 +30,9 @@ dpdt no; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions"; +foamChemistryFile "/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly"; +foamChemistryThermoFile "/thermo.incompressiblePoly"; liquids { diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/pointDisplacement b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/pointDisplacement index b73c0d0967..dd83d35872 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/pointDisplacement +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/pointDisplacement @@ -15,8 +15,8 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "$FOAM_CASE/constant/dynamicMeshDict" -#include "$FOAM_CASE/system/blockMeshDict" +#include "/dynamicMeshDict" +#include "/blockMeshDict" dimensions [0 1 0 0 0 0 0]; diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/createPatchDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/createPatchDict index ef1206a09b..60cfdf16bb 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/createPatchDict +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/createPatchDict @@ -20,7 +20,7 @@ FoamFile pointSync false; // Patches to create. An empty patch list just removes patches with zero -// faces from $FOAM_CASE/constant/polyMesh/boundary. +// faces from /polyMesh/boundary. patches ( ); diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict index 5d68c20061..a441fdba1e 100644 --- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict +++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict @@ -22,7 +22,7 @@ motionSolver solidBody; solidBodyMotionFunction tabulated6DoFMotion; CofG (0 0 0); -timeDataFileName "$FOAM_CASE/constant/6DoF.dat"; +timeDataFileName "/6DoF.dat"; // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas index 7f23983caf..3641cbe08b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas @@ -30,9 +30,9 @@ inertSpecie AIR; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions.gas"; +foamChemistryFile "/reactions.gas"; -foamChemistryThermoFile "$FOAM_CASE/constant/thermo.gas"; +foamChemistryThermoFile "/thermo.gas"; // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas index 8e80205f99..bfa64a94e1 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas @@ -37,7 +37,7 @@ inertSpecie water; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions.gas"; +foamChemistryFile "/reactions.gas"; water { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas index 8e80205f99..bfa64a94e1 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas @@ -37,7 +37,7 @@ inertSpecie water; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/reactions.gas"; +foamChemistryFile "/reactions.gas"; water {