Commit e022597c authored by Gianmarco Mengaldo's avatar Gianmarco Mengaldo
Browse files

Minor.

parent 261d2b88
......@@ -73,18 +73,23 @@ namespace Nektar
Array<OneD, Array<OneD, Array<OneD, NekDouble> > > flux (nDim);
Array<OneD, Array<OneD, Array<OneD, NekDouble> > > qfield(nDim);
Array<OneD, Array<OneD, Array<OneD, NekDouble> > > qfieldStd(nDim);
for (j = 0; j < nDim; ++j)
{
qfield[j] =
Array<OneD, Array<OneD, NekDouble> >(nConvectiveFields);
qfieldStd[j] =
Array<OneD, Array<OneD, NekDouble> >(nConvectiveFields);
flux[j] =
Array<OneD, Array<OneD, NekDouble> >(nConvectiveFields);
for (i = 0; i < nConvectiveFields; ++i)
{
qfield[j][i] = Array<OneD, NekDouble>(nPts, 0.0);
qfieldStd[j][i] = Array<OneD, NekDouble>(nPts, 0.0);
flux[j][i] = Array<OneD, NekDouble>(nTracePts, 0.0);
}
}
......@@ -110,7 +115,7 @@ namespace Nektar
fields[i]->BwdTrans (qcoeffs, qfield[j][i]);
}
}
for (i = 0; i < nPts; ++i)
{
cout<<"LDG, i = "<<i<<",\t derivativesO1-X = "<<qfield[0][0][i] << endl;
......@@ -122,7 +127,6 @@ namespace Nektar
}
int num;
cin>>num;
// Compute u from q_{\eta} and q_{\xi}
// Obtain numerical fluxes
......@@ -146,6 +150,13 @@ namespace Nektar
fields[i]->MultiplyByElmtInvMass(tmp[i], tmp[i]);
fields[i]->BwdTrans (tmp[i], outarray[i]);
}
cout<<endl;
for (i = 0; i < nPts; ++i)
{
cout<<"LDG, i = "<<i<<",\t outarray = "<<outarray[0][i] << endl;
}
cin>>num;
}
......@@ -302,7 +313,7 @@ namespace Nektar
int nvariables = fields.num_elements();
int nDim = qfield.num_elements();
NekDouble C11 = 1.0;
NekDouble C11 = 0.0;
Array<OneD, NekDouble > Fwd(nTracePts);
Array<OneD, NekDouble > Bwd(nTracePts);
Array<OneD, NekDouble > Vn (nTracePts, 0.0);
......
......@@ -122,14 +122,28 @@ namespace Nektar
const int var,
const Array<OneD, const NekDouble> &ufield,
Array<OneD, NekDouble> &penaltyflux);
/*
virtual void v_NumFluxforVector(
const Array<OneD, MultiRegions::ExpListSharedPtr> &fields,
const Array<OneD, Array<OneD, NekDouble> > &ufield,
Array<OneD, Array<OneD, Array<OneD, NekDouble> > >&qfield,
Array<OneD, Array<OneD, NekDouble> > &qflux);
virtual void v_WeakPenaltyforVector(
const Array<OneD, MultiRegions::ExpListSharedPtr> &fields,
const int var,
const int dir,
const Array<OneD, const NekDouble> &qfield,
Array<OneD, NekDouble> &penaltyflux,
NekDouble C11);
virtual void v_DivCFlux_2D(
const int nConvectiveFields,
const Array<OneD, MultiRegions::ExpListSharedPtr>&fields,
const Array<OneD, const NekDouble> &fluxX1,
const Array<OneD, const NekDouble> &fluxX2,
const Array<OneD, const NekDouble> &numericalFlux,
Array<OneD, NekDouble> &divCFlux);*/
Array<OneD, NekDouble> &divCFlux);
};
}
}
......
......@@ -2159,17 +2159,16 @@ namespace Nektar
{
out << "\tProjection Type : Flux Reconstruction HU" <<endl;
}
else if (AdvectionType == "FRc")
else if (AdvectionType == "FRcmin")
{
out << "\tProjection Type : Flux Reconstruction c = c-min" <<endl;
}
else if (AdvectionType == "FRc")
else if (AdvectionType == "FRcinf")
{
out << "\tProjection Type : Flux Reconstruction c = c-infinity" <<endl;
}
break;
}
case MultiRegions::eMixed_CG_Discontinuous:
{
out << "\tProjection Type : Mixed CG/DG" << endl;
......@@ -2192,6 +2191,48 @@ namespace Nektar
{
out << "\tProjection Type : Mixed Continuous Galerkin and Discontinuous" <<endl;
}
if (m_session->DefinesSolverInfo("DiffusionType"))
{
std::string DiffusionType;
DiffusionType = m_session->GetSolverInfo("DiffusionType");
switch (m_projectionType)
{
case MultiRegions::eGalerkin:
{
break;
}
case MultiRegions::eDiscontinuous:
{
if (DiffusionType == "LDG")
{
out << "\tDiffusion Type : LDG" <<endl;
}
else if (DiffusionType == "LFRDG")
{
out << "\tDiffusion Type : LFRDG" <<endl;
}
else if (DiffusionType == "LFRSD")
{
out << "\tDiffusion Type : LFRSD" <<endl;
}
else if (DiffusionType == "LFRHU")
{
out << "\tDiffusion Type : LFRHU" <<endl;
}
else if (DiffusionType == "LFRcmin")
{
out << "\tDiffusion Type : LFR c = c-min" <<endl;
}
else if (DiffusionType == "LFRcinf")
{
out << "\tDiffusion Type : LFR c = c-infinity" <<endl;
}
break;
}
}
}
}
/**
......
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