[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] r5285 - in /trunk/getfem: interface/tests/matlab/check_
From: |
Yves . Renard |
Subject: |
[Getfem-commits] r5285 - in /trunk/getfem: interface/tests/matlab/check_mesh_fem.m src/bgeot_mesh_structure.cc src/getfem_mesh_fem.cc |
Date: |
Mon, 04 Apr 2016 11:04:13 -0000 |
Author: renard
Date: Mon Apr 4 13:04:12 2016
New Revision: 5285
URL: http://svn.gna.org/viewcvs/getfem?rev=5285&view=rev
Log:
minor changes
Modified:
trunk/getfem/interface/tests/matlab/check_mesh_fem.m
trunk/getfem/src/bgeot_mesh_structure.cc
trunk/getfem/src/getfem_mesh_fem.cc
Modified: trunk/getfem/interface/tests/matlab/check_mesh_fem.m
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/check_mesh_fem.m?rev=5285&r1=5284&r2=5285&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/check_mesh_fem.m (original)
+++ trunk/getfem/interface/tests/matlab/check_mesh_fem.m Mon Apr 4
13:04:12 2016
@@ -166,12 +166,12 @@
m2=gf_mesh('from string',s);
gf_mesh_fem_get(mf,'nbdof');
- d=gf_mesh_fem_get(mf,'basic dof from cv',[1 5]);
- gfassert(['d==[1 2 3 4 5 6 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58
59 60]']);
- d=gf_mesh_fem_get(mf,'basic dof from cv',[1 5;1 2]);
- gfassert('d==[3 5 6 43 46 48 49 52 54 55 58 60]');
- d=gf_mesh_fem_get(mf,'basic dof from cvid',5);
- gfassert('d==[43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60]');
+ d=gf_mesh_fem_get(mf,'basic dof from cv',[1 5])
+ gfassert(['d==[1 2 3 4 5 6 37 40 42 43 44 45 46 47 48 49 50 51 52 53 54 55
56 57]']);
+ d=gf_mesh_fem_get(mf,'basic dof from cv',[1 5;1 2])
+ gfassert('d==[3 5 6 37 40 42 45 47 50 52 55 57]');
+ d=gf_mesh_fem_get(mf,'basic dof from cvid',5)
+ gfassert('d==[37 43 44 45 46 47 40 48 49 50 51 52 42 53 54 55 56 57]');
s2=gf_mesh_get(mf,'char');
gfassert('length(s2)>500');
Modified: trunk/getfem/src/bgeot_mesh_structure.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/bgeot_mesh_structure.cc?rev=5285&r1=5284&r2=5285&view=diff
==============================================================================
--- trunk/getfem/src/bgeot_mesh_structure.cc (original)
+++ trunk/getfem/src/bgeot_mesh_structure.cc Mon Apr 4 13:04:12 2016
@@ -265,7 +265,7 @@
}
if (ipts.size() == 0) {
- GMM_ASSERT1(false, "pb");
+ return; // Should we return the all the neighbours ?
}
auto ipt0 = ipts.cbegin();
Modified: trunk/getfem/src/getfem_mesh_fem.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_mesh_fem.cc?rev=5285&r1=5284&r2=5285&view=diff
==============================================================================
--- trunk/getfem/src/getfem_mesh_fem.cc (original)
+++ trunk/getfem/src/getfem_mesh_fem.cc Mon Apr 4 13:04:12 2016
@@ -363,18 +363,16 @@
} else { // For a standard linkable dof
pgp->transform(linked_mesh().points_of_convex(cv), i, P);
size_type idof = nbdof;
- // if (ftab[i].size()) { // sauf si elt de taille < N ...
- linked_mesh().neighbours_of_convex(cv, ftab[i], s);
- for (size_type ncv : s) { // For each neighbour
- // control if the dof already exists.
- fd.ind_node = dof_nodes[ncv].search_node(P);
- if (fd.ind_node != size_type(-1)) {
- auto it = dof_sorts[ncv].find(fd);
- if (it != dof_sorts[ncv].end()) { idof = it->second; break; }
- }
- }
- // }
- if (idof == nbdof) nbdof += Qdim / pf->target_dim();
+ linked_mesh().neighbours_of_convex(cv, ftab[i], s);
+ for (size_type ncv : s) { // For each neighbour
+ // control if the dof already exists.
+ fd.ind_node = dof_nodes[ncv].search_node(P);
+ if (fd.ind_node != size_type(-1)) {
+ auto it = dof_sorts[ncv].find(fd);
+ if (it != dof_sorts[ncv].end()) { idof = it->second; break; }
+ }
+ }
+ if (idof == nbdof) nbdof += Qdim / pf->target_dim();
itab[i] = idof;
fd.ind_node = dof_nodes[cv].add_node(P);
dof_sorts[cv][fd] = idof;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Getfem-commits] r5285 - in /trunk/getfem: interface/tests/matlab/check_mesh_fem.m src/bgeot_mesh_structure.cc src/getfem_mesh_fem.cc,
Yves . Renard <=