[Getfem-commits] [getfem-commits] branch devel-tetsuo-add_lumped_mass_python_interface_squash updated: Add brick at the end of the methods

[Tetsuo Koyama]

This is an automated email from the git hooks/post-receive script.

tkoyama010 pushed a commit to branch 
devel-tetsuo-add_lumped_mass_python_interface_squash
in repository getfem.

The following commit(s) were added to 
refs/heads/devel-tetsuo-add_lumped_mass_python_interface_squash by this push:
     new f2a1c9c  Add brick at the end of the methods
f2a1c9c is described below

commit f2a1c9cd83b7b2362cee01fe10bed2a34f35bfb8
Author: Tetsuo Koyama <tkoyama010@gmail.com>
AuthorDate: Fri Apr 16 20:24:55 2021 +0900

    Add brick at the end of the methods
---
 interface/src/gf_model_set.cc                | 18 +++++++++---------
 interface/tests/python/demo_wave_equation.py |  2 +-
 src/getfem/getfem_models.h                   |  6 +++---
 src/getfem_models.cc                         | 12 ++++++------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/interface/src/gf_model_set.cc b/interface/src/gf_model_set.cc
index 346c570..2c90b65 100644
--- a/interface/src/gf_model_set.cc
+++ b/interface/src/gf_model_set.cc
@@ -1978,7 +1978,7 @@ void gf_model_set(getfemint::mexargs_in& m_in,
        out.pop().from_integer(int(ind));
        );
 
-    /*@SET ind = ('add isotropic linearized elasticity brick pstrain', @tmim 
mim, @str varname, @str data_E, @str data_nu[, @int region])
+    /*@SET ind = ('add isotropic linearized elasticity pstrain brick', @tmim 
mim, @str varname, @str data_E, @str data_nu[, @int region])
       Add an isotropic linearized elasticity term to the model relatively to
       the variable `varname`. `data_E` and `data_nu` should
       contain the Young modulus and Poisson ratio, respectively.
@@ -1990,7 +1990,7 @@ void gf_model_set(getfemint::mexargs_in& m_in,
       standard model. 
       Return the brick index in the model.@*/
     sub_command
