Commit 78735368 authored by Dave Moxey's avatar Dave Moxey

Merge remote-tracking branch 'upstream/master' into feature/mc-linearise

parents e3653aa1 953dcfb8
......@@ -96,6 +96,7 @@ ADD_NEKTAR_TEST(Helmholtz2D_CG_varP_Modes)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_CG_Hex)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_Heterogeneous)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs_iter_ml)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs_iter_sc_cont)
......
<?xml version="1.0" encoding="utf-8" ?>
<test>
<description>Helmholtz 3D CG for Hexahedron, heterogeneous expansion</description>
<executable>Helmholtz3D</executable>
<parameters>Helmholtz3D_Hex_Heterogeneous.xml</parameters>
<files>
<file description="Session File">Helmholtz3D_Hex_Heterogeneous.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">5.23385e-05</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-12">0.00014837</value>
</metric>
</metrics>
</test>
<?xml version="1.0" encoding="utf-8" ?>
<NEKTAR xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.nektar.info/schema/nektar.xsd">
<GEOMETRY DIM="3" SPACE="3">
<VERTEX>
<V ID="0">0.000e+00 0.000e+00 0.000e+00</V>
<V ID="1">1.000e+00 0.000e+00 0.000e+00</V>
<V ID="2">0.000e+00 1.000e+00 0.000e+00</V>
<V ID="3">1.000e+00 1.000e+00 0.000e+00</V>
<V ID="4">0.000e+00 0.000e+00 1.000e+00</V>
<V ID="5">1.000e+00 0.000e+00 1.000e+00</V>
<V ID="6">1.000e+00 1.000e+00 1.000e+00</V>
<V ID="7">0.000e+00 1.000e+00 1.000e+00</V>
<V ID="8">5.000e-01 0.000e+00 0.000e+00</V>
<V ID="9">5.000e-01 1.000e+00 0.000e+00</V>
<V ID="10">0.000e+00 5.000e-01 0.000e+00</V>
<V ID="11">1.000e+00 5.000e-01 0.000e+00</V>
<V ID="12">5.000e-01 0.000e+00 1.000e+00</V>
<V ID="13">1.000e+00 5.000e-01 1.000e+00</V>
<V ID="14">5.000e-01 1.000e+00 1.000e+00</V>
<V ID="15">0.000e+00 5.000e-01 1.000e+00</V>
<V ID="16">0.000e+00 0.000e+00 5.000e-01</V>
<V ID="17">1.000e+00 0.000e+00 5.000e-01</V>
<V ID="18">1.000e+00 1.000e+00 5.000e-01</V>
<V ID="19">0.000e+00 1.000e+00 5.000e-01</V>
<V ID="20">5.000e-01 5.000e-01 0.000e+00</V>
<V ID="21">5.000e-01 0.000e+00 5.000e-01</V>
<V ID="22">1.000e+00 5.000e-01 5.000e-01</V>
<V ID="23">5.000e-01 1.000e+00 5.000e-01</V>
<V ID="24">0.000e+00 5.000e-01 5.000e-01</V>
<V ID="25">5.000e-01 5.000e-01 1.000e+00</V>
<V ID="26">5.000e-01 5.000e-01 5.000e-01</V>
</VERTEX>
<EDGE>
<E ID="0"> 0 8 </E>
<E ID="1"> 8 20 </E>
<E ID="2"> 20 10 </E>
<E ID="3"> 10 0 </E>
<E ID="4"> 8 21 </E>
<E ID="5"> 21 16 </E>
<E ID="6"> 16 0 </E>
<E ID="7"> 20 26 </E>
<E ID="8"> 26 21 </E>
<E ID="9"> 10 24 </E>
<E ID="10"> 24 26 </E>
<E ID="11"> 16 24 </E>
<E ID="12"> 21 12 </E>
<E ID="13"> 12 4 </E>
<E ID="14"> 4 16 </E>
<E ID="15"> 26 25 </E>
<E ID="16"> 25 12 </E>
<E ID="17"> 24 15 </E>
<E ID="18"> 15 25 </E>
<E ID="19"> 4 15 </E>
<E ID="20"> 20 9 </E>
<E ID="21"> 9 2 </E>
<E ID="22"> 2 10 </E>
<E ID="23"> 9 23 </E>
<E ID="24"> 23 26 </E>
<E ID="25"> 2 19 </E>
<E ID="26"> 19 23 </E>
<E ID="27"> 24 19 </E>
<E ID="28"> 23 14 </E>
<E ID="29"> 14 25 </E>
<E ID="30"> 19 7 </E>
<E ID="31"> 7 14 </E>
<E ID="32"> 15 7 </E>
<E ID="33"> 8 1 </E>
<E ID="34"> 1 11 </E>
<E ID="35"> 11 20 </E>
<E ID="36"> 1 17 </E>
<E ID="37"> 17 21 </E>
<E ID="38"> 11 22 </E>
<E ID="39"> 22 17 </E>
<E ID="40"> 26 22 </E>
<E ID="41"> 17 5 </E>
<E ID="42"> 5 12 </E>
<E ID="43"> 22 13 </E>
<E ID="44"> 13 5 </E>
<E ID="45"> 25 13 </E>
<E ID="46"> 11 3 </E>
<E ID="47"> 3 9 </E>
<E ID="48"> 3 18 </E>
<E ID="49"> 18 22 </E>
<E ID="50"> 23 18 </E>
<E ID="51"> 18 6 </E>
<E ID="52"> 6 13 </E>
<E ID="53"> 14 6 </E>
</EDGE>
<FACE>
<Q ID="0"> 0 1 2 3</Q>
<Q ID="1"> 0 4 5 6</Q>
<Q ID="2"> 1 7 8 4</Q>
<Q ID="3"> 2 9 10 7</Q>
<Q ID="4"> 3 6 11 9</Q>
<Q ID="5"> 5 8 10 11</Q>
<Q ID="6"> 5 12 13 14</Q>
<Q ID="7"> 8 15 16 12</Q>
<Q ID="8"> 10 17 18 15</Q>
<Q ID="9"> 11 14 19 17</Q>
<Q ID="10"> 13 16 18 19</Q>
<Q ID="11"> 2 20 21 22</Q>
<Q ID="12"> 20 23 24 7</Q>
<Q ID="13"> 21 25 26 23</Q>
<Q ID="14"> 22 9 27 25</Q>
<Q ID="15"> 10 24 26 27</Q>
<Q ID="16"> 24 28 29 15</Q>
<Q ID="17"> 26 30 31 28</Q>
<Q ID="18"> 27 17 32 30</Q>
<Q ID="19"> 18 29 31 32</Q>
<Q ID="20"> 33 34 35 1</Q>
<Q ID="21"> 33 36 37 4</Q>
<Q ID="22"> 34 38 39 36</Q>
<Q ID="23"> 35 7 40 38</Q>
<Q ID="24"> 37 39 40 8</Q>
<Q ID="25"> 37 41 42 12</Q>
<Q ID="26"> 39 43 44 41</Q>
<Q ID="27"> 40 15 45 43</Q>
<Q ID="28"> 42 44 45 16</Q>
<Q ID="29"> 35 46 47 20</Q>
<Q ID="30"> 46 48 49 38</Q>
<Q ID="31"> 47 23 50 48</Q>
<Q ID="32"> 40 49 50 24</Q>
<Q ID="33"> 49 51 52 43</Q>
<Q ID="34"> 50 28 53 51</Q>
<Q ID="35"> 45 52 53 29</Q>
</FACE>
<ELEMENT>
<H ID="0"> 0 1 2 3 4 5 </H>
<H ID="1"> 5 6 7 8 9 10 </H>
<H ID="2"> 11 3 12 13 14 15 </H>
<H ID="3"> 15 8 16 17 18 19 </H>
<H ID="4"> 20 21 22 23 2 24 </H>
<H ID="5"> 24 25 26 27 7 28 </H>
<H ID="6"> 29 23 30 31 12 32 </H>
<H ID="7"> 32 27 33 34 16 35 </H>
</ELEMENT>
<COMPOSITE>
<C ID="0"> H[0-7] </C>
<C ID="1"> F[0,11,20,29] </C>
<C ID="2"> F[1,6,21,25] </C>
<C ID="3"> F[22,26,30,33] </C>
<C ID="4"> F[13,17,31,34] </C>
<C ID="5"> F[4,9,14,18] </C>
<C ID="6"> F[10,19,28,35] </C>
</COMPOSITE>
<DOMAIN> C[0] </DOMAIN>
</GEOMETRY>
<EXPANSIONS>
<E COMPOSITE="C[0]"
BASISTYPE="Modified_A,Modified_A,Modified_A"
NUMMODES="4,6,8"
POINTSTYPE="GaussLobattoLegendre,GaussLobattoLegendre,GaussLobattoLegendre"
NUMPOINTS="5,7,9"
FIELDS="u" />
</EXPANSIONS>
<CONDITIONS>
<PARAMETERS>
<P> Lambda = 1 </P>
</PARAMETERS>
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
<BOUNDARYREGIONS>
<B ID="0"> C[1-6] </B>
</BOUNDARYREGIONS>
<BOUNDARYCONDITIONS>
<REGION REF="0">
<D VAR="u" VALUE="sin(PI/2*x)*sin(PI/2*y)*sin(PI/2*z)" />
</REGION>
</BOUNDARYCONDITIONS>
<FUNCTION NAME="Forcing">
<E VAR="u" VALUE="-(Lambda + 3*PI*PI/4)*sin(PI/2*x)*sin(PI/2*y)*sin(PI/2*z)" />
</FUNCTION>
<FUNCTION NAME="ExactSolution">
<E VAR="u" VALUE="sin(PI/2*x)*sin(PI/2*y)*sin(PI/2*z)" />
</FUNCTION>
</CONDITIONS>
</NEKTAR>
......@@ -367,7 +367,7 @@ namespace Nektar
int HexGeom::v_GetDir(const int faceidx, const int facedir) const
{
if (faceidx == 0 || faceidx == 1)
if (faceidx == 0 || faceidx == 5)
{
return facedir;
}
......
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