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

curved elements work, too

Browse Source
This commit is contained in:
Julius Zimmermann 2019-07-16 10:42:27 +02:00
parent bffdf689ae
commit fe782670f8
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libsrc/interface/readuser.cpp
View File

@ -127,7 +127,7 @@ namespace netgen
cout << "read " << mesh.GetNP() << " points" << endl; cout << "read " << mesh.GetNP() << " points" << endl;
Point3d pmin, pmax; Point3d pmin, pmax;
mesh.GetBox (pmin, pmax); mesh.GetBox (pmin, pmax);
if(fabs(pmin.Z() - pmax.Z()) < 1e-10) //hard-coded for now if(fabs(pmin.Z() - pmax.Z()) < 1e-10 * Dist(pmin, pmax))
{ {
cout << "Set Dimension to 2." << endl; cout << "Set Dimension to 2." << endl;
mesh.SetDimension(2); mesh.SetDimension(2);
@ -167,14 +167,14 @@ namespace netgen
el[2] = -1; el[2] = -1;
if(dim == 3){ if(dim == 3){
auto nr = tmp_segments.Size(); auto nr = tmp_segments.Size();
tmp_segments.Append(el); tmp_segments.Append(el);
element_map[label] = std::make_tuple(nr+1, 2); element_map[label] = std::make_tuple(nr+1, 2);
} }
else if(dim == 2){ else if(dim == 2){
el.si = -1; // add label to segment, will be changed later when BC's are assigned el.si = -1; // add label to segment, will be changed later when BC's are assigned
auto nr = mesh.AddSegment(el); auto nr = mesh.AddSegment(el);
element_map[label] = std::make_tuple(nr+1, 2); element_map[label] = std::make_tuple(nr+1, 2);
} }
break; break;
} }
@ -186,18 +186,26 @@ namespace netgen
el[1] = nodes[2]; el[1] = nodes[2];
el[2] = nodes[1]; el[2] = nodes[1];
auto nr = tmp_segments.Size(); if(dim == 3){
tmp_segments.Append(el); auto nr = tmp_segments.Size();
element_map[label] = std::make_tuple(nr+1, 2); tmp_segments.Append(el);
element_map[label] = std::make_tuple(nr+1, 2);
}
else if(dim == 2){
el.si = -1; // add label to segment, will be changed later when BC's are assigned
auto nr = mesh.AddSegment(el);
element_map[label] = std::make_tuple(nr+1, 2);
}
break; break;
} }
case 41: // TRIG case 41: // TRIG
{ {
Element2d el (TRIG); Element2d el (TRIG);
el.SetIndex(1); el.SetIndex (1);
for (int j = 0; j < nnodes; j++) for (int j = 0; j < nnodes; j++)
el[j] = nodes[j]; el[j] = nodes[j];
auto nr = mesh.AddSurfaceElement(el); auto nr = mesh.AddSurfaceElement (el);
element_map[label] = std::make_tuple(nr+1, 1); element_map[label] = std::make_tuple(nr+1, 1);
break; break;
} }