Commit a8e03d67 authored by graham's avatar graham
Browse files

Merge branch 'master' into cvm

parents d2ad25fd 70906932
......@@ -85,6 +85,14 @@ Foam::dynamicCodeContext::dynamicCodeContext(const dictionary& dict)
stringOps::inplaceExpand(libs_, dict);
}
// optional
const entry* localPtr = dict.lookupEntryPtr("localCode", false, false);
if (localPtr)
{
localCode_ = stringOps::trim(localPtr->stream());
stringOps::inplaceExpand(localCode_, dict);
}
// calculate SHA1 digest from include, options, localCode, code
OSHA1stream os;
os << include_ << options_ << libs_ << localCode_ << code_;
......@@ -103,14 +111,18 @@ Foam::dynamicCodeContext::dynamicCodeContext(const dictionary& dict)
{
addLineDirective(include_, includePtr->startLineNumber(), dict.name());
}
if (optionsPtr)
{
addLineDirective(options_, optionsPtr->startLineNumber(), dict.name());
}
// Do not add line directive to options_ (Make/options) since at it is a
// single line at this point. Can be fixed.
if (libsPtr)
{
addLineDirective(libs_, libsPtr->startLineNumber(), dict.name());
}
if (localPtr)
{
addLineDirective(localCode_, localPtr->startLineNumber(), dict.name());
}
}
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -46,6 +46,12 @@ namespace Foam
gasThermoPhysics
);
makeChemistryModel
(
ODEChemistryModel,
psiChemistryModel,
constGasThermoPhysics
);
makeChemistryModel
(
ODEChemistryModel,
psiChemistryModel,
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -46,6 +46,12 @@ namespace Foam
gasThermoPhysics
);
makeChemistryModel
(
ODEChemistryModel,
rhoChemistryModel,
constGasThermoPhysics
);
makeChemistryModel
(
ODEChemistryModel,
rhoChemistryModel,
......
......@@ -34,8 +34,10 @@ License
namespace Foam
{
makeChemistrySolverTypes(psiChemistryModel, gasThermoPhysics);
makeChemistrySolverTypes(psiChemistryModel, constGasThermoPhysics);
makeChemistrySolverTypes(psiChemistryModel, icoPoly8ThermoPhysics);
makeChemistrySolverTypes(rhoChemistryModel, gasThermoPhysics);
makeChemistrySolverTypes(rhoChemistryModel, constGasThermoPhysics);
makeChemistrySolverTypes(rhoChemistryModel, icoPoly8ThermoPhysics);
}
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -889,12 +889,12 @@ Foam::chemkinReader::chemkinReader(const dictionary& thermoDict)
fileName relPath = thermoDict.name().path();
if (relPath.size())
{
if (chemkinFile.size() && chemkinFile[0] != '/')
if (!chemkinFile.isAbsolute())
{
chemkinFile = relPath/chemkinFile;
}
if (thermoFile.size() && thermoFile[0] != '/')
if (!thermoFile.isAbsolute())
{
thermoFile = relPath/thermoFile;
}
......
......@@ -108,6 +108,8 @@ void Foam::singleStepReactingMixture<ThermoType>::calculateMaxProducts()
Yprod0_[specieI] = this->speciesData()[specieI].W()/Wm*Xi[i];
}
Info << "Maximum products mass concentrations :" << Yprod0_<< endl;
// Normalize the stoichiometric coeff to mass
forAll(specieStoichCoeffs_, i)
{
......
......@@ -152,6 +152,9 @@ public:
//- Return the list to indicate if specie is produced/consumed
inline const List<int>& specieProd() const;
//- Return the list of products mass concentrations
inline const scalarList& Yprod0() const;
// I-O
......
......@@ -94,4 +94,12 @@ Foam::singleStepReactingMixture<ThermoType>::specieProd() const
}
template<class ThermoType>
inline const Foam::scalarList&
Foam::singleStepReactingMixture<ThermoType>::Yprod0() const
{
return Yprod0_;
}
// ************************************************************************* //
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment