Commit 9bba0668 authored by David Moxey's avatar David Moxey

Fix use of tabs

parent 59a9b803
......@@ -83,7 +83,7 @@ typedef std::shared_ptr<NekMatrix<NekDouble> > SharedMatrix;
class NodalUtil
{
public:
LIB_UTILITIES_EXPORT virtual ~NodalUtil(){};
LIB_UTILITIES_EXPORT virtual ~NodalUtil() = default;
LIB_UTILITIES_EXPORT NekVector<NekDouble> GetWeights();
LIB_UTILITIES_EXPORT SharedMatrix GetVandermonde();
LIB_UTILITIES_EXPORT SharedMatrix GetVandermondeForDeriv(int dir);
......
......@@ -214,7 +214,8 @@ bool CADSystemCFI::LoadCAD()
fullEdgeList.push_back(*it2);
}
}
delete edgeList;
delete edgeList;
for (it2 = fullEdgeList.begin(); it2 != fullEdgeList.end(); it2++)
{
......@@ -223,8 +224,8 @@ bool CADSystemCFI::LoadCAD()
static_cast<cfi::Line *>(orientatedEdge.entity);
mapOfEdges[edge->getName()] = edge;
vector<cfi::Oriented<cfi::TopoEntity *>> *vertList =
edge->getChildList();
vector<cfi::Oriented<cfi::TopoEntity *>> *vertList =
edge->getChildList();
for (it3 = vertList->begin(); it3 != vertList->end(); it3++)
{
cfi::Oriented<cfi::TopoEntity *> orientatedVert = *it3;
......@@ -234,13 +235,13 @@ bool CADSystemCFI::LoadCAD()
m_mapVertToListEdge[vert->getName()].push_back(
edge->getName());
}
delete vertList;
delete vertList;
}
mapOfFaces[face->getName()] = face;
}
}
delete faceList;
delete faceList;
}
// make the vertices and build a map of name to id
......@@ -395,7 +396,8 @@ void CADSystemCFI::AddSurf(int i, cfi::Face *in)
firstVert = vertList->at(1).entity->getName();
edgeloop->edgeo.push_back(CADOrientation::eBackwards);
}
delete vertList;
delete vertList;
edgeloop->edges.push_back(
m_curves[m_nameToCurveId[fullEdgeList.at(done).entity->getName()]]);
......@@ -420,7 +422,8 @@ void CADSystemCFI::AddSurf(int i, cfi::Face *in)
}
edgeloop->edgeo.push_back(CADOrientation::eBackwards);
}
delete vertList;
delete vertList;
edgeloop->edges.push_back(
m_curves[m_nameToCurveId[
......
......@@ -164,8 +164,8 @@ void Edge::MakeOrder(int order, SpatialDomains::GeometrySharedPtr geom,
c->GetAdjSurf();
for (int j = 0; j < s.size(); j++)
{
Array<OneD, NekDouble> uv = s[j].first.lock()->locuv(loc);
m_edgeNodes[i]->SetCADSurf(s[j].first.lock(), uv);
Array<OneD, NekDouble> uv = s[j].first.lock()->locuv(loc);
m_edgeNodes[i]->SetCADSurf(s[j].first.lock(), uv);
}
}
}
......
......@@ -274,7 +274,7 @@ public:
std::vector<CADCurveSharedPtr> lst;
for (auto &c : CADCurveList)
{
lst.push_back(c.second.first.lock());
lst.push_back(c.second.first.lock());
}
return lst;
}
......@@ -284,7 +284,7 @@ public:
std::vector<CADSurfSharedPtr> lst;
for (auto &s : CADSurfList)
{
lst.push_back(s.second.first.lock());
lst.push_back(s.second.first.lock());
}
return lst;
}
......
......@@ -367,7 +367,7 @@ void Module::ProcessFaces(bool ReprocessFaces)
// Update 3D element boundary map.
for (int j = 0; j < (*it)->m_elLink.size(); ++j)
{
pair<weak_ptr<Element>, int> eMap = (*it)->m_elLink.at(j);
pair<weak_ptr<Element>, int> eMap = (*it)->m_elLink.at(j);
eMap.first.lock()->SetBoundaryLink(eMap.second, i);
}
......@@ -836,7 +836,7 @@ void Module::PrismLines(int prism,
nextId = f->m_elLink[0].first.lock()->GetId();
if (nextId == m_mesh->m_element[3][prism]->GetId())
{
nextId = f->m_elLink[1].first.lock()->GetId();
nextId = f->m_elLink[1].first.lock()->GetId();
}
PrismLines(nextId, perFaces, prismsDone, line);
......
......@@ -879,7 +879,7 @@ void Octree::CompileSourcePointList()
CPointSharedPtr newCPoint =
MemoryManager<CPoint>::AllocateSharedPtr(
ss[0].first.lock()->GetId(), uv, loc, del);
ss[0].first.lock()->GetId(), uv, loc, del);
m_SPList.push_back(newCPoint);
}
......@@ -887,7 +887,7 @@ void Octree::CompileSourcePointList()
{
BPointSharedPtr newBPoint =
MemoryManager<BPoint>::AllocateSharedPtr(
ss[0].first.lock()->GetId(), uv, loc);
ss[0].first.lock()->GetId(), uv, loc);
m_SPList.push_back(newBPoint);
}
......
......@@ -428,7 +428,7 @@ void CurveMesh::PeriodicOverwrite(CurveMeshSharedPtr from)
for (int j = 0; j < surfs.size(); j++)
{
Array<OneD, NekDouble> uv = surfs[j].first.lock()->locuv(nn->GetLoc());
Array<OneD, NekDouble> uv = surfs[j].first.lock()->locuv(nn->GetLoc());
nn->SetCADSurf(surfs[j].first.lock(), uv);
}
......
......@@ -579,8 +579,8 @@ void FaceMesh::DiagonalSwap()
continue;
}
ElementSharedPtr tri1 = e->m_elLink[0].first.lock();
ElementSharedPtr tri2 = e->m_elLink[1].first.lock();
ElementSharedPtr tri1 = e->m_elLink[0].first.lock();
ElementSharedPtr tri2 = e->m_elLink[1].first.lock();
NodeSharedPtr n1 = e->m_n1;
NodeSharedPtr n2 = e->m_n2;
......
......@@ -280,7 +280,8 @@ void HOSurfaceMesh::Process()
nn->SetCADCurve(c, ti[k]);
for (int m = 0; m < s.size(); m++)
{
Array<OneD, NekDouble> uv = s[m].first.lock()->locuv(loc);
Array<OneD, NekDouble> uv =
s[m].first.lock()->locuv(loc);
nn->SetCADSurf(s[m].first.lock(), uv);
}
......
......@@ -224,7 +224,7 @@ void ProcessDetectSurf::FindContiguousSurface(ElementSharedPtr start,
{
for (int j = 0; j < edges[i]->m_elLink.size(); ++j)
{
ElementSharedPtr elmt = (edges[i]->m_elLink[j].first).lock();
ElementSharedPtr elmt = (edges[i]->m_elLink[j].first).lock();
if (elmt == start)
{
continue;
......
......@@ -103,7 +103,7 @@ void ProcessExtractTetPrismInterface::Process()
{
if (face->m_elLink.size() == 1)
{
ElementSharedPtr el = face->m_elLink[0].first.lock();
ElementSharedPtr el = face->m_elLink[0].first.lock();
if (el->GetConf().m_e != LibUtilities::eTetrahedron)
{
......@@ -119,8 +119,8 @@ void ProcessExtractTetPrismInterface::Process()
{
if (face->m_elLink.size() != 1)
{
ElementSharedPtr el1 = face->m_elLink[0].first.lock();
ElementSharedPtr el2 = face->m_elLink[1].first.lock();
ElementSharedPtr el1 = face->m_elLink[0].first.lock();
ElementSharedPtr el2 = face->m_elLink[1].first.lock();
if ((el1->GetConf().m_e == LibUtilities::ePrism &&
el2->GetConf().m_e == LibUtilities::eTetrahedron) ||
......
......@@ -115,7 +115,8 @@ void ProcessOptiExtract::Process()
{
for (int k = 0; k < f[j]->m_elLink.size(); k++)
{
if (f[j]->m_elLink[k].first.lock()->GetId() == invalid[i]->GetId())
if (f[j]->m_elLink[k].first.lock()->GetId() ==
invalid[i]->GetId())
{
continue;
}
......@@ -124,7 +125,7 @@ void ProcessOptiExtract::Process()
if (t.second)
{
m_mesh->m_element[m_mesh->m_expDim].push_back(
f[j]->m_elLink[k].first.lock());
f[j]->m_elLink[k].first.lock());
totest.push_back(f[j]->m_elLink[k].first.lock());
}
}
......@@ -142,7 +143,8 @@ void ProcessOptiExtract::Process()
{
for (int l = 0; l < f[k]->m_elLink.size(); l++)
{
if (f[k]->m_elLink[l].first.lock()->GetId() == tmp[j]->GetId())
if (f[k]->m_elLink[l].first.lock()->GetId() ==
tmp[j]->GetId())
{
continue;
}
......@@ -151,7 +153,7 @@ void ProcessOptiExtract::Process()
if (t.second)
{
m_mesh->m_element[m_mesh->m_expDim].push_back(
f[k]->m_elLink[l].first.lock());
f[k]->m_elLink[l].first.lock());
totest.push_back(f[k]->m_elLink[l].first.lock());
}
}
......
......@@ -564,7 +564,7 @@ vector<ElUtilSharedPtr> ProcessVarOpti::GetLockedElements(NekDouble thres)
{
for (int k = 0; k < f[j]->m_elLink.size(); k++)
{
if (f[j]->m_elLink[k].first.lock()->GetId() ==
if (f[j]->m_elLink[k].first.lock()->GetId() ==
elBelowThres[i]->GetId())
{
continue;
......@@ -574,7 +574,7 @@ vector<ElUtilSharedPtr> ProcessVarOpti::GetLockedElements(NekDouble thres)
if (t.second)
{
totest.push_back(
m_dataSet[f[j]->m_elLink[k].first.lock()->GetId()]);
m_dataSet[f[j]->m_elLink[k].first.lock()->GetId()]);
}
}
}
......@@ -591,16 +591,18 @@ vector<ElUtilSharedPtr> ProcessVarOpti::GetLockedElements(NekDouble thres)
{
for (int l = 0; l < f[k]->m_elLink.size(); l++)
{
if (f[k]->m_elLink[l].first.lock()->GetId() == tmp[j]->GetId())
if (f[k]->m_elLink[l].first.lock()->GetId() ==
tmp[j]->GetId())
{
continue;
}
auto t = inmesh.insert(f[k]->m_elLink[l].first.lock()->GetId());
auto t = inmesh.insert(
f[k]->m_elLink[l].first.lock()->GetId());
if (t.second)
{
totest.push_back(
m_dataSet[f[k]->m_elLink[l].first.lock()->GetId()]);
m_dataSet[f[k]->m_elLink[l].first.lock()->GetId()]);
}
}
}
......@@ -639,7 +641,7 @@ void ProcessVarOpti::RemoveLinearCurvature()
bool rm = true;
for(int i = 0; i < face->m_elLink.size(); i++)
{
int id = face->m_elLink[i].first.lock()->GetId();
int id = face->m_elLink[i].first.lock()->GetId();
if(m_dataSet[id]->GetScaledJac() <= 0.999)
{
rm = false;
......
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