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

don't create element cache by default (it's quite slow on really large...

don't create element cache by default (it's quite slow on really large meshes); we'll create it if needed on demand
parent fbf176b0
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "MPyramid.h" #include "MPyramid.h"
#include "StringUtils.h" #include "StringUtils.h"
void writeMSHPeriodicNodes (FILE *fp, std::vector<GEntity*> &entities) void writeMSHPeriodicNodes(FILE *fp, std::vector<GEntity*> &entities)
{ {
int count = 0; int count = 0;
for (unsigned int i = 0; i < entities.size(); i++) for (unsigned int i = 0; i < entities.size(); i++)
...@@ -48,7 +48,7 @@ void writeMSHPeriodicNodes (FILE *fp, std::vector<GEntity*> &entities) ...@@ -48,7 +48,7 @@ void writeMSHPeriodicNodes (FILE *fp, std::vector<GEntity*> &entities)
fprintf(fp, "$EndPeriodic\n"); fprintf(fp, "$EndPeriodic\n");
} }
void readMSHPeriodicNodes (FILE *fp, GModel *gm) void readMSHPeriodicNodes(FILE *fp, GModel *gm)
{ {
int count; int count;
if(fscanf(fp, "%d", &count) != 1) return; if(fscanf(fp, "%d", &count) != 1) return;
...@@ -310,7 +310,6 @@ int GModel::readMSH(const std::string &name) ...@@ -310,7 +310,6 @@ int GModel::readMSH(const std::string &name)
if(sscanf(str, "%d", &numElements) != 1){ fclose(fp); return 0; } if(sscanf(str, "%d", &numElements) != 1){ fclose(fp); return 0; }
Msg::Info("%d elements", numElements); Msg::Info("%d elements", numElements);
Msg::ResetProgressMeter(); Msg::ResetProgressMeter();
_elementMapCache.clear();
for(int i = 0; i < numElements; i++) { for(int i = 0; i < numElements; i++) {
int num, type, entity, numData; int num, type, entity, numData;
if(!binary){ if(!binary){
...@@ -360,7 +359,6 @@ int GModel::readMSH(const std::string &name) ...@@ -360,7 +359,6 @@ int GModel::readMSH(const std::string &name)
case TYPE_POLYG: elements[8][entity].push_back(element); break; case TYPE_POLYG: elements[8][entity].push_back(element); break;
case TYPE_POLYH: elements[9][entity].push_back(element); break; case TYPE_POLYH: elements[9][entity].push_back(element); break;
} }
_elementMapCache[num] = element;
if(numElements > 100000) if(numElements > 100000)
Msg::ProgressMeter(i + 1, numElements, true, "Reading elements"); Msg::ProgressMeter(i + 1, numElements, true, "Reading elements");
} }
...@@ -377,7 +375,6 @@ int GModel::readMSH(const std::string &name) ...@@ -377,7 +375,6 @@ int GModel::readMSH(const std::string &name)
readMSHPeriodicNodes (fp, this); readMSHPeriodicNodes (fp, this);
} }
do { do {
if(!fgets(str, sizeof(str), fp) || feof(fp)) if(!fgets(str, sizeof(str), fp) || feof(fp))
break; break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment