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

[logari81]

Author: logari81
Date: Sun Apr  5 23:17:34 2015
New Revision: 4934

URL: http://svn.gna.org/viewcvs/getfem?rev=4934&view=rev
Log:
documentation fix and some minor improvements

Modified:
    trunk/getfem/doc/sphinx/source/python/install.rst
    trunk/getfem/doc/sphinx/source/userdoc/bfem.rst
    trunk/getfem/doc/sphinx/source/userdoc/gasm_high.rst
    trunk/getfem/src/getfem/getfem_generic_assembly.h
    trunk/getfem/src/getfem/getfem_level_set_contact.h
    trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc
    trunk/getfem/src/getfem_level_set_contact.cc
    trunk/getfem/src/getfem_models.cc

Modified: trunk/getfem/doc/sphinx/source/python/install.rst
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/doc/sphinx/source/python/install.rst?rev=4934&r1=4933&r2=4934&view=diff
==============================================================================
--- trunk/getfem/doc/sphinx/source/python/install.rst   (original)
+++ trunk/getfem/doc/sphinx/source/python/install.rst   Sun Apr  5 23:17:34 2015
@@ -5,21 +5,23 @@
 
 For the parallel version of the interface, see also :ref:`ud-parallel`.
 
-In a debian/ubuntu system
+In a Debian/Ubuntu system
 -------------------------
 
-If you have a problem installing the packages, please report it as a bug.
+GetFEM++ packages are available in the official repositories of Debian
+and Ubuntu distributions.
 
-Edit ``/etc/apt/sources.list`` and add the following lines::
+Information about the GetFEM++ versions available in different Debian
+releases can be found e.g. at
 
-  deb http://apt.dim.uchile.cl distro main
-  deb-src http://apt.dim.uchile.cl distro main
+https://packages.debian.org/source/sid/getfem++
 
-where
+and with respect to different Ubuntu releases at
 
-distro = `debian` xor `ubuntu`,
+https://launchpad.net/ubuntu/+source/getfem++
 
-then, do a ``aptitude update`` and ``aptitude install python-getfem``.
+GetFEM++ including its python interface cane be installed from a terminal
+by execcuting ``aptitude update`` and ``aptitude install python-getfem++``.
 
 In a general unix/linux based systems
 -------------------------------------
@@ -48,15 +50,15 @@
 There are two ways to get |gf|, either as a compressed package (stable
 release) or via anonymous svn access (unstable releases).
 
-The latest stable release of |gf| is getfem++-|version|\tar.gz
+The latest stable release of |gf| is getfem++-|version|\.tar.gz
 
 * download package:
 
-   wget http://download.gna.org/getfem/stable/getfem++-|version|\tar.gz
+   wget http://download.gna.org/getfem/stable/getfem++-|version|\.tar.gz
 
 * unpack:
 
-   tar xzf getfem++-|version|\tar.gz
+   tar xzf getfem++-|version|\.tar.gz
 
 * and go to the root directory of getfem:
      

Modified: trunk/getfem/doc/sphinx/source/userdoc/bfem.rst
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/doc/sphinx/source/userdoc/bfem.rst?rev=4934&r1=4933&r2=4934&view=diff
==============================================================================
--- trunk/getfem/doc/sphinx/source/userdoc/bfem.rst     (original)
+++ trunk/getfem/doc/sphinx/source/userdoc/bfem.rst     Sun Apr  5 23:17:34 2015
@@ -196,7 +196,7 @@
 
     mf.nb_dof_of_element(i) == mf.get_qdim()*mf.fem_of_element(i).nb_dof()
 
-Additionally, if the field to be represented is a tensor field instead of a 
vector field (for instance the stress or strian tensor field in elasticity), it 
is possible to specify the tensor dimensions with the methods::
+Additionally, if the field to be represented is a tensor field instead of a 
vector field (for instance the stress or strain tensor field in elasticity), it 
is possible to specify the tensor dimensions with the methods::
 
   mf.set_qdim(dim_type M, dim_type N)
   mf.set_qdim(dim_type M, dim_type N, dim_type O, dim_type P)  

Modified: trunk/getfem/doc/sphinx/source/userdoc/gasm_high.rst
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/doc/sphinx/source/userdoc/gasm_high.rst?rev=4934&r1=4933&r2=4934&view=diff
==============================================================================
--- trunk/getfem/doc/sphinx/source/userdoc/gasm_high.rst        (original)
+++ trunk/getfem/doc/sphinx/source/userdoc/gasm_high.rst        Sun Apr  5 
23:17:34 2015
@@ -630,7 +630,7 @@
 
 where ``u`` is a vector variable of the workspace/model.
 
-Once a transformation is define in the workspace/model, one can interpolate a 
variable or test functions, the position or the unit normal vector to a 
boundary thanks to one of these expressions::
+Once a transformation is defined in the workspace/model, one can interpolate a 
variable or test functions, the position or the unit normal vector to a 
boundary thanks to one of these expressions::
 
   Interpolate(Normal, transname)
   Interpolate(X, transname)

Modified: trunk/getfem/src/getfem/getfem_generic_assembly.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_generic_assembly.h?rev=4934&r1=4933&r2=4934&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_generic_assembly.h   (original)
+++ trunk/getfem/src/getfem/getfem_generic_assembly.h   Sun Apr  5 23:17:34 2015
@@ -521,7 +521,7 @@
       if (mf) {
         size_type ndof = mf->nb_dof();
         GMM_ASSERT1(ndof, "Variable " << name << " with no dof. You probably "
-                    "make a wrong initialization of a mesh_fem object");
+                    "made a wrong initialization of a mesh_fem object");
         return mf->get_qdim() * (n / ndof);
       } else if (imd) {
         size_type q = n / imd->nb_filtered_index();
@@ -539,7 +539,7 @@
       if (mf) {
         size_type ndof = mf->nb_dof();
         GMM_ASSERT1(ndof, "Variable " << name << " with no dof. You probably "
-                    "make a wrong initialization of a mesh_fem object");
+                    "made a wrong initialization of a mesh_fem object");
         bgeot::multi_index mi = mf->get_qdims();
         size_type qmult = n / ndof;
         if (qmult > 1) {

Modified: trunk/getfem/src/getfem/getfem_level_set_contact.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_level_set_contact.h?rev=4934&r1=4933&r2=4934&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_level_set_contact.h  (original)
+++ trunk/getfem/src/getfem/getfem_level_set_contact.h  Sun Apr  5 23:17:34 2015
@@ -61,8 +61,8 @@
   using getfem::model;
   using getfem::size_type;
   using getfem::scalar_type;
-  using getfem::modeling_standard_plain_vector;
-  typedef getfem::modeling_standard_plain_vector  plain_vector;
+  using getfem::model_real_plain_vector;
+  typedef getfem::model_real_plain_vector  plain_vector;
   typedef getfem::model_real_sparse_matrix sparse_matrix;
   
   
@@ -79,7 +79,7 @@
     //model and vars
     getfem::model md;
     md.add_fem_variable("LS",mf);
-    getfem::modeling_standard_plain_vector RHS(mf.nb_dof());
+    getfem::model_real_plain_vector RHS(mf.nb_dof());
     
     //calculating the size of the LS RHS based on the size of the geometry
     getfem::base_node Pmin(mesh.dim()),Pmax(mesh.dim()),range(mesh.dim());

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=4934&r1=4933&r2=4934&view=diff
==============================================================================
--- trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc       
(original)
+++ trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc       Sun Apr 
 5 23:17:34 2015
@@ -497,7 +497,7 @@
     const base_matrix &grad_phix(void) {
       if (!grad_phix_init) {
         pfem pf = ctx_ux().pf();
-        slice_vector_on_basic_dof_of_element(*mf_ux_,mcf.disp_of_boundary(ibx),
+        slice_vector_on_basic_dof_of_element(*mf_ux_, 
mcf.disp_of_boundary(ibx),
                                              cvx_, coeff);
         pf->interpolation_grad(ctx_ux(), coeff, grad_phix_, dim_type(N));
         gmm::add(gmm::identity_matrix(), grad_phix_);
@@ -519,7 +519,7 @@
     const base_matrix &grad_phiy(void) {
       if (!grad_phiy_init) {
         pfem pf = ctx_uy().pf();
-        slice_vector_on_basic_dof_of_element(*mf_uy_,mcf.disp_of_boundary(iby),
+        slice_vector_on_basic_dof_of_element(*mf_uy_, 
mcf.disp_of_boundary(iby),
                                              cvy_, coeff);
         pf->interpolation_grad(ctx_uy(), coeff, grad_phiy_, dim_type(N));
         gmm::add(gmm::identity_matrix(), grad_phiy_);

Modified: trunk/getfem/src/getfem_level_set_contact.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_level_set_contact.cc?rev=4934&r1=4933&r2=4934&view=diff
==============================================================================
--- trunk/getfem/src/getfem_level_set_contact.cc        (original)
+++ trunk/getfem/src/getfem_level_set_contact.cc        Sun Apr  5 23:17:34 2015
@@ -49,7 +49,7 @@
 
 {
        ls_mesh_fem.set_qdim(size_type(1));
-       modeling_standard_plain_vector LS(ls_mesh_fem.nb_dof());
+       model_real_plain_vector LS(ls_mesh_fem.nb_dof());
        boundary_level_set_field(get_mesh(),ls_mesh_fem,
                *pmim,LS);
        md.add_initialized_fem_data(ls_name,ls_mesh_fem,LS);
@@ -311,7 +311,7 @@
        GMM_ASSERT1(!scb.is_mesh_deformed(),"Trying to deform \
                                                                                
already deformed Slave  Contact Body");
 
-       const modeling_standard_plain_vector& 
+       const model_real_plain_vector& 
                Umaster=mcb.get_model().real_variable(mcb.get_var_name());
        // size_type dof_check = Umaster.size();
        // size_type node_check = mcb.get_mesh().nb_points();
@@ -320,7 +320,7 @@
        mcb.is_deformed=true;
        if (&mcb.get_mesh()!=&scb.get_mesh()){ 
                //  not deforming the slave if the master and the slave are the 
same
-               const modeling_standard_plain_vector& 
+               const model_real_plain_vector& 
                        
Uslave=scb.get_model().real_variable(scb.get_var_name());
                def_slave.reset(new getfem::temporary_mesh_deformator<>
                        (scb.get_mesh_fem(),Uslave));
@@ -386,10 +386,10 @@
   mf_boundary.adapt(mf_scalar.dof_on_region(GIVEN_CONTACT_REGION));
   
   // interpolate level set from the slave to the master
-  modeling_standard_plain_vector LS_on_contour(mf_boundary.nb_dof());
+  model_real_plain_vector LS_on_contour(mf_boundary.nb_dof());
   getfem::interpolation(slave_cb.get_ls_mesh_fem(), mf_boundary, 
                         slave_cb.ls_values(), LS_on_contour);
-  modeling_standard_plain_vector LS(mf_scalar.nb_dof());
+  model_real_plain_vector LS(mf_scalar.nb_dof());
   mf_boundary.extend_vector(LS_on_contour,LS);
   gmm::copy(LS,master_cb.get_model().set_real_variable
             
("ls_on"+master_cb.get_var_name()+"_from_"+slave_cb.get_var_name()));
@@ -422,9 +422,9 @@
   // extend Lagrange Multiplier onto the whole boundary of the master
   const mesh_fem& mf_mult = 
     master_cb.get_model().mesh_fem_of_variable(mult_name);
-  const modeling_standard_plain_vector& lambda = 
+  const model_real_plain_vector& lambda = 
     master_cb.get_model().real_variable(mult_name);
-  modeling_standard_plain_vector lambda_full(mf_mult.nb_basic_dof());
+  model_real_plain_vector lambda_full(mf_mult.nb_basic_dof());
   if (lambda.size()>0) mf_mult.extend_vector(lambda,lambda_full);
   // update contact region
   dal::bit_vector cc = master_cb.get_mesh().

Modified: trunk/getfem/src/getfem_models.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_models.cc?rev=4934&r1=4933&r2=4934&view=diff
==============================================================================
--- trunk/getfem/src/getfem_models.cc   (original)
+++ trunk/getfem/src/getfem_models.cc   Sun Apr  5 23:17:34 2015
@@ -170,7 +170,7 @@
 
   void model::resize_global_system() const {
     size_type tot_size = 0;
-    
+
     for (VAR_SET::iterator it = variables.begin(); it != variables.end();
          ++it) {
       if (it->second.is_variable && it->second.is_disabled)