thermophysicalModels: Renamed he*Thermo classes

The he*Thermo classes have been renamed to match their corresponding
basic thermo classes. E.g., rhoThermo now corresponds to RhoThermo,
rather than heRhoThermo.

etc/codeTemplates/dynamicCode/fluidMulticomponentThermo

@@ -19,7 +19,7 @@ type
     heRhoThermo
 );
 
-typeBase
+typeRenamed
 (
     hePsiThermo psiMulticomponentThermo
     heRhoThermo rhoMulticomponentThermo

etc/codeTemplates/dynamicCode/fluidMulticomponentThermoTemplate.C

@@ -37,15 +37,12 @@ License
 #include "${transport}Transport.H"
 
 // psi/rho
-#include "${typeBase}.H"
 #include "${type}.H"
 
 // Mixture
 #include "${mixture}.H"
 
 #include "thermo.H"
-#include "heMulticomponentThermo.H"
-#include "heFluidMulticomponentThermo.H"
 #include "typedefThermo.H"
 #include "makeThermo.H"
 
@@ -88,7 +85,7 @@ namespace Foam
 
     defineThermo
     (
-        ${typeBase},
+        ${type},
         ${mixture},
         ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie}
     );
@@ -96,15 +93,15 @@ namespace Foam
     addThermo
     (
         fluidMulticomponentThermo,
-        ${typeBase},
+        ${type},
         ${mixture},
         ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie}
     );
 
     addThermo
     (
-        ${typeBase},
-        ${typeBase},
+        ${type},
+        ${type},
         ${mixture},
         ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie}
     );

etc/codeTemplates/dynamicCode/fluidThermo

@@ -19,7 +19,7 @@ type
     heRhoThermo
 );
 
-typeBase
+typeRenamed
 (
     hePsiThermo psiThermo
     heRhoThermo rhoThermo

etc/codeTemplates/dynamicCode/fluidThermoTemplate.C

@@ -37,7 +37,6 @@ License
 #include "${transport}Transport.H"
 
 // psi/rho
-#include "${typeBase}.H"
 #include "${type}.H"
 
 // Mixture
@@ -86,7 +85,7 @@ namespace Foam
 
     defineThermo
     (
-        ${typeBase},
+        ${type},
         ${mixture},
         ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie}
     );
@@ -94,15 +93,15 @@ namespace Foam
     addThermo
     (
         fluidThermo,
-        ${typeBase},
+        ${type},
         ${mixture},
         ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie}
     );
 
     addThermo
     (
-        ${typeBase},
-        ${typeBase},
+        ${type},
+        ${type},
         ${mixture},
         ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie}
     );

etc/codeTemplates/dynamicCode/psiThermo

@@ -18,7 +18,7 @@ type
     hePsiThermo
 );
 
-typeBase
+typeRenamed
 (
     hePsiThermo psiThermo
 );

etc/codeTemplates/dynamicCode/psiuMulticomponentThermo

@@ -18,7 +18,7 @@ type
     heheuPsiThermo
 );
 
-typeBase
+typeRenamed
 (
     heheuPsiThermo psiuMulticomponentThermo
 );

etc/codeTemplates/dynamicCode/psiuMulticomponentThermoTemplate.C

@@ -37,7 +37,6 @@ License
 #include "${transport}Transport.H"
 
 // psi/rho
-#include "${typeBase}.H"
 #include "${type}.H"
 
 // Mixture
@@ -86,15 +85,15 @@ namespace Foam
 
     defineThermo
     (
-        ${typeBase},
+        ${type},
         ${mixture},
         ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie}
     );
 
     addThermo
     (
-        ${typeBase},
-        ${typeBase},
+        ${type},
+        ${type},
         ${mixture},
         ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie}
     );

etc/codeTemplates/dynamicCode/solidThermo

@@ -18,7 +18,7 @@ type
     heSolidThermo
 );
 
-typeBase
+typeRenamed
 (
     heSolidThermo solidThermo
 );

etc/codeTemplates/dynamicCode/solidThermoTemplate.C

@@ -37,7 +37,6 @@ License
 #include "${transport}Transport.H"
 
 // psi/rho
-#include "${typeBase}.H"
 #include "${type}.H"
 
 // Mixture
@@ -86,15 +85,15 @@ namespace Foam
 
     defineThermo
     (
-        ${typeBase},
+        ${type},
         ${mixture},
         ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie}
     );
 
     addThermo
     (
-        ${typeBase},
-        ${typeBase},
+        ${type},
+        ${type},
         ${mixture},
         ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie}
     );