Skip to content

Commit 5609acb

Browse files
lelandaisblelandaisb
committed
Remove home made container
1 parent 5425a79 commit 5609acb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2829
-3230
lines changed

‎src/Core/Geom/ExportVTKImplementation.cpp‎

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -60,28 +60,16 @@ void ExportVTKImplementation::perform(Internal::InfoCommand* icmd)
6060
std::vector<Topo::Block*> topo_blocs;
6161
m_context.getTopoManager().getBlocks(topo_blocs);
6262

63-
std::vector<Topo::CoFace*> topo_cofaces;
64-
std::vector<Topo::CoEdge*> topo_coedges;
65-
std::vector<Topo::Vertex*> topo_vertices;
66-
topo_blocs[0]->getCoFaces(topo_cofaces);
67-
topo_blocs[0]->getCoEdges(topo_coedges);
68-
topo_blocs[0]->getVertices(topo_vertices);
69-
//
70-
// std::vector<Mesh::Surface*> surfaces;
71-
// std::vector<Mesh::Cloud*> clouds;
72-
// m_context.getMeshManager().getSurfaces(surfaces);
73-
// m_context.getMeshManager().getClouds(clouds);
74-
7563
gmds::Mesh& mesh = m_context.getMeshManager().getMesh()->getGMDSMesh();
7664
{
7765
// surfaces
78-
for(unsigned int iCoFace=0; iCoFace<topo_cofaces.size(); iCoFace++) {
66+
for(Topo::CoFace* coface : topo_blocs[0]->getCoFaces()) {
7967

80-
Geom::Surface* surf_tmp = dynamic_cast<Geom::Surface*> (topo_cofaces[iCoFace]->getGeomAssociation());
68+
Geom::Surface* surf_tmp = dynamic_cast<Geom::Surface*> (coface->getGeomAssociation());
8169
CHECK_NULL_PTR_ERROR(surf_tmp);
8270
auto surf = mesh.newGroup<gmds::Face>(surf_tmp->getName());
8371

84-
std::vector<gmds::TCellID>& elems = topo_cofaces[iCoFace]->faces();
72+
std::vector<gmds::TCellID>& elems = coface->faces();
8573
std::vector<gmds::Face> face_elems;
8674
face_elems.resize(elems.size());
8775
for(unsigned int iGMDSFace=0; iGMDSFace<elems.size(); iGMDSFace++) {
@@ -93,13 +81,13 @@ void ExportVTKImplementation::perform(Internal::InfoCommand* icmd)
9381
}
9482

9583
// curves
96-
for(unsigned int iCoEdge=0; iCoEdge<topo_coedges.size(); iCoEdge++) {
84+
for(Topo::CoEdge* coedge : topo_blocs[0]->getCoEdges()) {
9785

98-
Geom::Curve* curv_tmp = dynamic_cast<Geom::Curve*> (topo_coedges[iCoEdge]->getGeomAssociation());
86+
Geom::Curve* curv_tmp = dynamic_cast<Geom::Curve*> (coedge->getGeomAssociation());
9987
CHECK_NULL_PTR_ERROR(curv_tmp);
10088
auto cl = mesh.newGroup<gmds::Node>(curv_tmp->getName());
10189

102-
std::vector<gmds::TCellID>& elems = topo_coedges[iCoEdge]->nodes();
90+
std::vector<gmds::TCellID>& elems = coedge->nodes();
10391

10492
std::vector<gmds::Node> node_elems;
10593
node_elems.resize(elems.size());
@@ -112,13 +100,12 @@ void ExportVTKImplementation::perform(Internal::InfoCommand* icmd)
112100
}
113101

114102
// vertices
115-
for(unsigned int iVertex=0; iVertex<topo_vertices.size(); iVertex++) {
103+
for(Topo::Vertex* vertex : topo_blocs[0]->getVertices()) {
116104

117-
Geom::Vertex* vert_tmp = dynamic_cast<Geom::Vertex*> (topo_vertices[iVertex]->getGeomAssociation());
105+
Geom::Vertex* vert_tmp = dynamic_cast<Geom::Vertex*> (vertex->getGeomAssociation());
118106
CHECK_NULL_PTR_ERROR(vert_tmp);
119107
auto cl = mesh.newGroup<gmds::Node>(vert_tmp->getName());
120-
gmds::Node elem = mesh.get<gmds::Node>(topo_vertices[iVertex]->getNode());
121-
108+
gmds::Node elem = mesh.get<gmds::Node>(vertex->getNode());
122109
cl->add(elem);
123110
}
124111
}

‎src/Core/Internal/ServiceGeomToTopo.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ bool ServiceGeomToTopo::convertBlockStructured(const int ni, const int nj, const
6363

6464
// cas où le nombre de bras est donné par l'utilisateur
6565
if (ni>0 && nj>0 && nk>0){
66-
std::vector<Topo::CoEdge*> coedges;
67-
bloc->getCoEdges(coedges);
66+
std::vector<Topo::CoEdge*> coedges = bloc->getCoEdges();
6867
if (coedges.size() != 12){
6968
throw TkUtil::Exception(TkUtil::UTF8String ("Erreur interne, on impose une discrétisation à un bloc qui n'a pas que 12 arêtes", TkUtil::Charset::UTF_8));
7069
}

‎src/Core/Mesh/CommandCreateSubVolumeBetweenSheets.cpp‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,12 @@ internalRedo()
112112
void CommandCreateSubVolumeBetweenSheets::
113113
selectCoFaces(std::map<Topo::CoFace*, uint>& filtre_coface)
114114
{
115-
for (uint j=0; j<m_blocks.size(); j++){
116-
Topo::Block* blk = m_blocks[j];
117-
115+
for (Topo::Block* blk : m_blocks) {
118116
if (blk->isStructured() && blk->isMeshed()){
119-
120-
std::vector<Topo::CoFace* > cofaces;
121-
122-
blk->getCoFaces(cofaces);
123-
124-
for (std::vector<Topo::CoFace* >::iterator iter1 = cofaces.begin();
125-
iter1 != cofaces.end(); ++iter1){
126-
filtre_coface[*iter1] = 1;
117+
for (Topo::CoFace* coface : blk->getCoFaces()) {
118+
filtre_coface[coface] = 1;
127119
//std::cout<<"filtre_coface à 1 pour "<<(*iter1)->getName()<<std::endl;
128120
}
129-
130121
} // end if (blk->isStructured() && blk->isMeshed())
131122
else if (!blk->isStructured()){
132123
TkUtil::UTF8String message (TkUtil::Charset::UTF_8);
@@ -140,7 +131,7 @@ selectCoFaces(std::map<Topo::CoFace*, uint>& filtre_coface)
140131
<<" n'est pas maillé";
141132
throw TkUtil::Exception(message);
142133
}
143-
} // end for j
134+
} // end for blk
144135
}
145136
/*----------------------------------------------------------------------------*/
146137
void CommandCreateSubVolumeBetweenSheets::
@@ -167,8 +158,7 @@ computePosCoEdge(std::map<Topo::CoFace*, uint>& filtre_coface,
167158
#ifdef _DEBUG_SHEETS
168159
std::cout<<"### coedge : "<<coedge_dep->getName()<<", pos1 : "<<pos1<<", pos2 : "<<pos2<<std::endl;
169160
#endif
170-
std::vector<Topo::CoFace* > cofaces;
171-
coedge_dep->getCoFaces(cofaces);
161+
std::vector<Topo::CoFace* > cofaces = coedge_dep->getCoFaces();
172162

173163
for (std::vector<Topo::CoFace* >::iterator iter1 = cofaces.begin();
174164
iter1 != cofaces.end(); ++iter1){
@@ -339,9 +329,10 @@ computePosBlock(std::map<Topo::CoEdge*, uint> &filtre1_coedge,
339329
std::cout<<"getCoEdgesBetweenVertices entre "<<bloc->getVertex(0)->getName()
340330
<<" et "<<bloc->getVertex(ind_vtx)->getName()<<" d'indice "<<ind_vtx<<std::endl;
341331
#endif
342-
Topo::TopoHelper::getCoEdgesBetweenVertices(bloc->getVertex(0), bloc->getVertex(ind_vtx), iCoedges[i], coedges_between);
332+
std::vector<Topo::Vertex*> vertices = bloc->getVertices();
333+
Topo::Vertex* vtx = vertices[0];
334+
Topo::TopoHelper::getCoEdgesBetweenVertices(vtx, vertices[ind_vtx], iCoedges[i], coedges_between);
343335

344-
Topo::Vertex* vtx = bloc->getVertex(0);
345336
for (std::vector<Topo::CoEdge* >::iterator iter3 = coedges_between.begin();
346337
iter3 != coedges_between.end(); ++iter3){
347338
Topo::CoEdge* coedge = *iter3;
@@ -353,7 +344,7 @@ computePosBlock(std::map<Topo::CoEdge*, uint> &filtre1_coedge,
353344
dir = (Topo::Block::eDirOnBlock)i;
354345
uint ratio = ratios[coedge];
355346
uint dec = ratio-1;
356-
if (vtx == coedge->getVertex(0)){
347+
if (vtx == coedge->getVertices()[0]){
357348
pos1_blk += (filtre1_coedge[coedge]+dec)/ratio;
358349
pos2_blk += (filtre2_coedge[coedge]+dec)/ratio;
359350
}

‎src/Core/Mesh/CommandMeshExplorer.cpp‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,7 @@ selectCoFaceAndBlocks(std::map<Topo::CoFace*, uint>& filtre_coface,
164164
#ifdef _DEBUG_EXPLORER
165165
std::cout<<" bloc pris en compte : "<<blk->getName()<<std::endl;
166166
#endif
167-
168-
std::vector<Topo::CoFace* > cofaces;
169-
170-
blk->getCoFaces(cofaces);
171-
172-
for (Topo::CoFace* coface : cofaces){
167+
for (Topo::CoFace* coface : blk->getCoFaces()){
173168
filtre_coface[coface] = 1;
174169
//std::cout<<"filtre_coface à 1 pour "<<(coface)->getName()<<std::endl;
175170
}
@@ -185,12 +180,7 @@ selectCoFaceAndBlocks(std::map<Topo::CoFace*, uint>& filtre_coface,
185180
#ifdef _DEBUG_EXPLORER
186181
std::cout<<" bloc pris en compte : "<<blk->getName()<<std::endl;
187182
#endif
188-
189-
std::vector<Topo::CoFace* > cofaces;
190-
191-
blk->getCoFaces(cofaces);
192-
193-
for (Topo::CoFace* coface : cofaces){
183+
for (Topo::CoFace* coface : blk->getCoFaces()){
194184
filtre_coface[coface] = 1;
195185
//std::cout<<"filtre_coface à 1 pour "<<coface->getName()<<std::endl;
196186
}
@@ -227,8 +217,7 @@ computePosCoEdge(std::map<Topo::CoFace*, uint>& filtre_coface,
227217
#ifdef _DEBUG_EXPLORER
228218
std::cout<<"### coedge : "<<coedge_dep->getName()<<", pos : "<<pos<<std::endl;
229219
#endif
230-
std::vector<Topo::CoFace* > cofaces;
231-
coedge_dep->getCoFaces(cofaces);
220+
std::vector<Topo::CoFace* > cofaces = coedge_dep->getCoFaces();
232221

233222
for (std::vector<Topo::CoFace* >::iterator iter1 = cofaces.begin();
234223
iter1 != cofaces.end(); ++iter1){
@@ -378,9 +367,10 @@ computePosBlock(std::map<Topo::Block*, uint>& filtre_block,
378367
std::cout<<"getCoEdgesBetweenVertices entre "<<bloc->getVertex(0)->getName()
379368
<<" et "<<bloc->getVertex(ind_vtx)->getName()<<" d'indice "<<ind_vtx<<std::endl;
380369
#endif
381-
Topo::TopoHelper::getCoEdgesBetweenVertices(bloc->getVertex(0), bloc->getVertex(ind_vtx), iCoedges[i], coedges_between);
370+
std::vector<Topo::Vertex*> vertices = bloc->getVertices();
371+
Topo::Vertex* vtx = vertices[0];;
372+
Topo::TopoHelper::getCoEdgesBetweenVertices(vtx, vertices[ind_vtx], iCoedges[i], coedges_between);
382373

383-
Topo::Vertex* vtx = bloc->getVertex(0);
384374
for (std::vector<Topo::CoEdge* >::iterator iter3 = coedges_between.begin();
385375
iter3 != coedges_between.end(); ++iter3){
386376
Topo::CoEdge* coedge = *iter3;
@@ -391,7 +381,7 @@ computePosBlock(std::map<Topo::Block*, uint>& filtre_block,
391381
dir = (Topo::Block::eDirOnBlock)i;
392382
uint ratio = ratios[coedge];
393383
uint dec = ratio-1;
394-
if (vtx == coedge->getVertex(0))
384+
if (vtx == coedge->getVertices()[0])
395385
pos_blk += (filtre_coedge[coedge]+dec)/ratio;
396386
else
397387
pos_blk += (coedge->getNbMeshingEdges() - filtre_coedge[coedge] + 1 + dec)/ratio;

‎src/Core/Mesh/CommandNewBlocksMesh.cpp‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,10 @@ internalExecute()
8787
setStepProgression (1.);
8888
setStep (++step, "Recensement des faces", 0.);
8989
std::list<Topo::CoFace*> list_cofaces;
90-
std::vector<Topo::CoFace* > cofaces;
9190
for (uint i=0; i<m_blocks.size(); i++){
92-
m_blocks[i]->getCoFaces(cofaces);
93-
94-
for (uint j=0; j<cofaces.size(); j++)
95-
if (!cofaces[j]->isMeshed())
96-
list_cofaces.push_back(cofaces[j]);
91+
for (Topo::CoFace* coface : m_blocks[i]->getCoFaces())
92+
if (!coface->isMeshed())
93+
list_cofaces.push_back(coface);
9794
}
9895
list_cofaces.sort(Utils::Entity::compareEntity);
9996
list_cofaces.unique();
@@ -107,10 +104,7 @@ internalExecute()
107104
{
108105
std::set<Topo::CoEdge *> set_coedges;
109106
for (auto b: m_blocks) {
110-
std::vector<Topo::CoEdge *> coedges;
111-
b->getCoEdges(coedges);
112-
113-
for (auto ce: coedges) {
107+
for (auto ce: b->getCoEdges()) {
114108
set_coedges.insert(ce);
115109
}
116110
}

‎src/Core/Mesh/MeshImplementation.cpp‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ void MeshImplementation::writeCGNS(std::string nom)
442442
Topo::Block* bloc = blocks[i];
443443
if (bloc->isMeshed() && bloc->isStructured()){
444444

445-
if (bloc->getNbVertices() != 8){
445+
if (bloc->getVertices().size() != 8){
446446
TkUtil::UTF8String message (TkUtil::Charset::UTF_8);
447447
message << "Erreur dans MeshImplementation::writeCGNS, cas dégénéré non implémenté pour "
448448
<<bloc->getName();
@@ -516,8 +516,7 @@ void MeshImplementation::writeCGNS(std::string nom)
516516

517517

518518
// les relations avec les autres blocs
519-
std::vector<Topo::CoFace*> cofaces;
520-
bloc->getCoFaces(cofaces);
519+
std::vector<Topo::CoFace*> cofaces = bloc->getCoFaces();
521520
for (uint j=0; j<cofaces.size(); j++){
522521
// on ne s'occupe que des cofaces entre 2 blocs
523522
std::vector<Topo::Block*> coface_blocks;
@@ -1077,8 +1076,7 @@ void MeshImplementation::mesh(Mesh::CommandCreateMesh* command, Topo::Block* bl)
10771076
if (getContext().getMeshDim() == Internal::Context::MESH2D)
10781077
throw TkUtil::Exception (TkUtil::UTF8String ("Il n'est pas possible de mailler des blocs alors que le maillage n'est pas 3D en sortie", TkUtil::Charset::UTF_8));
10791078

1080-
std::vector<Topo::Face* > faces;
1081-
bl->getFaces(faces);
1079+
std::vector<Topo::Face*> faces = bl->getFaces();
10821080
for (uint i=0; i<faces.size(); i++) {
10831081
mesh(command, faces[i]);
10841082
}
@@ -1199,9 +1197,10 @@ void MeshImplementation::mesh(Mesh::CommandCreateMesh* command, Topo::CoEdge* ed
11991197
ed->saveCoEdgeMeshingData(&command->getInfoCommand());
12001198

12011199
// on met toujours les noeuds aux extrémités
1202-
if (!ed->getVertex(0)->isMeshed())
1203-
mesh(command, ed->getVertex(0));
1204-
ed->nodes().push_back(ed->getVertex(0)->getNode());
1200+
const std::vector<Topo::Vertex* >& ed_vertices = ed->getVertices();
1201+
if (!ed_vertices[0]->isMeshed())
1202+
mesh(command, ed_vertices[0]);
1203+
ed->nodes().push_back(ed_vertices[0]->getNode());
12051204

12061205
const uint nbBrasI = ed->getNbMeshingEdges();
12071206
for (uint i=1; i<nbBrasI; i++){
@@ -1211,9 +1210,9 @@ void MeshImplementation::mesh(Mesh::CommandCreateMesh* command, Topo::CoEdge* ed
12111210
command->addCreatedNode(nd.id());
12121211
}
12131212

1214-
if (!ed->getVertex(1)->isMeshed())
1215-
mesh(command, ed->getVertex(1));
1216-
ed->nodes().push_back(ed->getVertex(1)->getNode());
1213+
if (!ed_vertices[1]->isMeshed())
1214+
mesh(command, ed_vertices[1]);
1215+
ed->nodes().push_back(ed_vertices[1]->getNode());
12171216

12181217
// ajoute les noeuds aux groupes suivant ce qui a été demandé
12191218
_addNodesInClouds(command, ed);

0 commit comments

Comments
 (0)