From 71036b3b54b899351a2f0305a784b78f198f2b6d Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Sun, 29 May 2011 09:58:05 +0100
Subject: [PATCH] ENH: Updated solid thermo i/o

---
 .../solid/radiation/const/constSolidRad.C         | 15 +++------------
 .../solid/rhoType/const/constRho.C                |  2 +-
 .../solid/thermo/const/constSolidThermo.C         |  4 ++--
 .../thermo/exponential/exponentialSolidThermo.C   |  8 ++++----
 .../solid/transport/const/constSolidTransport.C   |  2 +-
 .../exponential/exponentialSolidTransport.C       |  2 +-
 6 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/thermophysicalModels/solid/radiation/const/constSolidRad.C b/src/thermophysicalModels/solid/radiation/const/constSolidRad.C
index b4ec108951..f4a9e60c09 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 610e6ac215..23a924fe65 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 3d192b1111..5b2e537c6d 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 99f80b9846..b4c6405687 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 c2e08f7fb8..904a53848d 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 c1f07bfbcf..9f87f322cb 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"));