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

Merge branch 'fix/QuadExp-heterogenous' into 'master'

Fix problem in QuadExp with different number of points per direction

This fixes a few bugs in `QuadExp`, which prevent simulations using quads from working when the number of points is not the same in both directions.

See merge request !607
parents 99b27034 e89a0a5f
......@@ -10,6 +10,7 @@ v4.3.1
- Fix Homogeneous transform when unshuffling is not used. (!599)
- Fix namespace pollution in library header files. (!601)
- Fix issue with METIS compilation on clang 7.3 (!603)
- Fix issue with heterogeneous quadrilaterals (!607)
- Fix bug in modified Arnoldi algorithm causing convergence to be reported when
number of vectors is less than `nvec` (!608)
- Fix uninitialised array bug in AssemblyMap (!598)
......
......@@ -899,7 +899,7 @@ namespace Nektar
outarray = Array<OneD, int>(nquad1);
for (int i = 0; i < nquad1; ++i)
{
outarray[i] = (nquad0-1) + i*nquad1;
outarray[i] = (nquad0-1) + i*nquad0;
}
break;
case 2:
......@@ -980,7 +980,7 @@ namespace Nektar
&(jac[0])+(nquad0-1), nquad0,
&(j[0]), 1);
for (i = 0; i < nquad0; ++i)
for (i = 0; i < nquad1; ++i)
{
outarray[i] = j[i]*sqrt(g0[i]*g0[i] +
g2[i]*g2[i]);
......@@ -1020,7 +1020,7 @@ namespace Nektar
&(jac[0])+nquad0*(nquad1-1), -nquad0,
&(j[0]), 1);
for (i = 0; i < nquad0; ++i)
for (i = 0; i < nquad1; ++i)
{
outarray[i] = j[i]*sqrt(g0[i]*g0[i] +
g2[i]*g2[i]);
......@@ -1195,7 +1195,15 @@ namespace Nektar
LibUtilities::PointsKeyVector ptsKeys = GetPointsKeys();
const Array<TwoD, const NekDouble> & df = geomFactors->GetDerivFactors(ptsKeys);
const Array<OneD, const NekDouble> & jac = geomFactors->GetJac(ptsKeys);
int nqe = m_base[0]->GetNumPoints();
int nqe;
if (edge == 0 || edge == 2)
{
nqe = m_base[0]->GetNumPoints();
}
else
{
nqe = m_base[1]->GetNumPoints();
}
int vCoordDim = GetCoordim();
m_edgeNormals[edge] = Array<OneD, Array<OneD, NekDouble> >
......
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