[Getfem-commits] r4640 - in /trunk/getfem: interface/src/ src/ src/getfem/

[Yves . Renard]

Author: renard
Date: Tue May  6 17:05:13 2014
New Revision: 4640

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

Modified:
    trunk/getfem/interface/src/gf_mesh_im_set.cc
    trunk/getfem/src/getfem/getfem_mesh_im.h
    trunk/getfem/src/getfem_mesh_im.cc
    trunk/getfem/src/getfem_models.cc

Modified: trunk/getfem/interface/src/gf_mesh_im_set.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/gf_mesh_im_set.cc?rev=4640&r1=4639&r2=4640&view=diff
==============================================================================
--- trunk/getfem/interface/src/gf_mesh_im_set.cc        (original)
+++ trunk/getfem/interface/src/gf_mesh_im_set.cc        Tue May  6 17:05:13 2014
@@ -52,10 +52,12 @@
   }
 
   /* all the work done here */
-  if (!all_cv)
+  if (!all_cv) {
     mim->set_integration_method(bv, pim);
-  else
+  }  else {
     mim->set_integration_method(pim);
+  }
+
 }
 
 /* set the classical integ of order IM_DEGREE on the mesh_im, with a classical 
integration
@@ -64,14 +66,19 @@
                                           getfemint::mexargs_in& in) {
   dim_type IM_DEGREE = dim_type(-1);
   if (in.remaining()) IM_DEGREE = dim_type(in.pop().to_integer(-1,255));
+  bool all_cv = false;
   dal::bit_vector bv;
   if (in.remaining() == 1) {
     bv = in.pop().to_bit_vector(&mim->linked_mesh().convex_index(),
                                -config::base_index());
+  } else
+    all_cv = true;
+  if (!all_cv) {
+    mim->set_integration_method(bv,IM_DEGREE);
   } else {
-    bv = mim->linked_mesh().convex_index();
+    mim->set_integration_method(IM_DEGREE);
   }
-  mim->set_integration_method(bv,IM_DEGREE);
+  
 }
 
 /* WARNING: gf_mesh_im.cc also uses this function! do not change its 
interface! */

Modified: trunk/getfem/src/getfem/getfem_mesh_im.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_mesh_im.h?rev=4640&r1=4639&r2=4640&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_mesh_im.h    (original)
+++ trunk/getfem/src/getfem/getfem_mesh_im.h    Tue May  6 17:05:13 2014
@@ -94,10 +94,15 @@
     */
     void set_integration_method(pintegration_method ppi);
     /** Set an approximate integration method chosen to be exact for
-       polynomials of degree 'im_degree'
+       polynomials of degree 'im_degree'.
     */
     void set_integration_method(const dal::bit_vector &cvs, 
                                dim_type im_degree);
+    
+    /** Set an approximate integration method chosen to be exact for
+       polynomials of degree 'im_degree' on the whole mesh.
+    */
+    void set_integration_method(dim_type im_degree);
     
     /** return the integration method associated with an element (in
        no integration is associated, the function will crash! use the

Modified: trunk/getfem/src/getfem_mesh_im.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_mesh_im.cc?rev=4640&r1=4639&r2=4640&view=diff
==============================================================================
--- trunk/getfem/src/getfem_mesh_im.cc  (original)
+++ trunk/getfem/src/getfem_mesh_im.cc  Tue May  6 17:05:13 2014
@@ -84,6 +84,23 @@
       pintegration_method pim = 
        getfem::classical_approx_im(linked_mesh().trans_of_convex(cv), 
im_degree);
       set_integration_method(cv, pim);
+    }
+  }
+
+  void mesh_im::set_integration_method(dim_type im_degree) {
+    GMM_ASSERT1(im_degree != dim_type(-1), "im_degree==-1");
+    size_type i = 0;
+    for (dal::bv_visitor cv(linked_mesh().convex_index());
+         !cv.finished(); ++cv, ++i) {
+      pintegration_method pim = 
+       getfem::classical_approx_im(linked_mesh().trans_of_convex(cv),
+                                    im_degree);
+      set_integration_method(cv, pim);
+      if (i == 0)
+        set_auto_add(pim);
+      else {
+        if (pim != auto_add_elt_pim) auto_add_elt_pim = 0;
+      }
     }
   }
 

Modified: trunk/getfem/src/getfem_models.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_models.cc?rev=4640&r1=4639&r2=4640&view=diff
==============================================================================
--- trunk/getfem/src/getfem_models.cc   (original)
+++ trunk/getfem/src/getfem_models.cc   Tue May  6 17:05:13 2014
@@ -911,7 +911,7 @@
              list_distro<real_matlist> rmatlist(brick.rmatlist);
              list_distro<real_veclist> rveclist(brick.rveclist[rhs_ind]);
              list_distro<real_veclist> 
rveclist_sym(brick.rveclist_sym[rhs_ind]);
-        GMM_TRACE2("Matrix distribution took "<< gmm::uclock_sec()-time<<" 
s.");
+        // GMM_TRACE2("Matrix distribution took "<< gmm::uclock_sec()-time<<" 
s.");
         time = gmm::uclock_sec();
         /*running the assembly in parallel*/
              gmm::standard_locale locale;