Commit e1851632 authored by Michael Turner's avatar Michael Turner

2D gmsh output

parent 6cfa2c27
......@@ -66,16 +66,14 @@ Line::Line(ElmtConfig pConf,
{
m_vertex.push_back(pNodeList[i]);
}
vector<NodeSharedPtr> edgeNodes;
if (m_conf.m_order > 1)
{
for (int j = 0; j < n; ++j)
{
edgeNodes.push_back(pNodeList[2 + j]);
m_volumeNodes.push_back(pNodeList[2 + j]);
}
}
m_edge.push_back(boost::shared_ptr<Edge>(new Edge(
pNodeList[0], pNodeList[1], edgeNodes, m_conf.m_edgeCurveType)));
}
SpatialDomains::GeometrySharedPtr Line::GetGeom(int coordDim)
......
......@@ -950,8 +950,8 @@ void Octree::CompileSourcePointList()
// these are the acutal number of sample points in each parametric
// direction
int nu = ceil(DeltaU / m_minDelta) * 40;
int nv = ceil(DeltaV / m_minDelta) * 40;
int nu = ceil(DeltaU / m_minDelta) * 2;
int nv = ceil(DeltaV / m_minDelta) * 2;
for (int j = 0; j < nu; j++)
{
......
......@@ -1039,6 +1039,8 @@ vector<int> InputGmsh::CreateReordering(unsigned int InputGmshEntity)
case LibUtilities::eHexahedron:
return HexReordering(it->second);
break;
case LibUtilities::eSegment:
return LineReordering(it->second);
default:
break;
}
......@@ -1048,6 +1050,19 @@ vector<int> InputGmsh::CreateReordering(unsigned int InputGmshEntity)
return returnVal;
}
vector<int> InputGmsh::LineReordering(ElmtConfig conf)
{
const int order = conf.m_order;
vector<int> mapping(order+1);
for(int i = 0; i < order+1; i++)
{
mapping[i] = i;
}
return mapping;
}
/**
* @brief Create a reordering for triangles.
*/
......
......@@ -75,6 +75,7 @@ private:
static std::vector<int> HexReordering (NekMeshUtils::ElmtConfig conf);
static std::vector<int> PrismReordering(NekMeshUtils::ElmtConfig conf);
static std::vector<int> TetReordering (NekMeshUtils::ElmtConfig conf);
static std::vector<int> LineReordering (NekMeshUtils::ElmtConfig conf);
};
}
}
......
......@@ -303,7 +303,7 @@ void OutputGmsh::Process()
vector<int> inv(tags.size());
ASSERTL1(tags.size() == reordering.size(),
"Reordering map size not equal to element tags.");
"Reordering map size not equal to element tags 1.");
for (int j = 0; j < tags.size(); ++j)
{
......@@ -314,7 +314,7 @@ void OutputGmsh::Process()
}
ASSERTL1(tags.size() == oIt->second.size(),
"Reordering map size not equal to element tags.");
"Reordering map size not equal to element tags 2.");
// Finally write element nodes.
for (int j = 0; j < tags.size(); ++j)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment