[Getfem-commits] r4719 - in /trunk/getfem: doc/sphinx/source/userdoc/ src/getfem/

[Yves . Renard]

Author: renard
Date: Wed Jul 16 20:23:18 2014
New Revision: 4719

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

Modified:
    
trunk/getfem/doc/sphinx/source/userdoc/model_contact_friction_large_sliding.rst
    trunk/getfem/src/getfem/getfem_contact_and_friction_common.h

Modified: 
trunk/getfem/doc/sphinx/source/userdoc/model_contact_friction_large_sliding.rst
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/doc/sphinx/source/userdoc/model_contact_friction_large_sliding.rst?rev=4719&r1=4718&r2=4719&view=diff
==============================================================================
--- 
trunk/getfem/doc/sphinx/source/userdoc/model_contact_friction_large_sliding.rst 
    (original)
+++ 
trunk/getfem/doc/sphinx/source/userdoc/model_contact_friction_large_sliding.rst 
    Wed Jul 16 20:23:18 2014
@@ -370,7 +370,7 @@
              const std::string &transname,
              const std::string &expr, size_type N)
 
-where ``expr`` is the expression of a signed distance to the obstacle using 
the syntax of the high-level generic assembly language (``x`` being the current 
position, ``x(0)``, ``x(1)`` ... the corresponding components). For instance an 
expression ``x(0) + 5`` will correspond to a flat obstacle lying on the right 
of the position ``-5`` of the first coordinate. Be aware that the expression 
have to be close to a signed distance, which in particular means that the 
gradient norm have to be close to 1. 
+where ``expr`` is the expression of a signed distance to the obstacle using 
the syntax of the high-level generic assembly language (``X`` being the current 
position, ``X(0)``, ``X(1)`` ... the corresponding components). For instance an 
expression ``X(0) + 5`` will correspond to a flat obstacle lying on the right 
of the position ``-5`` of the first coordinate. Be aware that the expression 
have to be close to a signed distance, which in particular means that the 
gradient norm have to be close to 1. 
 
 In order to distinguish between non-contact situations and the occurence of a 
contact with another deformable body or with a rigid obstacle, the 
transformation returns an integer identifiant which can be used by the 
`Interpolate_filter` command of the high-level generic assembly language (see 
:ref:`ud-gasm-high_interpolate_trans`). The different values:
 
@@ -423,5 +423,5 @@
       size_type indbrick, std::string expr, size_type N)
 
 where `expr` is an expression using the high-level
-generic assembly language (whith `x` is the current position) which should
+generic assembly language (whith `X` is the current position) which should
 be a signed distance to the obstacle. `N` is the mesh dimension.

Modified: trunk/getfem/src/getfem/getfem_contact_and_friction_common.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_contact_and_friction_common.h?rev=4719&r1=4718&r2=4719&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_contact_and_friction_common.h        
(original)
+++ trunk/getfem/src/getfem/getfem_contact_and_friction_common.h        Wed Jul 
16 20:23:18 2014
@@ -797,7 +797,7 @@
 
   /** Add a rigid obstacle whose geometry corresponds to the zero level-set
       of the high-level generic assembly expression 'expr'
-      to an existing raytracin interpolate transformation called 'transname'.
+      to an existing raytracing interpolate transformation called 'transname'.
   */
   void add_rigid_obstacle_to_raytracing_transformation
   (model &md, const std::string &transname,
@@ -805,7 +805,7 @@
 
   /** Add a rigid obstacle whose geometry corresponds to the zero level-set
       of the high-level generic assembly expression 'expr'
-      to an existing raytracin interpolate transformation called 'transname'.
+      to an existing raytracing interpolate transformation called 'transname'.
   */
   void add_rigid_obstacle_to_raytracing_transformation
   (ga_workspace &workspace, const std::string &transname,