From bcc15fbc30bd341ba6b3ed8c16332a0ebc755558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Sch=C3=B6berl?= Date: Wed, 7 Aug 2019 18:34:43 +0200 Subject: [PATCH] use PointIndex::INVALID --- libsrc/csg/edgeflw.cpp | 4 ++-- libsrc/meshing/adfront3.cpp | 2 +- libsrc/meshing/delaunay.cpp | 2 +- libsrc/meshing/meshtype.cpp | 6 +++--- libsrc/visualization/mvdraw.cpp | 2 +- libsrc/visualization/vsmesh.cpp | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libsrc/csg/edgeflw.cpp b/libsrc/csg/edgeflw.cpp index ee1b6819..d2d961ac 100644 --- a/libsrc/csg/edgeflw.cpp +++ b/libsrc/csg/edgeflw.cpp @@ -1326,7 +1326,7 @@ namespace netgen // generate initial point p = edgepoints.Get(1); - lastpi = -1; + lastpi = PointIndex::INVALID; /* for (pi = PointIndex::BASE; @@ -1368,7 +1368,7 @@ namespace netgen np(1) = (1-lam) * edgepoints.Get(j-1)(1) + lam * edgepoints.Get(j)(1); np(2) = (1-lam) * edgepoints.Get(j-1)(2) + lam * edgepoints.Get(j)(2); - thispi = -1; + thispi = PointIndex::INVALID; if (i == ne) { /* diff --git a/libsrc/meshing/adfront3.cpp b/libsrc/meshing/adfront3.cpp index 506c8660..fb738367 100644 --- a/libsrc/meshing/adfront3.cpp +++ b/libsrc/meshing/adfront3.cpp @@ -590,7 +590,7 @@ int AdFront3 :: GetLocals (int fstind, for (j = 1; j <= locfaces.Get(i).GetNP(); j++) { PointIndex pi = locfaces.Get(i).PNum(j); - invpindex[pi] = -1; + invpindex[pi] = PointIndex::INVALID; } for (i = 1; i <= locfaces.Size(); i++) diff --git a/libsrc/meshing/delaunay.cpp b/libsrc/meshing/delaunay.cpp index c11a0946..1c675f28 100644 --- a/libsrc/meshing/delaunay.cpp +++ b/libsrc/meshing/delaunay.cpp @@ -418,7 +418,7 @@ namespace netgen list.DeleteElement (celind); for (int k = 0; k < 4; k++) - tempels.Elem(celind)[k] = -1; + tempels.Elem(celind)[k] = PointIndex::INVALID; tettree.DeleteElement (celind); freelist.Append (celind); diff --git a/libsrc/meshing/meshtype.cpp b/libsrc/meshing/meshtype.cpp index e6865d50..3d818647 100644 --- a/libsrc/meshing/meshtype.cpp +++ b/libsrc/meshing/meshtype.cpp @@ -53,8 +53,8 @@ namespace netgen Segment :: Segment() : is_curved(false) { - pnums[0] = -1; - pnums[1] = -1; + pnums[0] = PointIndex::INVALID; + pnums[1] = PointIndex::INVALID; edgenr = -1; singedge_left = 0.; @@ -69,7 +69,7 @@ namespace netgen surfnr1 = -1; surfnr2 = -1; - pnums[2] = -1; + pnums[2] = PointIndex::INVALID; meshdocval = 0; /* geominfo[0].trignum=-1; diff --git a/libsrc/visualization/mvdraw.cpp b/libsrc/visualization/mvdraw.cpp index 65f25975..3a71da01 100644 --- a/libsrc/visualization/mvdraw.cpp +++ b/libsrc/visualization/mvdraw.cpp @@ -81,7 +81,7 @@ namespace netgen transp = 0.3; locviewer = 0; showstltrias = 0; - centerpoint = 0; + centerpoint = PointIndex::INVALID; usedispllists = 1; strcpy (selectvisual, "cross"); diff --git a/libsrc/visualization/vsmesh.cpp b/libsrc/visualization/vsmesh.cpp index bb677d33..b784812f 100644 --- a/libsrc/visualization/vsmesh.cpp +++ b/libsrc/visualization/vsmesh.cpp @@ -55,8 +55,8 @@ namespace netgen selface = -1; selelement = -1; locpi = 1; - selpoint = -1; - selpoint2 = -1; + selpoint = PointIndex::INVALID; + selpoint2 = PointIndex::INVALID; seledge = -1; minh = 0.0;