adiabaticFlameT, equilibriumFlameT, mixtureAdiabaticFlameT: Rationalized the name of the properties dictionary

which controls the operation of these utilities
This commit is contained in:
Henry Weller
2018-06-10 17:09:43 +01:00
parent 4e0f49a858
commit c55eee0f66
8 changed files with 36 additions and 32 deletions

View File

@ -1,2 +1,4 @@
EXE_INC = -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
EXE_LIBS = -lspecie

View File

@ -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<janafThermo<perfectGas<specie>>, 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")));

View File

@ -1,2 +1,4 @@
EXE_INC = -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
EXE_LIBS = -lspecie

View File

@ -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<janafThermo<perfectGas<specie>>, 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")));

View File

@ -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<janafThermo<perfectGas<specie>>, 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