Commit 12ff4560 authored by Dave Moxey's avatar Dave Moxey
Browse files

Renaming 3D MultiRegions regression tests, removing redundant xml files.

parent 4af8e839
......@@ -2,9 +2,9 @@
<test>
<description>Helmholtz 3D CG for Hex</description>
<executable>Helmholtz3D</executable>
<parameters>Helmholtz3D_Hex_CG.xml</parameters>
<parameters>Helmholtz3D_Hex_P6.xml</parameters>
<files>
<file description="Session File">Helmholtz3D_Hex_CG.xml</file>
<file description="Session File">Helmholtz3D_Hex_P6.xml</file>
</files>
<metrics>
......
......@@ -2,9 +2,9 @@
<test>
<description>Helmholtz 3D CG, hexes, mixed BCs</description>
<executable>Helmholtz3D</executable>
<parameters>Helmholtz3D_Hex_MixedBCs_CG.xml</parameters>
<parameters>Helmholtz3D_Hex_AllBCs_P6.xml</parameters>
<files>
<file description="Session File">Helmholtz3D_Hex_MixedBCs_CG.xml</file>
<file description="Session File">Helmholtz3D_Hex_AllBCs_P6.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
......
......@@ -2,9 +2,9 @@
<test>
<description>Helmholtz 3D CG, hexes, mixed BCs, iterative ML</description>
<executable>Helmholtz3D</executable>
<parameters>Helmholtz3D_Hex_MixedBCs_Iter_ML_CG.xml</parameters>
<parameters>-I GlobalSysSoln=IterativeMultiLevelStaticCond Helmholtz3D_Hex_AllBCs_P6.xml</parameters>
<files>
<file description="Session File">Helmholtz3D_Hex_MixedBCs_Iter_ML_CG.xml</file>
<file description="Session File">Helmholtz3D_Hex_AllBCs_P6.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
......
......@@ -2,10 +2,10 @@
<test>
<description>Helmholtz 3D CG, hexes, mixed BCs, iterative ML</description>
<executable>Helmholtz3D</executable>
<parameters>Helmholtz3D_Hex_MixedBCs_Iter_ML_CG.xml</parameters>
<parameters>-I GlobalSysSoln=IterativeMultiLevelStaticCond Helmholtz3D_Hex_AllBCs_P6.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz3D_Hex_MixedBCs_Iter_ML_CG.xml</file>
<file description="Session File">Helmholtz3D_Hex_AllBCs_P6.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
......
......@@ -2,7 +2,7 @@
<test>
<description>Helmholtz 3D CG for Prism</description>
<executable>Helmholtz3D</executable>
<parameters>helmholtz3D_Prism.xml</parameters>
<parameters>Helmholtz3D_Prism.xml</parameters>
<files>
<file description="Session File">Helmholtz3D_Prism.xml</file>
</files>
......
......@@ -2,9 +2,9 @@
<test>
<description>Helmholtz 3D CG, prisms, Neumann BCs, iterative ML</description>
<executable>Helmholtz3D</executable>
<parameters>Helmholtz3D_Prism_Iter_ML_CG.xml</parameters>
<parameters>-I GlobalSysSoln=IterativeMultiLevelStaticCond Helmholtz3D_Prism.xml</parameters>
<files>
<file description="Session File">Helmholtz3D_Prism_Iter_ML_CG.xml</file>
<file description="Session File">Helmholtz3D_Prism.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
......
......@@ -2,10 +2,10 @@
<test>
<description>Helmholtz 3D CG, prisms, Neumann BCs, iterative ML, Par(3)</description>
<executable>Helmholtz3D</executable>
<parameters>Helmholtz3D_Prism_Iter_ML_CG.xml</parameters>
<parameters>Helmholtz3D_Prism.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz3D_Prism_Iter_ML_CG.xml</file>
<file description="Session File">Helmholtz3D_Prism.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
......
<?xml version="1.0" encoding="utf-8" ?>
<NEKTAR>
<EXPANSIONS>
<E COMPOSITE="C[0]" NUMMODES="5" TYPE="MODIFIED" FIELDS="u" />
</EXPANSIONS>
<CONDITIONS>
<PARAMETERS>
<P> Lambda = 1 </P>
</PARAMETERS>
<SOLVERINFO>
<I PROPERTY="GlobalSysSoln" VALUE="IterativeMultiLevelStaticCond" />
</SOLVERINFO>
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
<BOUNDARYREGIONS>
<B ID="0"> C[1] </B>
<B ID="1"> C[2] </B>
<B ID="2"> C[3] </B>
<B ID="3"> C[4] </B>
<B ID="4"> C[5] </B>
<B ID="5"> C[6] </B>
</BOUNDARYREGIONS>
<BOUNDARYCONDITIONS>
<REGION REF="0">
<N VAR="u" VALUE="-sin(PI/2*x)*sin(PI/2*y)*cos(PI/2*z)*PI/2" />
</REGION>
<REGION REF="1">
<N VAR="u" VALUE="-sin(PI/2*x)*cos(PI/2*y)*sin(PI/2*z)*PI/2" />
</REGION>
<REGION REF="2">
<N VAR="u" VALUE="cos(PI/2*x)*sin(PI/2*y)*sin(PI/2*z)*PI/2" />
</REGION>
<REGION REF="3">
<N VAR="u" VALUE="sin(PI/2*x)*cos(PI/2*y)*sin(PI/2*z)*PI/2" />
</REGION>
<REGION REF="4">
<N VAR="u" VALUE="-cos(PI/2*x)*sin(PI/2*y)*sin(PI/2*z)*PI/2" />
</REGION>
<REGION REF="5">
<N VAR="u" VALUE="sin(PI/2*x)*sin(PI/2*y)*cos(PI/2*z)*PI/2" />
</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>
<GEOMETRY DIM="3" SPACE="3">
<VERTEX>
<V ID="0">0.00000000e+00 0.00000000e+00 5.00000000e-01</V>
<V ID="1">5.00000000e-01 0.00000000e+00 5.00000000e-01</V>
<V ID="2">5.00000000e-01 0.00000000e+00 0.00000000e+00</V>
<V ID="3">0.00000000e+00 0.00000000e+00 0.00000000e+00</V>
<V ID="4">5.00000000e-01 5.00000000e-01 5.00000000e-01</V>
<V ID="5">5.00000000e-01 5.00000000e-01 0.00000000e+00</V>
<V ID="6">0.00000000e+00 0.00000000e+00 1.00000000e+00</V>
<V ID="7">5.00000000e-01 0.00000000e+00 1.00000000e+00</V>
<V ID="8">5.00000000e-01 5.00000000e-01 1.00000000e+00</V>
<V ID="9">0.00000000e+00 5.00000000e-01 5.00000000e-01</V>
<V ID="10">0.00000000e+00 5.00000000e-01 0.00000000e+00</V>
<V ID="11">0.00000000e+00 5.00000000e-01 1.00000000e+00</V>
<V ID="12">5.00000000e-01 1.00000000e+00 5.00000000e-01</V>
<V ID="13">5.00000000e-01 1.00000000e+00 0.00000000e+00</V>
<V ID="14">5.00000000e-01 1.00000000e+00 1.00000000e+00</V>
<V ID="15">0.00000000e+00 1.00000000e+00 5.00000000e-01</V>
<V ID="16">0.00000000e+00 1.00000000e+00 0.00000000e+00</V>
<V ID="17">0.00000000e+00 1.00000000e+00 1.00000000e+00</V>
<V ID="18">1.00000000e+00 0.00000000e+00 5.00000000e-01</V>
<V ID="19">1.00000000e+00 0.00000000e+00 0.00000000e+00</V>
<V ID="20">1.00000000e+00 5.00000000e-01 5.00000000e-01</V>
<V ID="21">1.00000000e+00 5.00000000e-01 0.00000000e+00</V>
<V ID="22">1.00000000e+00 0.00000000e+00 1.00000000e+00</V>
<V ID="23">1.00000000e+00 5.00000000e-01 1.00000000e+00</V>
<V ID="24">1.00000000e+00 1.00000000e+00 5.00000000e-01</V>
<V ID="25">1.00000000e+00 1.00000000e+00 0.00000000e+00</V>
<V ID="26">1.00000000e+00 1.00000000e+00 1.00000000e+00</V>
</VERTEX>
<EDGE>
<E ID="0"> 0 1 </E>
<E ID="1"> 1 2 </E>
<E ID="2"> 3 2 </E>
<E ID="3"> 0 3 </E>
<E ID="4"> 0 4 </E>
<E ID="5"> 1 4 </E>
<E ID="6"> 2 5 </E>
<E ID="7"> 3 5 </E>
<E ID="8"> 4 5 </E>
<E ID="9"> 6 7 </E>
<E ID="10"> 7 1 </E>
<E ID="11"> 6 0 </E>
<E ID="12"> 6 8 </E>
<E ID="13"> 7 8 </E>
<E ID="14"> 8 4 </E>
<E ID="15"> 0 9 </E>
<E ID="16"> 3 10 </E>
<E ID="17"> 9 10 </E>
<E ID="18"> 4 9 </E>
<E ID="19"> 5 10 </E>
<E ID="20"> 6 11 </E>
<E ID="21"> 11 9 </E>
<E ID="22"> 8 11 </E>
<E ID="23"> 9 12 </E>
<E ID="24"> 10 13 </E>
<E ID="25"> 12 13 </E>
<E ID="26"> 4 12 </E>
<E ID="27"> 5 13 </E>
<E ID="28"> 11 14 </E>
<E ID="29"> 14 12 </E>
<E ID="30"> 8 14 </E>
<E ID="31"> 12 15 </E>
<E ID="32"> 15 16 </E>
<E ID="33"> 13 16 </E>
<E ID="34"> 9 15 </E>
<E ID="35"> 10 16 </E>
<E ID="36"> 14 17 </E>
<E ID="37"> 17 15 </E>
<E ID="38"> 11 17 </E>
<E ID="39"> 1 18 </E>
<E ID="40"> 18 19 </E>
<E ID="41"> 2 19 </E>
<E ID="42"> 1 20 </E>
<E ID="43"> 18 20 </E>
<E ID="44"> 19 21 </E>
<E ID="45"> 2 21 </E>
<E ID="46"> 20 21 </E>
<E ID="47"> 7 22 </E>
<E ID="48"> 22 18 </E>
<E ID="49"> 7 23 </E>
<E ID="50"> 22 23 </E>
<E ID="51"> 23 20 </E>
<E ID="52"> 20 4 </E>
<E ID="53"> 21 5 </E>
<E ID="54"> 23 8 </E>
<E ID="55"> 20 24 </E>
<E ID="56"> 24 25 </E>
<E ID="57"> 21 25 </E>
<E ID="58"> 4 24 </E>
<E ID="59"> 5 25 </E>
<E ID="60"> 23 26 </E>
<E ID="61"> 26 24 </E>
<E ID="62"> 8 26 </E>
<E ID="63"> 24 12 </E>
<E ID="64"> 25 13 </E>
<E ID="65"> 26 14 </E>
</EDGE>
<FACE>
<Q ID="0"> 0 1 2 3</Q>
<T ID="1"> 0 5 4</T>
<Q ID="2"> 1 6 8 5</Q>
<T ID="3"> 2 6 7</T>
<Q ID="4"> 3 7 8 4</Q>
<Q ID="5"> 9 10 0 11</Q>
<T ID="6"> 9 13 12</T>
<Q ID="7"> 10 5 14 13</Q>
<Q ID="8"> 11 4 14 12</Q>
<Q ID="9"> 15 3 16 17</Q>
<T ID="10"> 15 4 18</T>
<T ID="11"> 16 7 19</T>
<Q ID="12"> 17 19 8 18</Q>
<Q ID="13"> 20 11 15 21</Q>
<T ID="14"> 20 12 22</T>
<Q ID="15"> 21 18 14 22</Q>
<Q ID="16"> 23 17 24 25</Q>
<T ID="17"> 23 18 26</T>
<T ID="18"> 24 19 27</T>
<Q ID="19"> 25 27 8 26</Q>
<Q ID="20"> 28 21 23 29</Q>
<T ID="21"> 28 22 30</T>
<Q ID="22"> 29 26 14 30</Q>
<Q ID="23"> 31 32 33 25</Q>
<T ID="24"> 31 34 23</T>
<Q ID="25"> 32 35 17 34</Q>
<T ID="26"> 33 35 24</T>
<Q ID="27"> 36 37 31 29</Q>
<T ID="28"> 36 38 28</T>
<Q ID="29"> 37 34 21 38</Q>
<Q ID="30"> 39 40 41 1</Q>
<T ID="31"> 39 43 42</T>
<Q ID="32"> 40 44 46 43</Q>
<T ID="33"> 41 44 45</T>
<Q ID="34"> 1 45 46 42</Q>
<Q ID="35"> 47 48 39 10</Q>
<T ID="36"> 47 50 49</T>
<Q ID="37"> 48 43 51 50</Q>
<Q ID="38"> 10 42 51 49</Q>
<T ID="39"> 42 52 5</T>
<Q ID="40"> 46 53 8 52</Q>
<T ID="41"> 45 53 6</T>
<T ID="42"> 49 54 13</T>
<Q ID="43"> 51 52 14 54</Q>
<Q ID="44"> 55 56 57 46</Q>
<T ID="45"> 55 58 52</T>
<Q ID="46"> 56 59 8 58</Q>
<T ID="47"> 57 59 53</T>
<Q ID="48"> 60 61 55 51</Q>
<T ID="49"> 60 62 54</T>
<Q ID="50"> 61 58 14 62</Q>
<Q ID="51"> 63 25 64 56</Q>
<T ID="52"> 63 26 58</T>
<T ID="53"> 64 27 59</T>
<Q ID="54"> 65 29 63 61</Q>
<T ID="55"> 65 30 62</T>
</FACE>
<ELEMENT>
<R ID="0"> 0 1 2 3 4 </R>
<R ID="1"> 5 6 7 1 8 </R>
<R ID="2"> 9 10 4 11 12 </R>
<R ID="3"> 13 14 8 10 15 </R>
<R ID="4"> 16 17 12 18 19 </R>
<R ID="5"> 20 21 15 17 22 </R>
<R ID="6"> 23 24 25 26 16 </R>
<R ID="7"> 27 28 29 24 20 </R>
<R ID="8"> 30 31 32 33 34 </R>
<R ID="9"> 35 36 37 31 38 </R>
<R ID="10"> 34 39 40 41 2 </R>
<R ID="11"> 38 42 43 39 7 </R>
<R ID="12"> 44 45 46 47 40 </R>
<R ID="13"> 48 49 50 45 43 </R>
<R ID="14"> 51 52 19 53 46 </R>
<R ID="15"> 54 55 22 52 50 </R>
</ELEMENT>
<COMPOSITE>
<C ID="0"> R[0-15] </C>
<C ID="1"> F[3,11,18,26,33,41,47,53] </C>
<C ID="2"> F[0,5,30,35] </C>
<C ID="3"> F[32,37,44,48] </C>
<C ID="4"> F[23,27,51,54] </C>
<C ID="5"> F[9,13,25,29] </C>
<C ID="6"> F[6,14,21,28,36,42,49,55] </C>
</COMPOSITE>
<DOMAIN> C[0] </DOMAIN>
</GEOMETRY>
</NEKTAR>
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