star-geometry-2d

commit 58a79cf39c4e084b1589b8625ae97a842a1dfe13
parent a4650e997b34f1df99f496c622b8edfd892aefac
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Wed, 15 Apr 2020 17:30:57 +0200

Fix geometry VTK dumps

Diffstat:
M
src/sg2d_geometry.c
 | 
23
++++++++++++-----------

1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/sg2d_geometry.c b/src/sg2d_geometry.c
@@ -85,9 +85,10 @@ dump_seg_property
         tdefs++; /* Next value */
       }
     }
-    /* In VTK dumps INT_MAX is used for both unspecified and conflict
-     * (VTK ascii format doesn't allow a greater value) */
-    fprintf(stream, "%u\n", (int)MMIN(property, INT_MAX));
+    /* In VTK dumps UINT_MAX is used for unspecified */
+    if(property == SG2D_UNSPECIFIED_PROPERTY)
+      fprintf(stream, "%u\n", UINT_MAX);
+    else fprintf(stream, "%u\n", (unsigned)property);
   }
 }
 
@@ -882,27 +883,27 @@ sg2d_geometry_dump_as_vtk
   descriptions = darray_seg_descriptions_cdata_get(&geom->seg_descriptions);
 
   /* Dump front medium */
-  fprintf(stream, "SCALARS Front_medium int\n");
+  fprintf(stream, "SCALARS Front_medium unsigned_int 1\n");
   fprintf(stream, "LOOKUP_TABLE default\n");
   dump_seg_property(geom, stream, SG2D_FRONT);
 
   /* Dump back medium */
-  fprintf(stream, "SCALARS Back_medium int\n");
+  fprintf(stream, "SCALARS Back_medium unsigned_int 1\n");
   fprintf(stream, "LOOKUP_TABLE default\n");
   dump_seg_property(geom, stream, SG2D_BACK);
 
   /* Dump interface */
-  fprintf(stream, "SCALARS Interface int\n");
+  fprintf(stream, "SCALARS Interface unsigned_int 1\n");
   fprintf(stream, "LOOKUP_TABLE default\n");
   dump_seg_property(geom, stream, SG2D_INTFACE);
 
   /* Dump unique_id */
-  fprintf(stream, "SCALARS Unique_ID int\n");
+  fprintf(stream, "SCALARS Unique_ID unsigned_int 1\n");
   fprintf(stream, "LOOKUP_TABLE default\n");
   FOR_EACH(i, 0, ssz) fprintf(stream, PRTF_SEG"\n", (seg_id_t)i);
 
   /* Dump user_id */
-  fprintf(stream, "SCALARS User_ID int\n");
+  fprintf(stream, "SCALARS User_ID unsigned_int 1\n");
   fprintf(stream, "LOOKUP_TABLE default\n");
   FOR_EACH(i, 0, ssz) fprintf(stream, PRTF_SEG"\n", segments[i].user_id);
 
@@ -911,7 +912,7 @@ sg2d_geometry_dump_as_vtk
     fprintf(stream, "SCALARS Merge_conflict int\n");
     fprintf(stream, "LOOKUP_TABLE default\n");
     FOR_EACH(i, 0, ssz)
-      fprintf(stream, PRTF_SEG"\n", descriptions[i].merge_conflict);
+      fprintf(stream, "%d\n", descriptions[i].merge_conflict);
   }
 
   /* Dump property conflict status (if any) */
@@ -919,11 +920,11 @@ sg2d_geometry_dump_as_vtk
     fprintf(stream, "SCALARS Property_conflict int\n");
     fprintf(stream, "LOOKUP_TABLE default\n");
     FOR_EACH(i, 0, ssz)
-      fprintf(stream, PRTF_SEG"\n", descriptions[i].properties_conflict);
+      fprintf(stream, "%d\n", descriptions[i].properties_conflict);
   }
 
   /* Dump rank of the sg2d_geometry_add that created the segment */
-  fprintf(stream, "SCALARS Created_at_sg2d_geometry_add int\n");
+  fprintf(stream, "SCALARS Created_at_sg2d_geometry_add unsigned_int 1\n");
   fprintf(stream, "LOOKUP_TABLE default\n");
   FOR_EACH(i, 0, ssz) {
     const struct definition* tdefs;