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

[Yves . Renard]

Author: renard
Date: Thu Jul  3 21:10:43 2014
New Revision: 4699

URL: http://svn.gna.org/viewcvs/getfem?rev=4699&view=rev
Log:
work in progress

Modified:
    trunk/getfem/interface/tests/matlab/demo_large_sliding_contact.m
    trunk/getfem/src/getfem_contact_and_friction_common.cc
    trunk/getfem/src/getfem_generic_assembly.cc

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=4699&r1=4698&r2=4699&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/demo_large_sliding_contact.m    
(original)
+++ trunk/getfem/interface/tests/matlab/demo_large_sliding_contact.m    Thu Jul 
 3 21:10:43 2014
@@ -19,7 +19,7 @@
 clear all;
 gf_workspace('clear all');
 
-test_case = 0; % 0 = 2D punch on a rigid obstacle
+test_case = 3; % 0 = 2D punch on a rigid obstacle
                % 1 = 2D punch on a deformable obstacle (one slave, one master)
                % 2 = 2D with two different meshes
                % 3 = 2D with multi-body and only one mesh
@@ -28,14 +28,14 @@
 clambda1 = 1.; cmu1 = 1.;   % Elasticity parameters
 clambda2 = 1.; cmu2 = 1.;   % Elasticity parameters
 r = 0.1;                    % Augmentation parameter
-alpha = 1.0;                  % Alpha coefficient for "sliding velocity"
+alpha = 1.0;                % Alpha coefficient for "sliding velocity"
 f_coeff = 0.3;              % Friction coefficient
 
 test_tangent_matrix = false;
 nonlinear_elasticity = false;
 max_iter = 50;
 draw_mesh = false;
-generic_assembly_contact_brick = true;
+generic_assembly_contact_brick = false;
 
 switch(test_case)
   case {0,1}
@@ -254,7 +254,7 @@
   gf_model_set(md, 'add nonlinear generic assembly brick', mim1_contact, 
'-(1/r)*lambda1.Test_lambda1', CONTACT_BOUNDARY1);
   gf_model_set(md, 'add nonlinear generic assembly brick', mim1_contact, 
'Interpolate_filter(contact_trans, 
(1/r)*Coulomb_friction_coupled_projection(lambda1, 
Transformed_unit_vector(Grad_u1, Normal), u1, 
(Interpolate(x,contact_trans)-x-u1).Transformed_unit_vector(Grad_u1, Normal), 
f, r).Test_lambda1, 2)', CONTACT_BOUNDARY1);
   % gf_model_set(md, 'add nonlinear generic assembly brick', mim1_contact, 
'Interpolate_filter(contact_trans, (Interpolate(x,contact_trans)).Test_lambda1, 
2)', CONTACT_BOUNDARY1);
-  % gf_model_set(md, 'add nonlinear generic assembly brick', mim1_contact, 
'Interpolate_filter(contact_trans, 
(1/r)*Coulomb_friction_coupled_projection(lambda1, 
Transformed_unit_vector(Grad_u1, Normal), u1-Interpolate(u1,contact_trans), 
(x+u1-Interpolate(x,contact_trans)-Interpolate(u1,contact_trans)).Transformed_unit_vector(Grad_u1,
 Normal), f, r).Test_lambda1, 1)', CONTACT_BOUNDARY1);
+  gf_model_set(md, 'add nonlinear generic assembly brick', mim1_contact, 
'Interpolate_filter(contact_trans, 
(1/r)*Coulomb_friction_coupled_projection(lambda1, 
Transformed_unit_vector(Grad_u1, Normal), u1-Interpolate(u1,contact_trans), 
(x+u1-Interpolate(x,contact_trans)-Interpolate(u1,contact_trans)).Transformed_unit_vector(Grad_u1,
 Normal), f, r).Test_lambda1, 1)', CONTACT_BOUNDARY1);
     
 else
   mcff=gf_multi_contact_frame(md, N, release_dist, false, self_contact, 0.2, 
true, 0, false);

Modified: trunk/getfem/src/getfem_contact_and_friction_common.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_contact_and_friction_common.cc?rev=4699&r1=4698&r2=4699&view=diff
==============================================================================
--- trunk/getfem/src/getfem_contact_and_friction_common.cc      (original)
+++ trunk/getfem/src/getfem_contact_and_friction_common.cc      Thu Jul  3 
21:10:43 2014
@@ -663,7 +663,7 @@
 
           // is nb_pt_on_face really necessary, is this possible to occur?
           GMM_ASSERT1(nb_pt_on_face,
-                      "This element has not vertex on considered face !");
+                      "This element has no vertex on considered face !");
 
           // Computation of influence box :
           // offset of the bounding box relatively to the release distance
@@ -1361,7 +1361,7 @@
             
             bgeot::pconvex_structure cvs = pgt->structure();
             size_type nb_pt_on_face = cvs->nb_points_of_face(v.f());
-            GMM_ASSERT1(nb_pt_on_face < 2, "This element less than two "
+            GMM_ASSERT1(nb_pt_on_face >= 2, "This element has less than two "
                         "vertices on considered face !");
             gmm::clear(n_mean);
             

Modified: trunk/getfem/src/getfem_generic_assembly.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_generic_assembly.cc?rev=4699&r1=4698&r2=4699&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Thu Jul  3 21:10:43 2014
@@ -7181,7 +7181,7 @@
         if (pnode->node_type == GA_NODE_INTERPOLATE_VAL) {
           pgai = new ga_instruction_interpolate_val
             (pnode->t, m2, mfn, mfg, Un, Ug,*pctx,workspace.qdim(pnode->name));
-        } else if (pnode->node_type == GA_NODE_GRAD) {
+        } else if (pnode->node_type == GA_NODE_INTERPOLATE_GRAD) {
           pgai = new ga_instruction_interpolate_grad
             (pnode->t, m2, mfn, mfg, Un, Ug,*pctx,workspace.qdim(pnode->name));
         } else { 
@@ -7281,7 +7281,7 @@
         if (pnode->node_type == GA_NODE_INTERPOLATE_TEST) {
           pgai = new ga_instruction_interpolate_base
             (pnode->t, m2, mfn, mfg, *pctx,workspace.qdim(pnode->name));
-        } else if (pnode->node_type == GA_NODE_GRAD_TEST) {
+        } else if (pnode->node_type == GA_NODE_INTERPOLATE_GRAD_TEST) {
           pgai = new ga_instruction_interpolate_grad_base
             (pnode->t, m2, mfn, mfg, *pctx,workspace.qdim(pnode->name));
         } else {