Fix remeshing

- Fixed remeshing case where the mesh as a lower dimension than the tess
  (discussion #540).
- Made minor other improvements.

Author: rquey

VERSIONS

@@ -1,12 +1,12 @@
-New in 4.4.2-33 (19 Jul 2022):
+New in 4.4.2-34 (25 Aug 2022):
 - module -T: fixed -morpho cube, made minor fixes, added -statcell and -statvox
   <orientation_descriptor>, added -ori :flat, added -transform ori, made minor
   fix to the objective function for tesr (does not change the result), made
   minor fixes to -statface and -statpoly.
 - module -M: added -transform node and ori, fixed -stateltco and -statelsetco,
   made minor fix to inp output, made minor fixes, added -stat{elt,elset}{1d,2d}
   theta, added -statelt and -statelset <orientation_descriptor>, added
-  -statelset* elts,nodenb,nodes.
+  -statelset* elts,nodenb,nodes, made minor fixes.
 - module -S: fixed various bugs related to the initial state, made minor other
   fixes.
 - module -V: made minor fixes.

doc/conf.py

@@ -11,8 +11,8 @@
 import sphinx_rtd_theme
 
 project = u'Neper'
-version = u'4.4.2-33'
-release = u'4.4.2-33'
+version = u'4.4.2-34'
+release = u'4.4.2-34'
 author = u'Romain Quey'
 copyright = u'Romain Quey'
 language = 'en'

src/CMakeLists.txt

@@ -7,7 +7,7 @@ if(POLICY CMP0077)
   cmake_policy(SET CMP0077 NEW)
 endif()
 
-set(NEPER_VERSION \"4.4.2-33\")
+set(NEPER_VERSION \"4.4.2-34\")
 project(neper)
 
 if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8.1)

src/neper_m/nem_meshing_para/nem_meshing_para_cl/nem_meshing_para_cl1.c

@@ -79,7 +79,15 @@ nem_meshing_para_cl (struct IN_M In, struct TESS Tess, struct TESR *pTesr,
   }
   else if ((*pMeshPara).input == 'm')
   {
-    nem_meshing_para_cl_poly_mesh (clstring, pMeshPara, RNodes, Mesh, Tess);
+    // if the mesh of max dimension is available, we use it
+    if (!neut_mesh_isvoid (Mesh[Tess.Dim]))
+      nem_meshing_para_cl_poly_mesh (clstring, pMeshPara, RNodes, Mesh, Tess);
+    // otherwise, we use the tessellation
+    else
+    {
+      nem_meshing_para_cl_cell (clstring, pMeshPara, Tess);
+      ut_print_message (1, 3, "empty %dD mesh - used tess to compute cl.\n", Tess.Dim);
+    }
 
     if (!strcmp ((*pMeshPara).elttype, "tri"))
     {

src/neper_m/nem_meshing_para/nem_meshing_para_cl/nem_meshing_para_cl2.c

@@ -99,14 +99,20 @@ nem_meshing_para_cl_poly_mesh (char *clstring, struct MESHPARA *pMeshPara,
                                struct NODES Nodes, struct MESH *Mesh,
                                struct TESS Tess)
 {
+  char *elset = ut_alloc_1d_char (100);
+
+  sprintf (elset, "elset%dd", Tess.Dim);
+
   (*pMeshPara).poly_cl = ut_alloc_1d (Tess.PolyQty + 1);
   neut_mesh_entity_expr_val (Nodes, Mesh[0], Mesh[1], Mesh[2], Mesh[3], Mesh[4],
-                             Tess, NULL, NULL, NULL, NULL, "elset3d",
+                             Tess, NULL, NULL, NULL, NULL, elset,
                              clstring, (*pMeshPara).poly_cl, NULL);
 
   if (!strcmp ((*pMeshPara).cltype, "rel"))
     nem_meshing_para_rcl2cl (pMeshPara, Tess.CellQty, Tess.Dim,
                              (*pMeshPara).poly_cl);
 
+  ut_free_1d_char (&elset);
+
   return 0;
 }

src/neper_m/nem_meshing_para/nem_meshing_para_param/nem_meshing_para_param1.c

@@ -23,7 +23,7 @@ nem_meshing_para_param (struct IN_M In, struct TESS Tess, struct TESR *pTesr,
   ut_string_string (In.elttype, &(*pMeshPara).elttype); // needed by quad9
 
   // Testing type of input: tess or tesr or mesh
-  if (In.mesh)
+  if (In.mesh && !neut_mesh_isvoid (RMesh[Tess.Dim]))
   {
     (*pMeshPara).input = 'm';
     dim = 3;

src/neper_m/nem_reconstruct/nem_reconstruct_mesh/nem_reconstruct_mesh2.c

@@ -33,7 +33,7 @@ nem_reconstruct_mesh_2d (struct NODES Nodes, struct MESH *Mesh, int mode,
       neut_mesh_init_eltelset (Mesh + 2, NULL);
       neut_mesh_orderelsets (Mesh + 2);
 
-      if (mode == 2)
+      if (mode == 2 && pTess)
       {
         (*pTess).FaceQty = FaceQty;
         (*pTess).FacePoly = ut_alloc_2d_int ((*pTess).FaceQty + 1, 2);
@@ -43,7 +43,7 @@ nem_reconstruct_mesh_2d (struct NODES Nodes, struct MESH *Mesh, int mode,
     }
     else
     {
-      if (mode == 2)
+      if (mode == 2 && pTess)
       {
         (*pTess).FaceQty = Mesh[2].ElsetQty;
         neut_mesh_facepoly (Nodes, Mesh[2], Mesh[3], &((*pTess).FacePoly));
@@ -69,10 +69,11 @@ nem_reconstruct_mesh_2d (struct NODES Nodes, struct MESH *Mesh, int mode,
   // Setting up Tess face information
   if (mode == 2)
   {
-    if (!(*pTess).FaceState)
-      (*pTess).FaceState = ut_alloc_1d_int ((*pTess).FaceQty + 1);
-
+    (*pTess).FaceState = ut_realloc_1d_int ((*pTess).FaceState, (*pTess).FaceQty + 1);
     ut_array_1d_int_set ((*pTess).FaceState + 1, (*pTess).FaceQty, 1);
+
+    (*pTess).FacePt = ut_realloc_1d_int ((*pTess).FacePt, (*pTess).FaceQty + 1);
+    ut_array_1d_int_set ((*pTess).FacePt + 1, (*pTess).FaceQty, -1);
   }
 
   if (mode >= 1)