[Getfem-commits] r4582 - in /trunk/getfem/interface/tests/matlab: check_asm.m demo_nonlinear_elasticity.m

[Yves . Renard]

Author: renard
Date: Thu Apr  3 09:17:56 2014
New Revision: 4582

URL: http://svn.gna.org/viewcvs/getfem?rev=4582&view=rev
Log:
minor modification

Modified:
    trunk/getfem/interface/tests/matlab/check_asm.m
    trunk/getfem/interface/tests/matlab/demo_nonlinear_elasticity.m

Modified: trunk/getfem/interface/tests/matlab/check_asm.m
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/check_asm.m?rev=4582&r1=4581&r2=4582&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/check_asm.m     (original)
+++ trunk/getfem/interface/tests/matlab/check_asm.m     Thu Apr  3 09:17:56 2014
@@ -115,12 +115,12 @@
   mim=gf_mesh_im(m_1d, 2);
   U = ones(1, gf_mesh_fem_get(mf_1d, 'nbdof'));
   P = ones(1, gf_mesh_fem_get(mf_1d, 'nbdof'));
-  K=gf_asm('generic', mim, 2, 'Grad_u.Test_p + p.Grad_Test_u+ p.Test_u', -1, 
'u', 1, mf_1d, U, 'p', 1, mf_1d, P);
+  K=gf_asm('generic', mim, 2, 'Grad_u.Test_p + p.Grad_Test_u - p.Test_u', -1, 
'u', 1, mf_1d, U, 'p', 1, mf_1d, P);
   K1=gf_asm('generic', mim, 2, 'Grad_u.Test_p', -1, 'u', 1, mf_1d, U, 'p', 1, 
mf_1d, P);
   K2=gf_asm('generic', mim, 2, 'p.Grad_Test_u', -1, 'u', 1, mf_1d, U, 'p', 1, 
mf_1d, P);
   K3=gf_asm('generic', mim, 2, 'p.Test_u', -1, 'u', 1, mf_1d, U, 'p', 1, 
mf_1d, P);
-  error = norm(full(K-K1-K2-K3));
-  gfassert('error < 1E-10');
+  err = norm(full(K-K1-K2+K3))
+  gfassert('err < 1E-10');
   
   
   

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=4582&r1=4581&r2=4582&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/demo_nonlinear_elasticity.m     
(original)
+++ trunk/getfem/interface/tests/matlab/demo_nonlinear_elasticity.m     Thu Apr 
 3 09:17:56 2014
@@ -27,7 +27,7 @@
 dirichlet_version = 2; % 1 = simplification, 2 = penalisation
 drawing = true;
 test_tangent_matrix = false;
-incompressible = true;
+incompressible = false;
 
 % lawname = 'Ciarlet Geymonat';
 % params = [1;1;0.25];
@@ -85,16 +85,11 @@
 md=gf_model('real');
 gf_model_set(md, 'add fem variable', 'u', mfu);
 gf_model_set(md,'add initialized data','params', params);
-% gf_model_set(md, 'add nonlinear elasticity brick', mim, 'u', lawname, 
'params');
+gf_model_set(md, 'add nonlinear elasticity brick', mim, 'u', lawname, 
'params');
 % gf_model_set(md, 'add nonlinear generic assembly brick', mim, ...
 %             'sqr(Trace(Green_Lagrangian(Id(meshdim)+Grad_u)))/8 + 
Norm_sqr(Green_Lagrangian(Id(meshdim)+Grad_u))/4');
 % gf_model_set(md, 'add nonlinear generic assembly brick', mim, ...
-%             '((Id(meshdim)+Grad_u)*((2*Trace(Grad_u)+Norm_sqr(Grad_u))*
-%             Id(meshdim) + 
2*(Grad_u+Grad_u''+Grad_u''*Grad_u))):Grad_Test_u');
-% gf_model_set(md, 'add nonlinear generic assembly brick', mim, ...
-%            
'((Id(meshdim)+Grad_u)*(Trace(Green_Lagrangian(Id(meshdim)+Grad_u))*Id(meshdim)+2*Green_Lagrangian(Id(meshdim)+Grad_u))):Grad_Test_u');
-% gf_model_set(md, 'add nonlinear generic assembly brick', mim, ...
-%                'Grad_u:Grad_Test_u');
+%            
'((Id(meshdim)+Grad_u)*(params(1)*Trace(Green_Lagrangian(Id(meshdim)+Grad_u))*Id(meshdim)+2*params(2)*Green_Lagrangian(Id(meshdim)+Grad_u))):Grad_Test_u');
 % gf_model_set(md, 'add nonlinear generic assembly brick', mim, 
'Saint_Venant_Kirchhoff_potential(Grad_u,params)'); 
 % gf_model_set(md, 'add nonlinear generic assembly brick', mim, ...
 %           
'((Id(meshdim)+Grad_u)*(Ciarlet_Geymonat_sigma(Grad_u,params))):Grad_Test_u');
@@ -102,8 +97,8 @@
 %                'Ciarlet_Geymonat_potential(Grad_u,params)');
 % gf_model_set(md, 'add nonlinear generic assembly brick', mim, ...
 %         
'((Id(meshdim)+Grad_u)*(Incompressible_Mooney_Rivlin_sigma(Grad_u,params))):Grad_Test_u');
-gf_model_set(md, 'add nonlinear generic assembly brick', mim, ...
-                 'Incompressible_Mooney_Rivlin_potential(Grad_u,params)');
+% gf_model_set(md, 'add nonlinear generic assembly brick', mim, ...
+%                  'Incompressible_Mooney_Rivlin_potential(Grad_u,params)');
 % gf_model_set(md, 'add nonlinear generic assembly brick', mim, ...
 %      
'((Id(meshdim)+Grad_u)*(Saint_Venant_Kirchhoff_sigma(Grad_u,params))):Grad_Test_u');