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

@ -28,9 +28,9 @@ thermoType
chemistryReader foamChemistryReader;
foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";
foamChemistryThermoFile "<constant>/foam.dat";
foamChemistryFile "$FOAM_CASE/constant/foam.inp";
foamChemistryFile "<constant>/foam.inp";
inertSpecie N2;

View File

@ -30,9 +30,9 @@ inertSpecie N2;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryFile "<constant>/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas";
foamChemistryThermoFile "<constant>/thermo.compressibleGas";
// ************************************************************************* //

View File

@ -28,9 +28,9 @@ thermoType
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/foam.inp";
foamChemistryFile "<constant>/foam.inp";
foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";
foamChemistryThermoFile "<constant>/foam.dat";
inertSpecie N2;

View File

@ -30,9 +30,9 @@ dpdt no;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryFile "<constant>/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly";
foamChemistryThermoFile "<constant>/thermo.incompressiblePoly";
liquids
{

View File

@ -28,9 +28,9 @@ thermoType
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/foam.inp";
foamChemistryFile "<constant>/foam.inp";
foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";
foamChemistryThermoFile "<constant>/foam.dat";
inertSpecie N2;

View File

@ -30,9 +30,9 @@ dpdt no;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryFile "<constant>/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly";
foamChemistryThermoFile "<constant>/thermo.incompressiblePoly";
inertSpecie air;

View File

@ -28,9 +28,9 @@ thermoType
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/foam.inp";
foamChemistryFile "<constant>/foam.inp";
foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";
foamChemistryThermoFile "<constant>/foam.dat";
inertSpecie N2;

View File

@ -28,9 +28,9 @@ thermoType
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/foam.inp";
foamChemistryFile "<constant>/foam.inp";
foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";
foamChemistryThermoFile "<constant>/foam.dat";
inertSpecie N2;

View File

@ -30,9 +30,9 @@ dpdt no;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryFile "<constant>/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly";
foamChemistryThermoFile "<constant>/thermo.incompressiblePoly";
inertSpecie air;

View File

@ -28,9 +28,9 @@ thermoType
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryFile "<constant>/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly";
foamChemistryThermoFile "<constant>/thermo.incompressiblePoly";
inertSpecie air;

View File

@ -28,9 +28,9 @@ thermoType
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryFile "<constant>/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly";
foamChemistryThermoFile "<constant>/thermo.incompressiblePoly";
inertSpecie air;

View File

@ -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 "<case>/chemkin/chem.inp";
CHEMKINThermoFile "<case>/chemkin/therm.dat";
CHEMKINTransportFile "<case>/chemkin/transportProperties";
newFormat yes;