Skip to content

Commit 9e893a2

Browse files
author
Karli Gillette
committed
Implemented element checker in Carpmesh importer and removed output in Igbfile importer
1 parent 5431416 commit 9e893a2

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/Core/IEPlugin/CARPMesh_Plugin.cc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,19 @@ FieldHandle SCIRun::CARPMesh_reader(LoggerHandle pr, const char *filename)
238238
if (i == 0) {
239239
for (size_t k=0; k<line.size(); k++)
240240
{
241-
if (line[k]=' '){ break;}
241+
242+
if (line[k]==' '){ break;}
242243
else {
243244
elem_type += line[k];
245+
244246
}
245247
}
248+
249+
if (elem_type != "Tt") {
250+
if (pr) pr->error("Mesh types other than Tet not supported");
251+
return (result);
252+
253+
}
246254
}
247255

248256
multiple_from_string(line,ivalues);

src/Core/IEPlugin/IgbFileToMatrix_Plugin.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@ MatrixHandle SCIRun::IgbFileMatrix_reader(LoggerHandle pr, const char *filename)
9292

9393
for(int p=0;p<sz;p++)
9494
{
95-
96-
std::cout << p << std::endl;
97-
95+
9896
if (boost::iequals(strs[p], "x"))
9997
{
10098
x_size=atoi(strs[p+1].c_str());

0 commit comments

Comments
 (0)