[Getfem-commits] r5255 - in /trunk/getfem: doc/sphinx/source/userdoc/ interface/src/ interface/src/scilab/demos/ interface/src/scilab/help/en...

[logari81]

Author: logari81
Date: Wed Mar 23 00:17:44 2016
New Revision: 5255

URL: http://svn.gna.org/viewcvs/getfem?rev=5255&view=rev
Log:
rename function finite_strain_elasticity_Von_Mises

Modified:
    trunk/getfem/doc/sphinx/source/userdoc/model_nonlinear_elasticity.rst
    trunk/getfem/interface/src/gf_model_get.cc
    trunk/getfem/interface/src/scilab/demos/demo_tripod.sce
    trunk/getfem/interface/src/scilab/help/en_US/gf_model_get.xml
    trunk/getfem/interface/tests/matlab/demo_nonlinear_elasticity.m
    trunk/getfem/interface/tests/matlab/demo_tripod.m
    trunk/getfem/interface/tests/python/demo_tripod.py
    trunk/getfem/src/getfem/getfem_nonlinear_elasticity.h
    trunk/getfem/src/getfem_nonlinear_elasticity.cc

Modified: trunk/getfem/doc/sphinx/source/userdoc/model_nonlinear_elasticity.rst
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/doc/sphinx/source/userdoc/model_nonlinear_elasticity.rst?rev=5255&r1=5254&r2=5255&view=diff
==============================================================================
--- trunk/getfem/doc/sphinx/source/userdoc/model_nonlinear_elasticity.rst       
(original)
+++ trunk/getfem/doc/sphinx/source/userdoc/model_nonlinear_elasticity.rst       
Wed Mar 23 00:17:44 2016
@@ -428,7 +428,7 @@
 
 The Von Mises stress can be interpolated with the following function::
 
-  void finite_strain_elasticity_Von_Mises(md, varname, lawname, params, mf_vm, 
VM,
-                                          rg=mesh_region::all_convexes());
+  void compute_finite_strain_elasticity_Von_Mises(md, varname, lawname, 
params, mf_vm, VM,
+                                                  
rg=mesh_region::all_convexes());
 
 where ``md`` is the model, ``varname`` the variable of the model representing 
the large strain displacement, ``lawname`` is the constitutive law name (see 
previou brick), ``params`` is a string representing the parameters of the law, 
``mf_vm`` a (preferably discontinuous) Lagrange  finite element method on which 
the interpolation will be done and ``VM`` a vector of type 
``model_real_plain_vector`` in which the interpolation will be stored.

Modified: trunk/getfem/interface/src/gf_model_get.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/gf_model_get.cc?rev=5255&r1=5254&r2=5255&view=diff
==============================================================================
--- trunk/getfem/interface/src/gf_model_get.cc  (original)
+++ trunk/getfem/interface/src/gf_model_get.cc  Wed Mar 23 00:17:44 2016
@@ -753,7 +753,8 @@
       `dataname` is a vector of parameters for the constitutive law. Its length
       depends on the law. It could be a short vector of constant values or a
       vector field described on a finite element method for variable 
coefficients.
-      `version` should be  'Von_Mises' or 'Tresca' ('Von_Mises' is the 
default). @*/
+      `version` should be  'Von_Mises' or 'Tresca' ('Von_Mises' is the 
default).
+      @*/
     sub_command
       ("compute Von Mises or Tresca", 4, 5, 0, 1,
        std::string varname = in.pop().to_string();
@@ -778,25 +779,24 @@
        out.pop().from_dcvector(VMM);
        );
 
-    /address@hidden V = ('finite strain elasticity Von Mises', @str varname, 
@str lawname, @str params, @tmf mf_vm[, @int region])
+    /address@hidden V = ('compute finite strain elasticity Von Mises', @str 
varname, @str lawname, @str params, @tmf mf_vm[, @int region])
       Compute on `mf_vm` the Von-Mises stress of a field `varname`
       for nonlinear elasticity in 3D. `lawname` is the constitutive law which
       should be a valid name. `params` are the parameters law. It could be
       a short vector of constant values or may depend on data or variables
       of the model.
       Uses the high-level generic assembly.
- @*/
-    sub_command
-      ("finite strain elasticity Von Mises", 4, 5, 0, 1,
+      @*/
+    sub_command
+      ("compute finite strain elasticity Von Mises", 4, 5, 0, 1,
        std::string varname = in.pop().to_string();
        std::string lawname = in.pop().to_string();
        std::string params = in.pop().to_string();
        const getfem::mesh_fem *mf = to_meshfem_object(in.pop());
-       std::string stresca = "Von Mises";
        size_type rg = size_type(-1);
        if (in.remaining()) rg = in.pop().to_integer();
        getfem::model_real_plain_vector VMM(mf->nb_dof());
-       getfem::finite_strain_elasticity_Von_Mises
+       getfem::compute_finite_strain_elasticity_Von_Mises
        (*md, varname, lawname, params, *mf, VMM, rg);
        out.pop().from_dcvector(VMM);
        );
@@ -810,7 +810,7 @@
       depends on the law. It could be a short vector of constant values or a
       vector field described on a finite element method for variable
       coefficients.
-     @*/
+      @*/
     sub_command
       ("compute second Piola Kirchhoff tensor", 4, 4, 0, 1,
        std::string varname = in.pop().to_string();
@@ -904,7 +904,7 @@
        getfem::model_real_plain_vector plast(mf->nb_dof());
        getfem::compute_plastic_part
        (*md, *mim, *mf, varname, previous_dep,
-       abstract_constraints_projection_from_name(projname),
+        abstract_constraints_projection_from_name(projname),
         datalambda, datamu, datathreshold, datasigma, plast);
        out.pop().from_dcvector(plast);
        );

Modified: trunk/getfem/interface/src/scilab/demos/demo_tripod.sce
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/scilab/demos/demo_tripod.sce?rev=5255&r1=5254&r2=5255&view=diff
==============================================================================
--- trunk/getfem/interface/src/scilab/demos/demo_tripod.sce     (original)
+++ trunk/getfem/interface/src/scilab/demos/demo_tripod.sce     Wed Mar 23 
00:17:44 2016
@@ -111,7 +111,7 @@
 if (linear)
   VM = gf_model_get(md, 'compute isotropic linearized Von Mises or Tresca', 
'u', 'clambda', 'cmu', mfdu);
 else
-  VM = gf_model_get(md, 'finite strain elasticity Von Mises', 'u', lawname, 
'params', mfdu);
+  VM = gf_model_get(md, 'compute finite strain elasticity Von Mises', 'u', 
lawname, 'params', mfdu);
 end
 
 

Modified: trunk/getfem/interface/src/scilab/help/en_US/gf_model_get.xml
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/scilab/help/en_US/gf_model_get.xml?rev=5255&r1=5254&r2=5255&view=diff
==============================================================================
--- trunk/getfem/interface/src/scilab/help/en_US/gf_model_get.xml       
(original)
+++ trunk/getfem/interface/src/scilab/help/en_US/gf_model_get.xml       Wed Mar 
23 00:17:44 2016
@@ -36,7 +36,7 @@
     <synopsis>gf_model_get(model M, 'test tangent matrix term', string 
varname1, string varname2[, scalar EPS[, int NB[, scalar scale]]])</synopsis>
     <synopsis>V = gf_model_get(model M, 'compute isotropic linearized Von 
Mises or Tresca', string varname, string dataname_lambda, string dataname_mu, 
mesh_fem mf_vm[, string version])</synopsis>
     <synopsis>V = gf_model_get(model M, 'compute Von Mises or Tresca', string 
varname, string lawname, string dataname, mesh_fem mf_vm[, string 
version])</synopsis>
-    <synopsis>V = gf_model_get(model M, 'finite strain elasticity Von Mises', 
string varname, string lawname, string params, mesh_fem mf_vm[, int 
region])</synopsis>
+    <synopsis>V = gf_model_get(model M, 'compute finite strain elasticity Von 
Mises', string varname, string lawname, string params, mesh_fem mf_vm[, int 
region])</synopsis>
     <synopsis>V = gf_model_get(model M, 'compute second Piola Kirchhoff 
tensor', string varname, string lawname, string dataname, mesh_fem 
mf_sigma)</synopsis>
     <synopsis>V = gf_model_get(model M, 'compute elastoplasticity Von Mises or 
Tresca', string datasigma, mesh_fem mf_vm[, string version])</synopsis>
     <synopsis>gf_model_get(model M, 'elastoplasticity next iter', mesh_im mim, 
string varname, string projname, string datalambda, string datamu, string 
datathreshold, string datasigma)</synopsis>
@@ -299,7 +299,7 @@
     </listitem>
 
     <listitem>
-    <para><literal>V = gf_model_get(model M, 'finite strain elasticity Von 
Mises', string varname, string lawname, string params, mesh_fem mf_vm[, int 
region])</literal></para>
+    <para><literal>V = gf_model_get(model M, 'compute finite strain elasticity 
Von Mises', string varname, string lawname, string params, mesh_fem mf_vm[, int 
region])</literal></para>
 
     <para>         Compute on <literal>mf_vm</literal> the Von-Mises stress of 
a field <literal>varname</literal>
       for nonlinear elasticity in 3D. <literal>lawname</literal> is the 
constitutive law which

