END: chtMultiRegionFoam: avoid double registration of Cp

applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H

@@ -2,7 +2,9 @@ scalar DiNum = -GREAT;
 
 forAll(solidRegions, i)
 {
-    #include "setRegionSolidFields.H"
+    //- Note: do not use setRegionSolidFields.H to avoid double registering Cp
+    //#include "setRegionSolidFields.H"
+    const solidThermo& thermo = thermos[i];
 
     tmp<volScalarField> magKappa;
     if (thermo.isotropic())
@@ -14,6 +16,12 @@ forAll(solidRegions, i)
         magKappa = mag(thermo.Kappa());
     }
 
+    tmp<volScalarField> tcp = thermo.Cp();
+    const volScalarField& cp = tcp();
+
+    tmp<volScalarField> trho = thermo.rho();
+    const volScalarField& rho = trho();
+
     DiNum = max
     (
         solidRegionDiffNo