dolfin team mailing list archive

[Andre Massing <massing@xxxxxxxxx>]

Hi,

just corrected few lines in the 2D cpp mesh intersection demo.
Could you please review and merge it? (An updated version is although 
available at lp:~massing/dolfin/cgal_branch).

Kind regards,
Andre

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: massing@xxxxxxxxx-20091206082947-nzci6ylfx2njamfv
# target_branch: bzr+ssh://bazaar.launchpad.net/~dolfin-\
#   core/dolfin/main/
# testament_sha1: 43946e8642a2286d682c0311094aa7b7cc181c6e
# timestamp: 2009-12-06 09:39:28 +0100
# base_revision_id: massing@xxxxxxxxx-20091205190150-2l05o1izvt4fixco
# 
# Begin patch
=== modified file 'bench/fem/convergence/bench.log'
--- bench/fem/convergence/bench.log	2009-06-19 09:02:43 +0000
+++ bench/fem/convergence/bench.log	2009-12-06 08:29:47 +0000
@@ -118,3 +118,11 @@
 
 Total time: 2:04.64
 
+Date: Sun Dec 6 09:27:34 CET 2009
+-------------------------------------------------------------------------------
+
+Linux andre-laptop 2.6.31.4-centrino-duo #1 SMP Tue Oct 27 10:16:06 CET 2009 x86_64 GNU/Linux
+
+
+Total time: Command exited with non-zero status 127 0:00.00
+

=== modified file 'demo/mesh/intersection/2D/cpp/main.cpp'
--- demo/mesh/intersection/2D/cpp/main.cpp	2009-12-04 15:39:23 +0000
+++ demo/mesh/intersection/2D/cpp/main.cpp	2009-12-06 08:29:47 +0000
@@ -2,7 +2,7 @@
 // Licensed under the GNU LGPL Version 2.1.
 //
 // First added:  2008-10-08
-// Last changed: 2009-12-04
+// Last changed: 2009-12-06
 //
 // Modified by Anders Logg, 2008.
 // Modified by Andre Massing, 2009.
@@ -37,14 +37,15 @@
   {
     // Compute intersection with boundary of square
     BoundaryMesh boundary(omega1);
-    std::vector<unsigned int> cells;
-    omega0.intersection(boundary, cells, false);
+    //typedef for std::set<unsigned int>
+    uint_set cells;
+    omega0.all_intersected_entities(boundary, cells);
 
     // Copy values to mesh function for plotting
     MeshFunction<unsigned int> intersection(omega0, omega0.topology().dim());
     intersection = 0;
-    for (unsigned int i = 0; i < cells.size(); i++)
-      intersection[cells[i]] = 1;
+    for (uint_set::const_iterator i = cells.begin(); i != cells.end(); i++)
+      intersection[*i] = 1;
 
     // Plot intersection
     //plot(intersection);

=== added directory 'demo/mesh/intersection/3D/cpp'
=== added file 'demo/mesh/intersection/3D/cpp/README'
--- demo/mesh/intersection/3D/cpp/README	1970-01-01 00:00:00 +0000
+++ demo/mesh/intersection/3D/cpp/README	2009-12-06 08:29:47 +0000
@@ -0,0 +1,2 @@
+There is as yet no C++ version of this demo.
+Please consider contributing the missing code.

# Begin bundle
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
QA==