File: OperatorTools.cc

package info (click to toggle)
madlib 1.3.0-5
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 8,196 kB
  • sloc: cpp: 39,851; sh: 10,041; makefile: 473
file content (648 lines) | stat: -rw-r--r-- 19,647 bytes parent folder | download | duplicates (6)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
// -------------------------------------------------------------------
// MAdLib - Copyright (C) 2008-2009 Universite catholique de Louvain
//
// See the Copyright.txt and License.txt files for license information. 
// You should have received a copy of these files along with MAdLib. 
// If not, see <http://www.madlib.be/license/>
//
// Please report all bugs and problems to <contrib@madlib.be>
//
// Authors: Gaetan Compere, Olivier Pierard, Jean-Francois Remacle
// -------------------------------------------------------------------

#include "OperatorTools.h"
#include "CallbackManager.h"
#include "MAdMessage.h"
#include "Constraint.h"

#include <map>
#include <assert.h>

namespace MAd {

  // -------------------------------------------------------------------
  bool V_setPosition(pVertex vertex, double target[3])
  {
    if( EN_constrained((pEntity)vertex) ) return false;
    CallBackManagerSgl::instance().callCallBackMoves(vertex,target);
    pPoint point = V_point(vertex);
    P_setPos(point,target[0],target[1],target[2]);
    return true;
  }

  // -------------------------------------------------------------------
  void E_collapse(pMesh mesh, 
                  pEdge edgeDel, 
                  pVertex vDel, 
                  pVertex vTgt)
  {
    pPList eRegions = E_regions(edgeDel);

    // --- 2D collapse case ---
    if( PList_size(eRegions) == 0 ) {
      PList_delete(eRegions);
      E_collapseOnGFace(mesh,edgeDel,vDel,vTgt);
      return;
    }

    // --- build the new mesh ---

    pVertex verts[4];
    pPList newRegions = PList_new();
    pPList vDelRegions = V_regions(vDel);
    void * temp = NULL;
    while ( pRegion region = (pRegion)PList_next(vDelRegions,&temp) )
      {
        if( PList_inList(eRegions,(pEntity)region) ) continue;
        
        pFace fExt = R_vtOpFc(region,vDel);
        
        // create the region
        pGEntity rGEntity = (pGEntity)R_whatIn(region);
        verts[0] = vTgt;
        for (int iV = 0; iV<3; iV++) verts[iV+1] = F_vertex(fExt,iV);
        pRegion newR = M_createR (mesh, 4, verts, rGEntity);
        PList_append(newRegions, (pEntity)newR);
      }
    PList_delete(eRegions);

    // --- classify new boundary entities ---
    int gDim = E_whatInType(edgeDel);

    // Classify edges on lines
    if ( gDim == 1 )
      {
        pPList vDelEdges = V_edges(vDel);
        temp = NULL;
        pEdge pe;
        while ( ( pe = (pEdge)PList_next(vDelEdges,&temp) ) ) {
          if ( pe == edgeDel ) continue;
          if ( E_whatInType(pe) == 1 ) {
            pGEntity gEdge2 = E_whatIn(pe);
            pVertex oppV = E_otherVertex(pe,vDel);
            pEdge newLineEdge = E_exist(vTgt,oppV);
            E_setWhatIn(newLineEdge,gEdge2);
          }
        }
        PList_delete(vDelEdges);
      }

    // classify faces on surfaces
    if ( gDim <= 2 )
      {
        pGEntity gFace;
        pEdge oppE;
        pFace newSurfaceFace;

        pPList vDelFaces = V_faces(vDel);
        temp = NULL;
        pFace pf;
        while ( ( pf = (pFace)PList_next(vDelFaces,&temp) ) ) {
          if ( F_inClosure(pf,(pEntity)edgeDel) ) continue;
          if ( F_whatInType(pf) == 2 ) {
            gFace          = F_whatIn(pf);
            oppE           = F_vtOpEd(pf,vDel);
            newSurfaceFace = F_exist(oppE,vTgt);
            F_setWhatIn(newSurfaceFace,gFace);
          }
        }
        PList_delete(vDelFaces);
      }

    // --- call callback functions ---
    CallBackManagerSgl::instance().callCallBacks(vDelRegions,
                                                 newRegions,
                                                 MAd_ECOLLAPSE,
                                                 (pEntity)vDel);
    PList_delete(newRegions);

    // --- delete old cavity ---
    temp = NULL;
    while ( pRegion region = (pRegion)PList_next(vDelRegions,&temp) ) {
      M_removeRegion(mesh,region);
    }
    PList_delete(vDelRegions);

    pPList vFaces = V_faces(vDel);
    temp = NULL;
    while ( pFace face = (pFace)PList_next(vFaces,&temp) ) {
      M_removeFace(mesh,face);
    }
    PList_delete(vFaces);

    pPList vEdges = V_edges(vDel);
    temp = NULL;
    while ( pEdge edge = (pEdge)PList_next(vEdges,&temp) ) {
      M_removeEdge(mesh,edge);
    }
    PList_delete(vEdges);

    M_removeVertex(mesh,vDel);

  }
    

    
    /*
// This is the old way to make a collapse

    pPList eRegions = E_regions(edgeDel);

    // --- 2D collapse case ---
    if( PList_size(eRegions) == 0 ) {
      PList_delete(eRegions);
      E_collapseOnGFace(mesh,edgeDel,vDel,vTgt);
      return;
    }

    // --- list faces to be merged ---

    std::map<pFace,pFace> fOldToNew; // deleted face -> corresponding new (or target) face
    std::map<pFace,bool>  fDirs;     // if direction of (deleted) face has to be changed

    void * temp1 = 0;
    while ( pRegion region = (pRegion)PList_next(eRegions,&temp1) ) {
      
      pFace fDel, fTgt;
      
      pPList rFaces = R_faces(region);
      void * temp2 = 0;
      while ( pFace face = (pFace)PList_next(rFaces, &temp2) ) {
        if (!F_inClosure(face,(pEntity)edgeDel)) {
          if (F_inClosure(face,(pEntity)vDel)) fDel = face;  // deleted face
          else                                 fTgt = face;  // target face
        }
      }
      PList_delete(rFaces);

      fOldToNew[fDel] = fTgt;
      
      // Choose the direction and classification of target face
      pEdge edge = F_vtOpEd(fDel,vDel);
      if( F_whatInType(fDel) < F_whatInType(fTgt) ) {
        F_setWhatIn( fTgt, F_whatIn(fDel) );
        if( F_dirUsingEdge(fTgt,edge) != F_dirUsingEdge(fDel,edge) ) {
          F_chDir(fTgt);
        }
      }
      else {
        if( F_dirUsingEdge(fTgt,edge) == F_dirUsingEdge(fDel,edge) ) {
          fDirs[fDel] = true;
        } 
        else {
          fDirs[fDel] = false;
        }
      }
    }

    // --- list edges to be merged ---

    std::map<pEdge,pEdge> eOldToNew; // deleted edge -> corresponding new (or target) edge
    std::map<pEdge,bool>  eDirs;     // if direction of (deleted) edge has to be changed

    pPList eFaces = E_faces(edgeDel);
    void * temp3 = 0;
    while ( pFace face = (pFace)PList_next(eFaces,&temp3) ) {
      
      pEdge eDel, eTgt;

      pPList fEdges = F_edges(face);
      void * temp4 = 0;
      while ( pEdge edge = (pEdge)PList_next(fEdges, &temp4) ) {
        if ( edge != edgeDel ) {
          if (E_inClosure(edge,(pEntity)vDel)) eDel = edge;  // deleted edge
          else                                 eTgt = edge;  // target edge
        }
      }
      PList_delete(fEdges);

      eOldToNew[eDel] = eTgt;
      
      // Choose the classification of target edge
      if( E_whatInType(eDel) < E_whatInType(eTgt) ) {
        E_setWhatIn( eTgt, E_whatIn(eDel) );
      }

      // Choose the direction of target edge
      if( E_vertex(eDel,0) == E_vertex(eTgt,0) ||
          E_vertex(eDel,1) == E_vertex(eTgt,1) ) {
        eDirs[eDel] = true;
      }
      else {
        eDirs[eDel] = false;
      }
    }
    PList_delete(eFaces);

    // --- build the new mesh ---

    pPList newRegions = PList_new();
    pPList vDelRegions = V_regions(vDel);
    void * temp5 = 0;
    while ( pRegion region = (pRegion)PList_next(vDelRegions,&temp5) ) {

      if( PList_inList(eRegions,(pEntity)region) ) continue;

      // need to create a new region
      pFace rFaces[4];

      pFace fExt = R_vtOpFc(region,vDel);

      for(int iF=0; iF<4; iF++) {
        
        pFace face = R_face(region,iF);

        if( face == fExt ) {
          rFaces[iF] = face;
          continue;
        }
        
        if ( fOldToNew.find(face) != fOldToNew.end() ) {
          rFaces[iF] = fOldToNew.find(face)->second;
        }
        else {
          // need to create a new face
          pEdge fEdges[3];

          for(int iE=0; iE<3; iE++ ) {

            pEdge edge = F_edge(face,iE);

            if( F_inClosure(fExt,(pEntity)edge) ) {
              fEdges[iE] = edge;
              continue;
            }
        
            if ( eOldToNew.find(edge) != eOldToNew.end() ) {
              fEdges[iE] = eOldToNew.find(edge)->second;
            }
            else {
              // need to create a new edge

              pVertex eVertices[2];
              for(int iV=0; iV<2; iV++) {
                pVertex pV = E_vertex(edge,iV);
                if( pV == vDel ) eVertices[iV] = vTgt;
                else             eVertices[iV] = pV;
              }
          
              // create the edge
              pGEntity eGEntity = E_whatIn(edge);
              fEdges[iE] = M_createE(mesh, eVertices[0], eVertices[1], eGEntity);
              eOldToNew[edge] = fEdges[iE];
            }
          }
      
          // create the face
          pGEntity fGEntity = F_whatIn(face);
          rFaces[iF] = M_createF(mesh, 3, fEdges, fGEntity);
          fOldToNew[face] = rFaces[iF];
        }
      }

      // create the region
      pGEntity rGEntity = (pGEntity)R_whatIn(region);
      pRegion newRegion = M_createR(mesh, 4, rFaces, rGEntity);
      PList_append(newRegions, (pEntity)newRegion);
    }

    PList_delete(eRegions);

    // --- call callback functions ---
    CallBackManagerSgl::instance().callCallBacks(vDelRegions,
                                                 newRegions,
                                                 MAd_ECOLLAPSE,
                                                 (pEntity)vDel);
    PList_delete(newRegions);

    // --- delete old cavity ---
    void * temp = 0;
    while ( pRegion region = (pRegion)PList_next(vDelRegions,&temp) ) {
      M_removeRegion(mesh,region);
    }
    PList_delete(vDelRegions);

    pPList vFaces = V_faces(vDel);
    temp = 0;
    while ( pFace face = (pFace)PList_next(vFaces,&temp) ) {
      M_removeFace(mesh,face);
    }
    PList_delete(vFaces);

    pPList vEdges = V_edges(vDel);
    temp = 0;
    while ( pEdge edge = (pEdge)PList_next(vEdges,&temp) ) {
      M_removeEdge(mesh,edge);
    }
    PList_delete(vEdges);

    M_removeVertex(mesh,vDel);

    */

  // -------------------------------------------------------------------
  void E_collapseOnGFace(pMesh mesh, 
                         pEdge edgeDel, 
                         pVertex vDel, 
                         pVertex vTgt)
  {
    // --- list edges to be merged ---

    std::map<pEdge,pEdge> eOldToNew; // deleted edge -> corresponding new (or target) edge
    std::map<pEdge,bool>  eDirs;     // if direction of (deleted) edge has to be changed

    pPList eFaces = E_faces(edgeDel);
    void * temp1 = 0;
    while ( pFace face = (pFace)PList_next(eFaces,&temp1) ) {
      
      pEdge eDel, eTgt;

      pPList fEdges = F_edges(face);
      void * temp2 = 0;
      while ( pEdge edge = (pEdge)PList_next(fEdges, &temp2) ) {
        if ( edge != edgeDel ) {
          if (E_inClosure(edge,(pEntity)vDel)) eDel = edge;  // deleted edge
          else                                 eTgt = edge;  // target edge
        }
      }
      PList_delete(fEdges);

      eOldToNew[eDel] = eTgt;
      
      // Choose the classification of target edge
      if( E_whatInType(eDel) < E_whatInType(eTgt) ) {
        E_setWhatIn( eTgt, E_whatIn(eDel) );
      }

      // Choose the direction of target edge
      if( E_vertex(eDel,0) == E_vertex(eTgt,0) ||
          E_vertex(eDel,1) == E_vertex(eTgt,1) ) {
        eDirs[eDel] = true;
      }
      else {
        eDirs[eDel] = false;
      }
    }

    // --- build the new mesh ---

    pPList newFaces = PList_new();
    pPList vDelFaces = V_faces(vDel);
    void * temp3 = 0;
    while ( pFace face = (pFace)PList_next(vDelFaces,&temp3) ) {

      if( PList_inList(eFaces,(pEntity)face) ) continue;

      // need to create a new face
      pEdge fEdges[3];

      pEdge eExt = F_vtOpEd(face,vDel);

      for(int iE=0; iE<3; iE++ ) {

        pEdge edge = F_edge(face,iE);

        if( edge == eExt ) {
          fEdges[iE] = edge;
          continue;
        }
        
        if ( eOldToNew.find(edge) != eOldToNew.end() ) {
          fEdges[iE] = eOldToNew.find(edge)->second;
        }
        else {
          // need to create a new edge

          pVertex eVertices[2];
          for(int iV=0; iV<2; iV++) {
            pVertex pV = E_vertex(edge,iV);
            if( pV == vDel ) eVertices[iV] = vTgt;
            else             eVertices[iV] = pV;
          }
          
          // create the edge
          pGEntity eGEntity = E_whatIn(edge);
          fEdges[iE] = M_createE(mesh, eVertices[0], eVertices[1], eGEntity);
          eOldToNew[edge] = fEdges[iE];
        }
      }
      
      // create the face
      pGEntity fGEntity = F_whatIn(face);
      pFace newFace = M_createF(mesh, 3, fEdges, fGEntity);
      PList_append(newFaces,(pEntity)newFace);
    }

    PList_delete(eFaces);

    // --- call callback functions ---
    CallBackManagerSgl::instance().callCallBacks(vDelFaces,
                                                 newFaces,
                                                 MAd_ECOLLAPSE,
                                                 (pEntity)vDel);
    PList_delete(newFaces);

    // --- delete old cavity ---
    void * temp = 0;
    while ( pFace face = (pFace)PList_next(vDelFaces,&temp) ) {
      M_removeFace(mesh,face);
    }
    PList_delete(vDelFaces);

    pPList vEdges = V_edges(vDel);
    temp = 0;
    while ( pEdge edge = (pEdge)PList_next(vEdges,&temp) ) {
      M_removeEdge(mesh,edge);
    }
    PList_delete(vEdges);

    M_removeVertex(mesh,vDel);
  }


  // -------------------------------------------------------------------
  pVertex E_split(pMesh mesh, pEdge edge, double xyz[3], double t)
  {
    // --- build the vertex ---

    pVertex newV = NULL; // the new vertex

    pGEntity edgeGE = E_whatIn(edge); // its classification

    double u[2][2];
    u[0][0] = -2.; u[0][1] = -2.; u[1][0] = -2.; u[1][1] = -2.;
    if ( E_params(edge,u) ) {
      double uV[2];
      if ( GEN_type(edgeGE) == 2 ) {
        GF_centerOnGeodesic( (pGFace)edgeGE, t, u, uV );
      }
      else {
        for (int iP=0; iP<2; iP++)  uV[iP] = (1.-t) * u[0][iP] + t * u[1][iP];
      }
      newV = M_createVP(mesh, xyz[0], xyz[1], xyz[2], uV[0], uV[1], -1, edgeGE);
    }
    else {
      newV = M_createV(mesh, xyz[0], xyz[1], xyz[2], -1, edgeGE);
    }

    // --- build the edges ---
    pPList newEdges = PList_new();
    pEdge e1 = M_createE(mesh, E_vertex(edge,0), newV, edgeGE);
    PList_append(newEdges,(pEntity)e1);
    pEdge e2 = M_createE(mesh, newV, E_vertex(edge,1), edgeGE);
    PList_append(newEdges,(pEntity)e2);
    
    // --- build the faces bordered by new edges ---
    pPList newFaces = PList_new();
    pPList eFaces = E_faces(edge);
    void * temp = NULL;
    while( pFace face = (pFace)PList_next(eFaces,&temp) ) {

      pGEntity fGE = F_whatIn(face);
      pEdge newE = M_createE(mesh, newV, F_edOpVt(face,edge), fGE);
      
      int iEdge = 0;
      for( iEdge=0; iEdge< F_numEdges(face); iEdge++) {
        if( F_edge(face,iEdge) == edge ) break ;
      }
      pEdge fEdges[3];
      fEdges[0] = edge ;
      fEdges[1] = F_edge(face,(iEdge+1)%3);
      fEdges[2] = F_edge(face,(iEdge+2)%3);

      pFace newF1, newF2;
      if( F_edgeDir(face,iEdge) ) {

        pEdge newFEdges1[3] = {e1, newE, fEdges[2]};
        newF1 = M_createF(mesh, 3, newFEdges1, fGE);
        EN_attachDataP((pEntity)fEdges[2],"_EdgeSplitMarker_",(void *)newF1);

        pEdge newFEdges2[3] = {e2, fEdges[1], newE};
        newF2 = M_createF(mesh, 3, newFEdges2, fGE);
        EN_attachDataP((pEntity)fEdges[1],"_EdgeSplitMarker_",(void *)newF2);
      }
      else {
        pEdge newFEdges1[3] = {e1, fEdges[1], newE};
        newF1 = M_createF(mesh, 3, newFEdges1, fGE);
        EN_attachDataP((pEntity)fEdges[1],"_EdgeSplitMarker_",(void *)newF1); 
        
        pEdge newFEdges2[3] = {e2, newE, fEdges[2]};
        newF2 = M_createF(mesh, 3, newFEdges2, fGE);
        EN_attachDataP((pEntity)fEdges[2],"_EdgeSplitMarker_",(void *)newF2);
      }
      EN_attachDataP((pEntity)face,"_EdgeSplitMarker_",(void *)newE);
      EN_attachDataP((pEntity)newF1,"_EdgeSplitMarker_",face);
      EN_attachDataP((pEntity)newF2,"_EdgeSplitMarker_",face);
      
      PList_append(newFaces,(pEntity)newF1);
      PList_append(newFaces,(pEntity)newF2);
    }
    
    pPList delRegs = PList_new();
    pPList eRegs = E_regions(edge);
    if (eRegs) {

      temp = NULL;
      while( pRegion region = (pRegion)PList_next(eRegs, &temp) ) {

        pGEntity rGE = (pGEntity)R_whatIn(region);

        pFace extFaces[2];

        // --- build the new face between the two new regions ---
        pEdge fEdges[3];
        for(int iF=0, eCount=0, fCount=0; iF<R_numFaces(region); iF++) {
          pFace face = R_face(region,iF);
          if( F_inClosure(face,(pEntity)edge) ) {
            fEdges[eCount++] = (pEdge)EN_dataP((pEntity)face,"_EdgeSplitMarker_");
          }
          else {
            extFaces[fCount++] = face;
          }
        }
        pEdge oppE = R_gtOppEdg(region,edge);
        fEdges[2] = oppE;
        //         if( E_vertex(fEdges[0],1) != E_vertex(fEdges[1],0) && 
        //             E_vertex(fEdges[0],1) != E_vertex(fEdges[1],1) )  {
        //           pEdge tmpE = fEdges[1] ;
        //           fEdges[1] = fEdges[2];
        //           fEdges[2] = tmpE;
        //         }
        pFace newF = M_createF(mesh, 3, fEdges, rGE);

        // -- build the regions ---
        pFace rFaces[4];
        
        rFaces[0] = extFaces[0] ;
        rFaces[1] = newF;
        int fIndex = 2;
        for(int i=0; i<F_numEdges(extFaces[0]); i++) {
          pEdge tmpE = F_edge(extFaces[0],i);
          if( tmpE != oppE ) {
            rFaces[fIndex] = (pFace)EN_dataP((pEntity)tmpE,"_EdgeSplitMarker_");
            fIndex++;
          }
        }
        M_createR(mesh, 4, rFaces, rGE);

        rFaces[0] = extFaces[1] ;
        rFaces[1] = newF;
        fIndex = 2;
        for( int i=0; i < F_numEdges(extFaces[1]); i++ ) {
          pEdge tmpE = F_edge(extFaces[1],i);
          if( tmpE != oppE ) {
            rFaces[fIndex] = (pFace)EN_dataP((pEntity)tmpE,"_EdgeSplitMarker_");
            fIndex++;
          }
        }
        M_createR(mesh, 4, rFaces, rGE);

        PList_append(delRegs,(pEntity)region);
      }
    }
    PList_delete(eRegs);
    
    pPList delEdge = PList_new();
    PList_append(delEdge,(pEntity)edge);
    CallBackManagerSgl::instance().callCallBacks(delEdge, newEdges, 
                                                 MAd_ESPLIT, (pEntity)newV);
    PList_delete(delEdge);
    PList_delete(newEdges);
    
    // --- remove regions ---
    temp = NULL;
    while( pRegion region = (pRegion)PList_next(delRegs,&temp) ) {
      M_removeRegion(mesh, region);
    }
    PList_delete(delRegs);
    
    // --- remove and clean faces ---
    temp = NULL;
    while( pFace face = (pFace)PList_next(eFaces,&temp) ) {

      EN_removeData((pEntity)face,"_EdgeSplitMarker_");
      
      for(int iE=0; iE<F_numEdges(face); iE++) {
        pEdge iEdge = F_edge(face,iE);
        if( iEdge != edge ) EN_removeData((pEntity)iEdge,"_EdgeSplitMarker_");
      }

      M_removeFace(mesh, face);
    }
    PList_delete(eFaces);
    
    temp = NULL;
    while( pFace face = (pFace)PList_next(newFaces,&temp) ) {
      EN_removeData((pEntity)face,"_EdgeSplitMarker_");
    }
    PList_delete(newFaces);
    
    // --- remove edge ---
    M_removeEdge(mesh,edge);
    
    return newV ;
  }

  // -------------------------------------------------------------------

}