diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options index 9149d19f69..cd23364bc2 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options @@ -25,7 +25,8 @@ EXE_INC = \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/mesh/autoMesh/lnInclude \ -IPrintTable \ - -I../vectorTools + -I../vectorTools \ + -I/usr/include LIB_LIBS = \ ${CGAL_LIBS} \ diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H index 80a2912ad6..e052e151a7 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,10 +42,10 @@ Description #include "CGAL/Exact_predicates_inexact_constructions_kernel.h" typedef CGAL::Exact_predicates_inexact_constructions_kernel baseK; -// #include +// #include "CGAL/Robust_circumcenter_traits_3.h" // typedef CGAL::Robust_circumcenter_traits_3 K; - #include + #include "CGAL/Robust_circumcenter_filtered_traits_3.h" typedef CGAL::Robust_circumcenter_filtered_traits_3 K; #else diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H index f4397070c9..cb805f7149 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,8 +37,8 @@ SourceFiles #ifndef indexedCell_H #define indexedCell_H -#include -#include +#include "CGAL/Triangulation_3.h" +#include "CGAL/Triangulation_cell_base_with_circumcenter_3.h" #include "indexedVertex.H" #include "List.H" #include "globalIndex.H" diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H index 311329da0a..4636062a83 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,7 +37,7 @@ SourceFiles #ifndef indexedVertex_H #define indexedVertex_H -#include +#include "CGAL/Triangulation_3.h" #include "CGALTriangulation3DKernel.H" #include "tensor.H" #include "triad.H" diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyQuadMesh/Make/options index 7f87b67fed..75823532ef 100755 --- a/applications/utilities/mesh/generation/foamyQuadMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyQuadMesh/Make/options @@ -22,7 +22,8 @@ EXE_INC = \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/mesh/autoMesh/lnInclude + -I$(LIB_SRC)/mesh/autoMesh/lnInclude \ + -I/usr/include EXE_LIBS = \ $(CGAL_LIBS) \ diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/indexedFace.H b/applications/utilities/mesh/generation/foamyQuadMesh/indexedFace.H index 257c988f60..6a58aef3c9 100644 --- a/applications/utilities/mesh/generation/foamyQuadMesh/indexedFace.H +++ b/applications/utilities/mesh/generation/foamyQuadMesh/indexedFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,7 @@ Description #ifndef indexedFace_H #define indexedFace_H -#include +#include "CGAL/Triangulation_2.h" #include "indexedVertex.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/indexedVertex.H b/applications/utilities/mesh/generation/foamyQuadMesh/indexedVertex.H index ae58a0bfe5..05cd96cacb 100644 --- a/applications/utilities/mesh/generation/foamyQuadMesh/indexedVertex.H +++ b/applications/utilities/mesh/generation/foamyQuadMesh/indexedVertex.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,7 @@ Description #ifndef indexedVertex_H #define indexedVertex_H -#include +#include "CGAL/Triangulation_2.h" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //