ENH: additional text expansion shortcuts (issue #792)

Support the following expansions when they occur at the start of a
string:

    Short-form       Equivalent
    =========       ===========
      <etc>/          ~OpenFOAM/   (as per foamEtcFile)
      <case>/         $FOAM_CASE/
      <constant>/     $FOAM_CASE/constant/
      <system>/       $FOAM_CASE/system/

These can be used in fileName expansions to improve clarity and reduce
some typing

     "<constant>/reactions"   vs  "$FOAM_CASE/constant/reactions"
This commit is contained in:
Mark Olesen
2018-04-10 13:41:41 +02:00
parent d814bce3ee
commit a9741cea79
67 changed files with 259 additions and 170 deletions

View File

@ -91,10 +91,10 @@ sigmaRadialCoeffs
offsetSurfaceCoeffs
{
// Surface that mesh has been meshed to
baseSurface "$FOAM_CASE/constant/triSurface/DTC-scaled-inflated.obj";
baseSurface "<constant>/triSurface/DTC-scaled-inflated.obj";
// Surface to fill in to
offsetSurface "$FOAM_CASE/constant/triSurface/DTC-scaled.obj";
offsetSurface "<constant>/triSurface/DTC-scaled.obj";
}

View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "${FOAM_CASE}/constant/caseSettings"
#include "<constant>/caseSettings"
dimensions [0 0 0 1 0 0 0];

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "${FOAM_CASE}/constant/caseSettings"
#include "<constant>/caseSettings"
dimensions [0 1 -1 0 0 0 0];

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "${FOAM_CASE}/constant/caseSettings"
#include "<constant>/caseSettings"
dimensions [1 -1 -1 0 0 0 0];

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "${FOAM_CASE}/constant/caseSettings"
#include "<constant>/caseSettings"
dimensions [0 2 -3 0 0 0 0];

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "${FOAM_CASE}/constant/caseSettings"
#include "<constant>/caseSettings"
dimensions [0 2 -2 0 0 0 0];

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "${FOAM_CASE}/constant/caseSettings"
#include "<constant>/caseSettings"
dimensions [0 2 -1 0 0 0 0];

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "${FOAM_CASE}/constant/caseSettings"
#include "<constant>/caseSettings"
dimensions [1 -1 -2 0 0 0 0];

View File

@ -36,6 +36,6 @@ meshMotionProperties
omega 25; // rad/s
}
#include "${FOAM_CASE}/constant/boundaryConditions"
#include "<constant>/boundaryConditions"
// ************************************************************************* //

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "${FOAM_CASE}/constant/caseSettings"
#include "<constant>/caseSettings"
dynamicFvMesh dynamicMotionSolverFvMesh;

View File

@ -4,7 +4,7 @@ ABORT
{
type abort;
libs ("libutilityFunctionObjects.so");
//file "$FOAM_CASE/ABORT"; // default name
//file "<case>/ABORT"; // default name
// action writeNow;
action nextWrite;
}