[Getfem-commits] r4716 - in /trunk/getfem: interface/src/ interface/tests/matlab/ src/

[Yves . Renard]

Author: renard
Date: Wed Jul 16 11:26:23 2014
New Revision: 4716

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

Modified:
    trunk/getfem/interface/src/gf_model_set.cc
    trunk/getfem/interface/tests/matlab/demo_large_sliding_contact.m
    trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc

Modified: trunk/getfem/interface/src/gf_model_set.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/gf_model_set.cc?rev=4716&r1=4715&r2=4716&view=diff
==============================================================================
--- trunk/getfem/interface/src/gf_model_set.cc  (original)
+++ trunk/getfem/interface/src/gf_model_set.cc  Wed Jul 16 11:26:23 2014
@@ -2947,8 +2947,9 @@
       (generally a few times a mean element size, and less than the
       thickness of the body). Initially, the brick is added with no contact
       boundaries. The contact boundaries and rigid bodies are added with
-      special functions. `version` is 0 for the non-symmetric version
-      and 1 for the symmetric one (0 by default). @*/
+      special functions. `version` is 0 (the default value) for the
+      non-symmetric version and 1 for the more symmetric one
+      (symmetric only without friction). @*/
 
      sub_command
        ("add integral large sliding contact brick raytracing", 2, 5, 0, 1,

Modified: trunk/getfem/interface/tests/matlab/demo_large_sliding_contact.m
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/demo_large_sliding_contact.m?rev=4716&r1=4715&r2=4716&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/demo_large_sliding_contact.m    
(original)
+++ trunk/getfem/interface/tests/matlab/demo_large_sliding_contact.m    Wed Jul 
16 11:26:23 2014
@@ -27,7 +27,7 @@
 
 clambda1 = 1.; cmu1 = 1.;   % Elasticity parameters
 clambda2 = 1.; cmu2 = 1.;   % Elasticity parameters
-r = 0.1;                    % Augmentation parameter
+r = 1;                    % Augmentation parameter
 alpha = 1.0;                % Alpha coefficient for "sliding velocity"
 f_coeff = 0.5;              % Friction coefficient
 
@@ -286,7 +286,7 @@
     gf_model_set(md, 'add initialized data', 'r', r);
     gf_model_set(md, 'add initialized data', 'f', f_coeff);
     
-    ind = gf_model_set(md, 'add integral large sliding contact brick 
raytracing', 'r', release_dist, 'f');
+    ind = gf_model_set(md, 'add integral large sliding contact brick 
raytracing', 'r', release_dist, 'f', '1', 0);
     
     if (self_contact)
       gf_model_set(md, 'add master slave contact boundary to large sliding 
contact brick', ind,  mim1_contact, CONTACT_BOUNDARY1, 'u1', 'lambda1');

Modified: trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc?rev=4716&r1=4715&r2=4716&view=diff
==============================================================================
--- trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc       
(original)
+++ trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc       Wed Jul 
16 11:26:23 2014
@@ -2409,8 +2409,7 @@
           //       coupled_projection_def.Interpolate(Test_ug, contact_trans), 
1)
           + "+ Interpolate_filter("+transformation_name+","
           + (sym_version ? coupled_projection_def : lambda)
-          + ".Interpolate(Test_"+u_group+","
-          + transformation_name+"), 1)"
+          + ".Interpolate(Test_"+u_group+"," + transformation_name+"), 1)"
           // -(1/r)*lambda.Test_lambda
           + "-(1/"+augmentation_param+")*"+lambda+".Test_"+lambda
           // Interpolate_filter(trans, 
(1/r)*coupled_projection_rig.Test_lambda, 2)