diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp index 6621abca5cbb4d03cfa3045f435ebadb19760a05..14243e6d6c84bd432fbb18f75cf51fcecefe37d8 100644 --- a/Geo/GModel.cpp +++ b/Geo/GModel.cpp @@ -1819,17 +1819,6 @@ GModel *GModel::buildCutGModel(gLevelset *ls, bool cutElem, bool saveTri) Msg::Info("Cutting mesh..."); double t1 = Cpu(); - //emi debug - std::vector<GEntity*> entities0; - this->getEntities(entities0); - for(unsigned int i = 0; i < entities0.size(); i++){ - std::vector<int> phys = entities0[i]->getPhysicalEntities(); - for (int j= 0; j < phys.size(); j++){ - std::string name = this->getPhysicalName(entities0[i]->dim(), phys[j]); - printf("dim =%d elem=%d phys =%s \n", entities0[i]->dim(),entities0[i]->tag(), name.c_str() ); - } - } - GModel *cutGM = buildCutMesh(this, ls, elements, vertexMap, physicals, cutElem); for(int i = 0; i < (int)(sizeof(elements) / sizeof(elements[0])); i++) @@ -1848,28 +1837,8 @@ GModel *GModel::buildCutGModel(gLevelset *ls, bool cutElem, bool saveTri) } } - //set physical names - for(int i = 0; i < 4; i++){ - std::map<int, std::map<int, std::string> >::const_iterator it = physicals[i].begin(); - for(; it != physicals[i].end(); ++it){ - std::map<int, std::string>::const_iterator it2 = it->second.begin(); - cutGM->setPhysicalName(it2->second, i, it2->first); - } - } - Msg::Info("Mesh cutting completed (%g s)", Cpu() - t1); - //emi debug - std::vector<GEntity*> entities; - cutGM->getEntities(entities); - for(unsigned int i = 0; i < entities.size(); i++){ - std::vector<int> phys = entities[i]->getPhysicalEntities(); - for (int j= 0; j < phys.size(); j++){ - std::string name = cutGM->getPhysicalName(entities[i]->dim(), phys[j]); - printf("dim =%d elem=%d phys =%s \n", entities[i]->dim(),entities[i]->tag(), name.c_str() ); - } - } - return cutGM; } diff --git a/Geo/GModelIO_Mesh.cpp b/Geo/GModelIO_Mesh.cpp index ea518a7f1d5132a689b227d9702e0d3d02875064..b99a1891686049b0f69438afa29ead799b2cfffa 100644 --- a/Geo/GModelIO_Mesh.cpp +++ b/Geo/GModelIO_Mesh.cpp @@ -531,7 +531,7 @@ int GModel::readMSH(const std::string &name) _ghostCells.insert(std::pair<MElement*, short>(e, -data[5 + j])); if(numElements > 100000) Msg::ProgressMeter(numElementsPartial + i + 1, numElements, - "Readsing elements"); + "Reading elements"); } delete [] data; numElementsPartial += numElms; @@ -865,7 +865,6 @@ int GModel::writeMSH(const std::string &name, double version, bool binary, } } - if(binary) fprintf(fp, "\n"); if(version >= 2.0){ diff --git a/Geo/MElementCut.cpp b/Geo/MElementCut.cpp index b1efdaef9b06f03c5970083bf5fb651f424dafba..597fc748e1e7048e0e3765748e757c1a3fc20414 100644 --- a/Geo/MElementCut.cpp +++ b/Geo/MElementCut.cpp @@ -453,18 +453,11 @@ void MLineBorder::getIntegrationPoints(int pOrder, int *npts, IntPt **pts) static void assignPhysicals(GModel *GM, std::vector<int> &gePhysicals, int reg, int dim, std::map<int, std::map<int, std::string> > physicals[4]) { - //printf("assign \n"); for(unsigned int i = 0; i < gePhysicals.size(); i++){ int phys = gePhysicals[i]; - //printf("dim=%d elem=%d phys=%d \n", dim, reg, phys); - if(phys && (!physicals[dim].count(reg) || !physicals[dim][reg].count(phys))){ - std::string name = GM->getPhysicalName(dim, phys); - physicals[dim][reg][phys] = name; - //GM->setPhysicalName(name, dim, reg); - //printf("true name = %s \n", GM->getPhysicalName(dim, phys).c_str()); - } + if(phys && (!physicals[dim].count(reg) || !physicals[dim][reg].count(phys))) + physicals[dim][reg][phys] = GM->getPhysicalName(dim, phys); } - } static int getElementaryTag(int lsTag, int elementary, std::map<int, int> &newElemTags) @@ -484,20 +477,16 @@ static void getPhysicalTag(int lsTag, const std::vector<int> &physicals, std::vector<int> &phys2, std::map<int, int> &newPhysTags) { phys2.clear(); - //printf("getPhysical\n"); for(unsigned int i = 0; i < physicals.size(); i++){ int phys = physicals[i]; - //printf("lstag %d physOLD=%d \n", lsTag, phys); - if(lsTag < 0 ){ + if(lsTag < 0){ if(!newPhysTags.count(phys)) newPhysTags[phys] = ++newPhysTags[0]; phys = newPhysTags[phys]; } phys2.push_back(phys); - //printf("lstag %d phys=%d \n", lsTag, phys); } - } static int getBorderTag(int lsTag, int count, int &maxTag, std::map<int, int> &borderTags) @@ -563,7 +552,6 @@ static void elementSplitMesh(MElement *e, fullMatrix<double> &verticesLs, case MSH_POLYG_ : case MSH_POLYG_B : { - printf("in tri poly \n"); int reg = getElementaryTag(lsTag, elementary, newElemTags[2]); std::vector<int> phys; getPhysicalTag(lsTag, gePhysicals, phys, newPhysTags[2]); @@ -579,7 +567,6 @@ static void elementSplitMesh(MElement *e, fullMatrix<double> &verticesLs, case MSH_LIN_2 : case MSH_LIN_B : { - printf("in line \n"); int reg = getElementaryTag(lsTag, elementary, newElemTags[1]); std::vector<int> phys; getPhysicalTag(lsTag, gePhysicals, phys, newPhysTags[1]); @@ -589,7 +576,6 @@ static void elementSplitMesh(MElement *e, fullMatrix<double> &verticesLs, break; case MSH_PNT : { - printf("in point \n"); int reg = getElementaryTag(lsTag, elementary, newElemTags[0]); std::vector<int> phys; getPhysicalTag(lsTag, gePhysicals, phys, newPhysTags[0]); @@ -601,7 +587,6 @@ static void elementSplitMesh(MElement *e, fullMatrix<double> &verticesLs, Msg::Error("This type of element cannot be split."); return; } - } #if defined(HAVE_DINTEGRATION)