From aea7f5218ba07a85295b5680b95d18422ca434b6 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 11 Jun 2012 11:06:48 +0100 Subject: [PATCH 1/2] liquidProperties/C2H5OH: Corrected surface tension function from Niklas Nordin --- .../properties/liquidProperties/C2H5OH/C2H5OH.C | 6 +++--- .../properties/liquidProperties/C2H5OH/C2H5OH.H | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C index ee20b60434..55a4e1920a 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C +++ b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -88,7 +88,7 @@ Foam::C2H5OH::C2H5OH() mug_(1.0613e-07, 0.8066, 52.7, 0.0), K_(0.253, -0.000281, 0.0, 0.0, 0.0, 0.0), Kg_(-3.12, 0.7152, -3550000.0, 0.0), - sigma_(516.25, 0.04064, -4.34e-05, -6.42e-08, 0.0, 0.0), + sigma_(3.7640e-02, -2.1570e-05, -1.025e-07, 0.0, 0.0, 0.0), D_(147.18, 20.1, 46.069, 28) // note: Same as nHeptane {} @@ -107,7 +107,7 @@ Foam::C2H5OH::C2H5OH const NSRDSfunc2& vapourDynamicViscosity, const NSRDSfunc0& thermalConductivity, const NSRDSfunc2& vapourThermalConductivity, - const NSRDSfunc6& surfaceTension, + const NSRDSfunc0& surfaceTension, const APIdiffCoefFunc& vapourDiffussivity ) : diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H index 09c0c71bf5..6a51c1f63b 100644 --- a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H +++ b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,7 +73,7 @@ class C2H5OH NSRDSfunc2 mug_; NSRDSfunc0 K_; NSRDSfunc2 Kg_; - NSRDSfunc6 sigma_; + NSRDSfunc0 sigma_; APIdiffCoefFunc D_; @@ -103,7 +103,7 @@ public: const NSRDSfunc2& vapourDynamicViscosity, const NSRDSfunc0& thermalConductivity, const NSRDSfunc2& vapourThermalConductivity, - const NSRDSfunc6& surfaceTension, + const NSRDSfunc0& surfaceTension, const APIdiffCoefFunc& vapourDiffussivity ); From f36a25bf39be6f50d13248baaeca212c7ef68dff Mon Sep 17 00:00:00 2001 From: laurence Date: Mon, 11 Jun 2012 11:43:59 +0100 Subject: [PATCH 2/2] COMP: cvMesh: Changes to compile with Clang --- .../conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C index 06e93e4901..407de61b39 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C +++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C @@ -32,7 +32,7 @@ using namespace Foam::vectorTools; void Foam::conformalVoronoiMesh::insertBoundingPoints() { - pointField farPts = geometryToConformTo_.globalBounds().points(); + pointField farPts(geometryToConformTo_.globalBounds().points()); // Shift corners of bounds relative to origin farPts -= geometryToConformTo_.globalBounds().midpoint();