[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] r4891 - in /trunk/getfem/interface/tests/matlab: check_
From: |
Yves . Renard |
Subject: |
[Getfem-commits] r4891 - in /trunk/getfem/interface/tests/matlab: check_all.m check_plasticity.m demo_continuation.m demo_crack.m |
Date: |
Thu, 19 Mar 2015 08:23:46 -0000 |
Author: renard
Date: Thu Mar 19 09:23:46 2015
New Revision: 4891
URL: http://svn.gna.org/viewcvs/getfem?rev=4891&view=rev
Log:
minor corrections
Modified:
trunk/getfem/interface/tests/matlab/check_all.m
trunk/getfem/interface/tests/matlab/check_plasticity.m
trunk/getfem/interface/tests/matlab/demo_continuation.m
trunk/getfem/interface/tests/matlab/demo_crack.m
Modified: trunk/getfem/interface/tests/matlab/check_all.m
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/check_all.m?rev=4891&r1=4890&r2=4891&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/check_all.m (original)
+++ trunk/getfem/interface/tests/matlab/check_all.m Thu Mar 19 09:23:46 2015
@@ -1,4 +1,4 @@
-% Copyright (C) 2005-2012 Julien Pommier.
+% Copyright (C) 2005-2015 Julien Pommier.
%
% This file is a part of GETFEM++
%
@@ -96,7 +96,15 @@
errcnt=errcnt+1; disp(['== ' t ': FAILURE']);
end;
-t = 'demo_laplacian [model use for solving a Poisson problem] ';
+t = 'check_plasticity [model brick complex generic assembly] ';
+try
+ check_plasticity;
+ disp(['== ' t ': SUCCESS']);
+catch
+ errcnt=errcnt+1; disp(['== ' t ' : FAILURE']);
+end;
+
+t = 'demo_laplacian [model use for solving a Poisson problem] ';
try
automatic_var654 = 1;
demo_laplacian;
Modified: trunk/getfem/interface/tests/matlab/check_plasticity.m
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/check_plasticity.m?rev=4891&r1=4890&r2=4891&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/check_plasticity.m (original)
+++ trunk/getfem/interface/tests/matlab/check_plasticity.m Thu Mar 19
09:23:46 2015
@@ -15,9 +15,23 @@
% along with this program; if not, write to the Free Software Foundation,
% Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-clear all;
-gf_workspace('clear all');
-clc;
+
+function check_asm(iverbose,idebug)
+ global gverbose;
+ global gdebug;
+ if (nargin >= 1),
+ gverbose = iverbose;
+ if (nargin == 2),
+ gdebug = idebug;
+ else
+ gdebug = 0;
+ end;
+ else
+ gverbose = 0; gdebug = 0;
+ end;
+
+ gf_workspace('clear all');
+
@@ -28,7 +42,7 @@
bi_material = false;
-test_tangent_matrix = true;
+test_tangent_matrix = false;
do_plot = false;
@@ -36,8 +50,8 @@
% Initialize used data
LX = 100;
LY = 20;
-NX = 24;
-NY = 10;
+NX = 20;
+NY = 8;
% alpha is parameter of the generalized integration algorithms.
% The choice alpha = 1/2 yields the mid point method and alpha = 1 leads to
@@ -49,7 +63,7 @@
f = [15000 0]';
-t = [0 0.5 0.6 0.7 0.8 0.9 1 0.9 0.8 0.7 0.6 0.5 0.4 0.3 0.2 0.1 0 -0.1 -0.2
-0.4 -0.6 -0.8 -0.6 -0.4 -0.2 0];
+t = [0 0.6 0.8 1 0.8 0.6 0.4 0.2 0 -0.2 -0.4 -0.6 -0.8 -0.6 -0.4 -0.2 -0.1 0];
% Create the mesh
% m = gfMesh('triangles grid', [0:(LX/NX):LX], [0:(LY/NY):LY]);
@@ -239,10 +253,10 @@
end;
-
-
-
-
-
-
-
+nn = size(sigma_fig,2);
+gfassert('abs((sigma_fig(nn) + 0.092976819406567) < 1E-3)')
+
+
+
+
+
Modified: trunk/getfem/interface/tests/matlab/demo_continuation.m
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/demo_continuation.m?rev=4891&r1=4890&r2=4891&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/demo_continuation.m (original)
+++ trunk/getfem/interface/tests/matlab/demo_continuation.m Thu Mar 19
09:23:46 2015
@@ -114,7 +114,7 @@
xlabel('x'); ylabel('u');
pause(1);
-sing_out = [];
+sing_out = {};
% continue from the initial point
for step = 1:nbstep
disp(sprintf('\nbeginning of step %d', step));
@@ -136,7 +136,7 @@
s = ['step ' sprintf('%d', step) ': smooth bifurcation point, '...
sprintf('%d', size(T_U_bp, 2)) ' branch(es) located'];
end
- sing_out = [sing_out; s];
+ sing_out(size(sing_out, 1)+1,1) = {s};
end
U_hist(step+1) = U(1); lambda_hist(step+1) = lambda;
@@ -159,8 +159,9 @@
nsing = size(sing_out, 1);
if (nsing)
- disp(sprintf('\n------------------------------'))
- disp(' detected singular points')
+ disp('')
+ disp('------------------------------')
+ disp(' Detected singular points ')
disp('------------------------------')
for i = 1:nsing
disp(sing_out(i,:))
Modified: trunk/getfem/interface/tests/matlab/demo_crack.m
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/demo_crack.m?rev=4891&r1=4890&r2=4891&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/demo_crack.m (original)
+++ trunk/getfem/interface/tests/matlab/demo_crack.m Thu Mar 19 09:23:46 2015
@@ -82,11 +82,6 @@
gf_model_set(md,'add_initialized_data','lambda', [Lambda]);
gf_model_set(md,'add_initialized_data','mu', [Mu]);
gf_model_set(md,'add_isotropic_linearized_elasticity_brick',mim,'u','lambda','mu');
-% il fault!!!
-% gf_model_set(md,'add_variable','mult_spec',6);
-% BB = gf_spmat('empty',6,gf_mesh_fem_get(mf_u,'nbdof'));
-%
gf_model_set(md,'add_constraint_with_multipliers','u','mult_spec',BB,zeros(6,1));
-
gf_model_set(md,'add_initialized_fem_data','DirichletData', mf_ue, Ue);
gf_model_set(md,'add_Dirichlet_condition_with_penalization',mim,'u', 1e12,
DIRICHLET, 'DirichletData');
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Getfem-commits] r4891 - in /trunk/getfem/interface/tests/matlab: check_all.m check_plasticity.m demo_continuation.m demo_crack.m,
Yves . Renard <=