[Getfem-commits] r4724 - in /trunk/getfem/src: getfem_contact_and_friction_large_sliding.cc getfem_generic_assembly.cc

[Yves . Renard]

Author: renard
Date: Fri Jul 18 11:39:30 2014
New Revision: 4724

URL: http://svn.gna.org/viewcvs/getfem?rev=4724&view=rev
Log:
additional correction

Modified:
    trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc
    trunk/getfem/src/getfem_generic_assembly.cc

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=4724&r1=4723&r2=4724&view=diff
==============================================================================
--- trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc       
(original)
+++ trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc       Fri Jul 
18 11:39:30 2014
@@ -2371,7 +2371,7 @@
         //      Transformed_unit_vector(Grad_u, Normal), f, r)
         std::string coupled_projection_def =
           "Coulomb_friction_coupled_projection("
-          + lambda+", Transformed_unit_vector(Grad_"+u+", Normal),X+"
+          + lambda+", Transformed_unit_vector(Grad_"+u+", Normal),"
           + "("+u+"-Interpolate("+u_group+","+transformation_name+")"
           + (w.size() 
              ? ("-"+w+"+Interpolate("+w_group+","+transformation_name+")")

Modified: trunk/getfem/src/getfem_generic_assembly.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_generic_assembly.cc?rev=4724&r1=4723&r2=4724&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Fri Jul 18 11:39:30 2014
@@ -2542,6 +2542,7 @@
       ctx.set_pf(mf.fem_of_element(ctx.convex_num()));
       GMM_ASSERT1(ctx.pf(), "Undefined finite element method");
       ctx.pf()->interpolation(ctx, coeff, t.as_vector(), dim_type(qdim));
+      // cout << "interpolate " << &U << " result : " << t.as_vector() << endl;
       return 0;
     }
     ga_instruction_interpolate_val