Merge remote-tracking branch 'origin/master' into develop

src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C

@@ -81,10 +81,10 @@ Foam::heatTransferCoeffModels::ReynoldsAnalogy::Cp(const label patchi) const
         const label n = mesh_.boundary()[patchi].size();
         return tmp<Field<scalar>>::New(n, CpRef_);
     }
-    else if (mesh_.foundObject<fluidThermo>(fluidThermo::typeName))
+    else if (mesh_.foundObject<fluidThermo>(fluidThermo::dictName))
     {
         const fluidThermo& thermo =
-            mesh_.lookupObject<fluidThermo>(fluidThermo::typeName);
+            mesh_.lookupObject<fluidThermo>(fluidThermo::dictName);
 
         const scalarField& pp = thermo.p().boundaryField()[patchi];
         const scalarField& Tp = thermo.T().boundaryField()[patchi];