Commit 7582e5f1 authored by Spencer Sherwin's avatar Spencer Sherwin
Browse files

Updated the StdRegions demos and regression tests to be consistent with new...

Updated the StdRegions demos and regression tests to be consistent with new numbering of Basis Types
parent 231f989d
......@@ -26,15 +26,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);
}
......
......@@ -56,9 +56,10 @@ int main(int argc, char *argv[])
fprintf(stderr,"\t Gauss Lagrange = 11\n");
fprintf(stderr,"\t Legendre = 12\n");
fprintf(stderr,"\t Chebyshev = 13\n");
fprintf(stderr,"\t FourierSingleMode = 14\n");
fprintf(stderr,"\t Nodal tri (Electro) = 15\n");
fprintf(stderr,"\t Nodal tri (Fekete) = 16\n");
fprintf(stderr,"\t Monomial = 14\n");
fprintf(stderr,"\t FourierSingleMode = 15\n");
fprintf(stderr,"\t Nodal tri (Electro) = 18\n");
fprintf(stderr,"\t Nodal tri (Fekete) = 19\n");
fprintf(stderr,"Note type = 3,6,7,8 are for three-dimensional basis\n");
......@@ -77,17 +78,17 @@ int main(int argc, char *argv[])
int btype1_val = atoi(argv[2]);
int btype2_val = atoi(argv[3]);
if(( btype1_val <= 14)&&( btype2_val <= 14))
if(( btype1_val <= 15)&&( btype2_val <= 15))
{
btype1 = (LibUtilities::BasisType) btype1_val;
btype2 = (LibUtilities::BasisType) btype2_val;
}
else if(( btype1_val >=15)&&(btype2_val <= 16))
else if(( btype1_val >=18)&&(btype2_val <= 19))
{
btype1 = LibUtilities::eOrtho_A;
btype2 = LibUtilities::eOrtho_B;
if(btype1_val == 15)
if(btype1_val == 18)
{
NodalType = LibUtilities::eNodalTriElec;
}
......
......@@ -70,16 +70,15 @@ int main(int argc, char *argv[]){
fprintf(stderr,"\t Modified_A = 4\n");
fprintf(stderr,"\t Modified_B = 5\n");
fprintf(stderr,"\t Modified_C = 6\n");
fprintf(stderr,"\t Ortho_C = 7\n");
fprintf(stderr,"\t Modified_C = 8\n");
fprintf(stderr,"\t Fourier = 8\n");
fprintf(stderr,"\t Lagrange = 9\n");
fprintf(stderr,"\t Gauss Lagrange = 10\n");
fprintf(stderr,"\t Legendre = 11\n");
fprintf(stderr,"\t Chebyshev = 12\n");
fprintf(stderr,"\t Nodal tri (Electro) = 13\n");
fprintf(stderr,"\t Nodal tri (Fekete) = 14\n");
fprintf(stderr,"\t OrthoPyr_C = 7\n");
fprintf(stderr,"\t ModifiedPyr_C = 8\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 tet (Electro) = 15\n");
fprintf(stderr,"\t Nodal tet (Even) = 16\n");
fprintf(stderr,"\t Nodal prism (Even) = 17\n");
......@@ -102,13 +101,13 @@ int main(int argc, char *argv[]){
int btype2_val = atoi(argv[3]);
int btype3_val = atoi(argv[4]);
if (btype1_val <= 13 && btype2_val <= 13)
if (btype1_val <= 14 && btype2_val <= 14)
{
btype1 = (LibUtilities::BasisType) btype1_val;
btype2 = (LibUtilities::BasisType) btype2_val;
btype3 = (LibUtilities::BasisType) btype3_val;
}
else if(btype1_val >=14 && btype2_val <= 18)
else if(btype1_val >=15 && btype2_val <= 17)
{
if (regionshape == LibUtilities::eTetrahedron)
{
......@@ -123,19 +122,11 @@ int main(int argc, char *argv[]){
btype3 = LibUtilities::eOrtho_B;
}
if(btype1_val == 14)
{
NodalType = LibUtilities::eNodalTriElec;
}
else if (btype1_val == 15)
{
NodalType = LibUtilities::eNodalTriFekete;
}
else if (btype1_val == 16)
if (btype1_val == 15)
{
NodalType = LibUtilities::eNodalTetElec;
}
else if (btype1_val == 17)
else if (btype1_val == 16)
{
NodalType = LibUtilities::eNodalTetEvenlySpaced;
}
......
......@@ -26,15 +26,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);
}
......
......@@ -89,13 +89,15 @@ int main(int argc, char *argv[]){
fprintf(stderr,"\t Modified_C = 6\n");
fprintf(stderr,"\t OrthoPyr_C = 7\n");
fprintf(stderr,"\t ModifiedPyr_C = 8\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 Nodal tri (Electro) = 14\n");
fprintf(stderr,"\t Nodal tri (Fekete) = 15\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 tet (Electro) = 15\n");
fprintf(stderr,"\t Nodal tet (Even) = 16\n");
fprintf(stderr,"\t Nodal prism (Even) = 17\n");
exit(1);
}
......@@ -114,17 +116,26 @@ int main(int argc, char *argv[]){
int btype1_val = atoi(argv[2]);
int btype2_val = atoi(argv[3]);
int btype3_val = atoi(argv[4]);
if(( btype1_val <= 13)&&( btype2_val <= 13))
if(( btype1_val <= 15)&&( btype2_val <= 15))
{
btype1 = (LibUtilities::BasisType) btype1_val;
btype2 = (LibUtilities::BasisType) btype2_val;
btype3 = (LibUtilities::BasisType) btype3_val;
}
else if(( btype1_val >=14)&&(btype2_val <= 15))
else if(( btype1_val >=15)&&(btype2_val <= 17))
{
btype1 = LibUtilities::eOrtho_A;
btype2 = LibUtilities::eOrtho_B;
btype3 = LibUtilities::eOrtho_C;
if (regionshape == LibUtilities::eTetrahedron)
{
btype1 = LibUtilities::eOrtho_A;
btype2 = LibUtilities::eOrtho_B;
btype3 = LibUtilities::eOrtho_C;
}
else if (regionshape == LibUtilities::ePrism)
{
btype1 = LibUtilities::eOrtho_A;
btype2 = LibUtilities::eOrtho_A;
btype3 = LibUtilities::eOrtho_B;
}
}
// Check to see that correct Expansions are used
......
<?xml version="1.0" encoding="utf-8"?>
<test>
<description>StdProject2D Quadrilateral Fourier Single Mode basis P=2 Q=6</description>
<description>StdProject2D Quadrilateral Fourier Single Mode basis P=2 Q=2</description>
<executable>StdProject2D</executable>
<parameters>4 12 12 2 2 6 6</parameters>
<parameters>4 15 15 2 2 2 2</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">3.59678e-16</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>StdProject2D Quadrilateral Lagrange basis P=6 Q=7</description>
<executable>StdProject2D</executable>
<parameters>4 8 8 6 6 7 7</parameters>
<parameters>4 10 10 6 6 7 7</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">4.62859e-15</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>StdProject2D Triangle Nodal basis P=6 Q=7</description>
<executable>StdProject2D</executable>
<parameters>3 15 14 6 6 7 7</parameters>
<parameters>3 18 18 6 6 7 7</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">1.78107e-15</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>StdProject3D Hexahedron Chebyshev basis P=6 Q=7</description>
<executable>StdProject3D</executable>
<parameters>8 10 10 10 6 6 6 7 7 7</parameters>
<parameters>8 13 13 13 6 6 6 7 7 7</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">4.11256e-14</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>StdProject3D Hexahedron Legendre basis P=6 Q=7</description>
<executable>StdProject3D</executable>
<parameters>8 10 10 10 6 6 6 7 7 7</parameters>
<parameters>8 12 12 12 6 6 6 7 7 7</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">2.20528e-14</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>StdProject_Diff3D Hexahedron Chebyshev basis P=6 Q=7</description>
<executable>StdProject_Diff3D</executable>
<parameters>8 10 10 10 6 6 6 7 7 7</parameters>
<parameters>8 13 13 13 6 6 6 7 7 7</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-8">5.62024e-13</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>StdProject_Diff3D Hexahedron Legendre basis P=6 Q=7</description>
<executable>StdProject_Diff3D</executable>
<parameters>8 10 10 10 6 6 6 7 7 7</parameters>
<parameters>8 12 12 12 6 6 6 7 7 7</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">4.88883e-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