[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] r5439 - in /trunk/getfem/src: getfem/getfem_mesh_fem.h
From: |
Yves . Renard |
Subject: |
[Getfem-commits] r5439 - in /trunk/getfem/src: getfem/getfem_mesh_fem.h getfem_mesh_fem.cc |
Date: |
Mon, 24 Oct 2016 20:15:16 -0000 |
Author: renard
Date: Mon Oct 24 22:15:14 2016
New Revision: 5439
URL: http://svn.gna.org/viewcvs/getfem?rev=5439&view=rev
Log:
small clean up
Modified:
trunk/getfem/src/getfem/getfem_mesh_fem.h
trunk/getfem/src/getfem_mesh_fem.cc
Modified: trunk/getfem/src/getfem/getfem_mesh_fem.h
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_mesh_fem.h?rev=5439&r1=5438&r2=5439&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_mesh_fem.h (original)
+++ trunk/getfem/src/getfem/getfem_mesh_fem.h Mon Oct 24 22:15:14 2016
@@ -88,7 +88,7 @@
bool operator < (const iterator &i) const
{ return (it < i.it) && (ii < i.ii); }
- tab_scal_to_vect_iterator(void) {}
+ tab_scal_to_vect_iterator() {}
tab_scal_to_vect_iterator(const ITER &iter, dim_type n, dim_type i)
: it(iter), N(n), ii(i) { }
@@ -120,20 +120,20 @@
public :
- bool empty(void) const { return it == ite; }
- size_type size(void) const { return (ite - it) * N; }
-
- const_iterator begin(void) const { return iterator(it, N, 0); }
- const_iterator end(void) const { return iterator(ite, N, 0); }
- const_reverse_iterator rbegin(void) const
+ bool empty() const { return it == ite; }
+ size_type size() const { return (ite - it) * N; }
+
+ const_iterator begin() const { return iterator(it, N, 0); }
+ const_iterator end() const { return iterator(ite, N, 0); }
+ const_reverse_iterator rbegin() const
{ return const_reverse_iterator(end()); }
- const_reverse_iterator rend(void) const
+ const_reverse_iterator rend() const
{ return const_reverse_iterator(begin()); }
- value_type front(void) const { return *begin(); }
- value_type back(void) const { return *(--(end())); }
-
- tab_scal_to_vect(void) : N(0) {}
+ value_type front() const { return *begin(); }
+ value_type back() const { return *(--(end())); }
+
+ tab_scal_to_vect() : N(0) {}
tab_scal_to_vect(const CONT &cc, dim_type n)
: it(cc.begin()), ite(cc.end()), N(n) {}
@@ -181,24 +181,24 @@
typedef tab_scal_to_vect<mesh::ind_cv_ct> ind_dof_ct;
typedef tab_scal_to_vect<mesh::ind_pt_face_ct> ind_dof_face_ct;
- void update_from_context(void) const;
-
- gmm::uint64_type version_number(void) const
+ void update_from_context() const;
+
+ gmm::uint64_type version_number() const
{ context_check(); return v_num; }
/** Get the set of convexes where a finite element has been assigned.
*/
- inline const dal::bit_vector &convex_index(void) const
+ inline const dal::bit_vector &convex_index() const
{ context_check(); return fe_convex; }
/// Return true if a reduction matrix is applied to the dofs.
- bool is_reduced(void) const { return use_reduction; }
+ bool is_reduced() const { return use_reduction; }
/// Return the reduction matrix applied to the dofs.
- const REDUCTION_MATRIX &reduction_matrix(void) const { return R_; }
+ const REDUCTION_MATRIX &reduction_matrix() const { return R_; }
/// Return the extension matrix corresponding to reduction applied (RE=I).
- const EXTENSION_MATRIX &extension_matrix(void) const { return E_; }
+ const EXTENSION_MATRIX &extension_matrix() const { return E_; }
/** Allows to set the reduction and the extension matrices.
* Should satify (RR*EE=I). */
@@ -527,20 +527,20 @@
virtual void get_global_dof_index(std::vector<size_type> &ind) const;
/** Renumber the degrees of freedom. You should not have
* to call this function, as it is done automatically */
- virtual void enumerate_dof(void) const;
+ virtual void enumerate_dof() const;
#if GETFEM_PARA_LEVEL > 1
- void enumerate_dof_para(void)const;
+ void enumerate_dof_para()const;
#endif
/** Return the total number of basic degrees of freedom (before the
* optional reduction). */
- virtual size_type nb_basic_dof(void) const {
+ virtual size_type nb_basic_dof() const {
context_check(); if (!dof_enumeration_made) enumerate_dof();
return nb_total_dof;
}
/// Return the total number of degrees of freedom.
- virtual size_type nb_dof(void) const {
+ virtual size_type nb_dof() const {
context_check(); if (!dof_enumeration_made) enumerate_dof();
return use_reduction ? gmm::mat_nrows(R_) : nb_total_dof;
}
@@ -585,12 +585,12 @@
@param Q the Q dimension (see mesh_fem::get_qdim).
*/
explicit mesh_fem(const mesh &me, dim_type Q = 1);
- mesh_fem(void);
+ mesh_fem();
mesh_fem(const mesh_fem &mf);
mesh_fem &operator=(const mesh_fem &mf);
virtual ~mesh_fem();
- virtual void clear(void);
+ virtual void clear();
/** Read the mesh_fem from a stream.
@param ist the stream.
*/
Modified: trunk/getfem/src/getfem_mesh_fem.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_mesh_fem.cc?rev=5439&r1=5438&r2=5439&view=diff
==============================================================================
--- trunk/getfem/src/getfem_mesh_fem.cc (original)
+++ trunk/getfem/src/getfem_mesh_fem.cc Mon Oct 24 22:15:14 2016
@@ -27,7 +27,7 @@
namespace getfem {
- void mesh_fem::update_from_context(void) const {
+ void mesh_fem::update_from_context() const {
for (dal::bv_visitor i(fe_convex); !i.finished(); ++i) {
if (linked_mesh_->convex_index().is_in(i)) {
if (v_num_update < linked_mesh_->convex_version_number(i)) {
@@ -301,7 +301,7 @@
}
/// Enumeration of dofs
- void mesh_fem::enumerate_dof(void) const {
+ void mesh_fem::enumerate_dof() const {
bgeot::index_node_pair ipt;
is_uniform_ = true;
is_uniformly_vectorized_ = (get_qdim() > 1);
@@ -312,17 +312,6 @@
pfem first_pf = f_elems[fe_convex.first_true()];
if (first_pf && first_pf->is_on_real_element()) is_uniform_ = false;
if (first_pf && first_pf->target_dim() > 1) is_uniformly_vectorized_=false;
-
- // Gives the Cuthill McKee ordering to iterate on elements
- // const std::vector<size_type> &cmk =
linked_mesh().cuthill_mckee_ordering();
-
-
- // std::vector<size_type> cmk;
- // for (dal::bv_visitor cv(linked_mesh().convex_index()); !cv.finished();
++cv)
- // cmk.push_back(cv);
-
-
-
// Dof counter
size_type nbdof = 0;
@@ -460,7 +449,7 @@
set_reduction_matrices(RR, gmm::transposed(RR));
}
- void mesh_fem::clear(void) {
+ void mesh_fem::clear() {
fe_convex.clear();
dof_enumeration_made = false;
is_uniform_ = true;
@@ -521,7 +510,7 @@
mesh_fem::mesh_fem(const mesh &me, dim_type Q)
{ linked_mesh_ = 0; init_with_mesh(me, Q); }
- mesh_fem::mesh_fem(void) {
+ mesh_fem::mesh_fem() {
linked_mesh_ = 0;
dof_enumeration_made = false;
is_uniform_ = true;
@@ -799,7 +788,7 @@
else if (qdim < a.qdim) return true;
return false;
}
- void update_from_context(void) const {}
+ void update_from_context() const {}
mf__key_(const mf__key_ &mfk) : context_dependencies( ) {
pmsh = mfk.pmsh; order = mfk.order; qdim = mfk.qdim;
add_dependency(*pmsh);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Getfem-commits] r5439 - in /trunk/getfem/src: getfem/getfem_mesh_fem.h getfem_mesh_fem.cc,
Yves . Renard <=