[Getfem-commits] r4669 - in /trunk/getfem/src: bgeot_geometric_trans.cc getfem_generic_assembly.cc

[Yves . Renard]

Author: renard
Date: Fri May 30 21:56:39 2014
New Revision: 4669

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

Modified:
    trunk/getfem/src/bgeot_geometric_trans.cc
    trunk/getfem/src/getfem_generic_assembly.cc

Modified: trunk/getfem/src/bgeot_geometric_trans.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/bgeot_geometric_trans.cc?rev=4669&r1=4668&r2=4669&view=diff
==============================================================================
--- trunk/getfem/src/bgeot_geometric_trans.cc   (original)
+++ trunk/getfem/src/bgeot_geometric_trans.cc   Fri May 30 21:56:39 2014
@@ -68,11 +68,13 @@
       size_type P = pgt_->structure()->dim();
       K_.resize(N(), P);
       if (have_pgp()) {
+        GMM_ASSERT1(ii_ < pgp_->get_point_tab().size(),
+                    "Invalid index " << ii_ << " should be < "
+                    << pgp_->get_point_tab().size());
 
         if (&pgp_->grad(ii_) == 0) { cerr << "OULA!! " << ii_ << "\n"; }
         else if (pgp_->grad(ii_).size() == 0) { cerr << "OUCH\n"; }
 
-        assert(ii_ < pgp_->get_point_tab().size());
         pgt()->compute_K_matrix(G(), pgp_->grad(ii_), K_);
       } else {
         base_matrix pc(pgt()->nb_points(), P);

Modified: trunk/getfem/src/getfem_generic_assembly.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_generic_assembly.cc?rev=4669&r1=4668&r2=4669&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Fri May 30 21:56:39 2014
@@ -6401,10 +6401,9 @@
           if (pim->type() == IM_NONE) continue;
           GMM_ASSERT1(pim->type() == IM_APPROX, "Sorry, exact methods cannot "
                       "be used in high level generic assembly");
-          gis.pai = pim->approx_method();
-          const bgeot::stored_point_tab &spt = gis.pai->integration_points();
+          const bgeot::stored_point_tab &spt 
=pim->approx_method()->integration_points();
           if (spt.size()) {
-            if (gis.ctx.have_pgp() && gis.ctx.pgt() == pgt) {
+            if (gis.ctx.have_pgp() && gis.pai == pim->approx_method()) {
               gis.ctx = fem_interpolation_context(gis.ctx.pgp(), 0, 0, G,
                                                   v.cv(), v.f());
             } else {
@@ -6417,6 +6416,8 @@
                                                     v.cv(), v.f());
               }
             }
+            gis.pai = pim->approx_method();
+
 
             // iterations on Gauss points
             gis.nbpt = gis.pai->nb_points_on_convex();