-      ("add isotropic linearized elasticity brick pstrain", 4, 5, 0, 1,
+      ("add isotropic linearized elasticity pstrain brick", 4, 5, 0, 1,
        getfem::mesh_im *mim = to_meshim_object(in.pop());
        std::string varname = in.pop().to_string();
        std::string data_E = in.pop().to_string();
@@ -1998,14 +1998,14 @@ void gf_model_set(getfemint::mexargs_in& m_in,
        size_type region = size_type(-1);
        if (in.remaining()) region = in.pop().to_integer();
        size_type ind
-       = getfem::add_isotropic_linearized_elasticity_brick_pstrain
+       = getfem::add_isotropic_linearized_elasticity_pstrain_brick
        (*md, *mim, varname, data_E, data_nu, region)
        + config::base_index();
        workspace().set_dependence(md, mim);
        out.pop().from_integer(int(ind));
        );
 
-    /*@SET ind = ('add isotropic linearized elasticity brick pstress', @tmim 
mim, @str varname, @str data_E, @str data_nu[, @int region])
+    /*@SET ind = ('add isotropic linearized elasticity pstress brick', @tmim 
mim, @str varname, @str data_E, @str data_nu[, @int region])
       Add an isotropic linearized elasticity term to the model relatively to
       the variable `varname`. `data_E` and `data_nu` should
       contain the Young modulus and Poisson ratio, respectively.
@@ -2017,7 +2017,7 @@ void gf_model_set(getfemint::mexargs_in& m_in,
       standard model. 
       Return the brick index in the model.@*/
     sub_command
-      ("add isotropic linearized elasticity brick pstress", 4, 5, 0, 1,
+      ("add isotropic linearized elasticity pstress brick", 4, 5, 0, 1,
        getfem::mesh_im *mim = to_meshim_object(in.pop());
        std::string varname = in.pop().to_string();
        std::string data_E = in.pop().to_string();
@@ -2025,7 +2025,7 @@ void gf_model_set(getfemint::mexargs_in& m_in,
        size_type region = size_type(-1);
        if (in.remaining()) region = in.pop().to_integer();
        size_type ind
-       = getfem::add_isotropic_linearized_elasticity_brick_pstress
+       = getfem::add_isotropic_linearized_elasticity_pstress_brick
        (*md, *mim, varname, data_E, data_nu, region)
        + config::base_index();
        workspace().set_dependence(md, mim);
@@ -2816,14 +2816,14 @@ void gf_model_set(getfemint::mexargs_in& m_in,
        );
 
 
-    /*@SET ind = ('add lumped mass brick for first order', @tmim mim, @str 
varname[, @str dataexpr_rho[, @int region]])
+    /*@SET ind = ('add lumped mass for first order brick', @tmim mim, @str 
varname[, @str dataexpr_rho[, @int region]])
       Add lumped mass for first order term to the model relatively to the 
variable `varname`.
       If specified, the data `dataexpr_rho` is the
       density (1 if omitted). `region` is an optional mesh region on
       which the term is added. If it is not specified, it
       is added on the whole mesh. Return the brick index in the model.@*/
     sub_command
-      ("add lumped mass brick for first order", 2, 4, 0, 1,
+      ("add lumped mass for first order brick", 2, 4, 0, 1,
        getfem::mesh_im *mim = to_meshim_object(in.pop());
        std::string varname = in.pop().to_string();
        std::string dataname_rho;
@@ -2831,7 +2831,7 @@ void gf_model_set(getfemint::mexargs_in& m_in,
        size_type region = size_type(-1);
        if (in.remaining()) region = in.pop().to_integer();
        size_type ind
-       = getfem::add_lumped_mass_brick_for_first_order
+       = getfem::add_lumped_mass_for_first_order_brick
        (*md, *mim, varname, dataname_rho, region)
        + config::base_index();
        workspace().set_dependence(md, mim);
diff --git a/interface/tests/python/demo_wave_equation.py 
b/interface/tests/python/demo_wave_equation.py
index 8d35ffc..c5be7d7 100644
--- a/interface/tests/python/demo_wave_equation.py
+++ b/interface/tests/python/demo_wave_equation.py
@@ -80,7 +80,7 @@ md.add_Houbolt_scheme('u1')
 md.add_Newmark_scheme('u2', beta, gamma)
 md.add_mass_brick(mim, 'Dot2_u')
 md.add_mass_brick(mim, 'Dot2_u1')
-md.add_lumped_mass_brick_for_first_order(mim, 'Dot2_u2')
+md.add_lumped_mass_for_first_order_brick(mim, 'Dot2_u2')
 md.set_time_step(dt)
 
 ## Initial data.
diff --git a/src/getfem/getfem_models.h b/src/getfem/getfem_models.h
index 520efc0..d875ace 100644
--- a/src/getfem/getfem_models.h
+++ b/src/getfem/getfem_models.h
@@ -2373,7 +2373,7 @@ namespace getfem {
       ( @f$ \lambda = E\nu/((1+\nu)(1-2\nu)), \mu = E/(2(1+\nu)) @f$ ).
       Corresponds to the standard model for three-dimensional problems.
   */
-  size_type APIDECL add_isotropic_linearized_elasticity_brick_pstrain
+  size_type APIDECL add_isotropic_linearized_elasticity_pstrain_brick
   (model &md, const mesh_im &mim, const std::string &varname,
    const std::string &data_E, const std::string &data_nu,
    size_type region);
@@ -2386,7 +2386,7 @@ namespace getfem {
       ( @f$ \lambda^* = E\nu/(1-\nu^2), \mu = E/(2(1+\nu)) @f$ ).
       Corresponds to the standard model for three-dimensional problems.
   */
-  size_type APIDECL add_isotropic_linearized_elasticity_brick_pstress
+  size_type APIDECL add_isotropic_linearized_elasticity_pstress_brick
   (model &md, const mesh_im &mim, const std::string &varname,
    const std::string &data_E, const std::string &data_nu,
    size_type region);
@@ -2470,7 +2470,7 @@ namespace getfem {
       Add a lumped mass matix for first order on a variable (eventually with a 
specified region).
       If the parameter $\rho$ is omitted it is assumed to be equal to 1.
   */
-  size_type APIDECL add_lumped_mass_brick_for_first_order
+  size_type APIDECL add_lumped_mass_for_first_order_brick
   (model &md, const mesh_im &mim, const std::string &varname,
    const std::string &dataexpr_rho = std::string(),
    size_type region = size_type(-1));
diff --git a/src/getfem_models.cc b/src/getfem_models.cc
index 1aec2c3..9e08ad1 100644
--- a/src/getfem_models.cc
+++ b/src/getfem_models.cc
@@ -6124,7 +6124,7 @@ namespace getfem {
     }
   }
 
-  size_type add_isotropic_linearized_elasticity_brick_pstrain
+  size_type add_isotropic_linearized_elasticity_pstrain_brick
   (model &md, const mesh_im &mim, const std::string &varname,
    const std::string &data_E, const std::string &data_nu,
    size_type region) {
@@ -6153,7 +6153,7 @@ namespace getfem {
     }
   }
 
-  size_type add_isotropic_linearized_elasticity_brick_pstress
+  size_type add_isotropic_linearized_elasticity_pstress_brick
   (model &md, const mesh_im &mim, const std::string &varname,
    const std::string &data_E, const std::string &data_nu,
    size_type region) {
@@ -6543,7 +6543,7 @@ namespace getfem {
   //
   // ----------------------------------------------------------------------
 
-  struct lumped_mass_brick_for_first_order : public virtual_brick {
+  struct lumped_mass_for_first_order_brick : public virtual_brick {
 
     virtual void asm_real_tangent_terms(const model &md, size_type,
                                         const model::varnamelist &vl,
@@ -6589,7 +6589,7 @@ namespace getfem {
 
     }
 
-    lumped_mass_brick_for_first_order() {
+    lumped_mass_for_first_order_brick() {
       set_flags("Lumped mass brick", true /* is linear*/,
                 true /* is symmetric */, true /* is coercive */,
                 true /* is real */, false /* no complex version */,
@@ -6598,10 +6598,10 @@ namespace getfem {
 
   };
 
-  size_type add_lumped_mass_brick_for_first_order
+  size_type add_lumped_mass_for_first_order_brick
   (model & md, const mesh_im &mim, const std::string &varname,
    const std::string &dataexpr_rho, size_type region) {
-    pbrick pbr = std::make_shared<lumped_mass_brick_for_first_order>();
+    pbrick pbr = std::make_shared<lumped_mass_for_first_order_brick>();
     model::termlist tl;
     tl.push_back(model::term_description(varname, varname, true));
     model::varnamelist dl;