[Getfem-commits] r4980 - in /trunk/getfem/src: getfem/getfem_mesh_fem.h getfem_mesh_fem.cc

[Yves . Renard]

Author: renard
Date: Wed Apr 29 20:30:13 2015
New Revision: 4980

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

Modified:
    trunk/getfem/src/getfem/getfem_mesh_fem.h
    trunk/getfem/src/getfem_mesh_fem.cc

Modified: trunk/getfem/src/getfem/getfem_mesh_fem.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_mesh_fem.h?rev=4980&r1=4979&r2=4980&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_mesh_fem.h   (original)
+++ trunk/getfem/src/getfem/getfem_mesh_fem.h   Wed Apr 29 20:30:13 2015
@@ -464,8 +464,10 @@
     /** Return the number of  degrees of freedom attached to a given convex.
        @param cv the convex number.
     */
-    virtual size_type nb_basic_dof_of_element(size_type cv) const
-    { pfem pf = f_elems[cv]; return pf->nb_dof(cv) * Qdim / pf->target_dim(); }
+    virtual size_type nb_basic_dof_of_element(size_type cv) const {
+      context_check(); if (!dof_enumeration_made) enumerate_dof();
+      pfem pf = f_elems[cv]; return pf->nb_dof(cv) * Qdim / pf->target_dim();
+    }
     size_type nb_dof_of_element(size_type cv) const IS_DEPRECATED
     { return nb_basic_dof_of_element(cv); }
     

Modified: trunk/getfem/src/getfem_mesh_fem.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_mesh_fem.cc?rev=4980&r1=4979&r2=4980&view=diff
==============================================================================
--- trunk/getfem/src/getfem_mesh_fem.cc (original)
+++ trunk/getfem/src/getfem_mesh_fem.cc Wed Apr 29 20:30:13 2015
@@ -1,6 +1,6 @@
 /*===========================================================================
  
- Copyright (C) 1999-2012 Yves Renard
+ Copyright (C) 1999-2015 Yves Renard
  
  This file is a part of GETFEM++
  
@@ -238,7 +238,7 @@
   }
 
   size_type mesh_fem::first_convex_of_basic_dof(size_type d) const {
-    context_check();
+    context_check(); if (!dof_enumeration_made) enumerate_dof();
     for (size_type i = d; i != d - Qdim && i != size_type(-1); --i) {
       size_type j = dof_structure.first_convex_of_point(i);
       if (j != size_type(-1)) return j;
@@ -247,6 +247,7 @@
   }
 
   const mesh::ind_cv_ct &mesh_fem::convex_to_basic_dof(size_type d) const {
+    context_check(); if (!dof_enumeration_made) enumerate_dof();
     for (size_type i = d; i != d - Qdim && i != size_type(-1); --i) {
       size_type j = dof_structure.first_convex_of_point(i);
       if (j != size_type(-1)) return dof_structure.convex_to_point(i);