Skip to content
Snippets Groups Projects
Commit 4da5f268 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix compile

parent b0bd408c
No related branches found
No related tags found
No related merge requests found
...@@ -27,9 +27,6 @@ ...@@ -27,9 +27,6 @@
namespace { namespace {
// Type for periodic node correpondence (global indices)
typedef std::map<MVertex *, MVertex *> VertVertMap;
// Types for periodic and interface connectivities // Types for periodic and interface connectivities
typedef std::pair<unsigned int, unsigned int> PartitionInterface; typedef std::pair<unsigned int, unsigned int> PartitionInterface;
typedef std::pair<std::vector<cgsize_t>, std::vector<cgsize_t> > typedef std::pair<std::vector<cgsize_t>, std::vector<cgsize_t> >
...@@ -169,7 +166,7 @@ void initInterfVertex2LocalData(const std::vector<GEntity *> &entitiesPer, ...@@ -169,7 +166,7 @@ void initInterfVertex2LocalData(const std::vector<GEntity *> &entitiesPer,
{ {
// Periodic entities // Periodic entities
for(std::size_t i = 0; i < entitiesPer.size(); i++) { for(std::size_t i = 0; i < entitiesPer.size(); i++) {
VertVertMap &vv = entitiesPer[i]->correspondingVertices; auto &vv = entitiesPer[i]->correspondingVertices;
for(auto itV = vv.begin(); itV != vv.end(); itV++) { for(auto itV = vv.begin(); itV != vv.end(); itV++) {
interfVert2Local[itV->first] = std::vector<LocalData>(); interfVert2Local[itV->first] = std::vector<LocalData>();
interfVert2Local[itV->second] = std::vector<LocalData>(); interfVert2Local[itV->second] = std::vector<LocalData>();
...@@ -386,11 +383,10 @@ int writePeriodic(const std::vector<GEntity *> &entitiesPer, int cgIndexFile, ...@@ -386,11 +383,10 @@ int writePeriodic(const std::vector<GEntity *> &entitiesPer, int cgIndexFile,
Msg::Info("Constructing connectivities for %i periodic entities", Msg::Info("Constructing connectivities for %i periodic entities",
entitiesPer.size()); entitiesPer.size());
PeriodicConnection connect; PeriodicConnection connect;
typedef std::map<MVertex *, MVertex *> VertVertMap;
for(std::size_t iEnt = 0; iEnt < entitiesPer.size(); iEnt++) { for(std::size_t iEnt = 0; iEnt < entitiesPer.size(); iEnt++) {
GEntity *slaveEnt = entitiesPer[iEnt]; GEntity *slaveEnt = entitiesPer[iEnt];
GEntity *masterEnt = slaveEnt->getMeshMaster(); GEntity *masterEnt = slaveEnt->getMeshMaster();
VertVertMap &vv = slaveEnt->correspondingVertices; auto &vv = slaveEnt->correspondingVertices;
for(auto itV = vv.begin(); itV != vv.end(); itV++) { for(auto itV = vv.begin(); itV != vv.end(); itV++) {
const std::vector<LocalData> &allSlaveData = interfVert2Local[itV->first]; const std::vector<LocalData> &allSlaveData = interfVert2Local[itV->first];
const std::vector<LocalData> &allMasterData = const std::vector<LocalData> &allMasterData =
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment