Commit cd054914 authored by Michael Turner's avatar Michael Turner
Browse files

small fixes

parent 58e910ec
......@@ -35,6 +35,7 @@
#include <NekMeshUtils/MeshElements/Mesh.h>
#include <LibUtilities/Foundations/ManagerAccess.h>
#include <LibUtilities/BasicUtils/Progressbar.hpp>
using namespace std;
......@@ -122,11 +123,10 @@ void Mesh::MakeOrder(int order,
}
else if (distType == LibUtilities::eGaussLobattoLegendre)
{
// Prism still to do.
pTypes[LibUtilities::eSegment] = LibUtilities::eGaussLobattoLegendre;
pTypes[LibUtilities::eTriangle] = LibUtilities::eNodalTriElec;
pTypes[LibUtilities::eQuadrilateral] = LibUtilities::eGaussLobattoLegendre;
pTypes[LibUtilities::ePrism] = LibUtilities::eGaussLobattoLegendre;
pTypes[LibUtilities::ePrism] = LibUtilities::eNodalPrismElec;
pTypes[LibUtilities::eTetrahedron] = LibUtilities::eNodalTetElec;
pTypes[LibUtilities::eHexahedron] = LibUtilities::eGaussLobattoLegendre;
}
......@@ -170,8 +170,14 @@ void Mesh::MakeOrder(int order,
// Call MakeOrder with our generated geometries on each edge to fill in edge
// interior nodes.
for(eit = m_edgeSet.begin(); eit != m_edgeSet.end(); eit++)
int ct = 0;
for(eit = m_edgeSet.begin(); eit != m_edgeSet.end(); eit++, ct++)
{
if(m_verbose)
{
LibUtilities::PrintProgressbar(
ct, m_edgeSet.size(), "MakeOrder: Edges: ");
}
int edgeId = (*eit)->m_id;
if (processedEdges.find(edgeId) != processedEdges.end())
......@@ -186,8 +192,14 @@ void Mesh::MakeOrder(int order,
// Call MakeOrder with our generated geometries on each face to fill in face
// interior nodes.
for(fit = m_faceSet.begin(); fit != m_faceSet.end(); fit++)
ct = 0;
for(fit = m_faceSet.begin(); fit != m_faceSet.end(); fit++, ct++)
{
if(m_verbose)
{
LibUtilities::PrintProgressbar(
ct, m_faceSet.size(), "MakeOrder: Faces: ");
}
int faceId = (*fit)->m_id;
if (processedFaces.find(faceId) != processedFaces.end())
......@@ -239,10 +251,18 @@ void Mesh::MakeOrder(int order,
const int nElmt = m_element[m_expDim].size();
for (int i = 0; i < nElmt; ++i)
{
if(m_verbose)
{
LibUtilities::PrintProgressbar(
i, nElmt, "MakeOrder: Elements: ");
}
ElementSharedPtr el = m_element[m_expDim][i];
el->MakeOrder(order, volGeoms[el->GetId()], pTypes[el->GetConf().m_e],
m_spaceDim, id);
}
if(m_verbose)
cout << endl;
}
}
......
......@@ -224,7 +224,6 @@ void InputCAD::Process()
{
mods[i]->Process();
}
}
}
}
......@@ -454,7 +454,7 @@ void ElUtil::Evaluate()
{
res->startInv++;
}
res->worstJac = min(res->worstJac,mn2/mx2);
res->worstJac = min(res->worstJac,mn2 / mx2);
mtx2.unlock();
//maps = MappingIdealToRef();
......
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