BUG: liquidProperties - corrected read scalar (was label). See #2142

src/sampling/meshToMesh/meshToMesh.C

@@ -152,7 +152,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
     const bool secondOrder
 ) const
 {
-    mapSrcToTgt(field, cop, result.primitiveFieldRef());
+    mapTgtToSrc(field, cop, result.primitiveFieldRef());
 }
 
 
@@ -165,7 +165,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
     const bool secondOrder
 ) const
 {
-    mapSrcToTgt(field, cop, result.primitiveFieldRef());
+    mapTgtToSrc(field, cop, result.primitiveFieldRef());
 }
 
 
@@ -178,7 +178,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
     const bool secondOrder
 ) const
 {
-    mapSrcToTgt(field, cop, result.primitiveFieldRef());
+    mapTgtToSrc(field, cop, result.primitiveFieldRef());
 }
 
 
@@ -191,7 +191,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
     const bool secondOrder
 ) const
 {
-    mapSrcToTgt(field, cop, result.primitiveFieldRef());
+    mapTgtToSrc(field, cop, result.primitiveFieldRef());
 }
 
 
@@ -204,7 +204,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
     const bool secondOrder
 ) const
 {
-    mapSrcToTgt(field, cop, result.primitiveFieldRef());
+    mapTgtToSrc(field, cop, result.primitiveFieldRef());
 }
 
 
@@ -217,7 +217,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
     const bool secondOrder
 ) const
 {
-    mapSrcToTgt(field, cop, result.primitiveFieldRef());
+    mapTgtToSrc(field, cop, result.primitiveFieldRef());
 }
 
 

src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C

@@ -69,16 +69,16 @@ Foam::liquidProperties::liquidProperties
 Foam::liquidProperties::liquidProperties(const dictionary& dict)
 :
     thermophysicalProperties(dict),
-    Tc_(dict.get<label>("Tc")),
-    Pc_(dict.get<label>("Pc")),
-    Vc_(dict.get<label>("Vc")),
-    Zc_(dict.get<label>("Zc")),
-    Tt_(dict.get<label>("Tt")),
-    Pt_(dict.get<label>("Pt")),
-    Tb_(dict.get<label>("Tb")),
-    dipm_(dict.get<label>("dipm")),
-    omega_(dict.get<label>("omega")),
-    delta_(dict.get<label>("delta"))
+    Tc_(dict.get<scalar>("Tc")),
+    Pc_(dict.get<scalar>("Pc")),
+    Vc_(dict.get<scalar>("Vc")),
+    Zc_(dict.get<scalar>("Zc")),
+    Tt_(dict.get<scalar>("Tt")),
+    Pt_(dict.get<scalar>("Pt")),
+    Tb_(dict.get<scalar>("Tb")),
+    dipm_(dict.get<scalar>("dipm")),
+    omega_(dict.get<scalar>("omega")),
+    delta_(dict.get<scalar>("delta"))
 {}
 
 

src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.C

@@ -2,8 +2,11 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
+    \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2018-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -70,7 +73,7 @@ void Foam::solidProperties::readIfPresent(const dictionary& dict)
     dict.readIfPresent("rho", rho_);
     dict.readIfPresent("Cp", Cp_);
     dict.readIfPresentCompat("kappa", {{"K", 1612}}, kappa_);
-    dict.readIfPresent("Hf_", Hf_);
+    dict.readIfPresent("Hf", Hf_);
     dict.readIfPresent("emissivity", emissivity_);
 }