[Getfem-commits] r5268 - in /trunk/getfem: interface/tests/matlab/check_mesh_fem.m src/bgeot_convex_ref.cc src/getfem_mesh_fem.cc

[Yves . Renard]

Author: renard
Date: Tue Mar 29 19:35:20 2016
New Revision: 5268

URL: http://svn.gna.org/viewcvs/getfem?rev=5268&view=rev
Log:
fix a small bug in Node processor

Modified:
    trunk/getfem/interface/tests/matlab/check_mesh_fem.m
    trunk/getfem/src/bgeot_convex_ref.cc
    trunk/getfem/src/getfem_mesh_fem.cc

Modified: trunk/getfem/interface/tests/matlab/check_mesh_fem.m
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/check_mesh_fem.m?rev=5268&r1=5267&r2=5268&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/check_mesh_fem.m        (original)
+++ trunk/getfem/interface/tests/matlab/check_mesh_fem.m        Tue Mar 29 
19:35:20 2016
@@ -74,11 +74,11 @@
      'BEGIN MESH STRUCTURE DESCRIPTION' 10,...
      'CONVEX 0    GT_PK(2,2)      1 4 2 6 5 3' 10,...
      'CONVEX 1    GT_QK(2,1)      2 17 3 7' 10,...
-     'CONVEX 2    GT_QK(2,2)      7 8 10 14 46 15 17 9 11' 10,...
+     'CONVEX 2    GT_QK(2,2)      7 8 10 14 16 15 17 9 11' 10,...
      'CONVEX 3    GT_QK(2,1)      10 12 11 13' 10,...
      'CONVEX 4    GT_PRODUCT(GT_PK(2,2),GT_PK(1,1)) 12 22 18 24 23 19 13 25 20 
27 26 21' 10,...
      'CONVEX 5    GT_PRODUCT(GT_PK(1,1),GT_PK(1,3)) 2 3 28 29 30 31 32 33' 
10,...
-     'CONVEX 8    GT_PRODUCT(GT_PK(1,2),GT_QK(2,1)) 19 23 18 21 26 20 34 35 36 
37 38 49' 10,...
+     'CONVEX 8    GT_PRODUCT(GT_QK(2,1),GT_PK(1,2)) 19 21 34 37 23 26 35 38 18 
20 36 49' 10,...
      'END MESH STRUCTURE DESCRIPTION' 10,...
      'BEGIN MESH_FEM' 10,...
      ' CONVEX 0 FEM_PK(2,2)' 10,...
@@ -87,9 +87,10 @@
      ' CONVEX 3 FEM_QK(2,2)' 10,...
      ' CONVEX 4 FEM_PRODUCT(FEM_PK(2,2),FEM_PK(1,2))' 10,...
      ' CONVEX 5 FEM_PRODUCT(FEM_PK(1,2),FEM_PK(1,3))' 10,...
-     ' CONVEX 8 FEM_PRODUCT(FEM_PK(1,2),FEM_QK(2,3))' 10,...
+     ' CONVEX 8 FEM_PRODUCT(FEM_QK(2,3),FEM_PK(1,2))' 10,...
      'END MESH_FEM\n'];
   m=gf_mesh('from string',s);
+  gf_plot_mesh(m);
   mf=gf_mesh_fem('from string',s,m);
   s2=gf_mesh_fem_get(mf,'char');
   mf2=gf_mesh_fem('from string',s2,m);

Modified: trunk/getfem/src/bgeot_convex_ref.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/bgeot_convex_ref.cc?rev=5268&r1=5267&r2=5268&view=diff
==============================================================================
--- trunk/getfem/src/bgeot_convex_ref.cc        (original)
+++ trunk/getfem/src/bgeot_convex_ref.cc        Tue Mar 29 19:35:20 2016
@@ -342,7 +342,7 @@
 
     product_ref_(pconvex_ref a, pconvex_ref b) { 
       if (a->structure()->dim() < b->structure()->dim())
-        GMM_WARNING1("Illegal convex : swap your operands: dim(cv1)=" << 
+        GMM_WARNING1("Illegal convex: swap your operands: dim(cv1)=" << 
                     int(a->structure()->dim()) << " < dim(cv2)=" << 
                     int(b->structure()->dim()));
       cvr1 = a; cvr2 = b;

Modified: trunk/getfem/src/getfem_mesh_fem.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_mesh_fem.cc?rev=5268&r1=5267&r2=5268&view=diff
==============================================================================
--- trunk/getfem/src/getfem_mesh_fem.cc (original)
+++ trunk/getfem/src/getfem_mesh_fem.cc Tue Mar 29 19:35:20 2016
@@ -72,7 +72,6 @@
   }
 
   dal::bit_vector mesh_fem::basic_dof_on_region(const mesh_region &b) const {
-    // cout << "dof on region for " << b << endl;
     context_check(); if (!dof_enumeration_made) this->enumerate_dof();
     dal::bit_vector res;
     for (getfem::mr_visitor v(b,linked_mesh()); !v.finished(); ++v) {
@@ -292,7 +291,7 @@
   class node_processor
   {
   public:
-    node_processor(const mesh &mesh) : mesh_{mesh}, 
convex_nodes_map_(mesh.nb_convex())
+    node_processor(const mesh &mesh) : mesh_{mesh}, 
convex_nodes_map_(mesh.convex_index().last_true()+1)
     {}
 
     size_type process(bgeot::node_tab &dof_nodes, const base_node &p, 
size_type cv)
@@ -693,6 +692,7 @@
       ost << " \'" << name_of_fem(fem_of_element(cv));
       ost << "\'\n";
     }
+
     if (!dof_partition.empty()) {
       ost << " BEGIN DOF_PARTITION\n";
       unsigned i = 0;