ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 05:50:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'msg_level_fnfreader' into 'master'

Browse Source 
add msg level to cout of fnfreader

See merge request jschoeberl/netgen!162
This commit is contained in:
Joachim Schöberl 2019-05-14 19:42:51 +00:00
commit 2303025c3f
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libsrc/interface/read_fnf_mesh.cpp
View File

@ -94,7 +94,7 @@ namespace netgen
char ch; char ch;
string name; string name;
sbuf >> ch >> name; sbuf >> ch >> name;
cout << "Title: " << name << endl; PrintMessage(3, "Title: ", name);
} }
else if (token == "%STATISTICS") else if (token == "%STATISTICS")
{ {
@ -106,7 +106,7 @@ namespace netgen
} }
else else
{ {
cout << "SECTION HEADER, unknown field: " << buf << endl; PrintMessage(1, "SECTION HEADER, unknown field: ",buf);
} }
} }
} }
@ -142,7 +142,7 @@ namespace netgen
} }
else else
{ {
cout << "SECTION ELEM_TYPE, unknown field: " << buf << endl; PrintMessage(1, "SECTION ELEM_TYPE, unknown field: ", buf);
} }
} }
} }
@ -219,7 +219,7 @@ namespace netgen
} }
else else
{ {
cout << "SECTION MATERIALS, unknown field: " << buf << endl; PrintMessage(1, "SECTION MATERIALS, unknown field: ", buf);
} }
} }
} }
@ -271,7 +271,7 @@ namespace netgen
} }
else else
{ {
cout << "SECTION MESH, unknown: " << buf << endl; PrintMessage(1, "SECTION MESH, unknown: ", buf);
} }
} }
} }
@ -349,7 +349,7 @@ namespace netgen
} }
else else
{ {
cout << "SECTION MESH, unknown: " << buf << endl; PrintMessage(1, "SECTION MESH, unknown: ", buf);
} }
} }
} }
@ -378,10 +378,10 @@ namespace netgen
sbuf >> lt->id >> def >> ch >> lt->name >> lt->placement >> lt->valuetype; sbuf >> lt->id >> def >> ch >> lt->name >> lt->placement >> lt->valuetype;
if (lt->name == "DISPLACEMENT") if (lt->name == "DISPLACEMENT")
cout << "loadtype DISPLACEMENT found" << endl; PrintMessage(3, "loadtype DISPLACEMENT found");
if (lt->placement != "FACE" && lt->placement != "EDGE" && lt->placement != "NODE") if (lt->placement != "FACE" && lt->placement != "EDGE" && lt->placement != "NODE")
cout << "unsupported placement " << lt->placement << endl; PrintMessage(1, "unsupported placement ", lt->placement);
loadtypes.Append (lt); loadtypes.Append (lt);
} }
@ -412,27 +412,29 @@ namespace netgen
{ {
for (int i = 0; i < loadtypes.Size(); i++) for (int i = 0; i < loadtypes.Size(); i++)
{ {
stringstream str;
str << loadtypes[i]->places;
if (loadtypes[i]->placement == "FACE" && loadtypes[i]->name == "DISPLACEMENT") if (loadtypes[i]->placement == "FACE" && loadtypes[i]->name == "DISPLACEMENT")
{ {
mesh.SetUserData ("CONSTRAINT_DISP_FACE", loadtypes[i]->places); mesh.SetUserData ("CONSTRAINT_DISP_FACE", loadtypes[i]->places);
cout << "constrained faces: " << loadtypes[i]->places << endl; PrintMessage(3, "constrained faces: ", str.str());
} }
if (loadtypes[i]->placement == "EDGE" && loadtypes[i]->name == "DISPLACEMENT") if (loadtypes[i]->placement == "EDGE" && loadtypes[i]->name == "DISPLACEMENT")
{ {
mesh.SetUserData ("CONSTRAINT_DISP_EDGE", loadtypes[i]->places); mesh.SetUserData ("CONSTRAINT_DISP_EDGE", loadtypes[i]->places);
cout << "constrained edges: " << loadtypes[i]->places << endl; PrintMessage(3,"constrained edges: ", str.str());
} }
if (loadtypes[i]->placement == "NODE" && loadtypes[i]->name == "DISPLACEMENT") if (loadtypes[i]->placement == "NODE" && loadtypes[i]->name == "DISPLACEMENT")
{ {
mesh.SetUserData ("CONSTRAINT_DISP_NODE", loadtypes[i]->places); mesh.SetUserData ("CONSTRAINT_DISP_NODE", loadtypes[i]->places);
cout << "constrained nodes: " << loadtypes[i]->places << endl; PrintMessage(3, "constrained nodes: ", str.str());
} }
} }
break; break;
} }
else else
{ {
cout << "SECTION LOADS, unknown field: " << buf << endl; PrintMessage(1, "SECTION LOADS, unknown field: ", buf);
} }
} }
} }
@ -441,11 +443,11 @@ namespace netgen
else else
{ {
cout << "unknown section " << token << endl; PrintMessage(1, "unknown section ", token);
} }
} }
else else
cout << "parse line: (" << buf << ")" << endl; PrintMessage(3, "parse line: (", buf, ")");
} }
} }
} }