[Getfem-commits] (no subject)

[Konstantinos Poulios]

branch: master
commit 21c9098143ede42a13670684615737c1ef355be6
Author: Konstantinos Poulios <address@hidden>
Date:   Tue Feb 19 17:02:40 2019 +0100

    Type naming simplifications
---
 src/getfem/bgeot_mesh.h              | 4 ++--
 src/getfem/bgeot_mesh_structure.h    | 6 +++---
 src/getfem/getfem_deformable_mesh.h  | 2 +-
 src/getfem/getfem_mesh_fem.h         | 2 +-
 src/getfem/getfem_partial_mesh_fem.h | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/getfem/bgeot_mesh.h b/src/getfem/bgeot_mesh.h
index 10b9119..07e9a5e 100644
--- a/src/getfem/bgeot_mesh.h
+++ b/src/getfem/bgeot_mesh.h
@@ -88,12 +88,12 @@ namespace bgeot {
 
     /// Return a (pseudo)container of the points of a given convex
     ref_mesh_pt_ct points_of_convex(size_type ic) const {
-      const ind_cv_ct &rct = ind_points_of_convex(ic);
+      const ind_set &rct = ind_points_of_convex(ic);
       return ref_mesh_pt_ct(pts.begin(), rct.begin(), rct.end());
     }
 
     inline void points_of_convex(size_type ic, base_matrix &G) const {
-      const ind_cv_ct &rct = ind_points_of_convex(ic);
+      const ind_set &rct = ind_points_of_convex(ic);
       size_type N = dim(), Np = rct.size();
       G.base_resize(N, Np);
       auto it = G.begin();
diff --git a/src/getfem/bgeot_mesh_structure.h 
b/src/getfem/bgeot_mesh_structure.h
index 1e954c4..1e72fee 100644
--- a/src/getfem/bgeot_mesh_structure.h
+++ b/src/getfem/bgeot_mesh_structure.h
@@ -104,8 +104,8 @@ namespace bgeot {
     bool is_point_valid(size_type i) const { return !(points_tab[i].empty()); }
     /** Return a container to the list of points attached to convex ic.
         They are ordered according to structure_of_convex(ic) */
-    const ind_cv_ct &ind_points_of_convex(size_type ic)
-      const { return convex_tab[ic].pts; }
+    const ind_set &ind_points_of_convex(size_type ic) const
+    { return convex_tab[ic].pts; }
     /// Return the "local" index for point ip of the mesh
     size_type local_ind_of_convex_point(size_type ic, size_type ip) const;
     /// Return the pconvex_structure of the convex ic.
@@ -258,7 +258,7 @@ namespace bgeot {
   template<class ITER>
     bool mesh_structure::is_convex_having_points(size_type ic,
                                               short_type nb, ITER pit) const {
-    const ind_cv_ct &pt = ind_points_of_convex(ic);
+    const ind_set &pt = ind_points_of_convex(ic);
     for (short_type i = 0; i < nb; ++i, ++pit)
       if (std::find(pt.begin(), pt.end(), *pit) == pt.end())
         return false;
diff --git a/src/getfem/getfem_deformable_mesh.h 
b/src/getfem/getfem_deformable_mesh.h
index 511bdff..15dc3f1 100644
--- a/src/getfem/getfem_deformable_mesh.h
+++ b/src/getfem/getfem_deformable_mesh.h
@@ -100,7 +100,7 @@ namespace getfem {
       size_type cv;
       for (cv << conv_indices; cv != bgeot::size_type(-1); cv << conv_indices)
       {
-        getfem::mesh::ind_cv_ct pt_index = m_.ind_points_of_convex(cv);
+        getfem::mesh::ind_set pt_index = m_.ind_points_of_convex(cv);
         getfem::mesh_fem::ind_dof_ct dof = mf_.ind_basic_dof_of_element(cv);
         bgeot::size_type num_points = m_.structure_of_convex(cv)->nb_points();
 
diff --git a/src/getfem/getfem_mesh_fem.h b/src/getfem/getfem_mesh_fem.h
index 6a3864f..7a4b7d0 100644
--- a/src/getfem/getfem_mesh_fem.h
+++ b/src/getfem/getfem_mesh_fem.h
@@ -453,7 +453,7 @@ namespace getfem {
     }
     ind_dof_ct ind_dof_of_element(size_type cv) const IS_DEPRECATED
     { return ind_basic_dof_of_element(cv); }
-    virtual const bgeot::mesh_structure::ind_cv_ct &
+    virtual const std::vector<size_type> &
     ind_scalar_basic_dof_of_element(size_type cv) const
     { return dof_structure.ind_points_of_convex(cv); }
     /** Give an array of the dof numbers lying of a convex face (all
diff --git a/src/getfem/getfem_partial_mesh_fem.h 
b/src/getfem/getfem_partial_mesh_fem.h
index b6bd00d..3ce3411 100644
--- a/src/getfem/getfem_partial_mesh_fem.h
+++ b/src/getfem/getfem_partial_mesh_fem.h
@@ -101,7 +101,7 @@ namespace getfem {
     ind_dof_ct ind_basic_dof_of_element(size_type cv) const
     { return  mf.ind_basic_dof_of_element(cv); }
 
-    const bgeot::mesh_structure::ind_cv_ct &
+    const std::vector<size_type> &
     ind_scalar_basic_dof_of_element(size_type cv) const
     { return mf.ind_scalar_basic_dof_of_element(cv); }