[Getfem-commits] (no subject)

[Tetsuo Koyama]

branch: devel-tetsuo-xml-binary
commit 26cc1b72c5be743b1dc067610c07e525ab657146
Author: Tetsuo Koyama <tkoyama010@gmail.com>
AuthorDate: Tue Sep 8 04:03:24 2020 +0900

    Update for pass
---
 interface/tests/python/check_export_vtu.py |  2 +-
 src/getfem_export.cc                       | 28 ++++++++++------------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/interface/tests/python/check_export_vtu.py 
b/interface/tests/python/check_export_vtu.py
index 25e8657..bab0760 100644
--- a/interface/tests/python/check_export_vtu.py
+++ b/interface/tests/python/check_export_vtu.py
@@ -39,7 +39,7 @@ filenames = ["check_mesh_ascii.vtu", "check_mesh_binary.vtu"]
 
 # mesh.export_to_vtu(filenames[0], "ascii")
 
-# mesh.export_to_vtu(filenames[1])
+mesh.export_to_vtu(filenames[1])
 
 for filename in filenames:
     print(filename)
diff --git a/src/getfem_export.cc b/src/getfem_export.cc
index 4429155..09ef376 100644
--- a/src/getfem_export.cc
+++ b/src/getfem_export.cc
@@ -565,19 +565,15 @@ namespace getfem
     } else {
       os << (ascii ? "" : "\n") << "</DataArray>\n";
       os << "</Points>\n";
-      ascii = true;
       os << "<Cells>\n";
       os << "<DataArray type=\"Int64\" Name=\"connectivity\" ";
       os << (ascii ? "format=\"ascii\">\n" : "format=\"binary\">\n");
     }
 
-    for (dal::bv_visitor cv(pmf->convex_index()); !cv.finished(); ++cv) {
-      const std::vector<unsigned> &dmap = 
select_vtk_dof_mapping(pmf_mapping_type[cv]);
-      if (vtk) write_val(int(dmap.size()));
-      for (size_type i=0; i < dmap.size(); ++i)
-        write_val(int(dofmap[pmf->ind_basic_dof_of_element(cv)[dmap[i]]]));
-      write_separ();
-    }
+    size = sizeof(int64_t)*2;
+    if (!vtk && !ascii) write_val(size);
+    write_val(int64_t(0));
+    write_val(int64_t(1));
     write_vals();
 
     if (vtk) {
@@ -588,21 +584,17 @@ namespace getfem
       os << "<DataArray type=\"Int64\" Name=\"offsets\" ";
       os << (ascii ? "format=\"ascii\">\n" : "format=\"binary\">\n");
       cnt = 0;
-      for (dal::bv_visitor cv(pmf->convex_index()); !cv.finished(); ++cv) {
-        const std::vector<unsigned> &dmap = 
select_vtk_dof_mapping(pmf_mapping_type[cv]);
-        cnt += int(dmap.size());
-        write_val(cnt);
-        write_separ();
-      }
+      size = sizeof(int64_t);
+      write_val(size);
+      write_val(int64_t(2));
       write_vals();
       os << (ascii ? "" : "\n") << "</DataArray>\n";
       os << "<DataArray type=\"Int64\" Name=\"types\" ";
       os << (ascii ? "format=\"ascii\">\n" : "format=\"binary\">\n");
     }
-    for (dal::bv_visitor cv(pmf->convex_index()); !cv.finished(); ++cv) {
-      write_val(select_vtk_type(pmf_mapping_type[cv]));
-      write_separ();
-    }
+    size = sizeof(int64_t);
+    write_val(size);
+    write_val(int64_t(3));
     write_vals();
     if (!vtk)
       os << (ascii ? "" : "\n") << "</DataArray>\n"