Added many keywords to handle colours and groups partitioning

LoicMarechal · Oct 9, 2024 · d6575d2 · d6575d2
1 parent ad00222
commit d6575d2
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/sources/libmeshb7.c b/sources/libmeshb7.c
@@ -2,14 +2,14 @@
 
 /*----------------------------------------------------------------------------*/
 /*                                                                            */
-/*                               LIBMESHB V7.83                               */
+/*                               LIBMESHB V7.84                               */
 /*                                                                            */
 /*----------------------------------------------------------------------------*/
 /*                                                                            */
 /*   Description:        handles .meshb file format I/O                       */
 /*   Author:             Loic MARECHAL                                        */
 /*   Creation date:      dec 09 1999                                          */
-/*   Last modification:  jun 18 2024                                          */
+/*   Last modification:  oct 09 2024                                          */
 /*                                                                            */
 /*----------------------------------------------------------------------------*/
 
@@ -39,11 +39,8 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include <float.h>
-#include <math.h>
 #include <ctype.h>
 #include <setjmp.h>
-#include <fcntl.h>
 
 
 /*
@@ -114,6 +111,7 @@
 #ifdef WITH_GMF_AIO
 
 #include <aio.h>
+#include <fcntl.h>
 
 int    my_aio_error (const struct aiocb *aiocbp){return(aio_error (aiocbp));}
 int    my_aio_read  (      struct aiocb *aiocbp){return(aio_read  (aiocbp));}
@@ -463,7 +461,18 @@ const char *GmfKwdFmt[ GmfMaxKwd + 1 ][3] =
    {"QuadrialteralOnGeometryFace",              "i", "iiiiiii"},
    {"MeshOnGeometry",                           "i", "iiiiiidrdrii"},
    {"VerticesColour",                           "i", "i"},
-   {"VerticesGrain",                            "i", "i"}
+   {"VerticesGrain",                            "i", "i"},
+   {"VertexGrainPartitions",                    "i", "ii"},
+   {"EdgeGrainPartitions",                      "i", "ii"},
+   {"TriangleGrainPartitions",                  "i", "ii"},
+   {"QuadrilateralGrainPartitions",             "i", "ii"},
+   {"TetrahedronGrainPartitions",               "i", "ii"},
+   {"PyramidGrainPartitions",                   "i", "ii"},
+   {"PrismGrainPartitions",                     "i", "ii"},
+   {"HexahedronGrainPartitions",                "i", "ii"},
+   {"ColorPartitions",                          "i", "ii"},
+   {"TetrahedraColour",                         "i", "i"},
+   {"TetrahedraGrain",                          "i", "i"}
 };
 
 #ifdef TRANSMESH

diff --git a/sources/libmeshb7.h b/sources/libmeshb7.h
@@ -2,14 +2,14 @@
 
 /*----------------------------------------------------------------------------*/
 /*                                                                            */
-/*                               LIBMESHB V7.82                               */
+/*                               LIBMESHB V7.84                               */
 /*                                                                            */
 /*----------------------------------------------------------------------------*/
 /*                                                                            */
 /*    Description:        handle .meshb file format I/O                       */
 /*    Author:             Loic MARECHAL                                       */
 /*    Creation date:      dec 09 1999                                         */
-/*    Last modification:  jun 18 2024                                         */
+/*    Last modification:  oct 09 2024                                         */
 /*                                                                            */
 /*----------------------------------------------------------------------------*/
 
@@ -282,6 +282,17 @@ enum GmfKwdCod
    GmfMeshOnGeometry,
    GmfVerticesColour,
    GmfVerticesGrain,
+   GmfVertexGrainPartitions,
+   GmfEdgeGrainPartitions,
+   GmfTriangleGrainPartitions,
+   GmfQuadrilateralGrainPartitions,
+   GmfTetrahedronGrainPartitions,
+   GmfPyramidGrainPartitions,
+   GmfPrismGrainPartitions,
+   GmfHexahedronGrainPartitions,
+   GmfColorPartitions,
+   GmfTetrahedraColour,
+   GmfTetrahedraGrain,
    GmfLastKeyword
 };