[Getfem-commits] r5107 - in /trunk/getfem: doc/sphinx/source/userdoc/ interface/tests/matlab/ interface/tests/python/

[Yves . Renard]

Author: renard
Date: Fri Oct 23 16:26:59 2015
New Revision: 5107

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

Modified:
    trunk/getfem/doc/sphinx/source/userdoc/xfem.rst
    trunk/getfem/interface/tests/matlab/demo_static_contact.m
    trunk/getfem/interface/tests/python/demo_plasticity.py

Modified: trunk/getfem/doc/sphinx/source/userdoc/xfem.rst
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/doc/sphinx/source/userdoc/xfem.rst?rev=5107&r1=5106&r2=5107&view=diff
==============================================================================
--- trunk/getfem/doc/sphinx/source/userdoc/xfem.rst     (original)
+++ trunk/getfem/doc/sphinx/source/userdoc/xfem.rst     Fri Oct 23 16:26:59 2015
@@ -146,6 +146,39 @@
 function is modified, one has to call the method ``mim.adapt()``.
 
 
+When more than one level-set is declared on the |gf_mls| object, it is 
possible to set more precisely the integration domain using the method::
+
+  mim.set_level_set_boolean_operations("desc");
+
+where "desc" is a string containing the description of the boolean operation 
which defines the integration domain. The syntax is simple, for example if 
there are 3 different levelset,
+
+  "a*b*c" is the intersection of the domains defined by each
+  levelset (this is the default behaviour if this function is not
+  called).
+
+  "a+b+c" is the union of their domains.
+
+  "c-(a+b)" is the domain of the third levelset minus the union of
+  the domains of the two others.
+      
+  "!a" is the complementary of the domain of a (i.e. it is the
+  domain where a(x)>0)
+
+  The first levelset is always referred to with "a", the second
+  with "b", and so on.
+
+
+Cut-fem
+-------
+
+The previous tools (description of the level-sets, cut mesh and cut 
integration method) are already sufficient to build cut-fem applications.
+
++ exemple (:file:`interface/tests/python/demo_fictitious_domain.py`)
+
+A few word on stabilizations methods ... 
+
+
+
 Discontinuous field across some level-sets
 ------------------------------------------
 

Modified: trunk/getfem/interface/tests/matlab/demo_static_contact.m
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/demo_static_contact.m?rev=5107&r1=5106&r2=5107&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/demo_static_contact.m   (original)
+++ trunk/getfem/interface/tests/matlab/demo_static_contact.m   Fri Oct 23 
16:26:59 2015
@@ -27,9 +27,9 @@
 
 % Import the mesh : disc
 % m=gf_mesh('load', '../../../tests/meshes/disc_P2_h4.mesh');
-% m=gf_mesh('load', '../../../tests/meshes/disc_P2_h2.mesh');
+m=gf_mesh('load', '../../../tests/meshes/disc_P2_h2.mesh');
 % m=gf_mesh('load', '../../../tests/meshes/disc_P2_h1.mesh');
-m=gf_mesh('load', '../../../tests/meshes/disc_P2_h0_5.mesh');
+% m=gf_mesh('load', '../../../tests/meshes/disc_P2_h0_5.mesh');
 % m=gf_mesh('load', '../../../tests/meshes/disc_P2_h0_3.mesh');
 
 % Import the mesh : sphere
@@ -47,7 +47,7 @@
 clambda = 1;           % Lame coefficient
 cmu = 1;               % Lame coefficient
 friction_coeff = 0.4;  % coefficient of friction
-vertical_force = 0.05; % Volumic load in the vertical direction
+vertical_force = 0.015; % Volumic load in the vertical direction
 u_degree = 2;
 lambda_degree = 2;
 incompressibility = 0;
@@ -70,7 +70,7 @@
 
 niter = 100;   % Maximum number of iterations for Newton's algorithm.
 plot_mesh = true;
-version = 16; % 1 : frictionless contact and the basic contact brick
+version = 1; % 1 : frictionless contact and the basic contact brick
               % 2 : contact with 'static' Coulomb friction and basic contact 
brick
               % 3 : frictionless contact and the contact with a
               %     rigid obstacle brick
@@ -394,7 +394,7 @@
   set(gcf,'renderer','zbuffer');
   h=gf_plot_slice(sl2,'mesh','on','mesh_slice_edges','off','data',VMsl);
   view(-80,-15); axis on; camlight; gf_colormap('chouette');
-  % map=[1:-1/10:0]'*[1 1 1]; colormap(map); % for NB
+  
     
   % gf_plot(mfvm, VM, 'mesh', 'off', 'cvlst', ...
   %        gf_mesh_get(mfu,'outer faces'), 'deformation', U, ...
@@ -405,6 +405,7 @@
 else
   gf_plot(mfvm, VM, 'deformed_mesh', 'on', 'deformation', U, ...
           'deformation_mf', mfu, 'deformation_scale', 1, 'refine', 8);
+  map=[1:-1/10:0]'*[0.6 0.6 0.4]; colormap(map); % for NB
   xlabel('x'); ylabel('y');
   title('Deformed configuration (not really a small deformation of course 
...)');
 end;

Modified: trunk/getfem/interface/tests/python/demo_plasticity.py
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/python/demo_plasticity.py?rev=5107&r1=5106&r2=5107&view=diff
==============================================================================
--- trunk/getfem/interface/tests/python/demo_plasticity.py      (original)
+++ trunk/getfem/interface/tests/python/demo_plasticity.py      Fri Oct 23 
16:26:59 2015
@@ -75,7 +75,7 @@
 m.set_region(2,fright)
 
 md = gf.Model('real')
-md.add_fem_variable('u', mfu, 2)
+md.add_fem_variable('u', mfu)
 md.add_fem_data('sigma', mfsigma)
 md.add_initialized_data('lambda', Lambda)
 md.add_initialized_data('mu', Mu)