Commit 35efdb97 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Fixed merge error in linearised advection terms.

parent a840ddb0
......@@ -517,27 +517,11 @@ void AdjointAdvection::ImportFldBase(std::string pInfile,
if(m_session->DefinesSolverInfo("HOMOGENEOUS"))
{
std::vector<LibUtilities::FieldDefinitionsSharedPtr> FieldDef;
std::vector<std::vector<NekDouble> > FieldData;
int nqtot = pFields[0]->GetTotPoints();
Array<OneD, NekDouble> tmp_coeff(pFields[0]->GetNcoeffs(), 0.0);
//Get Homogeneous
LibUtilities::FieldIOSharedPtr fld =
MemoryManager<LibUtilities::FieldIO>::AllocateSharedPtr(
m_session->GetComm());
fld->Import(pInfile, FieldDef, FieldData);
int nvar = m_session->GetVariables().size();
int s;
if(m_session->DefinesSolverInfo("HOMOGENEOUS"))
{
std::string HomoStr = m_session->GetSolverInfo("HOMOGENEOUS");
}
std::string HomoStr = m_session->GetSolverInfo("HOMOGENEOUS");
}
// copy FieldData into m_fields
for(int j = 0; j < nvar; ++j)
// copy FieldData into m_fields
for(int j = 0; j < nvar; ++j)
{
for(int i = 0; i < FieldDef.size(); ++i)
{
......@@ -601,8 +585,6 @@ void AdjointAdvection::ImportFldBase(std::string pInfile,
{
pFields[j]->BwdTrans(tmp_coeff, m_baseflow[j]);
}
}
}
if(m_session->DefinesParameter("N_slices"))
......
......@@ -603,28 +603,12 @@ void LinearisedAdvection::ImportFldBase(std::string pInfile,
if(m_session->DefinesSolverInfo("HOMOGENEOUS"))
{
std::vector<LibUtilities::FieldDefinitionsSharedPtr> FieldDef;
std::vector<std::vector<NekDouble> > FieldData;
int nqtot = m_baseflow[0].num_elements();
//Get Homogeneous
LibUtilities::FieldIOSharedPtr fld =
MemoryManager<LibUtilities::FieldIO>::AllocateSharedPtr(
m_session->GetComm());
fld->Import(pInfile, FieldDef, FieldData);
int nvar = m_session->GetVariables().size();
int s;
Array<OneD, NekDouble> tmp_coeff(pFields[0]->GetNcoeffs(), 0.0);
if(m_session->DefinesSolverInfo("HOMOGENEOUS"))
{
std::string HomoStr = m_session->GetSolverInfo("HOMOGENEOUS");
}
std::string HomoStr = m_session->GetSolverInfo("HOMOGENEOUS");
}
// copy FieldData into m_fields
for(int j = 0; j < nvar; ++j)
{
// copy FieldData into m_fields
for(int j = 0; j < nvar; ++j)
{
for(int i = 0; i < FieldDef.size(); ++i)
{
if((m_session->DefinesSolverInfo("HOMOGENEOUS") &&
......@@ -691,8 +675,6 @@ void LinearisedAdvection::ImportFldBase(std::string pInfile,
pFields[j]->BwdTrans(tmp_coeff, m_baseflow[j]);
}
}
}
if(m_session->DefinesParameter("N_slices"))
......
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