From 53b4b3fc2dfcaad06e3595993094cebe14d9aa55 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Wed, 5 Jul 2017 17:24:34 +0100 Subject: [PATCH] foamyMesh: Fixed compilation failures Resolves bug reports https://bugs.openfoam.org/view.php?id=2601 and https://bugs.openfoam.org/view.php?id=2602 --- .../cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C | 8 ++++---- .../conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C | 3 ++- .../foamyHexMeshBackgroundMesh.C | 7 ++++--- .../foamyMesh/foamyQuadMesh/CGALTriangulation2DKernel.H | 3 ++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C index a9026a515..8a21d3bab 100644 --- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C +++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,7 +62,7 @@ Foam::tmp> filterFarPoints ) { tmp> tNewField(new Field(field.size())); - Field& newField = tNewField(); + Field& newField = tNewField.ref(); label added = 0; label count = 0; @@ -160,7 +160,7 @@ Foam::tmp buildAlignmentField(const T& mesh) ( new triadField(mesh.vertexCount(), triad::unset) ); - triadField& alignments = tAlignments(); + triadField& alignments = tAlignments.ref(); for ( @@ -188,7 +188,7 @@ Foam::tmp buildPointField(const T& mesh) ( new pointField(mesh.vertexCount(), point(GREAT, GREAT, GREAT)) ); - pointField& points = tPoints(); + pointField& points = tPoints.ref(); for ( diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C index eb88c4357..1a91712f1 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,6 +30,7 @@ License #include "scalarIOField.H" #include "labelIOField.H" #include "pointConversion.H" +#include "polyMesh.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C index a7ed55b72..78cad8c31 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -311,7 +311,7 @@ tmp signedDistance ) { tmp tfld(new scalarField(points.size(), Foam::sqr(GREAT))); - scalarField& fld = tfld(); + scalarField& fld = tfld.ref(); // Find nearest List nearest; @@ -647,7 +647,8 @@ int main(int argc, char *argv[]) forAll(fvm.C().boundaryField(), patchi) { const pointField& cc = fvm.C().boundaryField()[patchi]; - fvPatchScalarField& fld = cellDistance.boundaryField()[patchi]; + fvPatchScalarField& fld = + cellDistance.boundaryFieldRef()[patchi]; scalarField patchDistSqr ( fld.patch().patchInternalField(distSqr) diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CGALTriangulation2DKernel.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CGALTriangulation2DKernel.H index 012192b1f..45a2bcdbf 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CGALTriangulation2DKernel.H +++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CGALTriangulation2DKernel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,6 +33,7 @@ Description // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#include "CGAL/number_utils.h" #include "CGAL/Delaunay_triangulation_2.h" #ifdef CGAL_INEXACT