diff --git a/src/thermophysicalModels/solid/radiation/const/constSolidRad.C b/src/thermophysicalModels/solid/radiation/const/constSolidRad.C index b4ec108951e61f8b01fc21c7b3d02e0dc72a5a1d..f4a9e60c09e00fd1d5d955ebd10b372bfb39800b 100644 --- a/src/thermophysicalModels/solid/radiation/const/constSolidRad.C +++ b/src/thermophysicalModels/solid/radiation/const/constSolidRad.C @@ -37,18 +37,9 @@ template<class thermo> constSolidRad<thermo>::constSolidRad(const dictionary& dict) : thermo(dict), - kappa_(readScalar(dict.subDict("radiativeProperties").lookup("kappa"))), - sigmaS_ - ( - readScalar - ( - dict.subDict("radiativeProperties").lookup("sigmaS") - ) - ), - emissivity_ - ( - readScalar(dict.subDict("radiativeProperties").lookup("emissivity")) - ) + kappa_(readScalar(dict.subDict("radiation").lookup("kappa"))), + sigmaS_(readScalar(dict.subDict("radiation").lookup("sigmaS"))), + emissivity_(readScalar(dict.subDict("radiation").lookup("emissivity"))) {} diff --git a/src/thermophysicalModels/solid/rhoType/const/constRho.C b/src/thermophysicalModels/solid/rhoType/const/constRho.C index 610e6ac215cdbfe307df0f19ac8453bfe1f75908..23a924fe6541b841c05ba64a47456d0b787eabb5 100644 --- a/src/thermophysicalModels/solid/rhoType/const/constRho.C +++ b/src/thermophysicalModels/solid/rhoType/const/constRho.C @@ -29,7 +29,7 @@ License Foam::constRho::constRho(const dictionary& dict) : - rho_(readScalar(dict.subDict("densityProperties").lookup("rho"))) + rho_(readScalar(dict.subDict("density").lookup("rho"))) {} diff --git a/src/thermophysicalModels/solid/thermo/const/constSolidThermo.C b/src/thermophysicalModels/solid/thermo/const/constSolidThermo.C index 3d192b11118789f9aefb2d295eb9cdc9ac043fd3..5b2e537c6dcd8bb7457091657329a6a2bc2c83a7 100644 --- a/src/thermophysicalModels/solid/thermo/const/constSolidThermo.C +++ b/src/thermophysicalModels/solid/thermo/const/constSolidThermo.C @@ -35,8 +35,8 @@ Foam::constSolidThermo<rhoType>::constSolidThermo ) : rhoType(dict), - Cp_(readScalar(dict.subDict("thermoProperties").lookup("Cp"))), - Hf_(readScalar(dict.subDict("thermoProperties").lookup("Hf"))) + Cp_(readScalar(dict.subDict("thermodynamics").lookup("Cp"))), + Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf"))) {} diff --git a/src/thermophysicalModels/solid/thermo/exponential/exponentialSolidThermo.C b/src/thermophysicalModels/solid/thermo/exponential/exponentialSolidThermo.C index 99f80b98463b0d84087abef922d7c64ed6c7f85e..b4c6405687f69c3ac3d4e03a8f4227cd2e57b653 100644 --- a/src/thermophysicalModels/solid/thermo/exponential/exponentialSolidThermo.C +++ b/src/thermophysicalModels/solid/thermo/exponential/exponentialSolidThermo.C @@ -35,10 +35,10 @@ Foam::exponentialSolidThermo<rhoType>::exponentialSolidThermo ) : rhoType(dict), - c0_(readScalar(dict.subDict("thermoProperties").lookup("C0"))), - n0_(readScalar(dict.subDict("thermoProperties").lookup("n0"))), - Tref_(readScalar(dict.subDict("thermoProperties").lookup("Tref"))), - Hf_(readScalar(dict.subDict("thermoProperties").lookup("Hf"))) + c0_(readScalar(dict.subDict("thermodynamics").lookup("C0"))), + n0_(readScalar(dict.subDict("thermodynamics").lookup("n0"))), + Tref_(readScalar(dict.subDict("thermodynamics").lookup("Tref"))), + Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf"))) {} diff --git a/src/thermophysicalModels/solid/transport/const/constSolidTransport.C b/src/thermophysicalModels/solid/transport/const/constSolidTransport.C index c2e08f7fb827748f3b5011b0d0dce124718f28cd..904a53848d845fd4c32203b03839c1e4319d745b 100644 --- a/src/thermophysicalModels/solid/transport/const/constSolidTransport.C +++ b/src/thermophysicalModels/solid/transport/const/constSolidTransport.C @@ -32,7 +32,7 @@ template<class thermo> Foam::constSolidTransport<thermo>::constSolidTransport(const dictionary& dict) : thermo(dict), - K_(readScalar(dict.subDict("transportProperties").lookup("K"))) + K_(readScalar(dict.subDict("transport").lookup("K"))) {} diff --git a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.C b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.C index c1f07bfbcff2c213c6cdf42eeadf879c071f5bb4..9f87f322cbbd32503a3354fbf66ccb98aa6b60e7 100644 --- a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.C +++ b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.C @@ -39,7 +39,7 @@ Foam::exponentialSolidTransport<thermo>::exponentialSolidTransport n0_(0.0), Tref_(0.0) { - const dictionary& subDict = dict.subDict("transportProperties"); + const dictionary& subDict = dict.subDict("transport"); K0_ = readScalar(subDict.lookup("K0")); n0_ = readScalar(subDict.lookup("n0")); Tref_ = readScalar(subDict.lookup("Tref"));