Commit 2b110963 authored by Chris Cantwell's avatar Chris Cantwell

Merge branch 'feature/variableP' into 'master'

Feature/variable p

This MR implements modifications in the AssemblyMap to allow the use of variable order in 2D simulations using CG.

See merge request !497
parents 89bb7d1d 2c49eec9
......@@ -92,6 +92,7 @@ ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_PreconBlock)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_PreconDiagonal)
ADD_NEKTAR_TEST(Helmholtz2D_HDG_P7_Modes)
ADD_NEKTAR_TEST(Helmholtz2D_HDG_P7_Modes_AllBCs)
ADD_NEKTAR_TEST(Helmholtz2D_CG_varP_Modes)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_CG_Hex)
......@@ -132,6 +133,7 @@ IF (NEKTAR_USE_MPI)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_iter_ml_par3)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_CG_Hex_AllBCs_xxt_sc_par3)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P14_xxt_per)
ADD_NEKTAR_TEST(Helmholtz2D_CG_varP_Modes_par)
# TODO: This test fails due to a bug with Dirichlet bnd conditions.
# To be resolved in a separate branch.
......
<?xml version="1.0" encoding="utf-8"?>
<test>
<description>Helmholtz 2D CG with P=7</description>
<executable>Helmholtz2D</executable>
<parameters>Helmholtz2D_varP.xml</parameters>
<files>
<file description="Session File">Helmholtz2D_varP.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-6">0.0045269</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-6">0.00420409</value>
</metric>
</metrics>
</test>
<?xml version="1.0" encoding="utf-8"?>
<test>
<description>Helmholtz 2D CG with P=7, parallel</description>
<executable>Helmholtz2D</executable>
<parameters>Helmholtz2D_varP.xml</parameters>
<processes>2</processes>
<files>
<file description="Session File">Helmholtz2D_varP.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-6">0.0045269</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-6">0.00420409</value>
</metric>
</metrics>
</test>
This diff is collapsed.
This diff is collapsed.
......@@ -799,7 +799,7 @@ namespace Nektar
(*m_exp)[eid]->ExtractDataToCoeffs(&fielddata[offset], fielddef->m_numModes,modes_offset,&coeffs[m_coeff_offset[eid] + planes_offset*ncoeffs_per_plane]);
}
}
modes_offset += (*m_exp)[0]->GetNumBases();
modes_offset += (*m_exp)[0]->GetNumBases() + fielddef->m_numHomogeneousDir;
}
}
}
......
......@@ -2287,6 +2287,7 @@ namespace Nektar
if(!UniOrder)
{
cnt++;
cnt += fielddef[i]->m_numHomogeneousDir;
}
bkeyvec.push_back(bkey);
}
......@@ -2342,6 +2343,7 @@ namespace Nektar
if(!UniOrder)
{
cnt += 2;
cnt += fielddef[i]->m_numHomogeneousDir;
}
}
break;
......@@ -2381,6 +2383,7 @@ namespace Nektar
if(!UniOrder)
{
cnt += 2;
cnt += fielddef[i]->m_numHomogeneousDir;
}
}
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