From 8ecfe133e8cd9d0de3cf1fe7cb3baaebadec8169 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 7 Sep 2017 19:00:51 +0200
Subject: [PATCH] fix #339
---
wrappers/java/WrapGmsh.i | 5 +----
.../java/com/artenum/sample/EssaiGmsh_v1.java | 19 -------------------
2 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/wrappers/java/WrapGmsh.i b/wrappers/java/WrapGmsh.i
index 27915cb16f..4eb0a46d64 100644
--- a/wrappers/java/WrapGmsh.i
+++ b/wrappers/java/WrapGmsh.i
@@ -52,10 +52,7 @@ enum meshGenerationStatus {PENDING, DONE, FAILED};
extern int GModel::indexMeshVertices(bool all, int singlePartition);
extern int GmshInitialize(int argc, char **argv);
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.
%include "std_vector.i"
namespace std {
diff --git a/wrappers/java/WrappingJava/src/main/java/com/artenum/sample/EssaiGmsh_v1.java b/wrappers/java/WrappingJava/src/main/java/com/artenum/sample/EssaiGmsh_v1.java
index 7caa0035bf..bfc45ff140 100755
--- a/wrappers/java/WrappingJava/src/main/java/com/artenum/sample/EssaiGmsh_v1.java
+++ b/wrappers/java/WrappingJava/src/main/java/com/artenum/sample/EssaiGmsh_v1.java
@@ -771,12 +771,6 @@ public class EssaiGmsh_v1 {
WrapGmsh.List_Add(lst2, 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
WrapGmsh.List_Reset(lst1);
WrapGmsh.List_Reset(lst2);
@@ -804,7 +798,6 @@ public class EssaiGmsh_v1 {
tag = v26.tag();
WrapGmsh.List_Add(lst4, tag);
- WrapGmsh.add_physical(str, lst4, m.getFileName(), "", 0, false, "");
WrapGmsh.List_Reset(lst4);
// //LINE
@@ -966,9 +959,6 @@ public class EssaiGmsh_v1 {
WrapGmsh.List_Add(lst2, 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(lst2);
WrapGmsh.List_Reset(lst3);
@@ -1012,7 +1002,6 @@ public class EssaiGmsh_v1 {
tag = e42.tag();
WrapGmsh.List_Add(lst4, tag);
- WrapGmsh.add_physical(str1, lst4, m.getFileName(), "", 0, false, "");
WrapGmsh.List_Reset(lst4);
// //FACE
@@ -1328,9 +1317,6 @@ public class EssaiGmsh_v1 {
WrapGmsh.List_Add(lst2, 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(lst2);
WrapGmsh.List_Reset(lst3);
@@ -1362,7 +1348,6 @@ public class EssaiGmsh_v1 {
tag = f26.tag();
WrapGmsh.List_Add(lst4, tag);
- WrapGmsh.add_physical(str2, lst4, m.getFileName(), "", 0, false, "");
WrapGmsh.List_Reset(lst4);
// //VOLUME
@@ -1423,9 +1408,6 @@ public class EssaiGmsh_v1 {
WrapGmsh.List_Add(lst2, 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(lst2);
WrapGmsh.List_Reset(lst3);
@@ -1435,7 +1417,6 @@ public class EssaiGmsh_v1 {
tag = r2.tag();
WrapGmsh.List_Add(lst4, tag);
- WrapGmsh.add_physical(str3, lst4, m.getFileName(), "", 0, false, "");
WrapGmsh.List_Reset(lst4);
//free memory
--
GitLab