diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C index 0062ddb24e..683154f913 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C @@ -60,7 +60,7 @@ Foam::pointFile::pointFile cellShapeControls, decomposition ), - pointFileName_(detailsDict().get("pointFile")), + pointFileName_(detailsDict().get("pointFile").expand()), insideOutsideCheck_(detailsDict().get("insideOutsideCheck")), randomiseInitialGrid_(detailsDict().get("randomiseInitialGrid")), randomPerturbationCoeff_ diff --git a/etc/caseDicts/annotated/extrudeMeshDict b/etc/caseDicts/annotated/extrudeMeshDict index 78b218c10e..4171cca1a7 100644 --- a/etc/caseDicts/annotated/extrudeMeshDict +++ b/etc/caseDicts/annotated/extrudeMeshDict @@ -24,7 +24,7 @@ constructFrom patch; //constructFrom surface; // If construct from patch/mesh: -sourceCase "$FOAM_CASE"; +sourceCase ""; sourcePatches (movingWall); // If construct from patch: patch to use for back (can be same as sourcePatch) diff --git a/etc/caseDicts/annotated/foamyHexMeshDict b/etc/caseDicts/annotated/foamyHexMeshDict index 919cc78e8e..b9bb8c3041 100644 --- a/etc/caseDicts/annotated/foamyHexMeshDict +++ b/etc/caseDicts/annotated/foamyHexMeshDict @@ -238,7 +238,7 @@ initialPoints // Reads points from file. Still rejects points that are too // close to the surface (minimumSurfaceDistanceCoeff) or on the // wrong side of the surfaces. - pointFile "constant/internalDelaunayVertices"; + pointFile "/internalDelaunayVertices"; } } diff --git a/etc/caseDicts/annotated/surfaceFeatureExtractDict b/etc/caseDicts/annotated/surfaceFeatureExtractDict index 4249a5cdd9..2678a17473 100644 --- a/etc/caseDicts/annotated/surfaceFeatureExtractDict +++ b/etc/caseDicts/annotated/surfaceFeatureExtractDict @@ -72,7 +72,7 @@ surface2.nas extractionMethod extractFromFile; // Load from an existing feature edge file - featureEdgeFile "constant/triSurface/featureEdges.nas"; + featureEdgeFile "/triSurface/featureEdges.nas"; trimFeatures { diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/extrudeMeshDict b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/extrudeMeshDict index cd9de509d2..487449030f 100644 --- a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/extrudeMeshDict +++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/extrudeMeshDict @@ -31,7 +31,7 @@ sourcePatches (movingWall); exposedPatchName movingWall; // If construct from surface: -surface "constant/triSurface/cylinder.vtk"; +surface "/triSurface/cylinder.vtk"; // Flip surface normals before usage. Valid only for extrude from surface or // patch. diff --git a/tutorials/combustion/coldEngineFoam/freePiston/constant/thermophysicalProperties b/tutorials/combustion/coldEngineFoam/freePiston/constant/thermophysicalProperties index 36461889f9..3730c94527 100644 --- a/tutorials/combustion/coldEngineFoam/freePiston/constant/thermophysicalProperties +++ b/tutorials/combustion/coldEngineFoam/freePiston/constant/thermophysicalProperties @@ -30,9 +30,9 @@ inertSpecie air; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/include/reactions.air"; +foamChemistryFile "/include/reactions.air"; -foamChemistryThermoFile "$FOAM_CASE/constant/include/thermo.air"; +foamChemistryThermoFile "/include/thermo.air"; // ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/RAS/membrane/constant/thermophysicalProperties index 16bcda9837..0266f6be0f 100644 --- a/tutorials/combustion/reactingFoam/RAS/membrane/constant/thermophysicalProperties +++ b/tutorials/combustion/reactingFoam/RAS/membrane/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/RAS/membrane/system/setFieldsDict b/tutorials/combustion/reactingFoam/RAS/membrane/system/setFieldsDict index 7d1dd01c70..75c863aff8 100644 --- a/tutorials/combustion/reactingFoam/RAS/membrane/system/setFieldsDict +++ b/tutorials/combustion/reactingFoam/RAS/membrane/system/setFieldsDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "../0.orig/include" +#include "/0.orig/include" defaultFieldValues ( diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/extrudeMeshDict b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/extrudeMeshDict index fcc5e64ca2..b47a04498c 100644 --- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/extrudeMeshDict +++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/extrudeMeshDict @@ -31,7 +31,7 @@ sourcePatches (movingWall); exposedPatchName movingWall; // If construct from surface: -surface "constant/triSurface/cylinder.vtk"; +surface "/triSurface/cylinder.vtk"; // Flip surface normals before usage. Valid only for extrude from surface or // patch. diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/extrudeMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/extrudeMeshDict index ccce542f2e..ef19912eae 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/extrudeMeshDict +++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/extrudeMeshDict @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // constructFrom patch; -sourceCase "$FOAM_CASE"; +sourceCase ""; sourcePatches (back); exposedPatchName front; diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/extrudeMeshDict b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/extrudeMeshDict index ccce542f2e..ef19912eae 100644 --- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/extrudeMeshDict +++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/extrudeMeshDict @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // constructFrom patch; -sourceCase "$FOAM_CASE"; +sourceCase ""; sourcePatches (back); exposedPatchName front; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict index d1247282e2..cc9aa2ee36 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict @@ -34,13 +34,13 @@ baffles type wall; patchFields { - #include "./0/include/wallBafflePatches" - #include "./0/include/1DBaffle/1DTemperatureMasterBafflePatches" + #include "/0/include/wallBafflePatches" + #include "/0/include/1DBaffle/1DTemperatureMasterBafflePatches" } } } - #include "./0/include/baffle3DSetup" + #include "/0/include/baffle3DSetup" baffleFacesThermoBaffle3D { @@ -57,8 +57,8 @@ baffles sameGroup off; patchFields { - #include "./0/include/wallBafflePatches" - #include "./0/include/3DBaffle/3DTemperatureMasterBafflePatches" + #include "/0/include/wallBafflePatches" + #include "/0/include/3DBaffle/3DTemperatureMasterBafflePatches" } } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/thermophysicalProperties index b8d9a412ff..7805d180d2 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/thermophysicalProperties @@ -30,9 +30,9 @@ inertSpecie N2; chemistryReader foamChemistryReader; -foamChemistryFile "$FOAM_CASE/constant/gas/reactions"; +foamChemistryFile "/gas/reactions"; -foamChemistryThermoFile "$FOAM_CASE/constant/gas/thermo.compressibleGas"; +foamChemistryThermoFile "/gas/thermo.compressibleGas"; // ************************************************************************* // diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/extrudeMeshDict b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/extrudeMeshDict index cd9de509d2..487449030f 100644 --- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/extrudeMeshDict +++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/extrudeMeshDict @@ -31,7 +31,7 @@ sourcePatches (movingWall); exposedPatchName movingWall; // If construct from surface: -surface "constant/triSurface/cylinder.vtk"; +surface "/triSurface/cylinder.vtk"; // Flip surface normals before usage. Valid only for extrude from surface or // patch. diff --git a/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict index 6e77c376c6..9fe3ba4ae8 100644 --- a/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict +++ b/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict @@ -58,7 +58,7 @@ initialPoints pointFileCoeffs { - pointFile "constant/internalDelaunayVertices"; + pointFile "/internalDelaunayVertices"; } } diff --git a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background index a3f03fe1f7..9c6a5e2cb7 100644 --- a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background +++ b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background @@ -23,7 +23,7 @@ actions source surfaceToCell; sourceInfo { - file "constant/triSurface/flange.obj"; + file "/triSurface/flange.obj"; outsidePoints ((-0.026 -0.0275 -0.0235)); includeCut true; includeInside true; diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict index ac346f3592..de393fe0d3 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // constructFrom patch; -sourceCase "$FOAM_CASE"; +sourceCase ""; sourcePatches (front); exposedPatchName back; diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict index ac346f3592..de393fe0d3 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // constructFrom patch; -sourceCase "$FOAM_CASE"; +sourceCase ""; sourcePatches (front); exposedPatchName back; diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict index 23698a1bd9..3e883f70eb 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict @@ -60,7 +60,7 @@ functions libs (utilityFunctionObjects); enabled yes; deltaT tableFile; - file "system/deltaTvalues"; + file "/deltaTvalues"; } minMaxp