[Getfem-commits] [getfem-commits] branch master updated: minor fix on integration method definition

[Yves Renard]

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

renard pushed a commit to branch master
in repository getfem.

The following commit(s) were added to refs/heads/master by this push:
     new 78cda97  minor fix on integration method definition
78cda97 is described below

commit 78cda97e6bbb700c05d24231ee78c040bac91636
Author: Yves Renard <address@hidden>
AuthorDate: Sat Feb 29 14:57:46 2020 +0100

    minor fix on integration method definition
---
 doc/sphinx/source/tutorial/thermo_coupling.rst                    | 8 ++++----
 .../scilab/demos/demo_thermo_elasticity_electrical_coupling.sce   | 2 +-
 .../tests/matlab/demo_thermo_elasticity_electrical_coupling.m     | 2 +-
 .../tests/python/demo_thermo_elasticity_electrical_coupling.py    | 2 +-
 tests/thermo_elasticity_electrical_coupling.cc                    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/sphinx/source/tutorial/thermo_coupling.rst 
b/doc/sphinx/source/tutorial/thermo_coupling.rst
index 8267ec1..4192595 100644
--- a/doc/sphinx/source/tutorial/thermo_coupling.rst
+++ b/doc/sphinx/source/tutorial/thermo_coupling.rst
@@ -438,7 +438,7 @@ The last thing to define is an integration method `mim`. 
There is no default int
                 
mfvm.set_classical_discontinuous_finite_element(elements_degree);
 
                 getfem::mesh_im  mim(mesh);
-                
mim.set_integration_method(bgeot::dim_type(gmm::sqr(elements_degree)));
+                mim.set_integration_method(2*elements_degree);
 ---------- 
---------------------------------------------------------------------------
 **Python** .. code-block:: python
 
@@ -448,7 +448,7 @@ The last thing to define is an integration method `mim`. 
There is no default int
                 mft.set_classical_fem(elements_degree)
                 mfvm = gf.MeshFem(mesh, 1)
                 mfvm.set_classical_discontinuous_fem(elements_degree)
-                mim = gf.MeshIm(mesh, pow(elements_degree,2))
+                mim = gf.MeshIm(mesh, elements_degree*2)
 ---------- 
---------------------------------------------------------------------------
 **Scilab** .. code-block:: matlab
 
@@ -458,7 +458,7 @@ The last thing to define is an integration method `mim`. 
There is no default int
                 gf_mesh_fem_set(mft, 'classical fem', elements_degree);
                 mfvm = gf_mesh_fem(mesh, 1);
                 gf_mesh_fem_set(mfvm, 'classical discontinuous fem', 
elements_degree-1);
-                mim = gf_mesh_im(mesh, elements_degree^2);
+                mim = gf_mesh_im(mesh, elements_degree*2);
 ---------- 
---------------------------------------------------------------------------
 **Matlab** .. code-block:: matlab
 
@@ -468,7 +468,7 @@ The last thing to define is an integration method `mim`. 
There is no default int
                 gf_mesh_fem_set(mft, 'classical fem', elements_degree);
                 mfvm = gf_mesh_fem(mesh, 1);
                 gf_mesh_fem_set(mfvm, 'classical discontinuous fem', 
elements_degree-1);
-                mim = gf_mesh_im(mesh, elements_degree^2);
+                mim = gf_mesh_im(mesh, elements_degree*2);
 ========== 
===========================================================================
 
 
diff --git 
a/interface/src/scilab/demos/demo_thermo_elasticity_electrical_coupling.sce 
b/interface/src/scilab/demos/demo_thermo_elasticity_electrical_coupling.sce
index 0cffdc7..e182250 100644
--- a/interface/src/scilab/demos/demo_thermo_elasticity_electrical_coupling.sce
+++ b/interface/src/scilab/demos/demo_thermo_elasticity_electrical_coupling.sce
@@ -142,7 +142,7 @@ mft = gf_mesh_fem(mesh, 1); // Finite element for the 
temperature and the electr
 gf_mesh_fem_set(mft, 'classical fem', elements_degree);
 mfvm = gf_mesh_fem(mesh, 1); // Finite element for Von Mises stress 
interpolation
 gf_mesh_fem_set(mfvm, 'classical discontinuous fem', elements_degree-1);
-mim = gf_mesh_im(mesh, elements_degree^2);   // Integration method
+mim = gf_mesh_im(mesh, elements_degree*2);   // Integration method
 
 
 //
diff --git 
a/interface/tests/matlab/demo_thermo_elasticity_electrical_coupling.m 
b/interface/tests/matlab/demo_thermo_elasticity_electrical_coupling.m
index b4fd158..66640c9 100644
--- a/interface/tests/matlab/demo_thermo_elasticity_electrical_coupling.m
+++ b/interface/tests/matlab/demo_thermo_elasticity_electrical_coupling.m
@@ -129,7 +129,7 @@ mft = gf_mesh_fem(mesh, 1); % Finite element for the 
temperature and the electri
 gf_mesh_fem_set(mft, 'classical fem', elements_degree);
 mfvm = gf_mesh_fem(mesh, 1); % Finite element for Von Mises stress 
interpolation
 gf_mesh_fem_set(mfvm, 'classical discontinuous fem', elements_degree-1);
-mim = gf_mesh_im(mesh, elements_degree^2);   % Integration method
+mim = gf_mesh_im(mesh, elements_degree*2);   % Integration method
 
 
 %
diff --git 
a/interface/tests/python/demo_thermo_elasticity_electrical_coupling.py 
b/interface/tests/python/demo_thermo_elasticity_electrical_coupling.py
index 8475c1d..5d02c6e 100644
--- a/interface/tests/python/demo_thermo_elasticity_electrical_coupling.py
+++ b/interface/tests/python/demo_thermo_elasticity_electrical_coupling.py
@@ -146,7 +146,7 @@ mft = gf.MeshFem(mesh, 1)  # Finite element for temperature 
and electrical field
 mft.set_classical_fem(elements_degree)
 mfvm = gf.MeshFem(mesh, 1) # Finite element for Von Mises stress interpolation
 mfvm.set_classical_discontinuous_fem(elements_degree)
-mim = gf.MeshIm(mesh, pow(elements_degree,2))   # Integration method
+mim = gf.MeshIm(mesh, elements_degree*2)   # Integration method
 
 
 #
diff --git a/tests/thermo_elasticity_electrical_coupling.cc 
b/tests/thermo_elasticity_electrical_coupling.cc
index df15913..d8ec0e6 100644
--- a/tests/thermo_elasticity_electrical_coupling.cc
+++ b/tests/thermo_elasticity_electrical_coupling.cc
@@ -208,7 +208,7 @@ int main(int argc, char *argv[]) {
   mfvm.set_classical_discontinuous_finite_element(elements_degree);
 
   getfem::mesh_im  mim(mesh);     // Integration method
-  mim.set_integration_method(bgeot::dim_type(gmm::sqr(elements_degree)));
+  mim.set_integration_method(bgeot::dim_type(2*elements_degree));
 
 
   //