From 7dcef320628ee02286ece274db08ea289c725b49 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 7 Aug 2008 16:02:33 +0000
Subject: [PATCH] trying to fix weird GVertex/MVertex association problem
---
Geo/GModel.cpp | 4 ++--
Geo/GModelIO_Mesh.cpp | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 69398d65fc..48af9dad50 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -926,7 +926,7 @@ void GModel::_associateEntityWithMeshVertices()
_associateEntityWithElementVertices(*it, (*it)->lines);
}
for(viter it = firstVertex(); it != lastVertex(); ++it){
- (*it)->mesh_vertices[0]->setEntity(*it);
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ (*it)->mesh_vertices[i]->setEntity(*it);
}
}
-
diff --git a/Geo/GModelIO_Mesh.cpp b/Geo/GModelIO_Mesh.cpp
index ff25186882..6483527b4a 100644
--- a/Geo/GModelIO_Mesh.cpp
+++ b/Geo/GModelIO_Mesh.cpp
@@ -211,12 +211,13 @@ int GModel::readMSH(const std::string &name)
Msg::ResetProgressMeter();
vertexVector.clear();
vertexMap.clear();
- int minVertex = numVertices + 1, maxVertex = -1;
+ int minVertex = numVertices + 1, maxVertex = -1;
for(int i = 0; i < numVertices; i++) {
int num;
double xyz[3];
if(!binary){
- if(fscanf(fp, "%d %lf %lf %lf", &num, &xyz[0], &xyz[1], &xyz[2]) != 4) return 0;
+ if(fscanf(fp, "%d %lf %lf %lf", &num, &xyz[0], &xyz[1], &xyz[2]) != 4)
+ return 0;
}
else{
if(fread(&num, sizeof(int), 1, fp) != 1) return 0;
--
GitLab