[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] r5070 - in /trunk/getfem: interface/src/ src/ src/getfe
|
From: |
logari81 |
|
Subject: |
[Getfem-commits] r5070 - in /trunk/getfem: interface/src/ src/ src/getfem/ |
|
Date: |
Tue, 18 Aug 2015 08:32:19 -0000 |
Author: logari81
Date: Tue Aug 18 10:32:18 2015
New Revision: 5070
URL: http://svn.gna.org/viewcvs/getfem?rev=5070&view=rev
Log:
whitespace changes and some minor improvements
Modified:
trunk/getfem/interface/src/gf_asm.cc
trunk/getfem/interface/src/gf_mesh_set.cc
trunk/getfem/src/bgeot_node_tab.cc
trunk/getfem/src/getfem/bgeot_mesh.h
trunk/getfem/src/getfem_generic_assembly.cc
trunk/getfem/src/getfem_import.cc
Modified: trunk/getfem/interface/src/gf_asm.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/gf_asm.cc?rev=5070&r1=5069&r2=5070&view=diff
==============================================================================
--- trunk/getfem/interface/src/gf_asm.cc (original)
+++ trunk/getfem/interface/src/gf_asm.cc Tue Aug 18 10:32:18 2015
@@ -1072,7 +1072,7 @@
);
- /address@hidden @CELL{HH, RR} = ('dirichlet', @int bnum, @tmim mim, @tmf
mf_u, @tmf mf_d, @dmat H, @dvec R [, threshold])
+ /address@hidden @CELL{HH, RR} = ('dirichlet', @int bnum, @tmim mim, @tmf
mf_u, @tmf mf_d, @dmat H, @dvec R [, @scalar threshold])
Assembly of Dirichlet conditions of type `h.u = r`.
Handle `h.u = r` where h is a square matrix (of any rank) whose
Modified: trunk/getfem/interface/src/gf_mesh_set.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/gf_mesh_set.cc?rev=5070&r1=5069&r2=5070&view=diff
==============================================================================
--- trunk/getfem/interface/src/gf_mesh_set.cc (original)
+++ trunk/getfem/interface/src/gf_mesh_set.cc Tue Aug 18 10:32:18 2015
@@ -91,8 +91,8 @@
struct sub_gf_mesh_set : virtual public dal::static_stored_object {
int arg_in_min, arg_in_max, arg_out_min, arg_out_max;
virtual void run(getfemint::mexargs_in& in,
- getfemint::mexargs_out& out,
- getfem::mesh *pmesh) = 0;
+ getfemint::mexargs_out& out,
+ getfem::mesh *pmesh) = 0;
};
typedef boost::intrusive_ptr<sub_gf_mesh_set> psub_command;
@@ -101,16 +101,16 @@
template <typename T> static inline void dummy_func(T &) {}
#define sub_command(name, arginmin, arginmax, argoutmin, argoutmax, code) { \
- struct subc : public sub_gf_mesh_set { \
- virtual void run(getfemint::mexargs_in& in, \
- getfemint::mexargs_out& out, \
- getfem::mesh *pmesh) \
- { dummy_func(in); dummy_func(out); code }
\
- }; \
- psub_command psubc = new subc; \
- psubc->arg_in_min = arginmin; psubc->arg_in_max = arginmax;
\
- psubc->arg_out_min = argoutmin; psubc->arg_out_max = argoutmax; \
- subc_tab[cmd_normalize(name)] = psubc; \
+ struct subc : public sub_gf_mesh_set { \
+ virtual void run(getfemint::mexargs_in& in, \
+ getfemint::mexargs_out& out, \
+ getfem::mesh *pmesh) \
+ { dummy_func(in); dummy_func(out); code } \
+ }; \
+ psub_command psubc = new subc; \
+ psubc->arg_in_min = arginmin; psubc->arg_in_max = arginmax; \
+ psubc->arg_out_min = argoutmin; psubc->arg_out_max = argoutmax; \
+ subc_tab[cmd_normalize(name)] = psubc; \
}
@@ -119,7 +119,7 @@
@*/
void gf_mesh_set(getfemint::mexargs_in& m_in,
- getfemint::mexargs_out& m_out) {
+ getfemint::mexargs_out& m_out) {
typedef std::map<std::string, psub_command > SUBC_TAB;
static SUBC_TAB subc_tab;
@@ -132,10 +132,10 @@
("pts", 1, 1, 0, 1,
darray P = in.pop().to_darray
(pmesh->dim(),
- int(pmesh->points().index().last_true()+1));
+ int(pmesh->points().index().last_true()+1));
for (dal::bv_visitor i(pmesh->points().index()); !i.finished(); ++i) {
- for (unsigned k=0; k < pmesh->dim(); ++k)
- pmesh->points()[i][k] = P(k,i);
+ for (unsigned k=0; k < pmesh->dim(); ++k)
+ pmesh->points()[i][k] = P(k,i);
}
);
@@ -158,8 +158,8 @@
darray v = in.pop().to_darray(pmesh->dim(), -1);
iarray w = out.pop().create_iarray_h(v.getn());
for (int j=0; j < int(v.getn()); j++) {
- w[j] = unsigned(pmesh->add_point(v.col_to_bn(j))
- + config::base_index());
+ w[j] = unsigned(pmesh->add_point(v.col_to_bn(j))
+ + config::base_index());
}
);
@@ -175,12 +175,12 @@
iarray v = in.pop().to_iarray();
for (size_type j=0; j < v.size(); j++) {
- id_type id = v[j]-config::base_index();
- if (pmesh->is_point_valid(id)) {
- THROW_ERROR( "Can't remove point " << id+config::base_index()
- << ": a convex is still attached to it.");
- }
- pmesh->sup_point(id);
+ id_type id = v[j]-config::base_index();
+ if (pmesh->is_point_valid(id)) {
+ THROW_ERROR("Can't remove point " << id+config::base_index()
+ << ": a convex is still attached to it.");
+ }
+ pmesh->sup_point(id);
}
);
@@ -204,12 +204,12 @@
std::vector<getfemint::id_type> qp(pgt->nb_points());
/* loop over convexes */
for (unsigned k=0; k < v.getp(); k++) {
- /* loop over convex points */
- for (unsigned j=0; j < v.getn(); j++) {
- qp[j] = unsigned(pmesh->add_point(v.col_to_bn(j,k)));
- }
- id_type cv_id = id_type(pmesh->add_convex(pgt, qp.begin()));
- w[k] = cv_id+config::base_index();
+ /* loop over convex points */
+ for (unsigned j=0; j < v.getn(); j++) {
+ qp[j] = unsigned(pmesh->add_point(v.col_to_bn(j,k)));
+ }
+ id_type cv_id = id_type(pmesh->add_convex(pgt, qp.begin()));
+ w[k] = cv_id+config::base_index();
}
);
@@ -225,13 +225,13 @@
iarray v = in.pop().to_iarray();
for (size_type j=0; j < v.size(); j++) {
- id_type id = v[j]-config::base_index();
- if (pmesh->convex_index().is_in(id)) {
- pmesh->sup_convex(id);
- } else {
- THROW_ERROR("can't delete convex " << id+config::base_index()
- << ", it is not part of the mesh");
- }
+ id_type id = v[j]-config::base_index();
+ if (pmesh->convex_index().is_in(id)) {
+ pmesh->sup_convex(id);
+ } else {
+ THROW_ERROR("Can't delete convex " << id+config::base_index()
+ << ", it is not part of the mesh");
+ }
}
);
@@ -245,9 +245,9 @@
("del convex of dim", 1, 1, 0, 0,
dal::bit_vector bv = in.pop().to_bit_vector(NULL, 0);
for (dal::bv_visitor_c cv(pmesh->convex_index());
- !cv.finished(); ++cv) {
- if (bv.is_in(pmesh->structure_of_convex(cv)->dim()))
- pmesh->sup_convex(cv);
+ !cv.finished(); ++cv) {
+ if (bv.is_in(pmesh->structure_of_convex(cv)->dim()))
+ pmesh->sup_convex(cv);
}
);
@@ -340,7 +340,7 @@
("delete boundary", 1, 1, 0, 0,
dal::bit_vector lst = in.pop().to_bit_vector(&pmesh->regions_index(),0);
for (dal::bv_visitor b(lst); !b.finished(); ++b)
- pmesh->sup_region(b);
+ pmesh->sup_region(b);
);
@@ -351,7 +351,7 @@
dal::bit_vector lst = in.pop().to_bit_vector(&pmesh->regions_index(),0);
// pmesh->sup_region(1); ??
for (dal::bv_visitor b(lst); !b.finished(); ++b)
- pmesh->sup_region(b);
+ pmesh->sup_region(b);
);
@@ -364,7 +364,7 @@
("merge", 1, 1, 0, 0,
const getfem::mesh *pmesh2 = in.pop().to_const_mesh();
for (dal::bv_visitor cv(pmesh2->convex_index()); !cv.finished(); ++cv)
- pmesh->add_convex_by_points(pmesh2->trans_of_convex(cv),
pmesh2->points_of_convex(cv).begin());
+ pmesh->add_convex_by_points(pmesh2->trans_of_convex(cv),
pmesh2->points_of_convex(cv).begin());
);
@@ -408,8 +408,8 @@
SUBC_TAB::iterator it = subc_tab.find(cmd);
if (it != subc_tab.end()) {
check_cmd(cmd, it->first.c_str(), m_in, m_out, it->second->arg_in_min,
- it->second->arg_in_max, it->second->arg_out_min,
- it->second->arg_out_max);
+ it->second->arg_in_max, it->second->arg_out_min,
+ it->second->arg_out_max);
it->second->run(m_in, m_out, pmesh);
}
else bad_cmd(init_cmd);
Modified: trunk/getfem/src/bgeot_node_tab.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/bgeot_node_tab.cc?rev=5070&r1=5069&r2=5070&view=diff
==============================================================================
--- trunk/getfem/src/bgeot_node_tab.cc (original)
+++ trunk/getfem/src/bgeot_node_tab.cc Tue Aug 18 10:32:18 2015
@@ -54,9 +54,9 @@
}
size_type node_tab::search_node(const base_node &pt,
- const scalar_type radius) const {
+ const scalar_type radius) const {
if (card() == 0) return size_type(-1);
-
+
scalar_type eps_radius = std::max(eps, radius);
for (size_type is = 0; is < 5; ++is) {
if (is >= sorters.size()) add_sorter();
@@ -70,15 +70,15 @@
// if (is > 0) cout << "begin loop " << " v = " <<
sorters[is].key_comp().v << "sp c = " << gmm::vect_sp(c,
sorters[is].key_comp().v) << " eps_radius = " << eps_radius << " max_radius "
<< max_radius << endl;
for (; it != sorters[is].end() && count < 20; ++it, ++count) {
- const base_node &pt2 = (*this)[*it];
+ const base_node &pt2 = (*this)[*it];
-// if (count > 0) {
-// cout << "count " << count << " is = " << is << " pt = " << pt << "
pt2 = " << pt2 << " sp = " << gmm::vect_sp(pt2, sorters[is].key_comp().v) << "
spinit = " << gmm::vect_sp(pt, sorters[is].key_comp().v) << endl;
-// }
+// if (count > 0) {
+// cout << "count " << count << " is = " << is << " pt = " << pt <<
" pt2 = " << pt2 << " sp = " << gmm::vect_sp(pt2, sorters[is].key_comp().v) <<
" spinit = " << gmm::vect_sp(pt, sorters[is].key_comp().v) << endl;
+// }
- if (gmm::vect_dist2(pt, pt2) < eps_radius) return *it;
- if (gmm::vect_sp(pt2, sorters[is].key_comp().v) > up_bound)
- return size_type(-1);
+ if (gmm::vect_dist2(pt, pt2) < eps_radius) return *it;
+ if (gmm::vect_sp(pt2, sorters[is].key_comp().v) > up_bound)
+ return size_type(-1);
}
if (it == sorters[is].end()) return size_type(-1);
}
@@ -107,11 +107,11 @@
GMM_ASSERT1(dim_ == pt.size(), "Nodes should have the same dimension");
id = search_node(pt);
if (id == size_type(-1)) {
- id = dal::dynamic_tas<base_node>::add(pt);
- for (size_type i = 0; i < sorters.size(); ++i) {
- sorters[i].insert(id);
- GMM_ASSERT3(sorters[i].size() == card(), "internal error");
- }
+ id = dal::dynamic_tas<base_node>::add(pt);
+ for (size_type i = 0; i < sorters.size(); ++i) {
+ sorters[i].insert(id);
+ GMM_ASSERT3(sorters[i].size() == card(), "internal error");
+ }
}
}
return id;
@@ -121,13 +121,13 @@
if (i != j) {
bool existi = index().is_in(i), existj = index().is_in(j);
for (size_type is = 0; is < sorters.size(); ++is) {
- if (existi) sorters[is].erase(i);
- if (existj) sorters[is].erase(j);
+ if (existi) sorters[is].erase(i);
+ if (existj) sorters[is].erase(j);
}
dal::dynamic_tas<base_node>::swap(i, j);
for (size_type is = 0; is < sorters.size(); ++is) {
- if (existi) sorters[is].insert(j);
- if (existj) sorters[is].insert(i);
+ if (existi) sorters[is].insert(j);
+ if (existj) sorters[is].insert(i);
GMM_ASSERT3(sorters[is].size() == card(), "internal error");
}
}
@@ -136,12 +136,12 @@
void node_tab::sup_node(size_type i) {
if (index().is_in(i)) {
for (size_type is = 0; is < sorters.size(); ++is) {
- sorters[is].erase(i);
+ sorters[is].erase(i);
GMM_ASSERT3(sorters[is].size()+1 == card(), "Internal error");
// if (sorters[is].size()+1 != card()) { resort(); }
}
dal::dynamic_tas<base_node>::sup(i);
-
+
}
}
@@ -153,7 +153,7 @@
void node_tab::transformation(const base_matrix &M) {
base_small_vector w(M.nrows());
GMM_ASSERT1(gmm::mat_nrows(M) != 0 && gmm::mat_ncols(M) == dim(),
- "invalid dimensions for the transformation matrix");
+ "invalid dimensions for the transformation matrix");
dim_ = unsigned(gmm::mat_nrows(M));
for (dal::bv_visitor i(index()); !i.finished(); ++i) {
w = (*this)[i];
Modified: trunk/getfem/src/getfem/bgeot_mesh.h
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/bgeot_mesh.h?rev=5070&r1=5069&r2=5070&view=diff
==============================================================================
--- trunk/getfem/src/getfem/bgeot_mesh.h (original)
+++ trunk/getfem/src/getfem/bgeot_mesh.h Tue Aug 18 10:32:18 2015
@@ -93,7 +93,7 @@
size_type add_convex(bgeot::pgeometric_trans pgt, ITER ipts) {
bool present;
size_type i = mesh_structure::add_convex(pgt->structure(), ipts,
- &present);
+ &present);
gtab[i] = pgt; trans_exists[i] = true;
return i;
}
@@ -109,7 +109,7 @@
}
size_type add_tetrahedron(size_type a, size_type b,
- size_type c, size_type d) {
+ size_type c, size_type d) {
size_type ipt[4]; ipt[0] = a; ipt[1] = b; ipt[2] = c; ipt[3] = d;
return add_convex(simplex_geotrans(3, 1), &(ipt[0]));
}
Modified: trunk/getfem/src/getfem_generic_assembly.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_generic_assembly.cc?rev=5070&r1=5069&r2=5070&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Tue Aug 18 10:32:18 2015
@@ -2399,10 +2399,10 @@
GMM_ASSERT1(!(ctx.is_on_face()),
"Im data cannot be used on boundaries");
}
- size_type ind = imd.filtered_index_of_point(cv, ctx.ii());
- GMM_ASSERT1(ind != size_type(-1),
- "Im data with no data on the current integration point");
- gmm::copy(gmm::sub_vector(U, gmm::sub_interval(ind*qdim, qdim)),
+ size_type ipt = imd.filtered_index_of_point(cv, ctx.ii());
+ GMM_ASSERT1(ipt != size_type(-1),
+ "Im data with no data on the current integration point.");
+ gmm::copy(gmm::sub_vector(U, gmm::sub_interval(ipt*qdim, qdim)),
t.as_vector());
return 0;
}
@@ -10245,6 +10245,8 @@
}
GMM_ASSERT1(s == si, "Internal error");
size_type ipt = imd.filtered_index_of_point(cv, i);
+ GMM_ASSERT1(ipt != size_type(-1),
+ "Im data with no data on the current integration point.");
gmm::add(t.as_vector(),
gmm::sub_vector(result, gmm::sub_interval(s*ipt, s)));
}
Modified: trunk/getfem/src/getfem_import.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_import.cc?rev=5070&r1=5069&r2=5070&view=diff
==============================================================================
--- trunk/getfem/src/getfem_import.cc (original)
+++ trunk/getfem/src/getfem_import.cc Tue Aug 18 10:32:18 2015
@@ -536,7 +536,7 @@
cvok = true;
}
else{
- GMM_WARNING2("gmsh import ignored a element of type "
+ GMM_WARNING2("gmsh import ignored an element of type "
<< bgeot::name_of_geometric_trans(ci.pgt) <<
" as it does not belong to the face of another element");
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Getfem-commits] r5070 - in /trunk/getfem: interface/src/ src/ src/getfem/,
logari81 <=