diff --git a/Geo/GModelIO_MSH.cpp b/Geo/GModelIO_MSH.cpp index 1cdad7135538fbd558a09357bdc0d9490a9ff6be..4858d2d2dd85a82cb96c7af445441089731de670 100644 --- a/Geo/GModelIO_MSH.cpp +++ b/Geo/GModelIO_MSH.cpp @@ -19,14 +19,15 @@ void writeMSHPeriodicNodes (FILE *fp, std::vector<GEntity*> &entities) { int count = 0; - for (unsigned int i = 0 ; i < entities.size() ; i++) if (entities[i]->meshMaster() != entities[i]->tag())count++; - if (!count)return; + for (unsigned int i = 0; i < entities.size(); i++) + if (entities[i]->meshMaster() != entities[i]->tag()) count++; + if (!count) return; fprintf(fp, "$Periodic\n"); - fprintf(fp, "%d\n",count); + fprintf(fp, "%d\n", count); for(unsigned int i = 0; i < entities.size(); i++){ GEntity *g_slave = entities[i]; int meshMaster = g_slave->meshMaster(); - if (g_slave->tag() != meshMaster){ + if (g_slave->tag() != meshMaster){ GEntity *g_master = 0; switch(g_slave->dim()){ case 0 : g_master = g_slave->model()->getVertexByTag(abs(meshMaster));break; @@ -34,12 +35,13 @@ void writeMSHPeriodicNodes (FILE *fp, std::vector<GEntity*> &entities) case 2 : g_master = g_slave->model()->getFaceByTag(abs(meshMaster));break; case 3 : g_master = g_slave->model()->getRegionByTag(abs(meshMaster));break; } - fprintf(fp,"%d %d %d\n",g_slave->dim(),g_slave->tag(),g_master->tag()); - fprintf(fp,"%d \n",(int)g_slave->correspondingVertices.size()); - for (std::map<MVertex*,MVertex*>::iterator it = g_slave->correspondingVertices.begin() ; it != g_slave->correspondingVertices.end() ; it++){ + fprintf(fp,"%d %d %d\n", g_slave->dim(), g_slave->tag(), g_master->tag()); + fprintf(fp,"%d\n", (int)g_slave->correspondingVertices.size()); + for (std::map<MVertex*,MVertex*>::iterator it = g_slave->correspondingVertices.begin(); + it != g_slave->correspondingVertices.end(); it++){ MVertex *v1 = it->first; MVertex *v2 = it->second; - fprintf(fp,"%d %d\n",v1->getNum(),v2->getNum()); + fprintf(fp,"%d %d\n", v1->getNum(), v2->getNum()); } } } @@ -49,23 +51,23 @@ void writeMSHPeriodicNodes (FILE *fp, std::vector<GEntity*> &entities) void readMSHPeriodicNodes (FILE *fp, GModel *gm) { int count; - fscanf(fp, "%d",&count); + fscanf(fp, "%d", &count); for(int i = 0; i < count; i++){ int dim,slave,master; - fscanf(fp,"%d %d %d",&dim,&slave,&master); + fscanf(fp, "%d %d %d", &dim, &slave, &master); GEntity *s=0,*m=0; switch(dim){ - case 0 : s = gm->getVertexByTag(slave); m = gm->getVertexByTag(master); break; - case 1 : s = gm->getEdgeByTag(slave); m = gm->getEdgeByTag(master); break; - case 2 : s = gm->getFaceByTag(slave); m = gm->getFaceByTag(master); break; + case 0 : s = gm->getVertexByTag(slave); m = gm->getVertexByTag(master); break; + case 1 : s = gm->getEdgeByTag(slave); m = gm->getEdgeByTag(master); break; + case 2 : s = gm->getFaceByTag(slave); m = gm->getFaceByTag(master); break; } if (s && m){ s->setMeshMaster(m->tag()); int numv; - fscanf(fp,"%d",&numv); + fscanf(fp, "%d", &numv); for(int j = 0; j < numv; j++){ int v1,v2; - fscanf(fp,"%d %d",&v1,&v2); + fscanf(fp,"%d %d", &v1, &v2); MVertex *mv1 = gm->getMeshVertexByTag(v1); MVertex *mv2 = gm->getMeshVertexByTag(v2); s->correspondingVertices[mv1] = mv2; @@ -74,7 +76,6 @@ void readMSHPeriodicNodes (FILE *fp, GModel *gm) } } - int GModel::readMSH(const std::string &name) { FILE *fp = fopen(name.c_str(), "rb"); @@ -573,5 +574,3 @@ int GModel::writeMSH(const std::string &name, double version, bool binary, return 1; } - -