Skip to content
Snippets Groups Projects
Commit 8ecfe133 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix #339

parent 6b380234
No related branches found
No related tags found
No related merge requests found
...@@ -52,10 +52,7 @@ enum meshGenerationStatus {PENDING, DONE, FAILED}; ...@@ -52,10 +52,7 @@ enum meshGenerationStatus {PENDING, DONE, FAILED};
extern int GModel::indexMeshVertices(bool all, int singlePartition); extern int GModel::indexMeshVertices(bool all, int singlePartition);
extern int GmshInitialize(int argc, char **argv); extern int GmshInitialize(int argc, char **argv);
extern int GmshFinalize(); extern int GmshFinalize();
extern Vertex *Create_Vertex(int Num, double X, double Y, double Z, double lc, double u);
extern void add_physical(std::string type, List_T *list, std::string fileName,
const std::string &name, int forceTag, bool append,
const std::string &mode);
//use the Vector object defined in Java language to wrap the std vector. //use the Vector object defined in Java language to wrap the std vector.
%include "std_vector.i" %include "std_vector.i"
namespace std { namespace std {
......
...@@ -771,12 +771,6 @@ public class EssaiGmsh_v1 { ...@@ -771,12 +771,6 @@ public class EssaiGmsh_v1 {
WrapGmsh.List_Add(lst2, tag); WrapGmsh.List_Add(lst2, tag);
WrapGmsh.List_Add(lst3, tag); WrapGmsh.List_Add(lst3, tag);
// add all tags defines in the first physical in the GModel
WrapGmsh.add_physical(str, lst1, m.getFileName(), "", 0, false, "");
WrapGmsh.add_physical(str, lst2, m.getFileName(), "", 0, false, "");
WrapGmsh.add_physical(str, lst3, m.getFileName(), "", 0, false, "");
// delete what is in the List // delete what is in the List
WrapGmsh.List_Reset(lst1); WrapGmsh.List_Reset(lst1);
WrapGmsh.List_Reset(lst2); WrapGmsh.List_Reset(lst2);
...@@ -804,7 +798,6 @@ public class EssaiGmsh_v1 { ...@@ -804,7 +798,6 @@ public class EssaiGmsh_v1 {
tag = v26.tag(); tag = v26.tag();
WrapGmsh.List_Add(lst4, tag); WrapGmsh.List_Add(lst4, tag);
WrapGmsh.add_physical(str, lst4, m.getFileName(), "", 0, false, "");
WrapGmsh.List_Reset(lst4); WrapGmsh.List_Reset(lst4);
// //LINE // //LINE
...@@ -966,9 +959,6 @@ public class EssaiGmsh_v1 { ...@@ -966,9 +959,6 @@ public class EssaiGmsh_v1 {
WrapGmsh.List_Add(lst2, tag); WrapGmsh.List_Add(lst2, tag);
WrapGmsh.List_Add(lst3, tag); WrapGmsh.List_Add(lst3, tag);
WrapGmsh.add_physical(str1, lst1, m.getFileName(), "", 0, false, "");
WrapGmsh.add_physical(str1, lst2, m.getFileName(), "", 0, false, "");
WrapGmsh.add_physical(str1, lst3, m.getFileName(), "", 0, false, "");
WrapGmsh.List_Reset(lst1); WrapGmsh.List_Reset(lst1);
WrapGmsh.List_Reset(lst2); WrapGmsh.List_Reset(lst2);
WrapGmsh.List_Reset(lst3); WrapGmsh.List_Reset(lst3);
...@@ -1012,7 +1002,6 @@ public class EssaiGmsh_v1 { ...@@ -1012,7 +1002,6 @@ public class EssaiGmsh_v1 {
tag = e42.tag(); tag = e42.tag();
WrapGmsh.List_Add(lst4, tag); WrapGmsh.List_Add(lst4, tag);
WrapGmsh.add_physical(str1, lst4, m.getFileName(), "", 0, false, "");
WrapGmsh.List_Reset(lst4); WrapGmsh.List_Reset(lst4);
// //FACE // //FACE
...@@ -1328,9 +1317,6 @@ public class EssaiGmsh_v1 { ...@@ -1328,9 +1317,6 @@ public class EssaiGmsh_v1 {
WrapGmsh.List_Add(lst2, tag); WrapGmsh.List_Add(lst2, tag);
WrapGmsh.List_Add(lst3, tag); WrapGmsh.List_Add(lst3, tag);
WrapGmsh.add_physical(str2, lst1, m.getFileName(), "", 0, false, "");
WrapGmsh.add_physical(str2, lst2, m.getFileName(), "", 0, false, "");
WrapGmsh.add_physical(str2, lst3, m.getFileName(), "", 0, false, "");
WrapGmsh.List_Reset(lst1); WrapGmsh.List_Reset(lst1);
WrapGmsh.List_Reset(lst2); WrapGmsh.List_Reset(lst2);
WrapGmsh.List_Reset(lst3); WrapGmsh.List_Reset(lst3);
...@@ -1362,7 +1348,6 @@ public class EssaiGmsh_v1 { ...@@ -1362,7 +1348,6 @@ public class EssaiGmsh_v1 {
tag = f26.tag(); tag = f26.tag();
WrapGmsh.List_Add(lst4, tag); WrapGmsh.List_Add(lst4, tag);
WrapGmsh.add_physical(str2, lst4, m.getFileName(), "", 0, false, "");
WrapGmsh.List_Reset(lst4); WrapGmsh.List_Reset(lst4);
// //VOLUME // //VOLUME
...@@ -1423,9 +1408,6 @@ public class EssaiGmsh_v1 { ...@@ -1423,9 +1408,6 @@ public class EssaiGmsh_v1 {
WrapGmsh.List_Add(lst2, tag); WrapGmsh.List_Add(lst2, tag);
WrapGmsh.List_Add(lst3, tag); WrapGmsh.List_Add(lst3, tag);
WrapGmsh.add_physical(str3, lst1, m.getFileName(), "", 0, false, "");
WrapGmsh.add_physical(str3, lst2, m.getFileName(), "", 0, false, "");
WrapGmsh.add_physical(str3, lst3, m.getFileName(), "", 0, false, "");
WrapGmsh.List_Reset(lst1); WrapGmsh.List_Reset(lst1);
WrapGmsh.List_Reset(lst2); WrapGmsh.List_Reset(lst2);
WrapGmsh.List_Reset(lst3); WrapGmsh.List_Reset(lst3);
...@@ -1435,7 +1417,6 @@ public class EssaiGmsh_v1 { ...@@ -1435,7 +1417,6 @@ public class EssaiGmsh_v1 {
tag = r2.tag(); tag = r2.tag();
WrapGmsh.List_Add(lst4, tag); WrapGmsh.List_Add(lst4, tag);
WrapGmsh.add_physical(str3, lst4, m.getFileName(), "", 0, false, "");
WrapGmsh.List_Reset(lst4); WrapGmsh.List_Reset(lst4);
//free memory //free memory
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment