solidchemistryModel: renamed solid() -> solidThermo()

src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C

@@ -35,11 +35,8 @@ Foam::chemistryModel<CompType, ThermoType>::chemistryModel
 )
 :
     CompType(mesh),
-
     ODE(),
-
     Y_(this->thermo().composition().Y()),
-
     reactions_
     (
         dynamic_cast<const reactingMixture<ThermoType>&>(this->thermo())

src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C

@@ -37,7 +37,7 @@ ODESolidChemistryModel
 :
     CompType(mesh),
     ODE(),
-    Ys_(this->solid().composition().Y()),
+    Ys_(this->solidThermo().composition().Y()),
     pyrolisisGases_
     (
         mesh.lookupObject<dictionary>
@@ -45,12 +45,17 @@ ODESolidChemistryModel
     ),
     reactions_
     (
-        dynamic_cast<const reactingSolidMixture<SolidThermo>& >(this->solid())
+        dynamic_cast<const reactingSolidMixture<SolidThermo>& >
+        (
+            this->solidThermo()
+        )
     ),
     solidThermo_
     (
         dynamic_cast<const reactingSolidMixture<SolidThermo>& >
-            (this->solid()).solidData()
+        (
+            this->solidThermo()
+        ).solidData()
     ),
     gasThermo_(pyrolisisGases_.size()),
     nGases_(pyrolisisGases_.size()),
@@ -147,7 +152,7 @@ ODESolidChemistryModel
 
             // Calculate inital values of Ysi0 = rho*delta*Yi
             Ys0_[fieldI].internalField() =
-                this->solid().rho()
+                this->solidThermo().rho()
                *max(Ys_[fieldI], scalar(0.001))*mesh.V();
         }
    }
@@ -564,7 +569,7 @@ void Foam::ODESolidChemistryModel<CompType, SolidThermo, GasThermo>::calculate()
             IOobject::NO_WRITE,
             false
         ),
-        this->solid().rho()
+        this->solidThermo().rho()
     );
 
     forAll(RRs_, i)
@@ -585,8 +590,8 @@ void Foam::ODESolidChemistryModel<CompType, SolidThermo, GasThermo>::calculate()
         if (reactingCells_[celli])
         {
             scalar rhoi = rho[celli];
-            scalar Ti = this->solid().T()[celli];
-            scalar pi = this->solid().p()[celli];
+            scalar Ti = this->solidThermo().T()[celli];
+            scalar pi = this->solidThermo().p()[celli];
 
             scalarField c(nSpecie_, 0.0);
             for (label i=0; i<nSolids_; i++)
@@ -636,7 +641,7 @@ Foam::ODESolidChemistryModel<CompType, SolidThermo, GasThermo>::solve
             IOobject::NO_WRITE,
             false
         ),
-        this->solid().rho()
+        this->solidThermo().rho()
     );
 
     forAll(RRs_, i)
@@ -656,8 +661,8 @@ Foam::ODESolidChemistryModel<CompType, SolidThermo, GasThermo>::solve
             cellCounter_ = celli;
 
             scalar rhoi = rho[celli];
-            scalar Ti = this->solid().T()[celli];
-            scalar pi = this->solid().p()[celli];
+            scalar Ti = this->solidThermo().T()[celli];
+            scalar pi = this->solidThermo().p()[celli];
 
             scalarField c(nSpecie_, 0.0);
             scalarField c0(nSpecie_, 0.0);

src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H

@@ -110,10 +110,10 @@ public:
     // Member Functions
 
         //- Return access to the solid thermo package
-        inline solidReactionThermo& solid();
+        inline solidReactionThermo& solidThermo();
 
         //- Return const access to the solid thermo package
-        inline const solidReactionThermo& solid() const;
+        inline const solidReactionThermo& solidThermo() const;
 
         //- Return total gases mass source term [kg/m3/s]
         virtual tmp<DimensionedField<scalar, volMesh> > RRg() const = 0;

src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H

@@ -25,14 +25,14 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline Foam::solidReactionThermo& Foam::solidChemistryModel::solid()
+inline Foam::solidReactionThermo& Foam::solidChemistryModel::solidThermo()
 {
     return solidThermo_();
 }
 
 
 inline const Foam::solidReactionThermo&
-Foam::solidChemistryModel::solid() const
+Foam::solidChemistryModel::solidThermo() const
 {
     return solidThermo_();
 }