[Getfem-commits] r4807 - in /trunk/getfem/src: ./ getfem/

[logari81]

Author: logari81
Date: Mon Nov 10 11:18:51 2014
New Revision: 4807

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

Removed:
    trunk/getfem/src/getfem_deformable_mesh.cc
Modified:
    trunk/getfem/src/Makefile.am
    trunk/getfem/src/getfem/getfem_continuation.h
    trunk/getfem/src/getfem/getfem_im_data.h
    trunk/getfem/src/getfem_im_data.cc
    trunk/getfem/src/getfem_mesh.cc

Modified: trunk/getfem/src/Makefile.am
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/Makefile.am?rev=4807&r1=4806&r2=4807&view=diff
==============================================================================
--- trunk/getfem/src/Makefile.am        (original)
+++ trunk/getfem/src/Makefile.am        Mon Nov 10 11:18:51 2014
@@ -218,7 +218,6 @@
        getfem_contact_and_friction_large_sliding.cc    \
        getfem_plasticity.cc                            \
        getfem_omp.cc                                   \
-       getfem_deformable_mesh.cc                       \
        getfem_level_set_contact.cc                     \
        getfem_im_data.cc
 #      getfem_enumeration_dof_para.cc

Modified: trunk/getfem/src/getfem/getfem_continuation.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_continuation.h?rev=4807&r1=4806&r2=4807&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_continuation.h       (original)
+++ trunk/getfem/src/getfem/getfem_continuation.h       Mon Nov 10 11:18:51 2014
@@ -723,9 +723,11 @@
       unsigned long nbdof = md->nb_dof();
       gmm::resize(b_x_, nbdof); gmm::fill_random(b_x_);
       gmm::resize(c_x_, nbdof); gmm::fill_random(c_x_);
-      b_gamma_ = gmm::random(1.)/nbdof; c_gamma_ = gmm::random(1.)/nbdof;
-      d_ = gmm::random(1.)/nbdof;
-      gmm::scale(b_x_, 1./nbdof); gmm::scale(c_x_, 1./nbdof);
+      b_gamma_ = gmm::random(1.)/scalar_type(nbdof);
+      c_gamma_ = gmm::random(1.)/scalar_type(nbdof);
+      d_ = gmm::random(1.)/scalar_type(nbdof);
+      gmm::scale(b_x_, scalar_type(1)/scalar_type(nbdof));
+      gmm::scale(c_x_, scalar_type(1)/scalar_type(nbdof));
     }
 
     cont_struct_getfem_model

Modified: trunk/getfem/src/getfem/getfem_im_data.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_im_data.h?rev=4807&r1=4806&r2=4807&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_im_data.h    (original)
+++ trunk/getfem/src/getfem/getfem_im_data.h    Mon Nov 10 11:18:51 2014
@@ -107,7 +107,7 @@
     size_type nb_filtered_index() const;
 
     /**Number of points in element cv, optionally on face, f*/
-    size_type nb_points_of_element(size_type cv, size_type f = size_type(-1)) 
const;
+    size_type nb_points_of_element(size_type cv, short_type f = 
short_type(-1)) const;
 
     /**sum of tensor elements, M(3,3) will have 3*3=9 elements*/
     size_type nb_tensor_elem() const;

Removed: trunk/getfem/src/getfem_deformable_mesh.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_deformable_mesh.cc?rev=4806&view=auto
==============================================================================
--- trunk/getfem/src/getfem_deformable_mesh.cc  (original)
+++ trunk/getfem/src/getfem_deformable_mesh.cc  (removed)
@@ -1 +0,0 @@
-

Modified: trunk/getfem/src/getfem_im_data.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_im_data.cc?rev=4807&r1=4806&r2=4807&view=diff
==============================================================================
--- trunk/getfem/src/getfem_im_data.cc  (original)
+++ trunk/getfem/src/getfem_im_data.cc  Mon Nov 10 11:18:51 2014
@@ -146,10 +146,10 @@
     return nb_filtered_index_;
   }
 
-  size_type im_data::nb_points_of_element(size_type cv, size_type f) const{
+  size_type im_data::nb_points_of_element(size_type cv, short_type f) const{
     context_check();
     if (!im_.convex_index().is_in(cv)) return 0;
-    if (f == size_type(-1)){
+    if (f == short_type(-1)){
       size_type nb_points = im_.int_method_of_element(cv)
                               ->approx_method()->nb_points_on_convex();
       if (!is_on_face_) return nb_points;

Modified: trunk/getfem/src/getfem_mesh.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_mesh.cc?rev=4807&r1=4806&r2=4807&view=diff
==============================================================================
--- trunk/getfem/src/getfem_mesh.cc     (original)
+++ trunk/getfem/src/getfem_mesh.cc     Mon Nov 10 11:18:51 2014
@@ -23,7 +23,6 @@
 #include "gmm/gmm_condition_number.h"
 #include "getfem/getfem_mesh.h"
 #include "getfem/getfem_integration.h"
-#include "getfem/getfem_mesh_fem.h"
 
 #if GETFEM_HAVE_METIS_OLD_API
 extern "C" void METIS_PartGraphKway(int *, int *, int *, int *, int *, int *,