This is an automated email from the git hooks/post-receive script.
logari81 pushed a commit to branch master
in repository getfem.
The following commit(s) were added to refs/heads/master by this push:
new 0241496 Rename brick addition functions and new interface function
for lumped mass brick
0241496 is described below
commit 0241496a72624aca5f7f6a4f3725accee863d46e
Author: Tetsuo Koyama
AuthorDate: Thu Apr 22 18:59:19 2021 +0200
Rename brick addition functions and new interface function for lumped mass
brick
---
.../source/userdoc/model_linear_elasticity.rst | 4 +--
interface/src/gf_model_set.cc | 35 ++
interface/tests/matlab-octave/demo_elasticity.m| 4 +--
interface/tests/python/demo_wave_equation.py | 11 +++
src/getfem/getfem_models.h | 6 ++--
src/getfem_models.cc | 12
6 files changed, 53 insertions(+), 19 deletions(-)
diff --git a/doc/sphinx/source/userdoc/model_linear_elasticity.rst
b/doc/sphinx/source/userdoc/model_linear_elasticity.rst
index 6ebbf1f..ca28a87 100644
--- a/doc/sphinx/source/userdoc/model_linear_elasticity.rst
+++ b/doc/sphinx/source/userdoc/model_linear_elasticity.rst
@@ -56,13 +56,13 @@ representing the |Lame| coefficients.
The function which adds this brick to a model and parametrized with Young
modulus and Poisson ratio is::
- ind_brick = getfem::add_isotropic_linearized_elasticity_brick_pstrain
+ ind_brick = getfem::add_isotropic_linearized_elasticity_pstrain_brick
(md, mim, varname, data_E, data_nu, region = size_type(-1));
This brick represent a plane strain approximation when it is applied to a 2D
mesh (and a standard model on a 3D mesh). In order to obtain a plane stress
approximation for 2D meshes, one can use::
- ind_brick = getfem::add_isotropic_linearized_elasticity_brick_pstress
+ ind_brick = getfem::add_isotropic_linearized_elasticity_pstress_brick
(md, mim, varname, data_E, data_nu, region = size_type(-1));
For 3D meshes, the two previous bricks give the same result.
diff --git a/interface/src/gf_model_set.cc b/interface/src/gf_model_set.cc
index 288572d..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())
