Commit 12e5682c authored by Spencer Sherwin's avatar Spencer Sherwin
Browse files

Modified LocProject3D tests to be consistent with introduction of Pyramid...

Modified LocProject3D tests to be consistent with introduction of Pyramid expansion. All seem OK except Hex and Lagrange changes which were rather large in a relative sense if or order 10e-11
parent a03207ba
......@@ -88,10 +88,12 @@ 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 Fourier = 7\n");
fprintf(stderr,"\t Lagrange = 8\n");
fprintf(stderr,"\t Legendre = 9\n");
fprintf(stderr,"\t Chebyshev = 10\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 Legendre = 11\n");
fprintf(stderr,"\t Chebyshev = 12\n");
exit(1);
}
......@@ -142,25 +144,28 @@ int main(int argc, char *argv[]){
break;
case LibUtilities::ePyramid:
if((btype1 == eOrtho_B) || (btype1 == eOrtho_C)
|| (btype1 == eModified_B) || (btype1 == eModified_C))
|| (btype1 == eModified_B) || (btype1 == eModified_C)
|| (btype1 == eModifiedPyr_C))
{
NEKERROR(ErrorUtil::efatal,
"Basis 1 cannot be of type Ortho_B, Ortho_C, Modified_B "
"or Modified_C");
"Basis 1 cannot be of type Ortho_B, Ortho_C, Modified_B, "
"Modified_C or ModifiedPyr_C");
}
if((btype2 == eOrtho_B) || (btype2 == eOrtho_C)
|| (btype2 == eModified_B) || (btype2 == eModified_C))
|| (btype2 == eModified_B) || (btype2 == eModified_C)
|| (btype2 == eModifiedPyr_C))
{
NEKERROR(ErrorUtil::efatal,
"Basis 2 cannot be of type Ortho_B, Ortho_C, Modified_B "
"or Modified_C");
"Basis 2 cannot be of type Ortho_B, Ortho_C, Modified_B, "
"Modified_C or ModifiedPyr_C");
}
if((btype3 == eOrtho_A) || (btype3 == eOrtho_B)
|| (btype3 == eModified_A) || (btype3 == eModified_B))
|| (btype3 == eModified_A) || (btype3 == eModified_B)
|| (btype3 == eModified_C))
{
NEKERROR(ErrorUtil::efatal,
"Basis 3 cannot be of type Ortho_A, Ortho_B, Modified_A "
"or Modified_B");
"Basis 3 cannot be of type Ortho_A, Ortho_B, Modified_A, "
"Modified_B or ModifiedPyr_C");
}
break;
case LibUtilities::ePrism:
......
......@@ -104,10 +104,12 @@ 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 Fourier = 7\n");
fprintf(stderr,"\t Lagrange = 8\n");
fprintf(stderr,"\t Legendre = 9\n");
fprintf(stderr,"\t Chebyshev = 10\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 Legendre = 11\n");
fprintf(stderr,"\t Chebyshev = 12\n");
exit(1);
}
......@@ -136,21 +138,24 @@ int main(int argc, char *argv[]){
{
case LibUtilities::eTetrahedron:
if((btype1 == eOrtho_B) || (btype1 == eOrtho_C)
|| (btype1 == eModified_B) || (btype1 == eModified_C))
|| (btype1 == eModified_B) || (btype1 == eModified_C)
|| (btype1 == eModifiedPyr_C))
{
NEKERROR(ErrorUtil::efatal,
"Basis 1 cannot be of type Ortho_B, "
"Ortho_C, Modified_B or Modified_C");
}
if((btype2 == eOrtho_A) || (btype2 == eOrtho_C)
|| (btype2 == eModified_A) || (btype2 == eModified_C))
|| (btype2 == eModified_A) || (btype2 == eModified_C)
|| (btype1 == eModifiedPyr_C))
{
NEKERROR(ErrorUtil::efatal,
"Basis 2 cannot be of type Ortho_A, "
"Ortho_C, Modified_A or Modified_C");
}
if((btype3 == eOrtho_A) || (btype3 == eOrtho_B)
|| (btype3 == eModified_A) || (btype3 == eModified_B))
|| (btype3 == eModified_A) || (btype3 == eModified_B)
|| (btype1 == eModified_C))
{
NEKERROR(ErrorUtil::efatal,
"Basis 3 cannot be of type Ortho_A, "
......@@ -159,21 +164,24 @@ int main(int argc, char *argv[]){
break;
case LibUtilities::ePyramid:
if((btype1 == eOrtho_B) || (btype1 == eOrtho_C)
|| (btype1 == eModified_B) || (btype1 == eModified_C))
|| (btype1 == eModified_B) || (btype1 == eModified_C)
|| (btype1 == eModifiedPyr_C))
{
NEKERROR(ErrorUtil::efatal,
"Basis 1 cannot be of type Ortho_B, "
"Ortho_C, Modified_B or Modified_C");
}
if((btype2 == eOrtho_B) || (btype2 == eOrtho_C)
|| (btype2 == eModified_B) || (btype2 == eModified_C))
|| (btype2 == eModified_B) || (btype2 == eModified_C)
|| (btype1 == eModifiedPyr_C))
{
NEKERROR(ErrorUtil::efatal,
"Basis 2 cannot be of type Ortho_B, "
"Ortho_C, Modified_B or Modified_C");
}
if((btype3 == eOrtho_A) || (btype3 == eOrtho_B)
|| (btype3 == eModified_A) || (btype3 == eModified_B))
|| (btype3 == eModified_A) || (btype3 == eModified_B)
|| (btype1 == eModified_C))
{
NEKERROR(ErrorUtil::efatal,
"Basis 3 cannot be of type Ortho_A, "
......
......@@ -5,10 +5,10 @@
<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>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">1.7955e-14</value>
<value tolerance="1e-11">3.83739e-11</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-11">8.81073e-13</value>
<value tolerance="1e-11">9.15321e-11</value>
</metric>
</metrics>
</test>
......@@ -2,13 +2,13 @@
<test>
<description>Project3D Pyramid Modified basis P=6 Q=7</description>
<executable>LocProject3D</executable>
<parameters>6 4 4 6 6 6 6 7 7 6 0 0 0 1 0 0 1 1 0 0 1 0 0.5 0.5 0.866</parameters>
<parameters>6 4 4 8 6 6 6 7 7 6 0 0 0 1 0 0 1 1 0 0 1 0 0.5 0.5 0.866</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-8">1.80317e-12</value>
<value tolerance="1e-8">1.15445e-12</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-8">1.20881e-11</value>
<value tolerance="1e-8">8.91376e-12</value>
</metric>
</metrics>
</test>
......@@ -5,10 +5,10 @@
<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>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">6.14629e-14</value>
<value tolerance="1e-12">1.82817e-12</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-12">4.83169e-13</value>
<value tolerance="1e-12">4.12292e-12</value>
</metric>
</metrics>
</test>
......
......@@ -2,13 +2,13 @@
<test>
<description>LocProject_Diff3D Reg. Prism Modified Basis, P=6, Q=7</description>
<executable>LocProject_Diff3D</executable>
<parameters>6 4 4 6 6 6 6 7 7 6 0 0 0 1 0 0 1 1 0 0 1 0 0.5 0 1 0.5 0.5 0.866</parameters>
<parameters>6 4 4 8 6 6 6 7 7 6 0 0 0 1 0 0 1 1 0 0 1 0 0.5 0 1 0.5 0.5 0.866</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-9">5.9107e-12</value>
<value tolerance="1e-9">4.64852e-12</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-9">3.81348e-11</value>
<value tolerance="1e-9">2.413e-11</value>
</metric>
</metrics>
</test>
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