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

fix warnings

parent d382ef05
Branches
Tags
No related merge requests found
...@@ -361,7 +361,6 @@ bool gmshFace::buildSTLTriangulation(bool force) ...@@ -361,7 +361,6 @@ bool gmshFace::buildSTLTriangulation(bool force)
stl_vertices.clear(); stl_vertices.clear();
stl_triangles.clear(); stl_triangles.clear();
if (!triangles.size()){ if (!triangles.size()){
contextMeshOptions _temp = CTX::instance()->mesh; contextMeshOptions _temp = CTX::instance()->mesh;
FieldManager *fields = model()->getFields(); FieldManager *fields = model()->getFields();
...@@ -382,7 +381,7 @@ bool gmshFace::buildSTLTriangulation(bool force) ...@@ -382,7 +381,7 @@ bool gmshFace::buildSTLTriangulation(bool force)
std::map<MVertex*,int> _v; std::map<MVertex*,int> _v;
int COUNT =0; int COUNT =0;
for (int j = 0; j < triangles.size(); j++){ for (unsigned int j = 0; j < triangles.size(); j++){
for (int i = 0; i < 3; i++){ for (int i = 0; i < 3; i++){
std::map<MVertex*,int>::iterator it = std::map<MVertex*,int>::iterator it =
_v.find(triangles[j]->getVertex(j)); _v.find(triangles[j]->getVertex(j));
......
...@@ -1316,7 +1316,7 @@ void printJacobians(GModel *m, const char *nm) ...@@ -1316,7 +1316,7 @@ void printJacobians(GModel *m, const char *nm)
double u = (double)i / (n - 1); double u = (double)i / (n - 1);
double v = (double)k / (n - 1); double v = (double)k / (n - 1);
t->pnt(u, v, 0, pt); t->pnt(u, v, 0, pt);
//D[i][k] = mesh_functional_distorsion_2D(t, u, v); D[i][k] = 0.; //mesh_functional_distorsion_2D(t, u, v);
//X[i][k] = u; //X[i][k] = u;
//Y[i][k] = v; //Y[i][k] = v;
//Z[i][k] = 0.0; //Z[i][k] = 0.0;
......
...@@ -66,7 +66,7 @@ bool buildEdgeCavity(MTet4 *t, int iLocalEdge, MVertex **v1, MVertex **v2, ...@@ -66,7 +66,7 @@ bool buildEdgeCavity(MTet4 *t, int iLocalEdge, MVertex **v1, MVertex **v2,
// a change here for hybrid meshes // a change here for hybrid meshes
int ITER = 0; //int ITER = 0;
while (1){ while (1){
MVertex *ov1 = t->tet()->getVertex(edges[5 - iLocalEdge][0]); MVertex *ov1 = t->tet()->getVertex(edges[5 - iLocalEdge][0]);
MVertex *ov2 = t->tet()->getVertex(edges[5 - iLocalEdge][1]); MVertex *ov2 = t->tet()->getVertex(edges[5 - iLocalEdge][1]);
......
...@@ -509,7 +509,7 @@ void meshMetric::computeMetricEigenDir() ...@@ -509,7 +509,7 @@ void meshMetric::computeMetricEigenDir()
if (signed_dist < _E && signed_dist > _E_moins && gMag != 0.0){ if (signed_dist < _E && signed_dist > _E_moins && gMag != 0.0){
const double metric_value_hmin = 1./(hmin*hmin); const double metric_value_hmin = 1./(hmin*hmin);
const SVector3 nVec = invGMag*gVec; // Unit normal vector const SVector3 nVec = invGMag*gVec; // Unit normal vector
double lambda_n; // Eigenvalues of metric for normal & tangential directions double lambda_n = 0.; // Eigenvalues of metric for normal & tangential directions
if (_technique==meshMetric::EIGENDIRECTIONS_LINEARINTERP_H){ if (_technique==meshMetric::EIGENDIRECTIONS_LINEARINTERP_H){
const double h_dist = hmin + ((hmax-hmin)/_E)*dist; // Characteristic element size in the normal direction - linear interp between hmin and hmax const double h_dist = hmin + ((hmax-hmin)/_E)*dist; // Characteristic element size in the normal direction - linear interp between hmin and hmax
lambda_n = 1./(h_dist*h_dist); lambda_n = 1./(h_dist*h_dist);
......
...@@ -72,7 +72,7 @@ PView *GMSH_SimplePartitionPlugin::execute(PView *v) ...@@ -72,7 +72,7 @@ PView *GMSH_SimplePartitionPlugin::execute(PView *v)
for(unsigned int i = 0; i < entities.size(); i++){ for(unsigned int i = 0; i < entities.size(); i++){
GEntity *ge = entities[i]; GEntity *ge = entities[i];
if(ge->dim() != dim) continue; if(ge->dim() != dim) continue;
for(int j = 0; j < ge->getNumMeshElements(); j++){ for(unsigned int j = 0; j < ge->getNumMeshElements(); j++){
MElement *e = ge->getMeshElement(j); MElement *e = ge->getMeshElement(j);
double valmin = pmax; double valmin = pmax;
double valmax = pmin; double valmax = pmin;
...@@ -108,7 +108,7 @@ PView *GMSH_SimplePartitionPlugin::execute(PView *v) ...@@ -108,7 +108,7 @@ PView *GMSH_SimplePartitionPlugin::execute(PView *v)
for(unsigned int i = 0; i < entities.size(); i++){ for(unsigned int i = 0; i < entities.size(); i++){
GEntity *ge = entities[i]; GEntity *ge = entities[i];
if(ge->dim() == dim) continue; if(ge->dim() == dim) continue;
for(int j = 0; j < ge->getNumMeshElements(); j++){ for(unsigned int j = 0; j < ge->getNumMeshElements(); j++){
MElement *e = ge->getMeshElement(j); MElement *e = ge->getMeshElement(j);
if(e->getDim() == 2){ if(e->getDim() == 2){
MFace f = e->getFace(0); MFace f = e->getFace(0);
......
...@@ -244,7 +244,7 @@ bool PView::readMED(const std::string &fileName, int fileIndex) ...@@ -244,7 +244,7 @@ bool PView::readMED(const std::string &fileName, int fileIndex)
std::vector<std::string> fieldNames = medGetFieldNames(fileName); std::vector<std::string> fieldNames = medGetFieldNames(fileName);
for(unsigned int index = 0; index < fieldNames.size(); index++){ for(unsigned int index = 0; index < fieldNames.size(); index++){
if(fileIndex < 0 || index == fileIndex){ if(fileIndex < 0 || (int)index == fileIndex){
PViewDataGModel *d = 0; PViewDataGModel *d = 0;
// we use the filename as a kind of "partition" indicator, allowing to // we use the filename as a kind of "partition" indicator, allowing to
// complete datasets provided in separate files (e.g. coming from DDM) // complete datasets provided in separate files (e.g. coming from DDM)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment