dolfin team mailing list archive

[Benjamin Kehlet <benjamik@xxxxxxxxx>]

On 3 May 2011 14:44, Anders Logg <logg@xxxxxxxxx> wrote:
> On Tue, May 03, 2011 at 02:29:40PM +0200, Benjamin Kehlet wrote:
>> On 3 May 2011 14:07, Garth N. Wells <gnw20@xxxxxxxxx> wrote:
>> >
>> >
>> > On 03/05/11 13:02, Anders Logg wrote:
>> >> Who removed the mesh data "vertex_map" and "cell_map", and why were
>> >> they removed?
>> >>
>> >
>> > It may have been me. It will have been moved rather than removed.
>> >
>> >> When I think of it now, the move to BoundaryMesh may be appropriate
>> >> since "vertex_map" is ambiguous (not clear that it refers to a mapping
>> >> from the boundary).
>> >>
>> >
>> > There were many ambiguities in the mesh data - I've been trying to
>> > straighten out the ones relate to parallel meshes so I can start on
>> > implementing missing functionality. The code was too confusing for me
>> > too implement new functionality without straightening things out first.
>>
>> There seems to be consensus to keep it in BoundaryMesh and as
>> functions ( cell_map() and vertex_map() ) rather than named mesh
>> functions. I'll update Meshbuilder then.
>
> Great.

While i*m on it: Here is a patch that update the comments in MeshData
and BoundarMyMesh.

Also, the class FacetCell now takes a BoundaryMesh as constructor
argument. Is this ok?

Benjamin

>
> --
> Anders
>
>
>> >
>> > Garth
>> >
>> >> In any case, docstrings are missing in MeshBoundary.h and MeshData.h
>> >> still list "vertex_map" and "cell_map".
>> >>
>> >>
>> >> _______________________________________________
>> >> Mailing list: https://launchpad.net/~dolfin
>> >> Post to     : dolfin@xxxxxxxxxxxxxxxxxxx
>> >> Unsubscribe : https://launchpad.net/~dolfin
>> >> More help   : https://help.launchpad.net/ListHelp
>> >
>> >
>> > _______________________________________________
>> > Mailing list: https://launchpad.net/~dolfin
>> > Post to     : dolfin@xxxxxxxxxxxxxxxxxxx
>> > Unsubscribe : https://launchpad.net/~dolfin
>> > More help   : https://help.launchpad.net/ListHelp
>> >
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~dolfin
>> Post to     : dolfin@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~dolfin
>> More help   : https://help.launchpad.net/ListHelp
>

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: benjamik@xxxxxxxxxx-20110503141110-8j0uerdm6rm6pc30
# target_branch: bzr+ssh://bazaar.launchpad.net/%2Bbranch/dolfin/
# testament_sha1: 5d99550947469f62bd2c878ea74a48058739b4d4
# timestamp: 2011-05-03 16:15:23 +0200
# base_revision_id: logg@xxxxxxxxx-20110501220145-60ys4e77qbc0mq32
# 
# Begin patch
=== modified file 'dolfin/adaptivity/Extrapolation.cpp'
--- dolfin/adaptivity/Extrapolation.cpp	2011-03-30 17:42:48 +0000
+++ dolfin/adaptivity/Extrapolation.cpp	2011-05-03 14:11:10 +0000
@@ -22,7 +22,6 @@
 #include <dolfin/log/log.h>
 #include <dolfin/mesh/BoundaryMesh.h>
 #include <dolfin/mesh/Cell.h>
-#include <dolfin/mesh/FacetCell.h>
 #include "Extrapolation.h"
 
 using namespace dolfin;

=== modified file 'dolfin/mesh/BoundaryMesh.h'
--- dolfin/mesh/BoundaryMesh.h	2011-03-22 22:58:27 +0000
+++ dolfin/mesh/BoundaryMesh.h	2011-05-03 14:11:10 +0000
@@ -40,9 +40,11 @@
     MeshFunction<unsigned int>& cell_map()
     { return _cell_map; }
 
+    /// Get cell mapping from the boundary mesh to the original full mesh
     const MeshFunction<unsigned int>& cell_map() const
     { return _cell_map; }
 
+    /// Get vertex mapping from the boundary mesh to the original full mesh
     MeshFunction<unsigned int>& vertex_map()
     { return _vertex_map; }
 

=== modified file 'dolfin/mesh/FacetCell.cpp'
--- dolfin/mesh/FacetCell.cpp	2011-03-13 19:37:53 +0000
+++ dolfin/mesh/FacetCell.cpp	2011-05-03 14:11:10 +0000
@@ -13,18 +13,14 @@
 using namespace dolfin;
 
 //-----------------------------------------------------------------------------
-FacetCell::FacetCell(const Mesh& mesh, const Cell& facet)
+FacetCell::FacetCell(const BoundaryMesh& mesh, const Cell& facet)
   : Cell(mesh, 0), _facet_index(0)
 {
   // Get map from facets (boundary cells) to mesh cells
-  boost::shared_ptr<const MeshFunction<unsigned int> > cell_map = facet.mesh().data().mesh_function("cell map");
-
-  // Check that mapping exists
-  if (!cell_map)
-    error("Unable to create create cell corresponding to facet, missing cell map.");
+  const MeshFunction<unsigned int>& cell_map = mesh.cell_map();
 
   // Get mesh facet corresponding to boundary cell
-  Facet mesh_facet(mesh, (*cell_map)[facet]);
+  Facet mesh_facet(mesh, cell_map[facet]);
 
   // Get cell index (pick first, there is only one)
   const uint D = mesh.topology().dim();

=== modified file 'dolfin/mesh/FacetCell.h'
--- dolfin/mesh/FacetCell.h	2010-02-08 14:59:57 +0000
+++ dolfin/mesh/FacetCell.h	2011-05-03 14:11:10 +0000
@@ -8,6 +8,7 @@
 #define __FACET_CELL_H
 
 #include "Cell.h"
+#include "BoundaryMesh.h"
 
 namespace dolfin
 {
@@ -22,7 +23,7 @@
   public:
 
     /// Create cell on mesh corresponding to given facet (cell) on boundary
-    FacetCell(const Mesh& mesh, const Cell& facet);
+    FacetCell(const BoundaryMesh& mesh, const Cell& facet);
 
     /// Destructor
     ~FacetCell();

=== modified file 'dolfin/mesh/MeshData.h'
--- dolfin/mesh/MeshData.h	2011-04-08 13:53:18 +0000
+++ dolfin/mesh/MeshData.h	2011-05-03 14:11:10 +0000
@@ -54,8 +54,8 @@
   ///
   /// Boundary extraction
   ///
-  ///   "vertex map" - MeshFunction<uint> of dimension 0
-  ///   "cell map"   - MeshFunction<uint> of dimension D
+  ///   (moved to BoundaryMesh) "vertex map" - MeshFunction<uint> of dimension 0
+  ///   (moved to BoundaryMesh) "cell map"   - MeshFunction<uint> of dimension D
   ///
   /// Mesh partitioning
   ///

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