Commit fd5cbde3 authored by Sergio Ferraris's avatar Sergio Ferraris
Browse files

BUG: Fixing solidProperties New construtctor when defaultCoeffs is false

parent b482e3e4
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -57,19 +57,7 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New(Istream& is)
}
else if (coeffs == "coeffs")
{
IstreamConstructorTable::iterator cstrIter =
IstreamConstructorTablePtr_->find(solidType);
if (cstrIter == IstreamConstructorTablePtr_->end())
{
FatalErrorIn("solidProperties::New(Istream&)")
<< "Unknown solidProperties type " << solidType << nl << nl
<< "Valid solidProperties types are :" << endl
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return autoPtr<solidProperties>(cstrIter()(is));
return autoPtr<solidProperties>(new solidProperties(is));
}
else
{
......@@ -116,19 +104,13 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
}
else
{
dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(solidType);
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn("solidProperties::New(const dictionary&)")
<< "Unknown solidProperties type " << solidType << nl << nl
<< "Valid solidProperties types are :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return autoPtr<solidProperties>(cstrIter()(dict));
return autoPtr<solidProperties>
(
new solidProperties
(
dict.subDict(solidType + "Coeffs")
)
);
}
}
......
......@@ -46,7 +46,16 @@ solids
{
C
{
defaultCoeffs yes;
defaultCoeffs no;
// if defaultCoeffs no properties should be :
CCoeffs
{
rho 2010;
Cp 710;
K 0.04;
Hf 0;
emissivity 1.0;
}
}
ash
{
......
Markdown is supported
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