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

[logari81]

Author: logari81
Date: Mon Aug 25 10:00:56 2014
New Revision: 4752

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

Modified:
    trunk/getfem/doc/sphinx/source/userdoc/model_generic_assembly.rst
    trunk/getfem/interface/src/gf_mesh_im_data.cc
    trunk/getfem/interface/src/gf_mesh_im_data_get.cc
    trunk/getfem/src/getfem/getfem_models.h
    trunk/getfem/src/getfem_contact_and_friction_common.cc
    trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc
    trunk/getfem/src/getfem_generic_assembly.cc
    trunk/getfem/src/getfem_models.cc

Modified: trunk/getfem/doc/sphinx/source/userdoc/model_generic_assembly.rst
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/doc/sphinx/source/userdoc/model_generic_assembly.rst?rev=4752&r1=4751&r2=4752&view=diff
==============================================================================
--- trunk/getfem/doc/sphinx/source/userdoc/model_generic_assembly.rst   
(original)
+++ trunk/getfem/doc/sphinx/source/userdoc/model_generic_assembly.rst   Mon Aug 
25 10:00:56 2014
@@ -27,7 +27,7 @@
 
 with the same arguments. Conversely, this brick alway assume that the term 
corresponding to ``expr`` is linear and the assembly will be performed only 
once if the data used do not change. Thus, you have to care that your 
expression is indeed linear (affine in fact) with respect to each variable. 
Otherwise, the result is of course not guaranted. Source terms in the 
expression are taken into account. Still for linear problem, it is possible to 
perform the assembly of a sole source term thanks to::
 
-  size_type getfem::add_dource_term_generic_assembly_brick(md, mim, expr,
+  size_type getfem::add_source_term_generic_assembly_brick(md, mim, expr,
                          region = -1);
 
 with again the same arguments except the symmetry and coercivness. This brick 
performs the assembly of the corresponding order 1 term (residual vector) and 
add it as a right hand side to the problem. The assembly will be performed only 
once, so the term should not depend on the variables of the model (but could 
depend of course on the constants).

Modified: trunk/getfem/interface/src/gf_mesh_im_data.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/gf_mesh_im_data.cc?rev=4752&r1=4751&r2=4752&view=diff
==============================================================================
--- trunk/getfem/interface/src/gf_mesh_im_data.cc       (original)
+++ trunk/getfem/interface/src/gf_mesh_im_data.cc       Mon Aug 25 10:00:56 2014
@@ -36,8 +36,12 @@
   getfemint_mesh_im *mim = NULL;
   getfemint_mesh_im_data *mimd = NULL;
 
-  /address@hidden MIMD = ('.mesh_im', @tmim mim)
-    Build a new @tmimd object linked to a @tmim object.
+  /address@hidden MIMD = ('.mesh_im', @tmim mim, @int region, @ivec size)
+    Build a new @tmimd object linked to a @tmim object. If `region` is
+    provided, considered integration points are filtered in this region.
+    `size` is a vector of integers that specifies the dimensions of the
+    stored data per integration point. If not given, the scalar stored
+    data are considered.
   @*/
   mim = m_in.pop().to_getfemint_mesh_im();
   size_type rnum = size_type(-1);

Modified: trunk/getfem/interface/src/gf_mesh_im_data_get.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/gf_mesh_im_data_get.cc?rev=4752&r1=4751&r2=4752&view=diff
==============================================================================
--- trunk/getfem/interface/src/gf_mesh_im_data_get.cc   (original)
+++ trunk/getfem/interface/src/gf_mesh_im_data_get.cc   Mon Aug 25 10:00:56 2014
@@ -101,7 +101,7 @@
        );
 
     /address@hidden ('tensor size')
-      Output the size of the stored data (per integration point).
+      Output the dimensions of the stored data (per integration point).
     @*/
     sub_command
       ("tensor size", 0, 0, 0, 1,

Modified: trunk/getfem/src/getfem/getfem_models.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_models.h?rev=4752&r1=4751&r2=4752&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_models.h     (original)
+++ trunk/getfem/src/getfem/getfem_models.h     Mon Aug 25 10:00:56 2014
@@ -161,7 +161,7 @@
       bool is_variable;  // This is a variable or a parameter.
       bool is_disabled;  // For a variable, to be solved or not
       bool is_complex;   // The variable is complex numbers
-      bool is_affine_dependent;   // The variable depend in an affine way to 
another
+      bool is_affine_dependent;   // The variable depends in an affine way to 
another
                                   // variable. 
       bool is_fem_dofs;  // The variable is the dofs of a fem
       var_description_filter filter; // A filter on the dofs is applied or not.
@@ -850,7 +850,7 @@
 
 
     /** Adds a "virtual" variable be an affine depedent variable with respect
-        to another variable. Mainly used for tie integration scheme for
+        to another variable. Mainly used for time integration scheme for
         instance to represent time derivative of variables.
         `alpha` is the multiplicative scalar of the dependency. */
     void add_affine_dependent_variable(const std::string &name,
@@ -1163,7 +1163,7 @@
   //
   //=========================================================================
 
-  /** The time integration scheme object furnisheses the necessary methods
+  /** The time integration scheme object provides the necessary methods
       for the model object to apply a time integration scheme to an
       evolutionnary problem.
   **/

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=4752&r1=4751&r2=4752&view=diff
==============================================================================
--- trunk/getfem/src/getfem_contact_and_friction_common.cc      (original)
+++ trunk/getfem/src/getfem_contact_and_friction_common.cc      Mon Aug 25 
10:00:56 2014
@@ -613,8 +613,7 @@
             slice_vector_on_basic_dof_of_element(mfu, U, cv, coeff);
           bgeot::vectors_to_base_matrix
             (G, mfu.linked_mesh().points_of_convex(cv));
-          fem_interpolation_context ctx(pgt,pfp,size_type(-1), G, cv,
-                                        short_type(-1));
+          fem_interpolation_context ctx(pgt,pfp,size_type(-1), G, cv);
 
           size_type nb_pt_on_face = 0;
           dal::bit_vector points_on_face;
@@ -1356,8 +1355,7 @@
             slice_vector_on_basic_dof_of_element(mfu, U, cv, coeff);
             bgeot::vectors_to_base_matrix
               (G, mfu.linked_mesh().points_of_convex(cv));
-            fem_interpolation_context ctx(pgt,pfp,size_type(-1), G, cv,
-                                          short_type(-1));
+            fem_interpolation_context ctx(pgt,pfp,size_type(-1), G, cv);
             
             bgeot::pconvex_structure cvs = pgt->structure();
             size_type nb_pt_on_face = cvs->nb_points_of_face(v.f());
@@ -2042,7 +2040,7 @@
 
   //=========================================================================
   //
-  //  Specific nonlinear operator of the high-level generic assembly langage
+  //  Specific nonlinear operator of the high-level generic assembly language
   //  dedicated to contact/friction
   //
   //=========================================================================

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=4752&r1=4751&r2=4752&view=diff
==============================================================================
--- trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc       
(original)
+++ trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc       Mon Aug 
25 10:00:56 2014
@@ -1600,8 +1600,7 @@
       // if (pf_s_y0->need_G())
       bgeot::vectors_to_base_matrix(G, m_y0.points_of_convex(cv_y0));
 
-      fem_interpolation_context ctx_y0(pgt_y0, pf_s_y0, y0_ref, G, cv_y0,
-                                       short_type(-1));
+      fem_interpolation_context ctx_y0(pgt_y0, pf_s_y0, y0_ref, G, cv_y0);
 
       size_type newton_iter = 0;
       for(;;) { // Newton algorithm to invert geometric transformation
@@ -2399,7 +2398,7 @@
 
         cb.expr =
           // -lambda.Test_u for non-symmetric version
-          (sym_version ? "" : ("-"+lambda+"." + test_u))
+          (sym_version ? "" : ("-"+lambda+"."+test_u))
           // -coupled_projection_def.Test_u and -coupled_projection_rig.Test_u
           // for symmetric version
           + (sym_version ? ("+ Interpolate_filter("+transformation_name+",-"
@@ -2582,7 +2581,8 @@
        md.change_mims_of_brick(indbrick, p->ml);
      }
 
-     p->add_contact_boundary(md, mim, region, is_master, is_slave, u,lambda,w);
+     p->add_contact_boundary(md, mim, region, is_master, is_slave,
+                             u, lambda, w);
   } 
 
   size_type add_integral_large_sliding_contact_brick_raytracing

Modified: trunk/getfem/src/getfem_generic_assembly.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_generic_assembly.cc?rev=4752&r1=4751&r2=4752&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Mon Aug 25 10:00:56 2014
@@ -1708,7 +1708,7 @@
       const base_tensor &t = *args[0];
       size_type N = t.size();
       scalar_type no = gmm::vect_norm2(t.as_vector());
-      scalar_type no2 = no*no, no3 = no*no2;
+      scalar_type no3 = no*no*no;
 
       if (no < 1E-25) no = 1E-25; // In order to avoid infinite values
       
@@ -7872,7 +7872,7 @@
         }
         rmi.instructions.push_back(pgai);
 
-      } else { // Acces to a component of the tensor
+      } else { // Access to a component of the tensor
         bgeot::multi_index mi1(size0.size()), indices;
         if (pnode->t.size() == 1) {
           for (size_type i = 0; i < child0->tensor_order(); ++i)

Modified: trunk/getfem/src/getfem_models.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_models.cc?rev=4752&r1=4751&r2=4752&view=diff
==============================================================================
--- trunk/getfem/src/getfem_models.cc   (original)
+++ trunk/getfem/src/getfem_models.cc   Mon Aug 25 10:00:56 2014
@@ -394,7 +394,7 @@
       gmm::resize(rTM, tot_size, tot_size);
       gmm::resize(rrhs, tot_size);
     }
-    
+
     actualized = true;
 //     #if GETFEM_PARA_LEVEL > 1
 //     cout << "Actualize sizes time from thread " << rk << " : " << 
MPI_Wtime()-t_ref << endl;
@@ -424,12 +424,12 @@
         ost << std::setw(8) << std::right << si;
         if (is_complex()) ost << " complex";
         ost << " double" << ((si > 1) ? "s." : ".");
-       if (it->second.is_variable && 
+        if (it->second.is_variable && 
             variable_is_disabled(it->first)) ost << "\t (disabled)";
         else                                 ost << "\t           ";
         if (it->second.pim_data != 0) ost << "\t (is im_data)";
-       if (it->second.is_affine_dependent) ost << "\t (is affine dependent)";
-       ost << endl;
+        if (it->second.is_affine_dependent) ost << "\t (is affine dependent)";
+        ost << endl;
       }
     }
   }
@@ -2132,8 +2132,7 @@
                   gmm::add(gmm::scaled(brick.cveclist_sym[k][j],
                                        brick.coeffs[k]),
                            gmm::sub_vector(crhs, I2));
-              }
-              else {
+              } else {
                 gmm::add(gmm::scaled(brick.cveclist_sym[0][j],
                                      complex_type(alpha2)),
                          gmm::sub_vector(crhs, I2));
@@ -2867,7 +2866,7 @@
     bool is_lin = workspace.used_variables(vl, dl, 2);
     GMM_ASSERT1(is_lin, "Nonlinear term");
     if (order == 0) { is_coercive = is_sym = true; }
-    GMM_ASSERT1(order <= 1, "This brick do not support an order two term");
+    GMM_ASSERT1(order <= 1, "This brick does not support a second order term");
     pbrick pbr = new gen_linear_assembly_brick(expr, is_sym, is_coercive,
                                                (order == 0), brickname);
     model::termlist tl; // A unique global term
@@ -2875,7 +2874,7 @@
 
 
     // Test when an affine dependent variable is used if its original variable
-    // is also used. Bot allowed because of the treatment of the rhs in
+    // is also used. Not allowed because of the treatment of the rhs in
     // model::assembly. Can be weakened to test functions of the same kind,
     // with an adaptation of model::assembly.
     model::varnamelist orgs;