[Getfem-commits] (no subject)

[Tetsuo Koyama]

branch: devel-tetsuo-xml
commit 33d15918f0be25fc838e660b68d11ae472f8f0a4
Author: Tetsuo Koyama <address@hidden>
AuthorDate: Wed Apr 29 04:28:12 2020 +0000

    :test_tube: vtu_export by meshio
---
 src/getfem_export.cc | 13 +++++++++++--
 tests/Makefile.am    |  4 ----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/getfem_export.cc b/src/getfem_export.cc
index 9082b30..fe9cd6c 100644
--- a/src/getfem_export.cc
+++ b/src/getfem_export.cc
@@ -595,9 +595,9 @@ namespace getfem
     if (state >= STRUCTURE_WRITTEN) return;
     check_header();
     os << "<UnstructuredGrid>\n";
-    os << "<Piece \"NumberOfPoints=\"" << pmf_dof_used.card() << 
"\"NumberOfCells=\"" << pmf->convex_index().card() << "\n";
+    os << "<Piece NumberOfPoints=\"" << pmf_dof_used.card() << "\" 
NumberOfCells=\"" << pmf->convex_index().card() << "\">\n";
     os << "<Points>\n";
-    os << "<DataArray type=\"Float32\" NumberOfComponents=\"" << dim_<< "\" 
Format=\"ascii\">\n"; 
+    os << "<DataArray type=\"Float32\" NumberOfComponents=\"3\" 
Format=\"ascii\">\n";
     std::vector<int> dofmap(pmf->nb_dof());
     int cnt = 0;
     for (dal::bv_visitor d(pmf_dof_used); !d.finished(); ++d) {
@@ -620,6 +620,15 @@ namespace getfem
       write_separ();
     }
     os << "</DataArray>\n";
+    os << "<DataArray type=\"Int32\" Name=\"offsets\" Format=\"ascii\">\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();
+    }
+    os << "</DataArray>\n";
     os << "<DataArray type=\"Int32\" Name=\"types\" Format=\"ascii\">\n";
     for (dal::bv_visitor cv(pmf->convex_index()); !cv.finished(); ++cv) {
       write_val(select_vtk_type(pmf_mapping_type[cv]));
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d40e39c..761201a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -37,7 +37,6 @@ check_PROGRAMS =                   \
        test_rtree                 \
        test_mesh                  \
        test_slice                 \
-       test_export                \
        integration                \
        geo_trans_inv              \
        test_mat_elem              \
@@ -106,7 +105,6 @@ test_condensation_SOURCES = test_condensation.cc
 test_tree_sorted_SOURCES = test_tree_sorted.cc
 test_mat_elem_SOURCES = test_mat_elem.cc
 test_slice_SOURCES = test_slice.cc
-test_export_SOURCES = test_export.cc
 test_range_basis_SOURCES = test_range_basis.cc
 schwarz_additive_SOURCES = schwarz_additive.cc
 plasticity_SOURCES = plasticity.cc
@@ -140,7 +138,6 @@ TESTS = \
        test_interpolation.pl         \
        test_mat_elem.pl              \
        test_slice.pl                 \
-       test_export.pl                \
        integration.pl                \
        test_assembly.pl              \
        test_assembly_assignment.pl   \
@@ -224,7 +221,6 @@ EXTRA_DIST =                                                
\
        wave_equation.pl                                        \
        wave_equation.param                                     \
        cyl_slicer.pl                                           \
-       test_export.pl                                          \
        test_continuation.param                                 \
        test_continuation.pl                                    \
        make_gmm_test.pl                                        \