diff --git a/applications/test/momentOfInertia/Test-momentOfInertia.C b/applications/test/momentOfInertia/Test-momentOfInertia.C index 3705e687ea406afdc0dced1d8d2bd7c020763826..0da9595dd3fedf85b71e5ea7c97a664ee8e15efb 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 bf96da3a32b1761e0798a685ebe9e0391483db7d..50eda7838b909e02737d89c9e88a84a751c7322f 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 356a8cfa7c7f20183304f4258503ee2b48e326a0..0c3a124f2f4128b49a3be4b8ecaaf265f78de210 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 79058f4b8e3ec1e67aa74db138b33e856829a32f..e3d92c06fcf7e4aba62b6186b85cdb38b93d15e9 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()); }