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

allow empty names in mesh file

Browse Source
This commit is contained in:
Matthias Hochsteger 2021-02-02 18:58:54 +01:00
parent 40f3d3ee4d
commit 4619525280
1 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
libsrc/meshing/meshclass.cpp
View File

@ -889,6 +889,30 @@ namespace netgen
// Reads mandatory integer and optional string token from input stream
// used for parsing bcnames, cd2names etc.
void ReadNumberAndName( istream & infile, int & i, string & s )
{
string line;
std::istringstream iline;
bool empty_line = true;
while(empty_line && infile)
{
std::getline(infile, line);
iline = std::istringstream{line};
iline >> i;
if(iline)
empty_line = false;
iline >> s;
}
if(!infile)
throw Exception("Reached end of file while parsing");
}
void Mesh :: Load (istream & infile) void Mesh :: Load (istream & infile)
{ {
@ -1137,11 +1161,11 @@ namespace netgen
if (strcmp (str, "materials") == 0) if (strcmp (str, "materials") == 0)
{ {
infile >> n; infile >> n;
for (i = 1; i <= n; i++) for ( auto i : Range(n) )
{ {
int nr; int nr;
string mat; string mat;
infile >> nr >> mat; ReadNumberAndName( infile, nr, mat );
SetMaterial (nr, mat.c_str()); SetMaterial (nr, mat.c_str());
} }
} }
@ -1149,13 +1173,13 @@ namespace netgen
if ( strcmp (str, "bcnames" ) == 0 ) if ( strcmp (str, "bcnames" ) == 0 )
{ {
infile >> n; infile >> n;
NgArray<int,0> bcnrs(n); Array<int> bcnrs(n);
SetNBCNames(n); SetNBCNames(n);
for ( i = 1; i <= n; i++ ) for ( auto i : Range(n) )
{ {
string nextbcname; string nextbcname;
infile >> bcnrs[i-1] >> nextbcname; ReadNumberAndName( infile, bcnrs[i], nextbcname );
bcnames[bcnrs[i-1]-1] = new string(nextbcname); bcnames[bcnrs[i]-1] = new string(nextbcname);
} }
if ( GetDimension() == 3 ) if ( GetDimension() == 3 )
@ -1179,14 +1203,14 @@ namespace netgen
if ( strcmp (str, "cd2names" ) == 0) if ( strcmp (str, "cd2names" ) == 0)
{ {
infile >> n; infile >> n;
NgArray<int,0> cd2nrs(n); Array<int> cd2nrs(n);
SetNCD2Names(n); SetNCD2Names(n);
for( i=1; i<=n; i++) for ( auto i : Range(n) )
{ {
string nextcd2name; string nextcd2name;
infile >> cd2nrs[i-1] >> nextcd2name; ReadNumberAndName( infile, cd2nrs[i], nextcd2name );
cd2names[cd2nrs[i-1]-1] = new string(nextcd2name); cd2names[cd2nrs[i]-1] = new string(nextcd2name);
} }
if (GetDimension() == 2) if (GetDimension() == 2)
{ {
throw NgException("co dim 2 elements not implemented for dimension 2"); throw NgException("co dim 2 elements not implemented for dimension 2");
@ -1196,11 +1220,12 @@ namespace netgen
if ( strcmp (str, "cd3names" ) == 0) if ( strcmp (str, "cd3names" ) == 0)
{ {
infile >> n; infile >> n;
NgArray<int,0> cd3nrs(n); Array<int> cd3nrs(n);
SetNCD3Names(n); SetNCD3Names(n);
for( i=1; i<=n; i++) for( auto i : Range(n) )
{ {
string nextcd3name; string nextcd3name;
ReadNumberAndName( infile, cd3nrs[i], nextcd3name );
infile >> cd3nrs[i-1] >> nextcd3name; infile >> cd3nrs[i-1] >> nextcd3name;
cd3names[cd3nrs[i-1]-1] = new string(nextcd3name); cd3names[cd3nrs[i-1]-1] = new string(nextcd3name);
} }