getfem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Getfem-commits] r4573 - /trunk/getfem/src/getfem_mesh_im_level_set.cc


From: Yves . Renard
Subject: [Getfem-commits] r4573 - /trunk/getfem/src/getfem_mesh_im_level_set.cc
Date: Mon, 31 Mar 2014 19:13:13 -0000

Author: renard
Date: Mon Mar 31 21:13:12 2014
New Revision: 4573

URL: http://svn.gna.org/viewcvs/getfem?rev=4573&view=rev
Log:
small fix on OUTSIDE option of combinations of level-sets

Modified:
    trunk/getfem/src/getfem_mesh_im_level_set.cc

Modified: trunk/getfem/src/getfem_mesh_im_level_set.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_mesh_im_level_set.cc?rev=4573&r1=4572&r2=4573&view=diff
==============================================================================
--- trunk/getfem/src/getfem_mesh_im_level_set.cc        (original)
+++ trunk/getfem/src/getfem_mesh_im_level_set.cc        Mon Mar 31 21:13:12 2014
@@ -187,8 +187,8 @@
       scalar_type d1 = (mesherls0[i])(P);
       scalar_type d2 = (sec ? (mesherls1[i])(P) : -1);
       if (d1 < 0 && d2 < 0) ev.in.add(i);
-      if ((integrate_where & INTEGRATE_OUTSIDE) /*&& !sec*/)
-       ev.in[i].flip();
+      // if ((integrate_where & INTEGRATE_OUTSIDE) /*&& !sec*/)
+      //       ev.in[i].flip();
 
       if (gmm::abs(d1) < 1e-7 && d2 < 1e-7) 
        ev.bin.add(i);
@@ -196,12 +196,17 @@
     
 
     bool2 r;
-    if (ls_csg_description.size()) 
+    if (ls_csg_description.size())
       r = ev.is_in(ls_csg_description.c_str());
     else {
       r.in  = (ev.in.card() == mls->nb_level_sets());
       r.bin = (ev.bin.card() >= 1 && ev.in.card() >= mls->nb_level_sets()-1);
     }
+
+    if (integrate_where & INTEGRATE_OUTSIDE) r.in = !(r.in);
+    
+
+
     /*bool2 r2 = is_point_in_selected_area2(mesherls0,mesherls1,P);
     if (r2.in != r.in || r2.bin != r.bin) {
       cerr << "ev.in = " << ev.in << ", bin=" << ev.bin<<"\n";




reply via email to

[Prev in Thread] Current Thread [Next in Thread]