Commit 71036b3b authored by andy's avatar andy
Browse files

ENH: Updated solid thermo i/o

parent 3d24f995
...@@ -37,18 +37,9 @@ template<class thermo> ...@@ -37,18 +37,9 @@ template<class thermo>
constSolidRad<thermo>::constSolidRad(const dictionary& dict) constSolidRad<thermo>::constSolidRad(const dictionary& dict)
: :
thermo(dict), thermo(dict),
kappa_(readScalar(dict.subDict("radiativeProperties").lookup("kappa"))), kappa_(readScalar(dict.subDict("radiation").lookup("kappa"))),
sigmaS_ sigmaS_(readScalar(dict.subDict("radiation").lookup("sigmaS"))),
( emissivity_(readScalar(dict.subDict("radiation").lookup("emissivity")))
readScalar
(
dict.subDict("radiativeProperties").lookup("sigmaS")
)
),
emissivity_
(
readScalar(dict.subDict("radiativeProperties").lookup("emissivity"))
)
{} {}
......
...@@ -29,7 +29,7 @@ License ...@@ -29,7 +29,7 @@ License
Foam::constRho::constRho(const dictionary& dict) Foam::constRho::constRho(const dictionary& dict)
: :
rho_(readScalar(dict.subDict("densityProperties").lookup("rho"))) rho_(readScalar(dict.subDict("density").lookup("rho")))
{} {}
......
...@@ -35,8 +35,8 @@ Foam::constSolidThermo<rhoType>::constSolidThermo ...@@ -35,8 +35,8 @@ Foam::constSolidThermo<rhoType>::constSolidThermo
) )
: :
rhoType(dict), rhoType(dict),
Cp_(readScalar(dict.subDict("thermoProperties").lookup("Cp"))), Cp_(readScalar(dict.subDict("thermodynamics").lookup("Cp"))),
Hf_(readScalar(dict.subDict("thermoProperties").lookup("Hf"))) Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf")))
{} {}
......
...@@ -35,10 +35,10 @@ Foam::exponentialSolidThermo<rhoType>::exponentialSolidThermo ...@@ -35,10 +35,10 @@ Foam::exponentialSolidThermo<rhoType>::exponentialSolidThermo
) )
: :
rhoType(dict), rhoType(dict),
c0_(readScalar(dict.subDict("thermoProperties").lookup("C0"))), c0_(readScalar(dict.subDict("thermodynamics").lookup("C0"))),
n0_(readScalar(dict.subDict("thermoProperties").lookup("n0"))), n0_(readScalar(dict.subDict("thermodynamics").lookup("n0"))),
Tref_(readScalar(dict.subDict("thermoProperties").lookup("Tref"))), Tref_(readScalar(dict.subDict("thermodynamics").lookup("Tref"))),
Hf_(readScalar(dict.subDict("thermoProperties").lookup("Hf"))) Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf")))
{} {}
......
...@@ -32,7 +32,7 @@ template<class thermo> ...@@ -32,7 +32,7 @@ template<class thermo>
Foam::constSolidTransport<thermo>::constSolidTransport(const dictionary& dict) Foam::constSolidTransport<thermo>::constSolidTransport(const dictionary& dict)
: :
thermo(dict), thermo(dict),
K_(readScalar(dict.subDict("transportProperties").lookup("K"))) K_(readScalar(dict.subDict("transport").lookup("K")))
{} {}
......
...@@ -39,7 +39,7 @@ Foam::exponentialSolidTransport<thermo>::exponentialSolidTransport ...@@ -39,7 +39,7 @@ Foam::exponentialSolidTransport<thermo>::exponentialSolidTransport
n0_(0.0), n0_(0.0),
Tref_(0.0) Tref_(0.0)
{ {
const dictionary& subDict = dict.subDict("transportProperties"); const dictionary& subDict = dict.subDict("transport");
K0_ = readScalar(subDict.lookup("K0")); K0_ = readScalar(subDict.lookup("K0"));
n0_ = readScalar(subDict.lookup("n0")); n0_ = readScalar(subDict.lookup("n0"));
Tref_ = readScalar(subDict.lookup("Tref")); Tref_ = readScalar(subDict.lookup("Tref"));
......
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