diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C index 52a7c55ddc02be06ee92eb8de766a99412472c97..ead56293d765028f9adcdc84934b8b5426b58189 100644 --- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C +++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C @@ -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") + ) + ); } } diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties index 9fc96ae25793cc4c9f63550bffee87f637bb61eb..63932b5a8d58036863b0156b6cd9a99a49ed6cf0 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties @@ -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 {