Commit c1e8ca09 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Merge remote-tracking branch 'origin/feature/geom-factors' into feature/geom-factors

parents 5e932e9c a037c049
......@@ -156,7 +156,9 @@ namespace Nektar
{
nLocalSolutionPts = pFields[0]->GetExp(n)->GetTotPoints();
phys_offset = pFields[0]->GetPhys_Offset(n);
jac = LocalRegions::Expansion1D::FromStdExp(pFields[0]->GetExp(n))->GetGeom1D()->GetMetricInfo()->GetJac();
jac = LocalRegions::Expansion1D::FromStdExp(
pFields[0]->GetExp(n))->GetGeom1D()
->GetMetricInfo()->GetJac();
for (i = 0; i < nLocalSolutionPts; ++i)
{
m_jac[i+phys_offset] = jac[0];
......@@ -201,10 +203,16 @@ namespace Nektar
nLocalSolutionPts = pFields[0]->GetExp(n)->GetTotPoints();
phys_offset = pFields[0]->GetPhys_Offset(n);
jac = LocalRegions::Expansion2D::FromStdExp(pFields[0]->GetExp(n))->GetGeom2D()->GetMetricInfo()->GetJac();
gmat = LocalRegions::Expansion2D::FromStdExp(pFields[0]->GetExp(n))->GetGeom2D()->GetMetricInfo()->GetDerivFactors();
jac = LocalRegions::Expansion2D::FromStdExp(
pFields[0]->GetExp(n))->GetGeom2D()->
GetMetricInfo()->GetJac();
gmat = LocalRegions::Expansion2D::FromStdExp(
pFields[0]->GetExp(n))->GetGeom2D()->
GetMetricInfo()->GetDerivFactors();
if (LocalRegions::Expansion2D::FromStdExp(pFields[0]->GetExp(n))->GetGeom2D()->GetMetricInfo()->GetGtype()
if (LocalRegions::Expansion2D::FromStdExp(
pFields[0]->GetExp(n))->GetGeom2D()
->GetMetricInfo()->GetGtype()
== SpatialDomains::eDeformed)
{
for (i = 0; i < nLocalSolutionPts; ++i)
......
......@@ -204,7 +204,9 @@ namespace Nektar
{
nLocalSolutionPts = pFields[0]->GetExp(n)->GetTotPoints();
phys_offset = pFields[0]->GetPhys_Offset(n);
jac = LocalRegions::Expansion1D::FromStdExp(pFields[0]->GetExp(n))->GetGeom1D()->GetMetricInfo()->GetJac();
jac = LocalRegions::Expansion1D::FromStdExp(
pFields[0]->GetExp(n))->GetGeom1D()
->GetMetricInfo()->GetJac();
for (i = 0; i < nLocalSolutionPts; ++i)
{
m_jac[i+phys_offset] = jac[0];
......@@ -249,10 +251,16 @@ namespace Nektar
nLocalSolutionPts = pFields[0]->GetExp(n)->GetTotPoints();
phys_offset = pFields[0]->GetPhys_Offset(n);
jac = LocalRegions::Expansion2D::FromStdExp(pFields[0]->GetExp(n))->GetGeom2D()->GetMetricInfo()->GetJac();
gmat = LocalRegions::Expansion2D::FromStdExp(pFields[0]->GetExp(n))->GetGeom2D()->GetMetricInfo()->GetDerivFactors();
jac = LocalRegions::Expansion2D::FromStdExp(
pFields[0]->GetExp(n))->GetGeom2D()
->GetMetricInfo()->GetJac();
gmat = LocalRegions::Expansion2D::FromStdExp(
pFields[0]->GetExp(n))->GetGeom2D()
->GetMetricInfo()->GetDerivFactors();
if (LocalRegions::Expansion2D::FromStdExp(pFields[0]->GetExp(n))->GetGeom2D()->GetMetricInfo()->GetGtype()
if (LocalRegions::Expansion2D::FromStdExp(
pFields[0]->GetExp(n))->GetGeom2D()
->GetMetricInfo()->GetGtype()
== SpatialDomains::eDeformed)
{
for (i = 0; i < nLocalSolutionPts; ++i)
......@@ -1495,7 +1503,9 @@ namespace Nektar
{
nLocalSolutionPts = fields[0]->GetExp(n)->GetTotPoints();
phys_offset = fields[0]->GetPhys_Offset(n);
jac = LocalRegions::Expansion1D::FromStdExp(fields[0]->GetExp(n))->GetGeom1D()->GetMetricInfo()->GetJac();
jac = LocalRegions::Expansion1D
::FromStdExp(fields[0]->GetExp(n))->GetGeom1D()
->GetMetricInfo()->GetJac();
JumpL[n] = JumpL[n] * jac[0];
JumpR[n] = JumpR[n] * jac[0];
......@@ -1561,7 +1571,9 @@ namespace Nektar
phys_offset = fields[0]->GetPhys_Offset(n);
nLocalSolutionPts = fields[0]->GetExp(n)->GetTotPoints();
jac = LocalRegions::Expansion2D::FromStdExp(fields[0]->GetExp(n))->GetGeom2D()->GetMetricInfo()->GetJac();
jac = LocalRegions::Expansion2D::FromStdExp(
fields[0]->GetExp(n))->GetGeom2D()
->GetMetricInfo()->GetJac();
base = fields[0]->GetExp(n)->GetBase();
nquad0 = base[0]->GetNumPoints();
......@@ -1613,7 +1625,9 @@ namespace Nektar
}
// Deformed elements
if (LocalRegions::Expansion2D::FromStdExp(fields[0]->GetExp(n))->GetGeom2D()->GetMetricInfo()->GetGtype()
if (LocalRegions::Expansion2D::FromStdExp(
fields[0]->GetExp(n))->GetGeom2D()
->GetMetricInfo()->GetGtype()
== SpatialDomains::eDeformed)
{
// Extract the Jacobians along edge 'e'
......
......@@ -247,7 +247,9 @@ namespace Nektar
{
nLocalSolutionPts = pFields[0]->GetExp(n)->GetTotPoints();
phys_offset = pFields[0]->GetPhys_Offset(n);
jac = LocalRegions::Expansion1D::FromStdExp(pFields[0]->GetExp(n))->GetGeom1D()->GetMetricInfo()->GetJac();
jac = LocalRegions::Expansion1D::FromStdExp(
pFields[0]->GetExp(n))->GetGeom1D()->
GetMetricInfo()->GetJac();
for (i = 0; i < nLocalSolutionPts; ++i)
{
m_jac[i+phys_offset] = jac[0];
......@@ -292,10 +294,16 @@ namespace Nektar
nLocalSolutionPts = pFields[0]->GetExp(n)->GetTotPoints();
phys_offset = pFields[0]->GetPhys_Offset(n);
jac = LocalRegions::Expansion2D::FromStdExp(pFields[0]->GetExp(n))->GetGeom2D()->GetMetricInfo()->GetJac();
gmat = LocalRegions::Expansion2D::FromStdExp(pFields[0]->GetExp(n))->GetGeom2D()->GetMetricInfo()->GetDerivFactors();
jac = LocalRegions::Expansion2D::FromStdExp(
pFields[0]->GetExp(n))->GetGeom2D()
->GetMetricInfo()->GetJac();
gmat = LocalRegions::Expansion2D::FromStdExp(
pFields[0]->GetExp(n))->GetGeom2D()
->GetMetricInfo()->GetDerivFactors();
if (LocalRegions::Expansion2D::FromStdExp(pFields[0]->GetExp(n))->GetGeom2D()->GetMetricInfo()->GetGtype()
if (LocalRegions::Expansion2D::FromStdExp(
pFields[0]->GetExp(n))->GetGeom2D()
->GetMetricInfo()->GetGtype()
== SpatialDomains::eDeformed)
{
for (i = 0; i < nLocalSolutionPts; ++i)
......@@ -1650,7 +1658,9 @@ namespace Nektar
{
nLocalSolutionPts = fields[0]->GetExp(n)->GetTotPoints();
phys_offset = fields[0]->GetPhys_Offset(n);
jac = LocalRegions::Expansion1D::FromStdExp(fields[0]->GetExp(n))->GetGeom1D()->GetMetricInfo()->GetJac();
jac = LocalRegions::Expansion1D
::FromStdExp(fields[0]->GetExp(n))->GetGeom1D()
->GetMetricInfo()->GetJac();
JumpL[n] = JumpL[n] * jac[0];
JumpR[n] = JumpR[n] * jac[0];
......@@ -1714,7 +1724,9 @@ namespace Nektar
phys_offset = fields[0]->GetPhys_Offset(n);
nLocalSolutionPts = fields[0]->GetExp(n)->GetTotPoints();
jac = LocalRegions::Expansion2D::FromStdExp(fields[0]->GetExp(n))->GetGeom2D()->GetMetricInfo()->GetJac();
jac = LocalRegions::Expansion2D::FromStdExp(
fields[0]->GetExp(n))->GetGeom2D()
->GetMetricInfo()->GetJac();
base = fields[0]->GetExp(n)->GetBase();
nquad0 = base[0]->GetNumPoints();
......@@ -1772,7 +1784,9 @@ namespace Nektar
}
// Deformed elements
if (LocalRegions::Expansion2D::FromStdExp(fields[0]->GetExp(n))->GetGeom2D()->GetMetricInfo()->GetGtype()
if (LocalRegions::Expansion2D::FromStdExp(
fields[0]->GetExp(n))->GetGeom2D()
->GetMetricInfo()->GetGtype()
== SpatialDomains::eDeformed)
{
// Extract the Jacobians along edge 'e'
......
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