From c55eee0f6652f054c9291e0f87f2cbd6022eef61 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Sun, 10 Jun 2018 17:09:43 +0100 Subject: [PATCH] adiabaticFlameT, equilibriumFlameT, mixtureAdiabaticFlameT: Rationalized the name of the properties dictionary which controls the operation of these utilities --- .../adiabaticFlameT/Make/options | 4 ++- .../adiabaticFlameT/adiabaticFlameT.C | 16 +++++------ .../{controlDict => adiabaticFlameTDict} | 0 .../equilibriumFlameT/Make/options | 4 ++- .../equilibriumFlameT/equilibriumFlameT.C | 16 +++++------ .../{controlDict => equilibriumFlameTDict} | 0 .../mixtureAdiabaticFlameT.C | 28 +++++++++---------- ...controlDict => mixtureAdiabaticFlameTDict} | 0 8 files changed, 36 insertions(+), 32 deletions(-) rename applications/utilities/thermophysical/adiabaticFlameT/{controlDict => adiabaticFlameTDict} (100%) rename applications/utilities/thermophysical/equilibriumFlameT/{controlDict => equilibriumFlameTDict} (100%) rename applications/utilities/thermophysical/mixtureAdiabaticFlameT/{controlDict => mixtureAdiabaticFlameTDict} (100%) diff --git a/applications/utilities/thermophysical/adiabaticFlameT/Make/options b/applications/utilities/thermophysical/adiabaticFlameT/Make/options index 6be7b16bd..73aefe4bb 100644 --- a/applications/utilities/thermophysical/adiabaticFlameT/Make/options +++ b/applications/utilities/thermophysical/adiabaticFlameT/Make/options @@ -1,2 +1,4 @@ -EXE_INC = -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude +EXE_INC = \ + -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude + EXE_LIBS = -lspecie diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C index 811af55be..21a360e08 100644 --- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C +++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,23 +52,23 @@ typedef species::thermo>, absoluteEnthalpy> int main(int argc, char *argv[]) { - argList::validArgs.append("control file"); + argList::validArgs.append("properties dictionary"); argList args(argc, argv); - const fileName controlFileName = args[1]; + const fileName propertiesDictName = args[1]; // Construct control dictionary - IFstream controlFile(controlFileName); + IFstream propertiesDict(propertiesDictName); - // Check controlFile stream is OK - if (!controlFile.good()) + // Check propertiesDict stream is OK + if (!propertiesDict.good()) { FatalErrorInFunction - << "Cannot read file " << controlFileName + << "Cannot read file " << propertiesDictName << exit(FatalError); } - dictionary control(controlFile); + dictionary control(propertiesDict); scalar P(readScalar(control.lookup("P"))); diff --git a/applications/utilities/thermophysical/adiabaticFlameT/controlDict b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameTDict similarity index 100% rename from applications/utilities/thermophysical/adiabaticFlameT/controlDict rename to applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameTDict diff --git a/applications/utilities/thermophysical/equilibriumFlameT/Make/options b/applications/utilities/thermophysical/equilibriumFlameT/Make/options index 6be7b16bd..73aefe4bb 100644 --- a/applications/utilities/thermophysical/equilibriumFlameT/Make/options +++ b/applications/utilities/thermophysical/equilibriumFlameT/Make/options @@ -1,2 +1,4 @@ -EXE_INC = -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude +EXE_INC = \ + -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude + EXE_LIBS = -lspecie diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C index 23bfb8369..505970a3a 100644 --- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C +++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,23 +54,23 @@ typedef species::thermo>, absoluteEnthalpy> int main(int argc, char *argv[]) { - argList::validArgs.append("control file"); + argList::validArgs.append("properties dictionary"); argList args(argc, argv); - const fileName controlFileName = args[1]; + const fileName propertiesDictName = args[1]; // Construct control dictionary - IFstream controlFile(controlFileName); + IFstream propertiesDict(propertiesDictName); - // Check controlFile stream is OK - if (!controlFile.good()) + // Check propertiesDict stream is OK + if (!propertiesDict.good()) { FatalErrorInFunction - << "Cannot read file " << controlFileName + << "Cannot read file " << propertiesDictName << abort(FatalError); } - dictionary control(controlFile); + dictionary control(propertiesDict); scalar P(readScalar(control.lookup("P"))); diff --git a/applications/utilities/thermophysical/equilibriumFlameT/controlDict b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameTDict similarity index 100% rename from applications/utilities/thermophysical/equilibriumFlameT/controlDict rename to applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameTDict diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C index 2d6b114ac..0518db5bf 100644 --- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C +++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,36 +52,36 @@ typedef species::thermo>, absoluteEnthalpy> int main(int argc, char *argv[]) { - argList::validArgs.append("control file"); + argList::validArgs.append("properties dictionary"); argList args(argc, argv); - const fileName controlFileName(args[1]); + const fileName propertiesFileName(args[1]); - // Construct control dictionary - IFstream controlFile(controlFileName); + // Construct properties dictionary + IFstream propertiesFile(propertiesFileName); - // Check controlFile stream is OK - if (!controlFile.good()) + // Check propertiesFile stream is OK + if (!propertiesFile.good()) { FatalErrorInFunction - << "Cannot read file " << controlFileName + << "Cannot read file " << propertiesFileName << abort(FatalError); } - dictionary control(controlFile); + dictionary properties(propertiesFile); - scalar P(readScalar(control.lookup("P"))); - scalar T0(readScalar(control.lookup("T0"))); - mixture rMix(control.lookup("reactants")); - mixture pMix(control.lookup("products")); + scalar P(readScalar(properties.lookup("P"))); + scalar T0(readScalar(properties.lookup("T0"))); + mixture rMix(properties.lookup("reactants")); + mixture pMix(properties.lookup("products")); Info<< nl << "Reading thermodynamic data dictionary" << endl; fileName thermoDataFileName(findEtcFile("thermoData/thermoData")); - // Construct control dictionary + // Construct properties dictionary IFstream thermoDataFile(thermoDataFileName); // Check thermoData stream is OK diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/controlDict b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameTDict similarity index 100% rename from applications/utilities/thermophysical/mixtureAdiabaticFlameT/controlDict rename to applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameTDict