Commit a681c142 authored by Dave Moxey's avatar Dave Moxey
Browse files

Merge remote-tracking branch 'origin/master' into fix/perbc-edges

parents aab2bc27 40c100bf
......@@ -333,27 +333,35 @@ namespace Nektar
SegGeomSharedPtr edge;
// First set up the 3 bottom edges
if(m_faces[0]->GetEid(0) != m_faces[1]->GetEid(0))
{
std::ostringstream errstrm;
errstrm << "Local edge 0 (eid=" << m_faces[0]->GetEid(0);
errstrm << ") on face " << m_faces[0]->GetFid();
errstrm << " must be the same as local edge 0 (eid="<<m_faces[1]->GetEid(0);
errstrm << ") on face " << m_faces[1]->GetFid();
ASSERTL0(false, errstrm.str());
}
int faceConnected;
for(faceConnected = 1; faceConnected < 4 ; faceConnected++)
{
check = 0;
for(i = 0; i < 3; i++)
{
for(j = 0; j < 3; j++)
if( (m_faces[0])->GetEid(i) == (m_faces[faceConnected])->GetEid(0) )
{
if( (m_faces[0])->GetEid(i) == (m_faces[faceConnected])->GetEid(j) )
{
edge = boost::dynamic_pointer_cast<SegGeom>((m_faces[0])->GetEdge(i));
m_edges.push_back(edge);
check++;
}
edge = boost::dynamic_pointer_cast<SegGeom>((m_faces[0])->GetEdge(i));
m_edges.push_back(edge);
check++;
}
}
if( check < 1 )
{
std::ostringstream errstrm;
errstrm << "Connected faces do not share an edge. Faces ";
errstrm << "Face 0 does not share an edge with first edge of adjacent face. Faces ";
errstrm << (m_faces[0])->GetFid() << ", " << (m_faces[faceConnected])->GetFid();
ASSERTL0(false, errstrm.str());
}
......@@ -366,6 +374,7 @@ namespace Nektar
}
}
// Then, set up the 3 vertical edges
check = 0;
for(i = 0; i < 3; i++) //Set up the vertical edge :face(1) and face(3)
......
......@@ -331,8 +331,8 @@ namespace Nektar
UnsteadySystem::v_DoInitialise();
// Set up Field Meta Data for output files
m_fieldMetaDataMap["Kinvis"] = m_kinvis;
m_fieldMetaDataMap["TimeStep"] = m_timestep;
m_fieldMetaDataMap["Kinvis"] = boost::lexical_cast<std::string>(m_kinvis);
m_fieldMetaDataMap["TimeStep"] = boost::lexical_cast<std::string>(m_timestep);
for(int i = 0; i < m_nConvectiveFields; ++i)
{
......@@ -788,7 +788,6 @@ namespace Nektar
Pbc->NormVectorIProductWRTBase(Uy,Vx,Pvals);
}
}
// setting if just standard BC not High order
else if(type == SpatialDomains::eNoUserDefined || type == SpatialDomains::eTimeDependent)
{
......
......@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
Array<OneD, MultiRegions::ExpListSharedPtr> fields = IncNav->UpdateFields();
int i,n,nquad,cnt;
int nfields = fields.num_elements();
int nexp = fields[n]->GetExpSize();
int nexp = fields[0]->GetExpSize();
int elmtid = Vmath::Imax(nexp,cfl,1);
......
Supports Markdown
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