Commit 76ba87a6 authored by Chris Cantwell's avatar Chris Cantwell

Cleaned up formatting.

parent bf404c28
......@@ -51,7 +51,8 @@ namespace Nektar
ModuleKey(eProcessModule, "QCriterion"),
ProcessQCriterion::create, "Computes Q-Criterion.");
ProcessQCriterion::ProcessQCriterion(FieldSharedPtr f) : ProcessModule(f)
ProcessQCriterion::ProcessQCriterion(FieldSharedPtr f) :
ProcessModule(f)
{
}
......@@ -77,9 +78,12 @@ namespace Nektar
int nfields = m_f->m_fielddef[0]->m_fields.size();
if (spacedim == 1 || spacedim == 2)
{
cerr << "\n Error: ProcessQCriterion must be computed for a 3D (or quasi-3D) case. \n" << endl;
cerr << "\n Error: ProcessQCriterion must be computed for a 3D"
" (or quasi-3D) case. \n" << endl;
}
int addfields = 1; //For calculating Q-Criterion only 1 field must be added
//For calculating Q-Criterion only 1 field must be added
int addfields = 1;
int npoints = m_f->m_exp[0]->GetNpoints();
......@@ -93,10 +97,8 @@ namespace Nektar
Array<OneD, Array<OneD, NekDouble> > outfield2(addfields);
Array<OneD, Array<OneD, NekDouble> > outfield3(addfields);
m_f->m_exp.resize(nfields+addfields);
for (i = 0; i < nfields*nfields; ++i)
{
grad[i] = Array<OneD, NekDouble>(npoints);
......@@ -104,7 +106,8 @@ namespace Nektar
for (i = 0; i < addfields; ++i)
{
outfield[i] = Array<OneD, NekDouble>(npoints); //Will store the Q-Criterion
//Will store the Q-Criterion
outfield[i] = Array<OneD, NekDouble>(npoints);
outfield1[i] = Array<OneD, NekDouble>(npoints);
outfield2[i] = Array<OneD, NekDouble>(npoints);
outfield3[i] = Array<OneD, NekDouble>(npoints);
......@@ -115,7 +118,6 @@ namespace Nektar
for (i = 0; i < nfields; ++i)
{
m_f->m_exp[i]->PhysDeriv(m_f->m_exp[i]->GetPhys(),
grad[i*nfields],
grad[i*nfields+1],
......@@ -123,28 +125,41 @@ namespace Nektar
}
// W_x = Wy - Vz
Vmath::Vsub(npoints, grad[2 * nfields + 1], 1, grad[1 * nfields + 2], 1,
Vmath::Vsub(npoints, grad[2 * nfields + 1], 1,
grad[1 * nfields + 2], 1,
outfield1[0], 1);
// W_x^2
Vmath::Vmul(npoints, outfield1[0], 1, outfield1[0], 1, outfield1[0], 1);
Vmath::Vmul(npoints, outfield1[0], 1,
outfield1[0], 1,
outfield1[0], 1);
// W_y = Uz - Wx
Vmath::Vsub(npoints, grad[0 * nfields + 2], 1, grad[2 * nfields + 0], 1,
Vmath::Vsub(npoints, grad[0 * nfields + 2], 1,
grad[2 * nfields + 0], 1,
outfield2[0], 1);
// W_y^2
Vmath::Vmul(npoints, outfield2[0], 1, outfield2[0], 1, outfield2[0], 1);
Vmath::Vmul(npoints, outfield2[0], 1,
outfield2[0], 1,
outfield2[0], 1);
// W_z = Vx - Uy
Vmath::Vsub(npoints, grad[1 * nfields + 0], 1, grad[0 * nfields + 1], 1,
Vmath::Vsub(npoints, grad[1 * nfields + 0], 1,
grad[0 * nfields + 1], 1,
outfield3[0], 1);
// W_z^2
Vmath::Vmul(npoints, outfield3[0], 1, outfield3[0], 1, outfield3[0], 1);
Vmath::Vmul(npoints, outfield3[0], 1,
outfield3[0], 1,
outfield3[0], 1);
// add fields omega = 0.5*(W_x^2 + W_y^2 + W_z^2)
NekDouble fac = 0.5;
Vmath::Vadd(npoints, &outfield1[0][0], 1, &outfield2[0][0], 1, &omega[0][0], 1);
Vmath::Vadd(npoints, &omega[0][0], 1, &outfield3[0][0], 1, &omega[0][0], 1);
Vmath::Vadd(npoints, &outfield1[0][0], 1,
&outfield2[0][0], 1,
&omega[0][0], 1);
Vmath::Vadd(npoints, &omega[0][0], 1,
&outfield3[0][0], 1,
&omega[0][0], 1);
for (int k = 0; k < addfields; ++k)
{
......@@ -155,42 +170,58 @@ namespace Nektar
Vmath::Zero(npoints, &outfield2[0][0], 1);
Vmath::Zero(npoints, &outfield3[0][0], 1);
Vmath::Vmul(npoints, grad[0 * nfields + 0], 1, grad[0 * nfields + 0], 1,
Vmath::Vmul(npoints, grad[0 * nfields + 0], 1,
grad[0 * nfields + 0], 1,
outfield1[0], 1);
Vmath::Vmul(npoints, grad[1 * nfields + 1], 1, grad[1 * nfields + 1], 1,
Vmath::Vmul(npoints, grad[1 * nfields + 1], 1,
grad[1 * nfields + 1], 1,
outfield2[0], 1);
Vmath::Vmul(npoints, grad[2 * nfields + 2], 1, grad[2 * nfields + 2], 1,
Vmath::Vmul(npoints, grad[2 * nfields + 2], 1,
grad[2 * nfields + 2], 1,
outfield3[0], 1);
Vmath::Vadd(npoints, &outfield1[0][0], 1, &outfield2[0][0], 1, &S[0][0], 1);
Vmath::Vadd(npoints, &S[0][0], 1, &outfield3[0][0], 1, &S[0][0], 1);
Vmath::Vadd(npoints, &outfield1[0][0], 1,
&outfield2[0][0], 1,
&S[0][0], 1);
Vmath::Vadd(npoints, &S[0][0], 1,
&outfield3[0][0], 1,
&S[0][0], 1);
// W_y + V_z
Vmath::Vadd(npoints, grad[2 * nfields + 1], 1, grad[1 * nfields + 2], 1,
Vmath::Vadd(npoints, grad[2 * nfields + 1], 1,
grad[1 * nfields + 2], 1,
outfield1[0], 1);
Vmath::Vmul(npoints, &outfield1[0][0], 1, &outfield1[0][0], 1,
Vmath::Vmul(npoints, &outfield1[0][0], 1,
&outfield1[0][0], 1,
&outfield1[0][0], 1);
// U_z + W_x
Vmath::Vadd(npoints, grad[0 * nfields + 2], 1, grad[2 * nfields + 0], 1,
Vmath::Vadd(npoints, grad[0 * nfields + 2], 1,
grad[2 * nfields + 0], 1,
outfield2[0], 1);
Vmath::Vmul(npoints, &outfield2[0][0], 1, &outfield2[0][0], 1,
Vmath::Vmul(npoints, &outfield2[0][0], 1,
&outfield2[0][0], 1,
&outfield2[0][0], 1);
// V_x + U_y
Vmath::Vadd(npoints, grad[1 * nfields + 0], 1, grad[0 * nfields + 1], 1,
Vmath::Vadd(npoints, grad[1 * nfields + 0], 1,
grad[0 * nfields + 1], 1,
outfield3[0], 1);
Vmath::Vmul(npoints, &outfield3[0][0], 1, &outfield3[0][0], 1,
Vmath::Vmul(npoints, &outfield3[0][0], 1,
&outfield3[0][0], 1,
&outfield3[0][0], 1);
Vmath::Vadd(npoints, &outfield1[0][0], 1, &outfield2[0][0], 1,
Vmath::Vadd(npoints, &outfield1[0][0], 1,
&outfield2[0][0], 1,
&outfield2[0][0], 1);
Vmath::Vadd(npoints, &outfield2[0][0], 1, &outfield3[0][0], 1,
Vmath::Vadd(npoints, &outfield2[0][0], 1,
&outfield3[0][0], 1,
&outfield3[0][0], 1);
for (int k = 0; k < addfields; ++k)
{
Vmath::Smul(npoints, fac, &outfield3[k][0], 1, &outfield3[k][0], 1);
Vmath::Smul(npoints, fac, &outfield3[k][0], 1,
&outfield3[k][0], 1);
}
Vmath::Vadd(npoints, &outfield3[0][0], 1, &S[0][0], 1, &S[0][0], 1);
......@@ -198,7 +229,8 @@ namespace Nektar
for (int k = 0; k < addfields; ++k)
{
Vmath::Smul(npoints, fac, &outfield[k][0], 1, &outfield[k][0], 1);
Vmath::Smul(npoints, fac, &outfield[k][0], 1,
&outfield[k][0], 1);
}
......@@ -227,7 +259,8 @@ namespace Nektar
}
else
{
FieldDef[i]->m_fields.push_back(m_f->m_fielddef[0]->m_fields[j]);
FieldDef[i]->m_fields.push_back(
m_f->m_fielddef[0]->m_fields[j]);
}
m_f->m_exp[j]->AppendFieldData(FieldDef[i], FieldData[i]);
}
......@@ -235,8 +268,6 @@ namespace Nektar
m_f->m_fielddef = FieldDef;
m_f->m_data = FieldData;
}
}
}
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