BUG: Corrected liquidProperties New selector for user-defined liquid
This commit is contained in:
parent
a4deb40e3a
commit
492cf1e760
@ -148,20 +148,7 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New(Istream& is)
|
|||||||
}
|
}
|
||||||
else if (coeffs == "coeffs")
|
else if (coeffs == "coeffs")
|
||||||
{
|
{
|
||||||
IstreamConstructorTable::iterator cstrIter =
|
return autoPtr<liquidProperties>(new liquidProperties(is));
|
||||||
IstreamConstructorTablePtr_->find(liquidPropertiesType);
|
|
||||||
|
|
||||||
if (cstrIter == IstreamConstructorTablePtr_->end())
|
|
||||||
{
|
|
||||||
FatalErrorIn("liquidProperties::New(Istream&)")
|
|
||||||
<< "Unknown liquidProperties type "
|
|
||||||
<< liquidPropertiesType << nl << nl
|
|
||||||
<< "Valid liquidProperties types are:" << nl
|
|
||||||
<< IstreamConstructorTablePtr_->sortedToc()
|
|
||||||
<< abort(FatalError);
|
|
||||||
}
|
|
||||||
|
|
||||||
return autoPtr<liquidProperties>(cstrIter()(is));
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -212,24 +199,12 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
dictionaryConstructorTable::iterator cstrIter =
|
|
||||||
dictionaryConstructorTablePtr_->find(liquidPropertiesTypeName);
|
|
||||||
|
|
||||||
if (cstrIter == dictionaryConstructorTablePtr_->end())
|
|
||||||
{
|
|
||||||
FatalErrorIn
|
|
||||||
(
|
|
||||||
"liquidProperties::New(const dictionary&, const word&)"
|
|
||||||
) << "Unknown liquidProperties type "
|
|
||||||
<< liquidPropertiesTypeName << nl << nl
|
|
||||||
<< "Valid liquidProperties types are:" << nl
|
|
||||||
<< dictionaryConstructorTablePtr_->sortedToc()
|
|
||||||
<< abort(FatalError);
|
|
||||||
}
|
|
||||||
|
|
||||||
return autoPtr<liquidProperties>
|
return autoPtr<liquidProperties>
|
||||||
(
|
(
|
||||||
cstrIter()(dict.subDict(liquidPropertiesTypeName + "Coeffs"))
|
new liquidProperties
|
||||||
|
(
|
||||||
|
dict.subDict(liquidPropertiesTypeName + "Coeffs")
|
||||||
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user