Modified: trunk/getfem/interface/tests/matlab/demo_nonlinear_elasticity.m
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/demo_nonlinear_elasticity.m?rev=5255&r1=5254&r2=5255&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/demo_nonlinear_elasticity.m     
(original)
+++ trunk/getfem/interface/tests/matlab/demo_nonlinear_elasticity.m     Wed Mar 
23 00:17:44 2016
@@ -211,7 +211,7 @@
     % VM = gf_model_get(md, 'interpolation', 
'(sqrt(3/2)/Det(Id(meshdim)+Grad_u))*Norm((Id(meshdim)+Grad_u)*Saint_Venant_Kirchhoff_sigma(Grad_u,params)*(Id(meshdim)+Grad_u'')
 - 
Id(meshdim)*Trace((Id(meshdim)+Grad_u)*Saint_Venant_Kirchhoff_sigma(Grad_u,params)*(Id(meshdim)+Grad_u''))/meshdim)',
 mfdu);
     % VM = gf_model_get(md, 'interpolation', 
'(sqrt(3/2)/Det(Id(meshdim)+Grad_u))*Norm(Deviator((Id(meshdim)+Grad_u)*Saint_Venant_Kirchhoff_sigma(Grad_u,params)*(Id(meshdim)+Grad_u'')))',
 mfdu);
     % VM = gf_model_get(md, 'interpolation', 
'sqrt(3/2)*Norm(Deviator(Cauchy_stress_from_PK2(Saint_Venant_Kirchhoff_sigma(Grad_u,params),Grad_u)))',
 mfdu);
-    VM = gf_model_get(md, 'finite strain elasticity Von Mises', 'u', lawname, 
'params', mfdu);
+    VM = gf_model_get(md, 'compute finite strain elasticity Von Mises', 'u', 
lawname, 'params', mfdu);
     norm(VM-VM0)
     
     UU = [UU;U]; 

Modified: trunk/getfem/interface/tests/matlab/demo_tripod.m
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/demo_tripod.m?rev=5255&r1=5254&r2=5255&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/demo_tripod.m   (original)
+++ trunk/getfem/interface/tests/matlab/demo_tripod.m   Wed Mar 23 00:17:44 2016
@@ -107,7 +107,7 @@
 if (linear)
   VM = gf_model_get(md, 'compute isotropic linearized Von Mises or Tresca', 
'u', 'clambda', 'cmu', mfdu);
 else
-  VM = gf_model_get(md, 'finite strain elasticity Von Mises', 'u', lawname, 
'params', mfdu);
+  VM = gf_model_get(md, 'compute finite strain elasticity Von Mises', 'u', 
lawname, 'params', mfdu);
 end
 
 disp('plotting ... ');

Modified: trunk/getfem/interface/tests/python/demo_tripod.py
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/python/demo_tripod.py?rev=5255&r1=5254&r2=5255&view=diff
==============================================================================
--- trunk/getfem/interface/tests/python/demo_tripod.py  (original)
+++ trunk/getfem/interface/tests/python/demo_tripod.py  Wed Mar 23 00:17:44 2016
@@ -117,7 +117,7 @@
 if linear:
   VM = 
md.compute_isotropic_linearized_Von_Mises_or_Tresca('u','clambda','cmu', mfdu);
 else:
-  VM = md.finite_strain_elasticity_Von_Mises('u', lawname, 'params', mfdu);
+  VM = md.compute_finite_strain_elasticity_Von_Mises('u', lawname, 'params', 
mfdu);
 
 # post-processing
 sl=gf.Slice(('boundary',), mfu, degree)

Modified: trunk/getfem/src/getfem/getfem_nonlinear_elasticity.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_nonlinear_elasticity.h?rev=5255&r1=5254&r2=5255&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_nonlinear_elasticity.h       (original)
+++ trunk/getfem/src/getfem/getfem_nonlinear_elasticity.h       Wed Mar 23 
00:17:44 2016
@@ -664,12 +664,21 @@
      with respect to the nonlinear elasticity constitutive law `lawname`
      with parameters `params` (only valid in 3D).
   */
-  void finite_strain_elasticity_Von_Mises
+  void compute_finite_strain_elasticity_Von_Mises
   (model &md, const std::string &varname, const std::string &lawname,
    const std::string &params, const mesh_fem &mf_vm,
    model_real_plain_vector &VM,
    const mesh_region &rg=mesh_region::all_convexes());
 
+  IS_DEPRECATED inline void finite_strain_elasticity_Von_Mises
+  (model &md, const std::string &varname, const std::string &lawname,
+   const std::string &params, const mesh_fem &mf_vm,
+   model_real_plain_vector &VM,
+   const mesh_region &rg=mesh_region::all_convexes()) {
+    compute_finite_strain_elasticity_Von_Mises(md, varname, lawname, params,
+                                               mf_vm, VM, rg);
+  }
+
 }  /* end of namespace getfem.                                             */
 
 

Modified: trunk/getfem/src/getfem_nonlinear_elasticity.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_nonlinear_elasticity.cc?rev=5255&r1=5254&r2=5255&view=diff
==============================================================================
--- trunk/getfem/src/getfem_nonlinear_elasticity.cc     (original)
+++ trunk/getfem/src/getfem_nonlinear_elasticity.cc     Wed Mar 23 00:17:44 2016
@@ -2274,7 +2274,7 @@
        "Finite strain incompressibility brick");
   }
 
-  void finite_strain_elasticity_Von_Mises
+  void compute_finite_strain_elasticity_Von_Mises
     (model &md, const std::string &varname, const std::string &lawname,
      const std::string &params, const mesh_fem &mf_vm,
      model_real_plain_vector &VM, const mesh_region &rg) {