From e747f1cf0f8cf751779bbc3234b6456f9ac2072e Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 15 Oct 2010 11:39:39 +0000
Subject: [PATCH]
---
Geo/GFaceCompound.cpp | 8 ++++----
Geo/GModel.cpp | 40 ++++++++++++++++++++------------------
Geo/GModelFactory.cpp | 4 ++--
Geo/GModelIO_Mesh.cpp | 2 +-
Geo/GRegion.cpp | 3 +--
Geo/MElementCut.cpp | 4 ++--
Geo/MTetrahedron.cpp | 2 +-
Mesh/HighOrder.cpp | 3 +--
Mesh/meshGFaceOptimize.cpp | 2 +-
9 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp
index b9e2864c33..a142f33f59 100644
--- a/Geo/GFaceCompound.cpp
+++ b/Geo/GFaceCompound.cpp
@@ -349,7 +349,7 @@ void GFaceCompound::fillNeumannBCS() const
double z=0.;
//EMI- TODO FIND KERNEL OF POLYGON AND PLACE AT CG KERNEL !
//IF NO KERNEL -> DO NOT FILL TRIS
- for(unsigned int i = 0; i < nbLoop; ++i){
+ for(int i = 0; i < nbLoop; ++i){
MVertex *v0 = orderedLoop[i];
MVertex *v1 = (i==nbLoop-1) ? orderedLoop[0]: orderedLoop[i+1];
x += .5*(v0->x() + v1->x());
@@ -361,7 +361,7 @@ void GFaceCompound::fillNeumannBCS() const
MVertex *c = new MVertex(x, y, z);
//--- create new triangles
- for(unsigned int i = 0; i < nbLoop; ++i){
+ for(int i = 0; i < nbLoop; ++i){
MVertex *v0 = orderedLoop[i];
MVertex *v1 = (i==nbLoop-1) ? orderedLoop[0]: orderedLoop[i+1];
@@ -489,7 +489,7 @@ bool GFaceCompound::checkOverlap() const
else orderedLoop = _ordered;
int nbLoop = orderedLoop.size();
- for(unsigned int i = 0; i < nbLoop-1; ++i){
+ for(int i = 0; i < nbLoop-1; ++i){
SPoint3 p1 = coordinates[orderedLoop[i]];
SPoint3 p2 = coordinates[orderedLoop[i+1]];
int maxSize = (i==0) ? nbLoop-2: nbLoop-1;
@@ -2254,7 +2254,7 @@ void GFaceCompound::printStuff(int iNewton) const
char name0[256], name1[256], name2[256], name3[256];
char name4[256], name5[256], name6[256];
- char name7[256], name8[256], name9[256];
+ char name7[256];
sprintf(name0, "UVAREA-%d.pos", (*it)->tag());
sprintf(name1, "UVX-%d_%d.pos", (*it)->tag(), iNewton);
sprintf(name2, "UVY-%d_%d.pos", (*it)->tag(), iNewton);
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 4197747934..68789352d6 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -2005,7 +2005,6 @@ struct compareMLinePtr {
}
};
-
static GEdge *getNewModelEdge(GFace *gf1, GFace *gf2,
std::map<std::pair<int, int>, GEdge*> &newEdges)
{
@@ -2082,7 +2081,8 @@ static void recurClassify(MTri3 *t, GFace *gf,
}
}
-void GModel::detectEdges(double _tresholdAngle) {
+void GModel::detectEdges(double _tresholdAngle)
+{
e2t_cont adj;
std::vector<MTriangle*> elements;
std::vector<edge_angle> edges_detected, edges_lonly;
@@ -2113,8 +2113,8 @@ void GModel::detectEdges(double _tresholdAngle) {
// delete selected;
}
-void GModel::classifyFaces(std::set<GFace*> &_faces) {
-
+void GModel::classifyFaces(std::set<GFace*> &_faces)
+{
std::map<MLine*, GEdge*, compareMLinePtr> lines;
for(GModel::eiter it = GModel::current()->firstEdge();
@@ -2155,7 +2155,7 @@ void GModel::classifyFaces(std::set<GFace*> &_faces) {
GModel::current()->add(gf);
newf.push_back(gf);
- for (int i=0;i<gf->triangles.size();i++){
+ for (unsigned int i = 0; i < gf->triangles.size(); i++){
replacedBy.insert(std::make_pair(reverse_old[gf->triangles[i]],gf));
}
}
@@ -2219,7 +2219,8 @@ void GModel::classifyFaces(std::set<GFace*> &_faces) {
allSegments.erase(allSegments.begin());
while(1){
bool found = false;
- for (std::list<MLine*>::iterator it = allSegments.begin();it != allSegments.end(); ++it){
+ for (std::list<MLine*>::iterator it = allSegments.begin();
+ it != allSegments.end(); ++it){
MVertex *v1 = (*it)->getVertex(0);
MVertex *v2 = (*it)->getVertex(1);
if (v1 == vE || v2 == vE){
@@ -2245,8 +2246,8 @@ void GModel::classifyFaces(std::set<GFace*> &_faces) {
std::map<MVertex*,GVertex*>::iterator itMV = modelVertices.find(vB);
if (itMV == modelVertices.end()){
- GVertex *newGv = new discreteVertex(GModel::current(),
- GModel::current()->getMaxElementaryNumber(0) + 1);
+ GVertex *newGv = new discreteVertex
+ (GModel::current(), GModel::current()->getMaxElementaryNumber(0) + 1);
newGv->mesh_vertices.push_back(vB);
vB->setEntity(newGv);
newGv->points.push_back(new MPoint(vB));
@@ -2255,8 +2256,8 @@ void GModel::classifyFaces(std::set<GFace*> &_faces) {
}
itMV = modelVertices.find(vE);
if (itMV == modelVertices.end()){
- GVertex *newGv = new discreteVertex(GModel::current(),
- GModel::current()->getMaxElementaryNumber(0) + 1);
+ GVertex *newGv = new discreteVertex
+ (GModel::current(), GModel::current()->getMaxElementaryNumber(0) + 1);
newGv->mesh_vertices.push_back(vE);
newGv->points.push_back(new MPoint(vE));
vE->setEntity(newGv);
@@ -2265,22 +2266,24 @@ void GModel::classifyFaces(std::set<GFace*> &_faces) {
}
GEdge *newGe = new discreteEdge
- (GModel::current(), GModel::current()->getMaxElementaryNumber(1) + 1, modelVertices[vB], modelVertices[vE]);
- newGe->lines.insert(newGe->lines.end(), segmentsForThisDiscreteEdge.begin(), segmentsForThisDiscreteEdge.end());
+ (GModel::current(), GModel::current()->getMaxElementaryNumber(1) + 1,
+ modelVertices[vB], modelVertices[vE]);
+ newGe->lines.insert(newGe->lines.end(), segmentsForThisDiscreteEdge.begin(),
+ segmentsForThisDiscreteEdge.end());
- // printf("discrete edge %d\n",newGe->tag());
for (std::list<MLine*>::iterator itL = segmentsForThisDiscreteEdge.begin();
itL != segmentsForThisDiscreteEdge.end(); ++itL){
if((*itL)->getVertex(0)->onWhat()->dim() != 0){
newGe->mesh_vertices.push_back((*itL)->getVertex(0));
(*itL)->getVertex(0)->setEntity(newGe);
}
- // printf("%d %d \n",(*itL)->getVertex(0)->getNum(),(*itL)->getVertex(1)->getNum());
}
GModel::current()->add(newGe);
- discreteFace *gf1 = dynamic_cast<discreteFace*> (GModel::current()->getFaceByTag(ite->first.first));
- discreteFace *gf2 = dynamic_cast<discreteFace*> (GModel::current()->getFaceByTag(ite->first.second));
+ discreteFace *gf1 = dynamic_cast<discreteFace*>
+ (GModel::current()->getFaceByTag(ite->first.first));
+ discreteFace *gf2 = dynamic_cast<discreteFace*>
+ (GModel::current()->getFaceByTag(ite->first.second));
if (gf1)newFaceTopology[gf1].push_back(newGe->tag());
if (gf2)newFaceTopology[gf2].push_back(newGe->tag());
}
@@ -2291,7 +2294,6 @@ void GModel::classifyFaces(std::set<GFace*> &_faces) {
itFT->first->setBoundEdges(itFT->second);
}
-
for (std::map<std::pair<int, int>, GEdge*>::iterator it = newEdges.begin();
it != newEdges.end(); ++it){
GEdge *ge = it->second;
@@ -2319,14 +2321,14 @@ void GModel::classifyFaces(std::set<GFace*> &_faces) {
}
}
if ((*fit)->triangles.size())
- (*fit)->mesh_vertices.insert((*fit)->mesh_vertices.begin(),_verts.begin(),_verts.end());
+ (*fit)->mesh_vertices.insert((*fit)->mesh_vertices.begin(),
+ _verts.begin(), _verts.end());
else
remove(*fit);
}
}
-
#include "Bindings.h"
void GModel::registerBindings(binding *b)
diff --git a/Geo/GModelFactory.cpp b/Geo/GModelFactory.cpp
index 216f9dbe27..22359ab83d 100644
--- a/Geo/GModelFactory.cpp
+++ b/Geo/GModelFactory.cpp
@@ -88,7 +88,7 @@ GFace *GeoFactory::addPlanarFace(GModel *gm, std::vector< std::vector<GEdge *> >
int numf = gm->getMaxElementaryNumber(2) + 1;
Surface *s = Create_Surface(numf, MSH_SURF_PLAN);
List_T *iList = List_Create(nLoops, nLoops, sizeof(int));
- for (int i=0; i< vecLoops.size(); i++){
+ for (unsigned int i=0; i< vecLoops.size(); i++){
int numl = vecLoops[i]->Num;
List_Add(iList, &numl);
}
@@ -133,7 +133,7 @@ GRegion* GeoFactory::addVolume (GModel *gm, std::vector<std::vector<GFace *> > f
int numv = gm->getMaxElementaryNumber(3) + 1;
Volume *v = Create_Volume(numv, MSH_VOLUME);
List_T *iList = List_Create(nLoops, nLoops, sizeof(int));
- for (int i=0; i< vecLoops.size(); i++){
+ for (unsigned int i = 0; i < vecLoops.size(); i++){
int numl = vecLoops[i]->Num;
List_Add(iList, &numl);
}
diff --git a/Geo/GModelIO_Mesh.cpp b/Geo/GModelIO_Mesh.cpp
index 638b8db846..4ae9b44f44 100644
--- a/Geo/GModelIO_Mesh.cpp
+++ b/Geo/GModelIO_Mesh.cpp
@@ -1396,7 +1396,7 @@ int GModel::readPLY2(const std::string &name)
std::vector<MVertex*> vertexVector;
std::map<int, std::vector<MElement*> > elements[5];
- char buffer[256], str[256];
+ char buffer[256];
int elementary = getMaxElementaryNumber(-1) + 1;
int nbv, nbf;
while(!feof(fp)) {
diff --git a/Geo/GRegion.cpp b/Geo/GRegion.cpp
index b9dcc9f497..a36998fe2c 100644
--- a/Geo/GRegion.cpp
+++ b/Geo/GRegion.cpp
@@ -311,9 +311,8 @@ double GRegion::computeSolidProperties (std::vector<double> cg,
cg[0] = cg[1] = cg[2] = 0.0;
for ( ; it != l_faces.end(); ++it,++itdir){
printf("face %d dir %d %d elements\n",(*it)->tag(),*itdir,(int)(*it)->triangles.size());
- for (int i=0;i<(*it)->triangles.size();++i){
+ for (unsigned int i = 0; i < (*it)->triangles.size(); ++i){
MTriangle *e = (*it)->triangles[i];
- // MElement *e = (*it)->getMeshElement(i);
int npt;
IntPt *pts;
e->getIntegrationPoints (2*(e->getPolynomialOrder()-1)+3, &npt, &pts);
diff --git a/Geo/MElementCut.cpp b/Geo/MElementCut.cpp
index a6921f408a..76b030f4ea 100644
--- a/Geo/MElementCut.cpp
+++ b/Geo/MElementCut.cpp
@@ -840,7 +840,7 @@ static void elementCutMesh(MElement *e, std::vector<const gLevelset *> &RPN,
bords.push_back(std::pair<MElement*, MElement*>(dom, tb));
}
borders[1].erase(itr.first, itr.second);
- for(int i = 0; i < bords.size(); i++)
+ for(unsigned int i = 0; i < bords.size(); i++)
borders[1].insert(bords[i]);
if(eParent) {copy->setParent(NULL, false); delete copy;}
}
@@ -1009,7 +1009,7 @@ static void elementCutMesh(MElement *e, std::vector<const gLevelset *> &RPN,
bords.push_back(std::pair<MElement*, MElement*>(dom, lb));
}
borders[0].erase(itr.first, itr.second);
- for(int i = 0; i < bords.size(); i++)
+ for(unsigned int i = 0; i < bords.size(); i++)
borders[0].insert(bords[i]);
if(eParent) {copy->setParent(NULL, false); delete copy;}
}
diff --git a/Geo/MTetrahedron.cpp b/Geo/MTetrahedron.cpp
index f93a075066..aea4336b8d 100644
--- a/Geo/MTetrahedron.cpp
+++ b/Geo/MTetrahedron.cpp
@@ -366,7 +366,7 @@ static std::vector<std::vector<int> > tetReverseIndices(20);
const std::vector<int> &MTetrahedronN::_getReverseIndices (int order)
{
- if(order >= tetReverseIndices.size())
+ if(order >= (int)tetReverseIndices.size())
tetReverseIndices.resize(order + 1);
std::vector<int> &r = tetReverseIndices[order];
if (r.size() != 0) return r;
diff --git a/Mesh/HighOrder.cpp b/Mesh/HighOrder.cpp
index 1417a619cb..3317c57fd0 100644
--- a/Mesh/HighOrder.cpp
+++ b/Mesh/HighOrder.cpp
@@ -47,8 +47,7 @@ static bool mappingIsInvertible(MTetrahedron *e)
const fullMatrix<double> &points = e->getFunctionSpace()->points;
const fullMatrix<double> &alldf =
e->getGradShapeFunctionsAtNodes(e->getPolynomialOrder());
- double gradShapeFunctions[300][3];
- for (int i = 0; i < alldf.size2()/3; i++){
+ for (int i = 0; i < alldf.size2() / 3; i++){
df.setAsProxy(alldf, 3*i, 3);
e->getJacobian(df, mat);
if (det0 * det3x3(mat) <= 0.) return false;
diff --git a/Mesh/meshGFaceOptimize.cpp b/Mesh/meshGFaceOptimize.cpp
index 828e5c4dcb..686a4d1ff9 100644
--- a/Mesh/meshGFaceOptimize.cpp
+++ b/Mesh/meshGFaceOptimize.cpp
@@ -1606,7 +1606,7 @@ void recombineIntoQuads(GFace *gf)
if(success && CTX::instance()->mesh.algoRecombine == 1){
//gf->model()->writeMSH("smoothed.msh");
int COUNT = 0;
- char NAME[256];
+ //char NAME[256];
while(1){
int x = removeTwoQuadsNodes(gf);
//if(x){ sprintf(NAME,"iter%dTQ.msh",COUNT++); gf->model()->writeMSH(NAME);}
--
GitLab