Report the previous fix into the MMG2D and MMGS delPt/delElt functions.

MmgTools · Dec 5, 2023 · 41b2e77 · 41b2e77
1 parent 79331dc
commit 41b2e77
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/mmg2d/zaldy_2d.c b/src/mmg2d/zaldy_2d.c
@@ -64,7 +64,9 @@ void MMG2D_delPt(MMG5_pMesh mesh,MMG5_int ip) {
   ppt->tmp    = mesh->npnil;
 
   mesh->npnil = ip;
-  if ( ip == mesh->np )  mesh->np--;
+  if ( ip == mesh->np ) {
+    while ( (!MG_VOK((&mesh->point[mesh->np]))) && mesh->np )  mesh->np--;
+  }
 }
 
 void MMG5_delEdge(MMG5_pMesh mesh,MMG5_int iel) {
@@ -119,7 +121,9 @@ int MMG2D_delElt(MMG5_pMesh mesh,MMG5_int iel) {
     memset(&mesh->adja[iadr],0,3*sizeof(MMG5_int));
 
   mesh->nenil = iel;
-  if ( iel == mesh->nt )  mesh->nt--;
+  if ( iel == mesh->nt ) {
+    while ( (!MG_EOK((&mesh->tria[mesh->nt]))) && mesh->nt ) mesh->nt--;
+  }
   return 1;
 }
 

diff --git a/src/mmgs/zaldy_s.c b/src/mmgs/zaldy_s.c
@@ -64,7 +64,7 @@ void MMGS_delPt(MMG5_pMesh mesh,MMG5_int ip) {
   ppt->tmp    = mesh->npnil;
   mesh->npnil = ip;
   if ( ip == mesh->np ) {
-    while ( !MG_VOK((&mesh->point[mesh->np])) )  mesh->np--;
+    while ( (!MG_VOK((&mesh->point[mesh->np]))) && mesh->np )  mesh->np--;
   }
 }
 
@@ -104,7 +104,7 @@ int MMGS_delElt(MMG5_pMesh mesh,MMG5_int iel) {
     memset(&mesh->adja[3*(iel-1)+1],0,3*sizeof(MMG5_int));
   mesh->nenil = iel;
   if ( iel == mesh->nt ) {
-    while ( !MG_EOK((&mesh->tria[mesh->nt])) )  mesh->nt--;
+    while ( (!MG_EOK((&mesh->tria[mesh->nt]))) && mesh->nt )  mesh->nt--;
   }
   return 1;
 }