songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
andy 2012-06-11 12:37:59 +01:00
commit af6c3269b3
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
View File

@ -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();

6
src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
View File

@ -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
)
:

6
src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H
View File

@ -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
);