[Getfem-commits] r4893 - in /trunk/getfem: bin/ doc/sphinx/source/ doc/sphinx/source/.templates/ doc/sphinx/source/matlab/ interface/src/ int...

[Yves . Renard]

Author: renard
Date: Thu Mar 19 17:10:28 2015
New Revision: 4893

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

Modified:
    trunk/getfem/bin/extract_doc
    trunk/getfem/bin/split_cmdref
    trunk/getfem/doc/sphinx/source/.templates/indexcontent.html
    trunk/getfem/doc/sphinx/source/copyright.rst
    trunk/getfem/doc/sphinx/source/license.txt
    trunk/getfem/doc/sphinx/source/matlab/index.rst
    trunk/getfem/doc/sphinx/source/replaces.txt
    trunk/getfem/interface/src/gf_asm.cc
    trunk/getfem/interface/src/python/getfem_python.c
    trunk/getfem/src/getfem/getfem_generic_assembly.h
    trunk/getfem/src/getfem_generic_assembly.cc

Modified: trunk/getfem/bin/extract_doc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/bin/extract_doc?rev=4893&r1=4892&r2=4893&view=diff
==============================================================================
--- trunk/getfem/bin/extract_doc        (original)
+++ trunk/getfem/bin/extract_doc        Thu Mar 19 17:10:28 2015
@@ -874,8 +874,8 @@
   print 'to have a more extensive description of the structures algorithms '
   print 'and concepts used.'
   print ''
-  print 'Types'
-  print '-----'
+  # print 'Types'
+  # print '-----'
   print ''
   print 'The expected type of each function argument is indicated in this '
   print 'reference. Here is a list of these types:'
@@ -1385,8 +1385,8 @@
   print 'to have a more extensive description of the structures algorithms '
   print 'and concepts used.'
   print ''
-  print 'Types'
-  print '-----'
+  # print 'Types'
+  # print '-----'
   print ''
   print 'The expected type of each function argument is indicated in this '
   print 'reference. Here is a list of these types:'
@@ -1533,7 +1533,7 @@
 #
 # Python GetFEM++ interface
 #
-# Copyright (C) 2004-2014 Yves Renard, Julien Pommier.
+# Copyright (C) 2004-2015 Yves Renard, Julien Pommier.
 #
 # This file is a part of GetFEM++
 #

Modified: trunk/getfem/bin/split_cmdref
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/bin/split_cmdref?rev=4893&r1=4892&r2=4893&view=diff
==============================================================================
--- trunk/getfem/bin/split_cmdref       (original)
+++ trunk/getfem/bin/split_cmdref       Thu Mar 19 17:10:28 2015
@@ -57,7 +57,7 @@
         if (state == 0):
             flw.write('\n');
             flw.write('.. toctree::\n');
-            flw.write('   :maxdepth: 2\n\n');
+            flw.write('   :maxdepth: 3\n\n');
         flw.write('   cmdref_' + command_name + '\n');    
         state = 1
         if (flcom):

Modified: trunk/getfem/doc/sphinx/source/.templates/indexcontent.html
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/doc/sphinx/source/.templates/indexcontent.html?rev=4893&r1=4892&r2=4893&view=diff
==============================================================================
--- trunk/getfem/doc/sphinx/source/.templates/indexcontent.html (original)
+++ trunk/getfem/doc/sphinx/source/.templates/indexcontent.html Thu Mar 19 
17:10:28 2015
@@ -141,7 +141,7 @@
     </p>
     
     <p>
-    GetFEM++ has only a (very) experimental meshing procedure (and produces 
regular meshes). It is therefore often necessary to import meshes. The formats 
+    GetFEM++ has only an experimental meshing procedure (and produces regular 
meshes). It is therefore often necessary to import meshes. The formats 
     currently supported are GID, GMSH and EMC2.
     </p>
 </div>

Modified: trunk/getfem/doc/sphinx/source/copyright.rst
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/doc/sphinx/source/copyright.rst?rev=4893&r1=4892&r2=4893&view=diff
==============================================================================
--- trunk/getfem/doc/sphinx/source/copyright.rst        (original)
+++ trunk/getfem/doc/sphinx/source/copyright.rst        Thu Mar 19 17:10:28 2015
@@ -6,7 +6,7 @@
 
 |gf| and this documentation is:
 
-Copyright |copy| |licyears| |authors|.
+Copyright |copy| |licyears| |gf| project.
 
 
 

Modified: trunk/getfem/doc/sphinx/source/license.txt
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/doc/sphinx/source/license.txt?rev=4893&r1=4892&r2=4893&view=diff
==============================================================================
--- trunk/getfem/doc/sphinx/source/license.txt  (original)
+++ trunk/getfem/doc/sphinx/source/license.txt  Thu Mar 19 17:10:28 2015
@@ -1,6 +1,6 @@
 .. $Id$
 
-Copyright |copy| |licyears| |authors|.
+Copyright |copy| |licyears| |gf| project.
 
 The text of the |gf| website and the documentations are available for 
modification and reuse under the terms of the |gnufreedoc|_
 

Modified: trunk/getfem/doc/sphinx/source/matlab/index.rst
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/doc/sphinx/source/matlab/index.rst?rev=4893&r1=4892&r2=4893&view=diff
==============================================================================
--- trunk/getfem/doc/sphinx/source/matlab/index.rst     (original)
+++ trunk/getfem/doc/sphinx/source/matlab/index.rst     Thu Mar 19 17:10:28 2015
@@ -8,7 +8,7 @@
 ################
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 3
 
    intro
    install

Modified: trunk/getfem/doc/sphinx/source/replaces.txt
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/doc/sphinx/source/replaces.txt?rev=4893&r1=4892&r2=4893&view=diff
==============================================================================
--- trunk/getfem/doc/sphinx/source/replaces.txt (original)
+++ trunk/getfem/doc/sphinx/source/replaces.txt Thu Mar 19 17:10:28 2015
@@ -1,4 +1,3 @@
-.. |authors| replace:: Yves Renard, Julien Pommier
 .. |copy| unicode:: 0xA9 .. copyright sign
 .. |gnu| replace:: *GNU*
 .. |c++| replace:: *C++*

Modified: trunk/getfem/interface/src/gf_asm.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/gf_asm.cc?rev=4893&r1=4892&r2=4893&view=diff
==============================================================================
--- trunk/getfem/interface/src/gf_asm.cc        (original)
+++ trunk/getfem/interface/src/gf_asm.cc        Thu Mar 19 17:10:28 2015
@@ -468,7 +468,8 @@
     }
   }
 
-  pworkspace->add_expression(expr, gfi_mim->mesh_im(), region);
+  bool add_derivative = (order == 0) ? false : true;
+  pworkspace->add_expression(expr, gfi_mim->mesh_im(), region, add_derivative);
 
   switch (order) {
   case 0:

Modified: trunk/getfem/interface/src/python/getfem_python.c
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/python/getfem_python.c?rev=4893&r1=4892&r2=4893&view=diff
==============================================================================
--- trunk/getfem/interface/src/python/getfem_python.c   (original)
+++ trunk/getfem/interface/src/python/getfem_python.c   Thu Mar 19 17:10:28 2015
@@ -673,7 +673,7 @@
     word_out = PyString_FromString("GetFEM++");
   }else if (strcmp(word_in,"copyright") == 0){
     word_out = PyString_FromString
-    ("2004-2014 Yves Renard, Julien Pommier");
+    ("2004-2015 GetFEM++ project");
   }else if (strcmp(word_in,"authors") == 0){
     word_out = PyString_FromString
     ("Yves Renard, Julien Pommier");

Modified: trunk/getfem/src/getfem/getfem_generic_assembly.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_generic_assembly.h?rev=4893&r1=4892&r2=4893&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_generic_assembly.h   (original)
+++ trunk/getfem/src/getfem/getfem_generic_assembly.h   Thu Mar 19 17:10:28 2015
@@ -277,7 +277,8 @@
      *  the tangent terms. Return the maximal order found in the expression.
      */
     size_type add_expression(const std::string expr, const mesh_im &mim,
-                            const mesh_region &rg=mesh_region::all_convexes());
+                             const mesh_region &rg=mesh_region::all_convexes(),
+                             bool add_derivative = true);
     /* Internal use */
     void add_function_expression(const std::string expr);
     /* Internal use */

Modified: trunk/getfem/src/getfem_generic_assembly.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_generic_assembly.cc?rev=4893&r1=4892&r2=4893&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Thu Mar 19 17:10:28 2015
@@ -4196,7 +4196,8 @@
 
   size_type ga_workspace::add_expression(const std::string expr,
                                          const mesh_im &mim,
-                                         const mesh_region &rg_) {
+                                         const mesh_region &rg_,
+                                         bool add_derivative) {
     const mesh_region &rg = register_region(mim.linked_mesh(), rg_);
     // cout << "adding expression " << expr << endl;
     size_type max_order = 0;
@@ -4217,7 +4218,7 @@
                              false, false);
         if ((*it)->root)
           max_order = std::max((*it)->root->nb_test_functions(), max_order);
-        add_tree(*(*it), mim.linked_mesh(), mim, rg, expr);
+        add_tree(*(*it), mim.linked_mesh(), mim, rg, expr, add_derivative);
       }
 
       if (tree.root)