[Getfem-commits] r5060 - in /trunk/getfem: bin/extract_doc contrib/static_contact_gears/Makefile.am tests/Makefile.am

[Yves . Renard]

Author: renard
Date: Mon Jul 27 17:51:35 2015
New Revision: 5060

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

Modified:
    trunk/getfem/bin/extract_doc
    trunk/getfem/contrib/static_contact_gears/Makefile.am
    trunk/getfem/tests/Makefile.am

Modified: trunk/getfem/bin/extract_doc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/bin/extract_doc?rev=5060&r1=5059&r2=5060&view=diff
==============================================================================
--- trunk/getfem/bin/extract_doc        (original)
+++ trunk/getfem/bin/extract_doc        Mon Jul 27 17:51:35 2015
@@ -875,7 +875,7 @@
   print ''
   print '=====================  
=================================================='
   print '`int`                  integer value'
-  print '`hobj`                 a handle for any getfem++ object'
+  print '`hobj`                 a handle for any GetFEM++ object'
   print '`scalar`               scalar value'
   print '`string`               string'
   print '`ivec`                 vector of integer values'
@@ -883,8 +883,8 @@
   print '`imat`                 matrix of integer values'
   print '`mat`                  matrix'
   print '`spmat`                sparse matrix (both matlab native sparse'
-  print '                       matrices, and getfem sparse matrices)'
-  print '`precond`              getfem preconditioner object'
+  print '                       matrices, and GetFEM sparse matrices)'
+  print '`precond`              GetFEM preconditioner object'
   print '`mesh mesh`            object descriptor (or gfMesh object)'
   print '`mesh_fem`             mesh fem object descriptor (or gfMeshFem 
object)'
   print '`mesh_im`              mesh im object descriptor (or gfMeshIm object)'
@@ -1044,7 +1044,7 @@
   mfile.write('      <varlistentry>\n')
   mfile.write('        <term>hobj</term>\n')
   mfile.write('        <listitem>\n')
-  mfile.write('          <para>a handle for any getfem++ object</para>\n')
+  mfile.write('          <para>a handle for any GetFEM++ object</para>\n')
   mfile.write('        </listitem>\n')
   mfile.write('      </varlistentry>\n\n')
 
@@ -1093,14 +1093,14 @@
   mfile.write('      <varlistentry>\n')
   mfile.write('        <term>spmat</term>\n')
   mfile.write('        <listitem>\n')
-  mfile.write('          <para>sparse matrix (both matlab native sparse 
matrices, and getfem sparse matrices)</para>\n')
+  mfile.write('          <para>sparse matrix (both Matlab native sparse 
matrices, and GetFEM sparse matrices)</para>\n')
   mfile.write('        </listitem>\n')
   mfile.write('      </varlistentry>\n\n')
 
   mfile.write('      <varlistentry>\n')
   mfile.write('        <term>precond</term>\n')
   mfile.write('        <listitem>\n')
-  mfile.write('          <para>getfem preconditioner object</para>\n')
+  mfile.write('          <para>GetFEM preconditioner object</para>\n')
   mfile.write('        </listitem>\n')
   mfile.write('      </varlistentry>\n\n')
 
@@ -1377,7 +1377,7 @@
   print ''
   print '=====================  
=================================================='
   print '`int`                  integer value'
-  print '`hobj`                 a handle for any getfem++ object'
+  print '`hobj`                 a handle for any GetFEM++ object'
   print '`scalar`               scalar value'
   print '`string`               string'
   print '`ivec`                 vector of integer values'
@@ -1385,8 +1385,8 @@
   print '`imat`                 matrix of integer values'
   print '`mat`                  matrix'
   print '`spmat`                sparse matrix (both matlab native sparse'
-  print '                       matrices, and getfem sparse matrices)'
-  print '`precond`              getfem preconditioner object'
+  print '                       matrices, and GetFEM sparse matrices)'
+  print '`precond`              GetFEM preconditioner object'
   print '`mesh mesh`            object descriptor (or gfMesh object)'
   print '`mesh_fem`             mesh fem object descriptor (or gfMeshFem 
object)'
   print '`mesh_im`              mesh im object descriptor (or gfMeshIm object)'
@@ -1564,7 +1564,7 @@
 getfem('workspace', 'clear all')
 
 def generic_constructor(self, clname, *args):
-    \"\"\"Internal function -- acts as a constructor for all getfem 
objects.\"\"\"
+    \"\"\"Internal function -- acts as a constructor for all GetFEM 
objects.\"\"\"
     #print 'generic_constructor.'+clname+'('+str(args)+')'
     if (len(args)==1 and type(args[0]) is GetfemObject):
       if hasattr(self,'id'):
@@ -1589,7 +1589,7 @@
     obj_count[self.id] = obj_count.get(self.id,0)+1
 
 def generic_destructor(self, destructible=True):
-    \"\"\"Internal function -- acts as a destructor for all getfem 
objects.\"\"\"
+    \"\"\"Internal function -- acts as a destructor for all GetFEM 
objects.\"\"\"
     if (not hasattr(self,'id')):
       return
     #print \"Mesh.__del__       \",self.id,'count=',obj_count[self.id]
@@ -1850,7 +1850,7 @@
 
 
   print '\ndef memstats():'
-  print '  print "*** Getfem view of the workspace:"'
+  print '  print "*** GetFEM view of the workspace:"'
   print '  getfem(\'workspace\',\'stats\')'
   print '  print "*** Python view of the workspace:"'
   print '  for id,c in obj_count.iteritems():'

Modified: trunk/getfem/contrib/static_contact_gears/Makefile.am
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/contrib/static_contact_gears/Makefile.am?rev=5060&r1=5059&r2=5060&view=diff
==============================================================================
--- trunk/getfem/contrib/static_contact_gears/Makefile.am       (original)
+++ trunk/getfem/contrib/static_contact_gears/Makefile.am       Mon Jul 27 
17:51:35 2015
@@ -2,7 +2,12 @@
 
 check_PROGRAMS = static_contact_gears static_contact_gears_u1_u2
 
-CLEANFILES = 
+CLEANFILES =                                            \
+       static_contact_gears.U static_contact_gears.vtk  \
+       static_contact_gears.RHS static_contact_gears.VM \
+       static_contact_gears.mfd static_contact_gears.mf \
+       static_contact_gears.mesh
+
 
 static_contact_gears_SOURCES = static_contact_gears.cc
 static_contact_gears_u1_u2_SOURCES = static_contact_gears_u1_u2.cc
@@ -26,6 +31,7 @@
        static_contact_planetary_5.msh \
        static_contact_planetary.py \
        static_contact_gears.param \
+       static_contact_gears.pl \
        static_contact_gears_2D.param \
        static_contact_gears_2teeth.param
 

Modified: trunk/getfem/tests/Makefile.am
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/tests/Makefile.am?rev=5060&r1=5059&r2=5060&view=diff
==============================================================================
--- trunk/getfem/tests/Makefile.am      (original)
+++ trunk/getfem/tests/Makefile.am      Mon Jul 27 17:51:35 2015
@@ -50,14 +50,12 @@
        elasto_static.mesh test_mesh.mesh toto.mat test_mat_elem.mesh       \
        helmholtz.vtk plate.mesh plate.vtk nonlinear_elastostatic.mesh      \
        nonlinear_elastostatic.mf nonlinear_elastostatic.mfd                \
-       nonlinear_elastostatic.dx nonlinear_elastostatic.vtk                \
-       plasticity.mesh plasticity.U plasticity.sigmabar plasticity.vtk     \
-       plasticity.meshfem plasticity.coef elasto_static_err.vtk            \
+       nonlinear_elastostatic.dx plasticity.mesh plasticity.U              \
+        plasticity.sigmabar plasticity.meshfem plasticity.coef              \
        ii_files/* auto_gmm* dyn*.txt                                       \
-       *.sl time FN0              \
+       *.sl time FN0 *.vtk             \
        nonlinear_elastostatic.U crack.mesh cut.mesh nonlinear_membrane.mfd \
        nonlinear_membrane.mesh test_range_basis.mesh nonlinear_membrane.mf \
-       nonlinear_membrane.vtk feminterpolation.vtk circleslice.vtk         \
        Q2_incomplete.pos Q2_incomplete.msh
 
 dynamic_array_SOURCES = dynamic_array.cc