[Getfem-commits] r5066 - in /trunk/getfem/src: bgeot_mesh_structure.cc getfem/getfem_integration.h

[Yves . Renard]

Author: renard
Date: Mon Aug 10 19:45:25 2015
New Revision: 5066

URL: http://svn.gna.org/viewcvs/getfem?rev=5066&view=rev
Log:
minor fixes

Modified:
    trunk/getfem/src/bgeot_mesh_structure.cc
    trunk/getfem/src/getfem/getfem_integration.h

Modified: trunk/getfem/src/bgeot_mesh_structure.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/bgeot_mesh_structure.cc?rev=5066&r1=5065&r2=5066&view=diff
==============================================================================
--- trunk/getfem/src/bgeot_mesh_structure.cc    (original)
+++ trunk/getfem/src/bgeot_mesh_structure.cc    Mon Aug 10 19:45:25 2015
@@ -266,12 +266,12 @@
     auto face_points = ind_points_of_face_of_convex(cv, f);
     auto neighbour_element = neighbour_of_convex(cv, f);
     auto nNeighbourElementFaces = 
structure_of_convex(neighbour_element)->nb_faces();
-    for (short_type f = 0; f < nNeighbourElementFaces; ++f)
+    for (short_type iff = 0; iff < nNeighbourElementFaces; ++iff)
     {
-      auto nPointsOnFace = 
structure_of_convex(neighbour_element)->nb_points_of_face(f);
-      if (is_convex_face_having_points(neighbour_element, f, nPointsOnFace, 
face_points.begin()))
+      auto nPointsOnFace = 
structure_of_convex(neighbour_element)->nb_points_of_face(iff);
+      if (is_convex_face_having_points(neighbour_element, iff, nPointsOnFace, 
face_points.begin()))
       {
-        return {neighbour_element, f};
+        return {neighbour_element, iff};
       }
     }
     GMM_ASSERT2(false, "failed to determine neighbouring face");

Modified: trunk/getfem/src/getfem/getfem_integration.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_integration.h?rev=5066&r1=5065&r2=5066&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_integration.h        (original)
+++ trunk/getfem/src/getfem/getfem_integration.h        Mon Aug 10 19:45:25 2015
@@ -92,7 +92,11 @@
 #include "bgeot_convex_ref.h"
 #include "bgeot_geometric_trans.h"
 #include "bgeot_node_tab.h"
+#include "bgeot_poly_composite.h"
 #include "getfem/dal_naming_system.h"
+
+
+
 
 namespace getfem
 {
@@ -322,9 +326,9 @@
   /// return IM_NONE
   pintegration_method im_none(void);
 
-  class mesh_precomposite;
+
   class mesh_im;
-  papprox_integration composite_approx_int_method(const mesh_precomposite &mp, 
+  papprox_integration composite_approx_int_method(const 
bgeot::mesh_precomposite &mp, 
                                                  const mesh_im &mf,
                                                  bgeot::pconvex_ref cr);