[Getfem-commits] r4942 - in /trunk/getfem: interface/tests/matlab/ src/ tests/

[Yves . Renard]

Author: renard
Date: Tue Apr  7 12:52:35 2015
New Revision: 4942

URL: http://svn.gna.org/viewcvs/getfem?rev=4942&view=rev
Log:
Some tests with Div_

Modified:
    trunk/getfem/interface/tests/matlab/demo_Mindlin_Reissner_plate.m
    
trunk/getfem/interface/tests/matlab/demo_thermo_elasticity_electrical_coupling.m
    trunk/getfem/src/getfem_generic_assembly.cc
    trunk/getfem/tests/test_assembly.cc

Modified: trunk/getfem/interface/tests/matlab/demo_Mindlin_Reissner_plate.m
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/demo_Mindlin_Reissner_plate.m?rev=4942&r1=4941&r2=4942&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/demo_Mindlin_Reissner_plate.m   
(original)
+++ trunk/getfem/interface/tests/matlab/demo_Mindlin_Reissner_plate.m   Tue Apr 
 7 12:52:35 2015
@@ -82,7 +82,7 @@
 else
   gf_model_set(md, 'add elementary rotated RT0 projection', 'RT0_projection');
   gf_model_set(md, 'add linear generic assembly brick', mim, 
'(E*epsilon*epsilon*epsilon*(1-nu)/(48 * (1 - nu*nu))) * 
((Grad_theta+Grad_theta''):(Grad_Test_theta+Grad_Test_theta''))');
-  gf_model_set(md, 'add linear generic assembly brick', mim, 
'(E*epsilon*epsilon*epsilon*nu/(12 * (1 - nu*nu))) * 
(Trace(Grad_theta)*Trace(Grad_Test_theta))');
+  gf_model_set(md, 'add linear generic assembly brick', mim, 
'(E*epsilon*epsilon*epsilon*nu/(12 * (1 - nu*nu))) * 
(Div_theta*Div_Test_theta)');
   if (variant == 0)
     gf_model_set(md, 'add linear generic assembly brick', mim, 
'(E*kappa*epsilon/(1 + nu)) * ((Grad_u + theta).Grad_Test_u) + 
(E*kappa*epsilon/(1 + nu)) * ((Grad_u + theta).Test_theta)');
   elseif (variant == 1)
@@ -107,7 +107,7 @@
 gf_model_get(md, 'solve');
 U = gf_model_get(md, 'variable', 'u');
 
-if (draw)
+if (draw_solution)
   gf_plot(mfu,U,'mesh','off', 'zplot', 'on'); 
   colorbar; title('computed solution');
 end

Modified: 
trunk/getfem/interface/tests/matlab/demo_thermo_elasticity_electrical_coupling.m
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/demo_thermo_elasticity_electrical_coupling.m?rev=4942&r1=4941&r2=4942&view=diff
==============================================================================
--- 
trunk/getfem/interface/tests/matlab/demo_thermo_elasticity_electrical_coupling.m
    (original)
+++ 
trunk/getfem/interface/tests/matlab/demo_thermo_elasticity_electrical_coupling.m
    Tue Apr  7 12:52:35 2015
@@ -179,7 +179,7 @@
 
 % Thermal expansion term
 gf_model_set(md, 'add initialized data', 'beta', [alpha_th*E/(1-2*nu)]);
-gf_model_set(md, 'add linear generic assembly brick', mim, 
'beta*theta*Trace(Grad_Test_u)');
+gf_model_set(md, 'add linear generic assembly brick', mim, 
'beta*theta*Div_Test_u');
 
 
 %

Modified: trunk/getfem/src/getfem_generic_assembly.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_generic_assembly.cc?rev=4942&r1=4941&r2=4942&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Tue Apr  7 12:52:35 2015
@@ -6193,7 +6193,8 @@
           const mesh_fem *mf = workspace.associated_mf(name);
           const im_data *imd = workspace.associated_im_data(name);
 
-          if (test && workspace.is_constant(name))
+          if (test && workspace.is_constant(name) &&
+              !(workspace.is_disabled_variable(name)))
             ga_throw_error(expr, pnode->pos, "Test functions of constants "
                            "are not allowed.");
           if (test == 1) {

Modified: trunk/getfem/tests/test_assembly.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/tests/test_assembly.cc?rev=4942&r1=4941&r2=4942&view=diff
==============================================================================
--- trunk/getfem/tests/test_assembly.cc (original)
+++ trunk/getfem/tests/test_assembly.cc Tue Apr  7 12:52:35 2015
@@ -1140,7 +1140,7 @@
                  Iu, Iu,
                  getfem::asm_stiffness_matrix_for_homogeneous_linear_elasticity
                  (K, mim2, mf_u, lambda, mu));
-      MAT_TEST_2(ndofu, ndofu, "lambda*Trace(Grad_Test_u)*Trace(Grad_Test2_u) "
+      MAT_TEST_2(ndofu, ndofu, "lambda*Div_Test_u*Div_Test2_u "
                  "+ mu*(Grad_Test_u'+Grad_Test_u):Grad_Test2_u", mim2, Iu, Iu);
       
       MAT_TEST_2(ndofu, ndofu,