[Getfem-commits] (no subject)

[Yves Renard]

branch: master
commit 39720837d2f8a5a7f8ef6ca1c3a459b1f57d953c
Author: Yves Renard <address@hidden>
Date:   Wed Aug 28 09:13:23 2019 +0200

    minor fix
---
 interface/tests/python/demo_elasticity_HHO.py | 17 ++++++++---------
 interface/tests/python/demo_laplacian_HHO.py  |  7 +++----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/interface/tests/python/demo_elasticity_HHO.py 
b/interface/tests/python/demo_elasticity_HHO.py
index 436253b..aa94dc3 100644
--- a/interface/tests/python/demo_elasticity_HHO.py
+++ b/interface/tests/python/demo_elasticity_HHO.py
@@ -31,7 +31,7 @@ import getfem as gf
 import numpy as np
 
 ## Parameters
-NX = 20                           # Mesh parameter.
+NX = 40                           # Mesh parameter.
 Dirichlet_with_multipliers = True # Dirichlet condition with multipliers
                                   # or penalization
 dirichlet_coefficient = 1e10      # Penalization coefficient
@@ -43,16 +43,15 @@ nu = 0.3                          # Poisson ratio
 
 cmu = E/(2*(1+nu))                # Lame coefficient
 clambda = 2*cmu*nu/(1-2*nu)       # Lame coefficient
-use_quad = True                   # Quadrilaterals or triangles
+use_quad = False                  # Quadrilaterals or triangles
 
 # Create a simple cartesian mesh
+I = np.arange(0,1+1./NX,1./NX)
 if (use_quad):
-  m = gf.Mesh('cartesian', np.arange(0,1+1./NX,1./NX),
-              np.arange(0,1+1./NX,1./NX));
+  m = gf.Mesh('cartesian', I, I)
   # 
m=gf.Mesh('import','structured','GT="GT_QK(2,1)";SIZES=[1,1];NOISED=1;NSUBDIV=[1,1];')
 else:
-  m = gf.Mesh('regular_simplices', np.arange(0,1+1./NX,1./NX),
-              np.arange(0,1+1./NX,1./NX))
+  m = gf.Mesh('regular_simplices', I, I)
   # 
m=gf.Mesh('import','structured','GT="GT_PK(2,1)";SIZES=[1,1];NOISED=1;NSUBDIV=[%d,%d];'
 % (NX, NX))
   
 
@@ -85,10 +84,10 @@ else:
 if (use_quad):
   # mfgu.set_fem(gf.Fem('FEM_QUAD_IPK(2,2)'))
   mfgu.set_fem(gf.Fem('FEM_QK(2,2)'))
-  mfrhs.set_fem(gf.Fem('FEM_QK(2,2)'))
+  mfrhs.set_fem(gf.Fem('FEM_QK(2,3)'))
 else:
   mfgu.set_fem(gf.Fem('FEM_PK(2,2)'))
-  mfrhs.set_fem(gf.Fem('FEM_PK(2,2)'))
+  mfrhs.set_fem(gf.Fem('FEM_PK(2,3)'))
 
 print('nbdof : %d' % mfu.nbdof());
 
@@ -96,7 +95,7 @@ print('nbdof : %d' % mfu.nbdof());
 if (use_quad):
   mim = gf.MeshIm(m, gf.Integ('IM_GAUSS_PARALLELEPIPED(2,6)'))
 else:
-  mim = gf.MeshIm(m, gf.Integ('IM_TRIANGLE(4)'))
+  mim = gf.MeshIm(m, gf.Integ('IM_TRIANGLE(6)'))
 
 # Boundary selection
 flst  = m.outer_faces()
diff --git a/interface/tests/python/demo_laplacian_HHO.py 
b/interface/tests/python/demo_laplacian_HHO.py
index c6f287a..b8e6ceb 100644
--- a/interface/tests/python/demo_laplacian_HHO.py
+++ b/interface/tests/python/demo_laplacian_HHO.py
@@ -39,12 +39,11 @@ dirichlet_coefficient = 1e10       # Penalization 
coefficient
 using_HHO = True                   # Use HHO method or standard Lagrange FEM
 
 # Create a simple cartesian mesh
+I = np.arange(0,1+1./NX,1./NX)
 if (N == 2):
-  m = gf.Mesh('regular_simplices', np.arange(0,1+1./NX,1./NX),
-              np.arange(0,1+1./NX,1./NX))
+  m = gf.Mesh('regular_simplices', I, I)
 elif (N == 3):
-  m = gf.Mesh('regular_simplices', np.arange(0,1+1./NX,1./NX),
-              np.arange(0,1+1./NX,1./NX), np.arange(0,1+1./NX,1./NX))
+  m = gf.Mesh('regular_simplices', I, I, I)