[Getfem-commits] r4927 - in /trunk/getfem/contrib/static_contact_gears: static_contact_gears.cc static_contact_gears_u1_u2.cc

[Yves . Renard]

Author: renard
Date: Mon Mar 30 20:58:03 2015
New Revision: 4927

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

Modified:
    trunk/getfem/contrib/static_contact_gears/static_contact_gears.cc
    trunk/getfem/contrib/static_contact_gears/static_contact_gears_u1_u2.cc

Modified: trunk/getfem/contrib/static_contact_gears/static_contact_gears.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/contrib/static_contact_gears/static_contact_gears.cc?rev=4927&r1=4926&r2=4927&view=diff
==============================================================================
--- trunk/getfem/contrib/static_contact_gears/static_contact_gears.cc   
(original)
+++ trunk/getfem/contrib/static_contact_gears/static_contact_gears.cc   Mon Mar 
30 20:58:03 2015
@@ -66,7 +66,7 @@
   size_type N;                 /* dimension of the problem                     
*/
 
   bool frictionless;           /* flag for frictionless model                  
*/
-  size_type contact_algo;      /* contact algorithm (0:nodal, 1-4: integral
+  int contact_algo;      /* contact algorithm (0:nodal, 1-4: integral
                                   >=5:integral large sliding)                  
*/
 
   // Vectors holding the ids of mesh region pairs expected to come in contact
@@ -203,7 +203,7 @@
 
   datafilename = PARAM.string_value("ROOTFILENAME","Base name of data files.");
 
-  contact_algo = PARAM.int_value("CONTACT_ALGO","Algorithm for imposing the 
contact condition.");
+  contact_algo = int(PARAM.int_value("CONTACT_ALGO","Algorithm for imposing 
the contact condition."));
 
   if (contact_algo != 0) { // integral contact
     std::string MULT_FEM_TYPE  = PARAM.string_value("MULT_FEM_TYPE","FEM name 
for the multipliers");
@@ -278,9 +278,10 @@
       }
     }
     else { // large sliding is for the moment always frictionless
-      md.add_initialized_scalar_data("f_coeff", frict_coeff);
-      size_type indb = 
getfem::add_integral_large_sliding_contact_brick_field_extension
-        (md, mim, "u", "mult", "r", "f_coeff", CONTACT_BOUNDARY);
+      GMM_ASSERT1(false, "not supported yet");
+      // md.add_initialized_scalar_data("f_coeff", frict_coeff);
+      // size_type indb = 
getfem::add_integral_large_sliding_contact_brick_field_extension
+      //  (md, mim, "u", "mult", "r", "f_coeff", CONTACT_BOUNDARY);
     }
   }
 

Modified: 
trunk/getfem/contrib/static_contact_gears/static_contact_gears_u1_u2.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/contrib/static_contact_gears/static_contact_gears_u1_u2.cc?rev=4927&r1=4926&r2=4927&view=diff
==============================================================================
--- trunk/getfem/contrib/static_contact_gears/static_contact_gears_u1_u2.cc     
(original)
+++ trunk/getfem/contrib/static_contact_gears/static_contact_gears_u1_u2.cc     
Mon Mar 30 20:58:03 2015
@@ -68,7 +68,7 @@
   size_type N;                 /* dimension of the problem                     
*/
 
   bool frictionless;           /* flag for frictionless model                  
*/
-  size_type contact_algo;      /* contact algorithm (0:nodal, 1-4: integral
+  int contact_algo;      /* contact algorithm (0:nodal, 1-4: integral
                                   >=5:integral large sliding)                  
*/
 
   // Vectors holding the ids of mesh region pairs expected to come in contact
@@ -209,7 +209,7 @@
 
   datafilename = PARAM.string_value("ROOTFILENAME","Base name of data files.");
 
-  contact_algo = PARAM.int_value("CONTACT_ALGO","Algorithm for imposing the 
contact condition.");
+  contact_algo = int(PARAM.int_value("CONTACT_ALGO","Algorithm for imposing 
the contact condition."));
 
   if (contact_algo != 0) { // integral contact
     std::string MULT_FEM_TYPE  = PARAM.string_value("MULT_FEM_TYPE","FEM name 
for the multipliers");
@@ -292,12 +292,13 @@
       }
     }
     else { // large sliding is for the moment always frictionless
-      md.add_fem_variable("mult2", mf_mult2);
-      md.add_initialized_scalar_data("f_coeff", frict_coeff);
-      size_type indb = 
getfem::add_integral_large_sliding_contact_brick_field_extension
-        (md, mim1, "u1", "mult1", "r", "f_coeff", CONTACT_BOUNDARY_1);
-      getfem::add_boundary_to_large_sliding_contact_brick
-        (md, indb, mim2, "u2", "mult2", CONTACT_BOUNDARY_2);
+      GMM_ASSERT1(false, "not supported yet");
+      // md.add_fem_variable("mult2", mf_mult2);
+      // md.add_initialized_scalar_data("f_coeff", frict_coeff);
+      // size_type indb = 
getfem::add_integral_large_sliding_contact_brick_field_extension
+      //  (md, mim1, "u1", "mult1", "r", "f_coeff", CONTACT_BOUNDARY_1);
+      // getfem::add_boundary_to_large_sliding_contact_brick
+      //  (md, indb, mim2, "u2", "mult2", CONTACT_BOUNDARY_2);
     }
   }