Commit da8efe3e authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Tidied code. Merged VertexComponent into PointGeom.

parent c1e8ca09
......@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
// ////////////////////////////////////////////////////////////////
// Set up Hexahedron vertex coordinates
// VertexComponent (const int coordim, const int vid, double x,
// PointGeom (const int coordim, const int vid, double x,
// double y, double z)
const int nVerts = 8;
......@@ -149,9 +149,9 @@ int main(int argc, char *argv[])
};
// Populate the list of verts
VertexComponentSharedPtr verts[8];
PointGeomSharedPtr verts[8];
for( int i = 0; i < nVerts; ++i ) {
verts[i] = MemoryManager<VertexComponent>
verts[i] = MemoryManager<PointGeom>
::AllocateSharedPtr(three, i, point[i][0],
point[i][1], point[i][2]);
}
......@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
// Populate the list of edges
SegGeomSharedPtr edges[nEdges];
for( int i = 0; i < nEdges; ++i ) {
VertexComponentSharedPtr vertsArray[2];
PointGeomSharedPtr vertsArray[2];
for( int j = 0; j < 2; ++j ) {
vertsArray[j] = verts[vertexConnectivity[i][j]];
}
......
......@@ -118,10 +118,10 @@ int main(int argc, char *argv[])
// ////////////////////////////////////////////////////////////////////////////////////
// Populate the list of verts
// VertexComponent (const int coordim, const int vid, double x, double y, double z)
VertexComponentSharedPtr verts[6];
// PointGeom (const int coordim, const int vid, double x, double y, double z)
PointGeomSharedPtr verts[6];
for(int i=0; i < nVerts; ++i){
verts[i] = MemoryManager<VertexComponent>::
verts[i] = MemoryManager<PointGeom>::
AllocateSharedPtr( three, i, point[i][0], point[i][1], point[i][2] );
}
......@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
// Populate the list of edges
SegGeomSharedPtr edges[nEdges];
for(int i=0; i < nEdges; ++i){
VertexComponentSharedPtr vertsArray[2];
PointGeomSharedPtr vertsArray[2];
for(int j=0; j<2; ++j){
vertsArray[j] = verts[vertexConnectivity[i][j]];
}
......
......@@ -78,8 +78,8 @@ int main(int argc, char *argv[])
const int zero=0;
const int one=1;
const double dZero=0.0;
SpatialDomains::VertexComponentSharedPtr vert1 = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(one,zero,x[0],dZero,dZero);
SpatialDomains::VertexComponentSharedPtr vert2 = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(one,zero,x[1],dZero,dZero);
SpatialDomains::PointGeomSharedPtr vert1 = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(one,zero,x[0],dZero,dZero);
SpatialDomains::PointGeomSharedPtr vert2 = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(one,zero,x[1],dZero,dZero);
SpatialDomains::SegGeomSharedPtr geom = MemoryManager<SpatialDomains::SegGeom>::AllocateSharedPtr(zero,vert1,vert2);
geom->SetOwnData();
......
......@@ -175,14 +175,14 @@ int main(int argc, char *argv[])
coords[5] = atof(argv[13]);
// Set up coordinates
SpatialDomains::VertexComponentSharedPtr verts[3];
SpatialDomains::PointGeomSharedPtr verts[3];
const int zero = 0;
const int one=1;
const int two=2;
const double dZero = 0.0;
verts[0] = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(two,zero,coords[0],coords[1],dZero);
verts[1] = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(two,one,coords[2],coords[3],dZero);
verts[2] = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(two,two,coords[4],coords[5],dZero);
verts[0] = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(two,zero,coords[0],coords[1],dZero);
verts[1] = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(two,one,coords[2],coords[3],dZero);
verts[2] = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(two,two,coords[4],coords[5],dZero);
// Set up Edges
SpatialDomains::SegGeomSharedPtr edges[3];
......@@ -244,11 +244,11 @@ int main(int argc, char *argv[])
const int two=2;
const int three=3;
const double dZero=0.0;
SpatialDomains::VertexComponentSharedPtr verts[4];
verts[0] = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(two,zero,coords[0],coords[1],dZero);
verts[1] = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(two,one,coords[2],coords[3],dZero);
verts[2] = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(two,two,coords[4],coords[5],dZero);
verts[3] = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(two,three,coords[6],coords[7],dZero);
SpatialDomains::PointGeomSharedPtr verts[4];
verts[0] = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(two,zero,coords[0],coords[1],dZero);
verts[1] = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(two,one,coords[2],coords[3],dZero);
verts[2] = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(two,two,coords[4],coords[5],dZero);
verts[3] = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(two,three,coords[6],coords[7],dZero);
// Set up Edges
SpatialDomains::SegGeomSharedPtr edges[4];
......
......@@ -407,7 +407,7 @@ SpatialDomains::HexGeomSharedPtr CreateHexGeom(int argc, char *argv[])
// /////////////////////////////////////////////////////////////////////
// Set up Hexahedron vertex coordinates
// VertexComponent (const int coordim, const int vid, double x,
// PointGeom (const int coordim, const int vid, double x,
// double y, double z)
const int nVerts = 8;
const double point[][3] = {
......@@ -422,11 +422,11 @@ SpatialDomains::HexGeomSharedPtr CreateHexGeom(int argc, char *argv[])
};
// Populate the list of verts
VertexComponentSharedPtr verts[8];
PointGeomSharedPtr verts[8];
const int three = 3;
for( int i = 0; i < nVerts; ++i ) {
verts[i] = MemoryManager<VertexComponent>
verts[i] = MemoryManager<PointGeom>
::AllocateSharedPtr( three, i, point[i][0],
point[i][1], point[i][2] );
}
......@@ -443,7 +443,7 @@ SpatialDomains::HexGeomSharedPtr CreateHexGeom(int argc, char *argv[])
// Populate the list of edges
SegGeomSharedPtr edges[nEdges];
for( int i = 0; i < nEdges; ++i ) {
VertexComponentSharedPtr vertsArray[2];
PointGeomSharedPtr vertsArray[2];
for( int j = 0; j < 2; ++j ) {
vertsArray[j] = verts[vertexConnectivity[i][j]];
}
......@@ -492,7 +492,7 @@ SpatialDomains::PrismGeomSharedPtr CreatePrismGeom(int argc, char *argv[])
// /////////////////////////////////////////////////////////////////////
// Set up Prism vertex coordinates
// VertexComponent (const int coordim, const int vid, double x,
// PointGeom (const int coordim, const int vid, double x,
// double y, double z)
const int nVerts = 6;
const double point[][3] = {
......@@ -505,11 +505,11 @@ SpatialDomains::PrismGeomSharedPtr CreatePrismGeom(int argc, char *argv[])
};
// Populate the list of verts
VertexComponentSharedPtr verts[nVerts];
PointGeomSharedPtr verts[nVerts];
const int three = 3;
for( int i = 0; i < nVerts; ++i ) {
verts[i] = MemoryManager<VertexComponent>
verts[i] = MemoryManager<PointGeom>
::AllocateSharedPtr( three, i, point[i][0],
point[i][1], point[i][2] );
}
......@@ -526,7 +526,7 @@ SpatialDomains::PrismGeomSharedPtr CreatePrismGeom(int argc, char *argv[])
// Populate the list of edges
SegGeomSharedPtr edges[nEdges];
for( int i = 0; i < nEdges; ++i ) {
VertexComponentSharedPtr vertsArray[2];
PointGeomSharedPtr vertsArray[2];
for( int j = 0; j < 2; ++j ) {
vertsArray[j] = verts[vertexConnectivity[i][j]];
}
......@@ -607,12 +607,12 @@ SpatialDomains::TetGeomSharedPtr CreateTetGeom(int argc, char *argv[])
// ///////////////////////////////////////////////////////////////////////
// Populate the list of verts
// VertexComponent (const int coordim, const int vid, double x, double y,
// PointGeom (const int coordim, const int vid, double x, double y,
// double z)
VertexComponentSharedPtr verts[4];
PointGeomSharedPtr verts[4];
const int three = 3;
for(int i=0; i < nVerts; ++i){
verts[i] = MemoryManager<VertexComponent>
verts[i] = MemoryManager<PointGeom>
::AllocateSharedPtr(three,i,point[i][0],point[i][1],point[i][2]);
}
......@@ -628,7 +628,7 @@ SpatialDomains::TetGeomSharedPtr CreateTetGeom(int argc, char *argv[])
// Populate the list of edges
SegGeomSharedPtr edges[nEdges];
for(int i=0; i < nEdges; ++i){
VertexComponentSharedPtr vertsArray[2];
PointGeomSharedPtr vertsArray[2];
for(int j=0; j<2; ++j){
vertsArray[j] = verts[vertexConnectivity[i][j]];
}
......
......@@ -78,8 +78,8 @@ int main(int argc, char *argv[])
//-----------------------------------------------
// Define a segment expansion based on basis definition
SpatialDomains::VertexComponentSharedPtr vert1(new SpatialDomains::VertexComponent(1,0,x[0],0,0));
SpatialDomains::VertexComponentSharedPtr vert2(new SpatialDomains::VertexComponent(1,0,x[1],0,0));
SpatialDomains::PointGeomSharedPtr vert1(new SpatialDomains::PointGeom(1,0,x[0],0,0));
SpatialDomains::PointGeomSharedPtr vert2(new SpatialDomains::PointGeom(1,0,x[1],0,0));
SpatialDomains::SegGeomSharedPtr geom(new SpatialDomains::SegGeom(0,vert1,vert2));
geom->SetOwnData();
......
......@@ -195,14 +195,14 @@ int main(int argc, char *argv[])
coords[5] = atof(argv[13]);
// Set up coordinates
SpatialDomains::VertexComponentSharedPtr verts[3];
SpatialDomains::PointGeomSharedPtr verts[3];
const int zero = 0;
const int one=1;
const int two=2;
const double dZero = 0.0;
verts[0] = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(two,zero,coords[0],coords[1],dZero);
verts[1] = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(two,one,coords[2],coords[3],dZero);
verts[2] = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(two,two,coords[4],coords[5],dZero);
verts[0] = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(two,zero,coords[0],coords[1],dZero);
verts[1] = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(two,one,coords[2],coords[3],dZero);
verts[2] = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(two,two,coords[4],coords[5],dZero);
// Set up Edges
SpatialDomains::SegGeomSharedPtr edges[3];
......@@ -262,11 +262,11 @@ int main(int argc, char *argv[])
const int two=2;
const int three=3;
const double dZero=0.0;
SpatialDomains::VertexComponentSharedPtr verts[4];
verts[0] = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(two,zero,coords[0],coords[1],dZero);
verts[1] = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(two,one,coords[2],coords[3],dZero);
verts[2] = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(two,two,coords[4],coords[5],dZero);
verts[3] = MemoryManager<SpatialDomains::VertexComponent>::AllocateSharedPtr(two,three,coords[6],coords[7],dZero);
SpatialDomains::PointGeomSharedPtr verts[4];
verts[0] = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(two,zero,coords[0],coords[1],dZero);
verts[1] = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(two,one,coords[2],coords[3],dZero);
verts[2] = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(two,two,coords[4],coords[5],dZero);
verts[3] = MemoryManager<SpatialDomains::PointGeom>::AllocateSharedPtr(two,three,coords[6],coords[7],dZero);
// Set up Edges
SpatialDomains::SegGeomSharedPtr edges[4];
......
......@@ -570,7 +570,7 @@ SpatialDomains::HexGeomSharedPtr CreateHexGeom(int argc, char *argv[])
// /////////////////////////////////////////////////////////////////////
// Set up Hexahedron vertex coordinates
// VertexComponent (const int coordim, const int vid, double x, double y,
// PointGeom (const int coordim, const int vid, double x, double y,
// double z)
const int nVerts = 8;
......@@ -586,11 +586,11 @@ SpatialDomains::HexGeomSharedPtr CreateHexGeom(int argc, char *argv[])
};
// Populate the list of verts
VertexComponentSharedPtr verts[8];
PointGeomSharedPtr verts[8];
const int three = 3;
for( int i = 0; i < nVerts; ++i ) {
verts[i] = MemoryManager<VertexComponent>
verts[i] = MemoryManager<PointGeom>
::AllocateSharedPtr( three, i, point[i][0],
point[i][1], point[i][2] );
}
......@@ -607,7 +607,7 @@ SpatialDomains::HexGeomSharedPtr CreateHexGeom(int argc, char *argv[])
// Populate the list of edges
SegGeomSharedPtr edges[nEdges];
for( int i = 0; i < nEdges; ++i ) {
VertexComponentSharedPtr vertsArray[2];
PointGeomSharedPtr vertsArray[2];
for( int j = 0; j < 2; ++j ) {
vertsArray[j] = verts[vertexConnectivity[i][j]];
}
......@@ -657,7 +657,7 @@ SpatialDomains::PrismGeomSharedPtr CreatePrismGeom(int argc, char *argv[])
// /////////////////////////////////////////////////////////////////////
// Set up Prism vertex coordinates
// VertexComponent (const int coordim, const int vid, double x,
// PointGeom (const int coordim, const int vid, double x,
// double y, double z)
const int nVerts = 6;
const double point[][3] = {
......@@ -670,11 +670,11 @@ SpatialDomains::PrismGeomSharedPtr CreatePrismGeom(int argc, char *argv[])
};
// Populate the list of verts
VertexComponentSharedPtr verts[nVerts];
PointGeomSharedPtr verts[nVerts];
const int three = 3;
for( int i = 0; i < nVerts; ++i ) {
verts[i] = MemoryManager<VertexComponent>
verts[i] = MemoryManager<PointGeom>
::AllocateSharedPtr( three, i, point[i][0],
point[i][1], point[i][2] );
}
......@@ -691,7 +691,7 @@ SpatialDomains::PrismGeomSharedPtr CreatePrismGeom(int argc, char *argv[])
// Populate the list of edges
SegGeomSharedPtr edges[nEdges];
for( int i = 0; i < nEdges; ++i ) {
VertexComponentSharedPtr vertsArray[2];
PointGeomSharedPtr vertsArray[2];
for( int j = 0; j < 2; ++j ) {
vertsArray[j] = verts[vertexConnectivity[i][j]];
}
......@@ -773,12 +773,12 @@ SpatialDomains::TetGeomSharedPtr CreateTetGeom(int argc, char *argv[])
// //////////////////////////////////////////////////////////////////////
// Populate the list of verts
// VertexComponent (const int coordim, const int vid, double x, double y,
// PointGeom (const int coordim, const int vid, double x, double y,
// double z)
VertexComponentSharedPtr verts[4];
PointGeomSharedPtr verts[4];
const int three = 3;
for(int i=0; i < nVerts; ++i){
verts[i] = MemoryManager<VertexComponent>
verts[i] = MemoryManager<PointGeom>
::AllocateSharedPtr(three,i,point[i][0],point[i][1],point[i][2]);
}
......@@ -793,7 +793,7 @@ SpatialDomains::TetGeomSharedPtr CreateTetGeom(int argc, char *argv[])
// Populate the list of edges
SegGeomSharedPtr edges[nEdges];
for(int i=0; i < nEdges; ++i){
VertexComponentSharedPtr vertsArray[2];
PointGeomSharedPtr vertsArray[2];
for(int j=0; j<2; ++j){
vertsArray[j] = verts[vertexConnectivity[i][j]];
}
......
......@@ -116,10 +116,10 @@ int main(int argc, char *argv[])
// ////////////////////////////////////////////////////////////////////////////////////
// Populate the list of verts
// VertexComponent (const int coordim, const int vid, double x, double y, double z)
VertexComponentSharedPtr verts[5];
// PointGeom (const int coordim, const int vid, double x, double y, double z)
PointGeomSharedPtr verts[5];
for(int i=0; i < nVerts; ++i){
verts[i] = MemoryManager<VertexComponent>::
verts[i] = MemoryManager<PointGeom>::
AllocateSharedPtr( three, i, point[i][0], point[i][1], point[i][2] );
}
......@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
// Populate the list of edges
SegGeomSharedPtr edges[nEdges];
for(int i=0; i < nEdges; ++i){
VertexComponentSharedPtr vertsArray[2];
PointGeomSharedPtr vertsArray[2];
for(int j=0; j<2; ++j){
vertsArray[j] = verts[vertexConnectivity[i][j]];
}
......
......@@ -106,11 +106,11 @@ int main(int argc, char *argv[])
// //////////////////////////////////////////////////////////////////////
// Populate the list of verts
// VertexComponent (const int coordim, const int vid, double x, double y,
// PointGeom (const int coordim, const int vid, double x, double y,
// double z)
VertexComponentSharedPtr verts[4];
PointGeomSharedPtr verts[4];
for(int i=0; i < nVerts; ++i){
verts[i] = MemoryManager<VertexComponent>::
verts[i] = MemoryManager<PointGeom>::
AllocateSharedPtr( three, i, point[i][0], point[i][1], point[i][2] );
}
......@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
// Populate the list of edges
SegGeomSharedPtr edges[nEdges];
for(int i=0; i < nEdges; ++i){
VertexComponentSharedPtr vertsArray[2];
PointGeomSharedPtr vertsArray[2];
for(int j=0; j<2; ++j){
vertsArray[j] = verts[vertexConnectivity[i][j]];
}
......
......@@ -2216,7 +2216,7 @@ namespace Nektar
for (unsigned int j = i; j < dim; ++j)
{
m_metrics[m[i][j]] = Array<OneD, NekDouble>(nqtot);
Vmath::Vcopy(nqtot, &m_metricinfo->GetGmat()[i*dim+j][0], 1,
Vmath::Vcopy(pts, &m_metricinfo->GetGmat()[i*dim+j][0], 1,
&m_metrics[m[i][j]][0], 1);
MultiplyByQuadratureMetric(m_metrics[m[i][j]],
m_metrics[m[i][j]]);
......
......@@ -40,7 +40,7 @@ namespace Nektar
namespace LocalRegions
{
PointExp::PointExp(const SpatialDomains::VertexComponentSharedPtr &geom):
PointExp::PointExp(const SpatialDomains::PointGeomSharedPtr &geom):
StdExpansion (1,0),
StdExpansion0D(),
StdRegions::StdPointExp(),
......
......@@ -37,7 +37,7 @@
#define POINTEXP_H
#include <StdRegions/StdPointExp.h>
#include <SpatialDomains/MeshComponents.h>
#include <SpatialDomains/PointGeom.h>
#include <LocalRegions/LocalRegionsDeclspec.h>
#include <LocalRegions/Expansion0D.h>
......@@ -48,7 +48,7 @@ namespace Nektar
class PointExp: virtual public StdRegions::StdPointExp, virtual public Expansion0D
{
public:
LOCAL_REGIONS_EXPORT PointExp(const SpatialDomains::VertexComponentSharedPtr &m_geom);
LOCAL_REGIONS_EXPORT PointExp(const SpatialDomains::PointGeomSharedPtr &m_geom);
LOCAL_REGIONS_EXPORT ~PointExp(void);
inline const Array<OneD, const NekDouble>& GetCoeffs(void) const
......@@ -104,24 +104,24 @@ namespace Nektar
inline void GetCoords(NekDouble &x, NekDouble &y, NekDouble &z)
{
SpatialDomains::VertexComponentSharedPtr v = boost::dynamic_pointer_cast<SpatialDomains::VertexComponent>(m_geom);
SpatialDomains::PointGeomSharedPtr v = boost::dynamic_pointer_cast<SpatialDomains::PointGeom>(m_geom);
v->GetCoords(x,y,z);
}
inline void GetCoords(Array<OneD,NekDouble> &coords)
{
SpatialDomains::VertexComponentSharedPtr v = boost::dynamic_pointer_cast<SpatialDomains::VertexComponent>(m_geom);
SpatialDomains::PointGeomSharedPtr v = boost::dynamic_pointer_cast<SpatialDomains::PointGeom>(m_geom);
v->GetCoords(coords);
}
inline const SpatialDomains::VertexComponentSharedPtr GetGeom() const
inline const SpatialDomains::PointGeomSharedPtr GetGeom() const
{
return boost::dynamic_pointer_cast<SpatialDomains::VertexComponent>(m_geom);
return boost::dynamic_pointer_cast<SpatialDomains::PointGeom>(m_geom);
}
inline const SpatialDomains::VertexComponentSharedPtr GetVertex() const
inline const SpatialDomains::PointGeomSharedPtr GetVertex() const
{
return boost::dynamic_pointer_cast<SpatialDomains::VertexComponent>(m_geom);;
return boost::dynamic_pointer_cast<SpatialDomains::PointGeom>(m_geom);;
}
protected:
......
......@@ -2505,7 +2505,7 @@ namespace Nektar
for (unsigned int j = i; j < dim; ++j)
{
m_metrics[m[i][j]] = Array<OneD, NekDouble>(nqtot);
Vmath::Vcopy(nqtot, &m_metricinfo->GetGmat()[i*dim+j][0], 1,
Vmath::Vcopy(pts, &m_metricinfo->GetGmat()[i*dim+j][0], 1,
&m_metrics[m[i][j]][0], 1);
MultiplyByQuadratureMetric(m_metrics[m[i][j]],
m_metrics[m[i][j]]);
......
......@@ -863,6 +863,8 @@ namespace Nektar
int AssemblyMap::GetBndCondTraceToGlobalTraceMap(
const int i)
{
ASSERTL1(i < m_bndCondTraceToGlobalTraceMap.num_elements(),
"Index out of range.");
return m_bndCondTraceToGlobalTraceMap[i];
}
......
......@@ -204,7 +204,7 @@ namespace Nektar
{
if(bndConditions[i]->GetBoundaryConditionType()==SpatialDomains::eDirichlet)
{
meshVertId = ((bndCondExp[i])->GetVertex())->GetVid();
meshVertId = bndCondExp[i]->GetVertex()->GetVid();
vertReorderedGraphVertId[meshVertId] = graphVertId++;
m_numGlobalDirBndCoeffs++;
m_numLocalDirBndCoeffs++;
......@@ -257,7 +257,7 @@ namespace Nektar
// Set up the mapping for the boundary conditions
for(i = 0; i < nbnd; i++)
{
meshVertId = ((bndCondExp[i])->GetVertex())->GetVid();
meshVertId = bndCondExp[i]->GetVertex()->GetVid();
m_bndCondCoeffsToGlobalCoeffsMap[i] = vertReorderedGraphVertId[meshVertId];
}
......
......@@ -117,7 +117,7 @@ namespace Nektar
if(bndCond[i]->GetBoundaryConditionType() == SpatialDomains::eDirichlet)
{
m_numDirichletBndPhys++;
vid = ((bndCondExp[i])->GetVertex())->GetVid();
vid = bndCondExp[i]->GetVertex()->GetVid();
MeshVertToLocalVert[vid] = gid++;
}
......@@ -159,7 +159,7 @@ namespace Nektar
for(i = 0; i < nbnd; ++i)
{
vid = ((bndCondExp[i])->GetVertex())->GetVid();
vid = bndCondExp[i]->GetVertex()->GetVid();
m_bndCondCoeffsToGlobalCoeffsMap[i] = MeshVertToLocalVert.find(vid)->second;
if(bndCond[i]->GetBoundaryConditionType() == SpatialDomains::eDirichlet)
......@@ -197,7 +197,6 @@ namespace Nektar
AssemblyMap(pSession,variable)
{
int i,j,k,cnt,eid, id, id1, order_e,gid;
int ntrace_exp = trace->GetExpSize();
int nbnd = bndCondExp.num_elements();
......
......@@ -98,7 +98,7 @@ namespace Nektar
m_bndConditions,
*m_exp,graph1D,
periodicVertices);
m_trace = boost::dynamic_pointer_cast<ExpList>(trace);
m_traceMap = MemoryManager<AssemblyMapDG>::
......@@ -506,7 +506,7 @@ namespace Nektar
MultiRegions::ExpList0DSharedPtr locPointExp;
SpatialDomains::BoundaryConditionShPtr locBCond;
SpatialDomains::VertexComponentSharedPtr vert;
SpatialDomains::PointGeomSharedPtr vert;
cnt = 0;
// list Dirichlet boundaries first
......@@ -531,7 +531,7 @@ namespace Nektar
for (k = 0; k < bregionIt->second->size(); k++)
{
if ((vert = boost::dynamic_pointer_cast
<SpatialDomains::VertexComponent>(
<SpatialDomains::PointGeom>(
(*bregionIt->second)[k])))
{
locPointExp
......@@ -568,7 +568,7 @@ namespace Nektar
for (k = 0; k < bregionIt->second->size(); k++)
{
if((vert = boost::dynamic_pointer_cast
<SpatialDomains::VertexComponent>(
<SpatialDomains::PointGeom>(
(*bregionIt->second)[k])))
{
locPointExp
......@@ -632,7 +632,7 @@ namespace Nektar
MultiRegions::ExpList0DSharedPtr locPointExp;
SpatialDomains::BoundaryConditionShPtr locBCond;
SpatialDomains::VertexComponentSharedPtr vert;
SpatialDomains::PointGeomSharedPtr vert;
// Find the first boundary condition in the current domain
int firstcondition = subdomain*2;
......@@ -664,7 +664,7 @@ namespace Nektar
for(k = 0; k < bregionIt->second->size(); k++)
{
if ((vert = boost::dynamic_pointer_cast
<SpatialDomains::VertexComponent>
<SpatialDomains::PointGeom>
((*bregionIt->second)[k])))
{
locPointExp =
......@@ -701,7 +701,7 @@ namespace Nektar
for (k = 0; k < bregionIt->second->size(); k++)
{
if((vert = boost::dynamic_pointer_cast<
SpatialDomains::VertexComponent>(
SpatialDomains::PointGeom>(
(*bregionIt->second)[k])))
{
locPointExp =
......@@ -915,15 +915,13 @@ namespace Nektar
}
for (n = 0; n < m_bndCondExpansions.num_elements(); ++n)
{
{
int vid = m_bndCondExpansions[n]->GetVertex()->GetVid();
// Check if the current boundary condition
// belongs to the current subdomain
if ((m_bndCondExpansions[n]->GetVertex()->GetVid() >=
firstVertex)
&& (m_bndCondExpansions[n]->GetVertex()->GetVid() <=
lastVertex)