[Getfem-commits] r4813 - in /trunk/getfem/src: dal_static_stored_objects.cc getfem_im_data.cc

[logari81]

Author: logari81
Date: Wed Nov 12 13:45:35 2014
New Revision: 4813

URL: http://svn.gna.org/viewcvs/getfem?rev=4813&view=rev
Log:
fix compilation warnings and tide up (use short_type for face indices)

Modified:
    trunk/getfem/src/dal_static_stored_objects.cc
    trunk/getfem/src/getfem_im_data.cc

Modified: trunk/getfem/src/dal_static_stored_objects.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/dal_static_stored_objects.cc?rev=4813&r1=4812&r2=4813&view=diff
==============================================================================
--- trunk/getfem/src/dal_static_stored_objects.cc       (original)
+++ trunk/getfem/src/dal_static_stored_objects.cc       Wed Nov 12 13:45:35 2014
@@ -291,7 +291,8 @@
     {
       stored_object_tab& stored_objects
           = dal::singleton<stored_object_tab>::instance(thread);
-      if (dependent_deleted = stored_objects.del_dependent_(o1,o2))
+      dependent_deleted = stored_objects.del_dependent_(o1,o2);
+      if (dependent_deleted)
       {
         dependent_empty = stored_objects.has_dependent_objects(o2);
         break;

Modified: trunk/getfem/src/getfem_im_data.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_im_data.cc?rev=4813&r1=4812&r2=4813&view=diff
==============================================================================
--- trunk/getfem/src/getfem_im_data.cc  (original)
+++ trunk/getfem/src/getfem_im_data.cc  Wed Nov 12 13:45:35 2014
@@ -8,7 +8,7 @@
                    bgeot::multi_index tensorSize,
                    size_type filteredRegion)
     :im_(meshIm), nb_filtered_index_(0), nb_index_(0),
-    is_on_face_(false), filtered_region_(filteredRegion),
+    filtered_region_(filteredRegion), is_on_face_(false),
     locks_()
   {
     set_tensor_size(tensorSize);
@@ -23,7 +23,7 @@
 
   im_data::im_data(const getfem::mesh_im& meshIm, size_type filteredRegion)
     :im_(meshIm), nb_filtered_index_(0), nb_index_(0),
-    is_on_face_(false), filtered_region_(filteredRegion) {
+    filtered_region_(filteredRegion), is_on_face_(false) {
     tensor_size_.resize(1);
     tensor_size_[0] = 1;
     nb_tensor_elem_ = 1;
@@ -90,7 +90,7 @@
     
     for (dal::bv_visitor cv(im_.convex_index()); !cv.finished(); ++cv)
     {
-      size_type nb_faces = linked_mesh.nb_faces_of_convex(cv);      
+      short_type nb_faces = linked_mesh.nb_faces_of_convex(cv);      
       const getfem::papprox_integration pim = 
im_.int_method_of_element(cv)->approx_method();
       size_type nb_points = pim->nb_points_on_convex();
       size_type nb_points_on_faces = pim->nb_points() - nb_points;
@@ -100,7 +100,7 @@
       face_container_[cv].point_index_.resize(nb_points_on_faces);
       size_type nb_index_convex = 0;
 
-      for (size_type i_face = 0; i_face < nb_faces; ++i_face){
+      for (short_type i_face = 0; i_face < nb_faces; ++i_face){
         size_type nb_pt_face = pim->nb_points_on_face(i_face);
         for (size_type k = 0; k < nb_pt_face; ++k){
           face_container_[cv].point_index_[nb_index_convex] = nb_index_;
@@ -115,9 +115,9 @@
         filtered_face_container_[cv].inactive_ = false;
         filtered_face_container_[cv].start_index_ = nb_points - nb_points;
         filtered_face_container_[cv].point_index_.resize(nb_points_on_faces);
-        size_type nb_index_convex = 0;
-
-        for (size_type i_face = 0; i_face < nb_faces; ++i_face){
+        nb_index_convex = 0;
+
+        for (short_type i_face = 0; i_face < nb_faces; ++i_face){
           size_type nb_pt_face = pim->nb_points_on_face(i_face);
           for (size_type k = 0; k < nb_pt_face; ++k){
             if (!rg.is_in(cv, i_face)){
@@ -260,7 +260,6 @@
     size_type tensor_col = 1;
     bool first_checked = false;
     bool second_checked = false;
-    bool equivalent = false;
     for (size_type i = 0; i < sizes.size(); ++i){
       if (sizes[i] > 1 && !first_checked){
         first_checked = true;