From 5da4dbe6986cc21203c310f3b551ce6072c5db86 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 12 Aug 2011 09:55:12 +0100
Subject: [PATCH] ENH: conformalVoronoiMesh: replace fixedlist by tetCell
---
.../conformalVoronoiMesh/conformalVoronoiMesh.H | 5 -----
.../conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H | 5 +++--
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 65ec474a775..da061ae83c8 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -88,11 +88,6 @@ class faceAreaWeightModel;
class backgroundMeshDecomposition;
-typedef FixedList<label, 4>globalTetIndices;
-
-typedef HashTable<label, globalTetIndices, Hash<globalTetIndices> >
- HashTableGlobalTetIndices;
-
/*---------------------------------------------------------------------------*\
Class conformalVoronoiMesh Declaration
\*---------------------------------------------------------------------------*/
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H
index ca1a34d906e..44cd15615aa 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H
@@ -46,6 +46,7 @@ Description
#include "Pstream.H"
#include "Swap.H"
#include "InfoProxy.H"
+#include "tetCell.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -262,13 +263,13 @@ public:
// Using the globalIndex object, return a list of four (sorted) global
// Delaunay vertex indices that uniquely identify this tet in parallel
- inline Foam::FixedList<Foam::label, 4> vertexGlobalIndices
+ inline Foam::tetCell vertexGlobalIndices
(
const Foam::globalIndex& globalDelaunayVertexIndices
) const
{
// tetVertexGlobalIndices
- Foam::FixedList<Foam::label, 4> tVGI(-1);
+ tetCell tVGI(-1);
for (int i = 0; i < 4; i++)
{
--
GitLab