From 23988047088fe727c7356e7ab3c87e43564fc35d Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Fri, 14 Jan 2011 19:37:05 +0000
Subject: [PATCH] ENH: change point to vector.
---
applications/test/momentOfInertia/Test-momentOfInertia.C | 2 +-
etc/settings.sh | 2 +-
.../conformalVoronoiMesh/conformalVoronoiMesh.H | 2 +-
.../conformalVoronoiMesh/conformalVoronoiMeshI.H | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/applications/test/momentOfInertia/Test-momentOfInertia.C b/applications/test/momentOfInertia/Test-momentOfInertia.C
index 3705e687ea4..0da9595dd3f 100644
--- a/applications/test/momentOfInertia/Test-momentOfInertia.C
+++ b/applications/test/momentOfInertia/Test-momentOfInertia.C
@@ -26,7 +26,7 @@ Application
Description
Calculates the inertia tensor and principal axes and moments of a
- test face, tetrahedron and mesh.
+ test face, tetrahedron and cell.
\*---------------------------------------------------------------------------*/
diff --git a/etc/settings.sh b/etc/settings.sh
index bf96da3a32b..50eda7838b9 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -247,7 +247,7 @@ fi
# boost and CGAL
# ~~~~~~~~~~~~~~
-boost_version=boost_1_42_0
+boost_version=boost_1_45_0
cgal_version=CGAL-3.7
export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 356a8cfa7c7..0c3a124f2f4 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -709,7 +709,7 @@ public:
typedef K::Vector_3 CGALVector;
- inline CGALVector toCGALVector(const Foam::point& pt) const;
+ inline CGALVector toCGALVector(const Foam::vector& v) const;
// Access
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index 79058f4b8e3..e3d92c06fcf 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -422,9 +422,9 @@ Foam::conformalVoronoiMesh::toPoint
inline Foam::conformalVoronoiMesh::CGALVector
-Foam::conformalVoronoiMesh::toCGALVector(const Foam::point& pt) const
+Foam::conformalVoronoiMesh::toCGALVector(const Foam::vector& v) const
{
- return CGALVector(pt.x(), pt.y(), pt.z());
+ return CGALVector(v.x(), v.y(), v.z());
}
--
GitLab