Merge pull request #604 from richb2k/grid-gmsh-binary

ElmerGrid and ElmerGUI, add check for Gmsh binary input file format a…
ElmerCSC · Oct 31, 2024 · 8de3b75 · 8de3b75
2 parents 82c9bad + ed5dc25
commit 8de3b75
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/ElmerGUI/Application/plugins/egconvert.cpp b/ElmerGUI/Application/plugins/egconvert.cpp
@@ -5280,17 +5280,24 @@ int LoadGmshInput(struct FemType *data,struct BoundaryType *bound,
   }
 
   if(strstr(line,"$")) {
-    int verno,minorno;
+    int verno,minorno,gmshformat;
     char *cp;
-    
+
     Getrow(line,in,FALSE);
     cp = line;    
     verno = next_int(&cp);
     cp++;
     minorno = next_int(&cp);
 
     if(info) printf("Gmsh version is %d.%d\n",verno,minorno);
-
+
+    cp++;
+    gmshformat = next_int(&cp);
+    if(gmshformat == 1){
+      printf("Error: Gmsh input file is in binary format! Exiting.\n");
+      bigerror("Gmsh input file is in binary format!");
+    }
+
     fclose(in);
 
     if( verno == 4 ) {

diff --git a/elmergrid/src/egconvert.c b/elmergrid/src/egconvert.c
@@ -5280,17 +5280,24 @@ int LoadGmshInput(struct FemType *data,struct BoundaryType *bound,
   }
 
   if(strstr(line,"$")) {
-    int verno,minorno;
+    int verno,minorno,gmshformat;
     char *cp;
-    
+
     Getrow(line,in,FALSE);
     cp = line;    
     verno = next_int(&cp);
     cp++;
     minorno = next_int(&cp);
 
     if(info) printf("Gmsh version is %d.%d\n",verno,minorno);
-
+
+    cp++;
+    gmshformat = next_int(&cp);
+    if(gmshformat == 1){
+      printf("Error: Gmsh input file is in binary format! Exiting.\n");
+      bigerror("Gmsh input file is in binary format!");
+    }
+
     fclose(in);
 
     if( verno == 4 ) {