Commit c26b202e authored by Spencer Sherwin's avatar Spencer Sherwin
Browse files

Updated LocRegions regression test to be consistent with new basis list definition

parent 7582e5f1
......@@ -31,15 +31,15 @@ int main(int argc, char *argv[])
"dictates the basis as:\n");
fprintf(stderr,"\t Ortho_A = 1\n");
fprintf(stderr,"\t Modified_A = 4\n");
fprintf(stderr,"\t Fourier = 7\n");
fprintf(stderr,"\t Lagrange = 8\n");
fprintf(stderr,"\t Gauss Lagrange = 9\n");
fprintf(stderr,"\t Legendre = 10\n");
fprintf(stderr,"\t Chebyshev = 11\n");
fprintf(stderr,"\t Monomial = 12\n");
fprintf(stderr,"\t FourierSingleMode = 13\n");
fprintf(stderr,"\t Fourier = 9\n");
fprintf(stderr,"\t Lagrange = 10\n");
fprintf(stderr,"\t Gauss Lagrange = 11\n");
fprintf(stderr,"\t Legendre = 12\n");
fprintf(stderr,"\t Chebyshev = 13\n");
fprintf(stderr,"\t Monomial = 14\n");
fprintf(stderr,"\t FourierSingleMode = 15\n");
fprintf(stderr,"Note type = 1,2,4,5 are for higher dimensional basis\n");
fprintf(stderr,"Note type = 1,2,4,5,7,8 are for higher dimensional basis\n");
exit(1);
}
......
......@@ -53,15 +53,16 @@ int main(int argc, char *argv[])
fprintf(stderr,"\t Ortho_B = 2\n");
fprintf(stderr,"\t Modified_A = 4\n");
fprintf(stderr,"\t Modified_B = 5\n");
fprintf(stderr,"\t Fourier = 7\n");
fprintf(stderr,"\t Lagrange = 8\n");
fprintf(stderr,"\t Gauss Lagrange = 9\n");
fprintf(stderr,"\t Legendre = 10\n");
fprintf(stderr,"\t Chebyshev = 11\n");
fprintf(stderr,"\t Nodal tri (Electro) = 13\n");
fprintf(stderr,"\t Nodal tri (Fekete) = 14\n");
fprintf(stderr,"\t Fourier = 9\n");
fprintf(stderr,"\t Lagrange = 10\n");
fprintf(stderr,"\t Gauss Lagrange = 11\n");
fprintf(stderr,"\t Legendre = 12\n");
fprintf(stderr,"\t Chebyshev = 13\n");
fprintf(stderr,"\t Monomial = 14\n");
fprintf(stderr,"\t Nodal tri (Electro) = 15\n");
fprintf(stderr,"\t Nodal tri (Fekete) = 16\n");
fprintf(stderr,"Note type = 3,6 are for three-dimensional basis\n");
fprintf(stderr,"Note type = 3,6,7,8 are for three-dimensional basis\n");
fprintf(stderr,"The last series of values are the coordinates\n");
exit(1);
......@@ -78,17 +79,17 @@ int main(int argc, char *argv[])
int btype1_val = atoi(argv[2]);
int btype2_val = atoi(argv[3]);
if(( btype1_val <= 11)&&( btype2_val <= 11))
if(( btype1_val <= 14)&&( btype2_val <= 14))
{
btype1 = (LibUtilities::BasisType) btype1_val;
btype2 = (LibUtilities::BasisType) btype2_val;
}
else if(( btype1_val >=13)&&(btype2_val <= 14))
else if(( btype1_val >=15)&&(btype2_val <= 16))
{
btype1 = LibUtilities::eOrtho_A;
btype2 = LibUtilities::eOrtho_B;
if(btype1_val == 13)
if(btype1_val == 15)
{
NodalType = LibUtilities::eNodalTriElec;
}
......@@ -204,7 +205,7 @@ int main(int argc, char *argv[])
const LibUtilities::BasisKey Bkey1(btype1,order1,Pkey1);
const LibUtilities::BasisKey Bkey2(btype2,order2,Pkey2);
if(btype1_val >= 11)
if(btype1_val >= 15)
{
E = new LocalRegions::NodalTriExp(Bkey1,Bkey2,NodalType,geom);
}
......
......@@ -34,15 +34,15 @@ int main(int argc, char *argv[])
"dictates the basis as:\n");
fprintf(stderr,"\t Ortho_A = 1\n");
fprintf(stderr,"\t Modified_A = 4\n");
fprintf(stderr,"\t Fourier = 7\n");
fprintf(stderr,"\t Lagrange = 8\n");
fprintf(stderr,"\t Gauss Lagrange = 9\n");
fprintf(stderr,"\t Legendre = 10\n");
fprintf(stderr,"\t Chebyshev = 11\n");
fprintf(stderr,"\t Monomial = 12\n");
fprintf(stderr,"\t FourierSingleMode = 13\n");
fprintf(stderr,"Note type = 1,2,4,5 are for higher dimensional basis\n");
fprintf(stderr,"\t Fourier = 9\n");
fprintf(stderr,"\t Lagrange = 10\n");
fprintf(stderr,"\t Gauss Lagrange = 11\n");
fprintf(stderr,"\t Legendre = 12\n");
fprintf(stderr,"\t Chebyshev = 13\n");
fprintf(stderr,"\t Monomial = 14\n");
fprintf(stderr,"\t FourierSingleMode = 15\n");
fprintf(stderr,"Note type = 1,2,4,5,7,8 are for higher dimensional basis\n");
exit(1);
}
......
......@@ -63,16 +63,17 @@ int main(int argc, char *argv[])
fprintf(stderr,"\t Ortho_B = 2\n");
fprintf(stderr,"\t Modified_A = 4\n");
fprintf(stderr,"\t Modified_B = 5\n");
fprintf(stderr,"\t Fourier = 7\n");
fprintf(stderr,"\t Lagrange = 8\n");
fprintf(stderr,"\t Gauss Lagrange = 9\n");
fprintf(stderr,"\t Legendre = 10\n");
fprintf(stderr,"\t Chebyshev = 11\n");
fprintf(stderr,"\t Nodal tri (Electro) = 13\n");
fprintf(stderr,"\t Nodal tri (Fekete) = 14\n");
fprintf(stderr,"\t Fourier = 9\n");
fprintf(stderr,"\t Lagrange = 10\n");
fprintf(stderr,"\t Gauss Lagrange = 11\n");
fprintf(stderr,"\t Legendre = 12\n");
fprintf(stderr,"\t Chebyshev = 13\n");
fprintf(stderr,"\t Monomial = 13\n");
fprintf(stderr,"\t Nodal tri (Electro) = 15\n");
fprintf(stderr,"\t Nodal tri (Fekete) = 16\n");
fprintf(stderr,"Note type = 3,6 are for three-dimensional basis\n");
fprintf(stderr,"Note type = 3,6,7,8 are for three-dimensional basis\n");
fprintf(stderr,"The last series of values are the coordinates\n");
exit(1);
......@@ -90,17 +91,17 @@ int main(int argc, char *argv[])
int btype1_val = atoi(argv[2]);
int btype2_val = atoi(argv[3]);
if(( btype1_val <= 11)&&( btype2_val <= 11))
if(( btype1_val <= 14)&&( btype2_val <= 14))
{
btype1 = (LibUtilities::BasisType) btype1_val;
btype2 = (LibUtilities::BasisType) btype2_val;
}
else if(( btype1_val >=13)&&(btype2_val <= 14))
else if(( btype1_val >=15)&&(btype2_val <= 16))
{
btype1 = LibUtilities::eOrtho_A;
btype2 = LibUtilities::eOrtho_B;
if(btype1_val == 13)
if(btype1_val == 15)
{
NodalType = LibUtilities::eNodalTriElec;
}
......@@ -108,10 +109,8 @@ int main(int argc, char *argv[])
{
NodalType = LibUtilities::eNodalTriFekete;
}
}
// Check to see that correct Expansions are used
switch(regionshape)
{
......@@ -224,7 +223,7 @@ int main(int argc, char *argv[])
const LibUtilities::BasisKey Bkey1(btype1,order1,Pkey1);
const LibUtilities::BasisKey Bkey2(btype2,order2,Pkey2);
if(btype1_val >= 11)
if(btype1_val >= 15)
{
E = new LocalRegions::NodalTriExp(Bkey1,Bkey2,NodalType,geom);
}
......
......@@ -2,7 +2,7 @@
<test>
<description>Project2D Deformed Quad Lagrange basis P=6 Q=7</description>
<executable>LocProject2D</executable>
<parameters>4 8 8 6 6 7 7 0.0 0.0 1.0 0.0 1.5 1.5 0.0 1.0</parameters>
<parameters>4 10 10 6 6 7 7 0.0 0.0 1.0 0.0 1.5 1.5 0.0 1.0</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.0970116</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Project2D Quad Lagrange basis P=6 Q=7</description>
<executable>LocProject2D</executable>
<parameters>4 8 8 6 6 7 7 0.0 0.0 1.0 0.0 1.0 1.0 0.0 1.0</parameters>
<parameters>4 10 10 6 6 7 7 0.0 0.0 1.0 0.0 1.0 1.0 0.0 1.0</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">1.81771e-15</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Project2D Triangle Nodal basis P=6 Q=7</description>
<executable>LocProject2D</executable>
<parameters>3 13 13 6 6 7 7 0.0 0.0 1.0 1.0 0.5 1.0</parameters>
<parameters>3 15 15 6 6 7 7 0.0 0.0 1.0 1.0 0.5 1.0</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">1.84567e-15</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Project3D Deformed Hex Lagrange basis P=6 Q=7</description>
<executable>LocProject3D</executable>
<parameters>8 8 8 8 6 6 6 7 7 7 0 0 0 1 0 0 1 1.5 0 0 1 0 0 0 1 1.5 0 1 1 1 1 0 1 1.5</parameters>
<parameters>8 10 10 10 6 6 6 7 7 7 0 0 0 1 0 0 1 1.5 0 0 1 0 0 0 1 1.5 0 1 1 1 1 0 1 1.5</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.00820104</value>
......
......@@ -2,13 +2,13 @@
<test>
<description>Project3D Hex Lagrange basis P=6 Q=7</description>
<executable>LocProject3D</executable>
<parameters>8 8 8 8 6 6 6 7 7 7 0 0 0 1 0 0 1 1 0 0 1 0 0 0 1 1 0 1 1 1 1 0 1 1</parameters>
<parameters>8 10 10 10 6 6 6 7 7 7 0 0 0 1 0 0 1 1 0 0 1 0 0 0 1 1 0 1 1 1 1 0 1 1</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-11">3.83739e-11</value>
<value tolerance="1e-11">2.04616e-14</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-11">9.15321e-11</value>
<value tolerance="1e-11">8.52651e-13</value>
</metric>
</metrics>
</test>
......@@ -2,7 +2,7 @@
<test>
<description>LocProject_Diff2D Lin. Deformed Quad Lagrange Basis P=6, Q=7</description>
<executable>LocProject_Diff2D</executable>
<parameters>4 8 8 6 6 7 7 0.0 0.0 1.0 0.0 1.5 1.5 0.0 1.0</parameters>
<parameters>4 10 10 6 6 7 7 0.0 0.0 1.0 0.0 1.5 1.5 0.0 1.0</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.288711</value>
......
......@@ -2,13 +2,13 @@
<test>
<description>LocProject_Diff2D Reg. Quad Lagrange Basis P=6, Q=7</description>
<executable>LocProject_Diff2D</executable>
<parameters>4 8 8 6 6 7 7 0.0 0.0 1.0 0.0 1.0 1.0 0.0 1.0</parameters>
<parameters>4 10 10 6 6 7 7 0.0 0.0 1.0 0.0 1.0 1.0 0.0 1.0</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">1.82817e-12</value>
<value tolerance="1e-12">6.80298e-14</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-12">4.12292e-12</value>
<value tolerance="1e-12">4.83169e-13</value>
</metric>
</metrics>
</test>
......
......@@ -2,7 +2,7 @@
<test>
<description>LocProject_Diff2D Tri Nodal Basis P=6, Q=7</description>
<executable>LocProject_Diff2D</executable>
<parameters>3 13 13 6 6 7 7 0.0 0.0 1.0 1.0 0.5 1.0</parameters>
<parameters>3 15 15 6 6 7 7 0.0 0.0 1.0 1.0 0.5 1.0</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">2.99203e-14</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>LocProject_Diff3D Lin. Deformed Hex Lagrange Basis, P=6, Q=7</description>
<executable>LocProject_Diff3D</executable>
<parameters>8 8 8 8 6 6 6 7 7 7 0 0 0 1 0 0 1 1.5 0 0 1 0 0 0 1 1.5 0 1 1 1 1 0 1 1.5</parameters>
<parameters>8 10 10 10 6 6 6 7 7 7 0 0 0 1 0 0 1 1.5 0 0 1 0 0 0 1 1.5 0 1 1 1 1 0 1 1.5</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.0353098</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>LocProject_Diff3D Reg. Hex Lagrange Basis, P=6, Q=7</description>
<executable>LocProject_Diff3D</executable>
<parameters>8 8 8 8 6 6 6 7 7 7 0 0 0 1 0 0 1 1 0 0 1 0 0 0 1 1 0 1 1 1 1 0 1 1</parameters>
<parameters>8 10 10 10 6 6 6 7 7 7 0 0 0 1 0 0 1 1 0 0 1 0 0 0 1 1 0 1 1 1 1 0 1 1</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-08">5.89495e-13</value>
......
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