Commit bed791ec authored by Pavel Burovskiy's avatar Pavel Burovskiy

Merge branch 'master' into feature/sparse

parents bd25de21 0bfd2a2f
......@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
exit(1);
}
StdRegions::ExpansionType regionShape = StdRegions::ePrism;
LibUtilities::ShapeType regionShape = LibUtilities::ePrism;
int bType_x_val = atoi(argv[1]);
int bType_y_val = atoi(argv[2]);
int bType_z_val = atoi(argv[3]);
......@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
}
// Check to see that correct Expansions are used
if( regionShape == StdRegions::ePrism)
if( regionShape == LibUtilities::ePrism)
{
if( (bType_x == LibUtilities::eOrtho_B) || (bType_x == LibUtilities::eModified_B) ) {
NEKERROR(ErrorUtil::efatal, "Basis 1 cannot be of type Ortho_B or Modified_B");
......@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
// Define a 3D expansion based on basis definition
StdRegions::StdExpansion3D *lpr = 0;
if( regionShape == StdRegions::ePrism )
if( regionShape == LibUtilities::ePrism )
{
// //////////////////////////////////////////////////////
// Set up Prism vertex coordinates
......@@ -197,7 +197,7 @@ int main(int argc, char *argv[])
Array<OneD, StdRegions::StdExpansion3DSharedPtr> xMap(3);
for(int i=0; i < 3; ++i){
xMap[i] = MemoryManager<StdRegions::StdPrismExp>::AllocateSharedPtr(basisKey_x, basisKey_y, basisKey_z);
xMap[i] = MemoryManager<StdRegions::StdPrismExp>::AllocateSharedPtr(basisKey_x, basisKey_y, basisKey_z);
}
......@@ -250,7 +250,8 @@ int main(int argc, char *argv[])
t[1] = 0.5;
t[2] = 0.2;
if( regionShape == StdRegions::ePrism ) {
if( regionShape == LibUtilities::ePrism )
{
solution[0] = Prism_sol( t[0], t[1], t[2], P, Q, R, bType_x, bType_y, bType_z );
}
......
......@@ -23,9 +23,10 @@ int main(int argc, char *argv[])
int order1,order2, nq1,nq2;
LibUtilities::PointsType Qtype1,Qtype2;
LibUtilities::BasisType btype1,btype2;
LibUtilities::PointsType NodalType;
StdRegions::ExpansionType regionshape;
LibUtilities::BasisType btype1 = LibUtilities::eOrtho_A;
LibUtilities::BasisType btype2 = LibUtilities::eOrtho_B;
LibUtilities::PointsType NodalType = LibUtilities::eNodalTriElec;
LibUtilities::ShapeType regionshape;
StdRegions::StdExpansion2D *E;
Array<OneD, NekDouble> sol;
Array<OneD, NekDouble> coords(8);
......@@ -41,8 +42,8 @@ int main(int argc, char *argv[])
fprintf(stderr,"Where RegionShape is an integer value which "
"dictates the region shape:\n");
fprintf(stderr,"\t Triangle = 2\n");
fprintf(stderr,"\t Quadrilateral = 3\n");
fprintf(stderr,"\t Triangle = 3\n");
fprintf(stderr,"\t Quadrilateral = 4\n");
fprintf(stderr,"Where type is an integer value which "
"dictates the basis as:\n");
......@@ -64,10 +65,10 @@ int main(int argc, char *argv[])
exit(1);
}
regionshape = (StdRegions::ExpansionType) atoi(argv[1]);
regionshape = (LibUtilities::ShapeType) atoi(argv[1]);
// Check to see if 2D region
if((regionshape != StdRegions::eTriangle)&&(regionshape != StdRegions::eQuadrilateral))
if((regionshape != LibUtilities::eTriangle)&&(regionshape != LibUtilities::eQuadrilateral))
{
NEKERROR(ErrorUtil::efatal,"This shape is not a 2D region");
}
......@@ -99,7 +100,7 @@ int main(int argc, char *argv[])
// Check to see that correct Expansions are used
switch(regionshape)
{
case StdRegions::eTriangle:
case LibUtilities::eTriangle:
if((btype1 == LibUtilities::eOrtho_B)||(btype1 == LibUtilities::eModified_B))
{
NEKERROR(ErrorUtil::efatal,
......@@ -107,7 +108,7 @@ int main(int argc, char *argv[])
}
break;
case StdRegions::eQuadrilateral:
case LibUtilities::eQuadrilateral:
if((btype1 == LibUtilities::eOrtho_B)||(btype1 == LibUtilities::eOrtho_C)||
(btype1 == LibUtilities::eModified_B)||(btype1 == LibUtilities::eModified_C))
{
......@@ -145,7 +146,7 @@ int main(int argc, char *argv[])
if(btype2 != LibUtilities::eFourier)
{
if (regionshape == StdRegions::eTriangle) {
if (regionshape == LibUtilities::eTriangle) {
Qtype2 = LibUtilities::eGaussRadauMAlpha1Beta0;
}
else
......@@ -163,9 +164,8 @@ int main(int argc, char *argv[])
switch(regionshape)
{
case StdRegions::eTriangle:
case LibUtilities::eTriangle:
{
coords[0] = atof(argv[8]);
coords[1] = atof(argv[9]);
coords[2] = atof(argv[10]);
......@@ -225,7 +225,7 @@ int main(int argc, char *argv[])
}
break;
case StdRegions::eQuadrilateral:
case LibUtilities::eQuadrilateral:
{
// Gather coordinates
coords[0] = atof(argv[8]);
......@@ -319,7 +319,7 @@ int main(int argc, char *argv[])
x[0] = (coords[0] + coords[2])*0.5;
x[1] = (coords[1] + coords[5])*0.5;
if(regionshape == StdRegions::eTriangle)
if(regionshape == LibUtilities::eTriangle)
{
sol[0] = Tri_sol(x[0],x[1],order1,order2);
}
......
......@@ -58,7 +58,7 @@ int main(int argc, char *argv[]){
PointsType Qtype1,Qtype2,Qtype3;
BasisType btype1,btype2,btype3;
ExpansionType regionshape;
ShapeType regionshape;
StdExpansion* E;
Array<OneD, NekDouble> sol;
......@@ -69,9 +69,9 @@ int main(int argc, char *argv[]){
"x3 y3 z3 [x4 y4 z4...]\n");
fprintf(stderr,"Where RegionShape is an integer value which "
"dictates the region shape:\n");
fprintf(stderr,"\t Tetrahedron = 4\n");
fprintf(stderr,"\t Prism = 6\n");
fprintf(stderr,"\t Hexahedron = 7\n");
fprintf(stderr,"\t Tetrahedron = 5\n");
fprintf(stderr,"\t Prism = 7\n");
fprintf(stderr,"\t Hexahedron = 8\n");
fprintf(stderr,"Where type is an integer value which "
......@@ -91,12 +91,12 @@ int main(int argc, char *argv[]){
exit(1);
}
regionshape = (StdRegions::ExpansionType) atoi(argv[1]);
regionshape = (LibUtilities::ShapeType) atoi(argv[1]);
// Check to see if 3D region
if (regionshape != StdRegions::eTetrahedron &&
regionshape != StdRegions::ePrism &&
regionshape != StdRegions::eHexahedron)
if (regionshape != LibUtilities::eTetrahedron &&
regionshape != LibUtilities::ePrism &&
regionshape != LibUtilities::eHexahedron)
{
NEKERROR(ErrorUtil::efatal,"This shape is not a 3D region");
}
......@@ -111,7 +111,7 @@ int main(int argc, char *argv[]){
// Check to see that correct Expansions are used
switch(regionshape)
{
case StdRegions::eTetrahedron:
case LibUtilities::eTetrahedron:
if((btype1 == eOrtho_B) || (btype1 == eOrtho_C)
|| (btype1 == eModified_B) || (btype1 == eModified_C))
{
......@@ -134,7 +134,7 @@ int main(int argc, char *argv[]){
"or Modified_B");
}
break;
case StdRegions::ePrism:
case LibUtilities::ePrism:
if((btype1 == eOrtho_B) || (btype1 == eOrtho_C)
|| (btype1 == eModified_B) || (btype1 == eModified_C))
{
......@@ -157,7 +157,7 @@ int main(int argc, char *argv[]){
"or Modified_C");
}
break;
case StdRegions::eHexahedron:
case LibUtilities::eHexahedron:
if((btype1 == eOrtho_B) || (btype1 == eOrtho_C)
|| (btype1 == eModified_B) || (btype1 == eModified_C))
{
......@@ -204,7 +204,7 @@ int main(int argc, char *argv[]){
if(btype2 != LibUtilities::eFourier)
{
if (regionshape == StdRegions::eTetrahedron) {
if (regionshape == LibUtilities::eTetrahedron) {
Qtype2 = LibUtilities::eGaussRadauMAlpha1Beta0;
}
else
......@@ -219,10 +219,11 @@ int main(int argc, char *argv[]){
if(btype3 != LibUtilities::eFourier)
{
if (regionshape == StdRegions::eTetrahedron) {
if (regionshape == LibUtilities::eTetrahedron)
{
Qtype3 = LibUtilities::eGaussRadauMAlpha2Beta0;
}
else if (regionshape == StdRegions::ePrism)
else if (regionshape == LibUtilities::ePrism)
{
Qtype3 = LibUtilities::eGaussRadauMAlpha1Beta0;
}
......@@ -251,7 +252,7 @@ int main(int argc, char *argv[]){
switch(regionshape)
{
case StdRegions::eTetrahedron:
case LibUtilities::eTetrahedron:
{
SpatialDomains::TetGeomSharedPtr geom = CreateTetGeom(argc, argv);
E = new LocalRegions::TetExp(Bkey1, Bkey2, Bkey3, geom);
......@@ -266,7 +267,7 @@ int main(int argc, char *argv[]){
//----------------------------------------------
}
break;
case StdRegions::ePrism:
case LibUtilities::ePrism:
{
SpatialDomains::PrismGeomSharedPtr geom = CreatePrismGeom(argc, argv);
E = new LocalRegions::PrismExp(Bkey1, Bkey2, Bkey3, geom);
......@@ -281,7 +282,7 @@ int main(int argc, char *argv[]){
//----------------------------------------------
}
break;
case StdRegions::eHexahedron:
case LibUtilities::eHexahedron:
{
SpatialDomains::HexGeomSharedPtr geom = CreateHexGeom(argc, argv);
E = new LocalRegions::HexExp(Bkey1, Bkey2, Bkey3, geom);
......
......@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
exit(1);
}
StdRegions::ExpansionType regionShape = StdRegions::ePyramid;
LibUtilities::ShapeType regionShape = LibUtilities::ePyramid;
int bType_x_val = atoi(argv[1]);
int bType_y_val = atoi(argv[2]);
int bType_z_val = atoi(argv[3]);
......@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
}
// Check to see that correct Expansions are used
if( regionShape == StdRegions::ePyramid )
if( regionShape == LibUtilities::ePyramid )
{
if( (bType_x == LibUtilities::eOrtho_B) || (bType_x == LibUtilities::eModified_B) ) {
NEKERROR(ErrorUtil::efatal, "Basis 1 cannot be of type Ortho_B or Modified_B");
......@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
StdRegions::StdExpansion3D *lpe = 0;
if( regionShape == StdRegions::ePyramid )
if( regionShape == LibUtilities::ePyramid )
{
// //////////////////////////////////////////////////////
// Set up Prism vertex coordinates
......@@ -214,9 +214,12 @@ int main(int argc, char *argv[])
geom->SetOwnData();
if( bType_x_val < 10 ) {
if( bType_x_val < 10 )
{
lpe = new LocalRegions::PyrExp( basisKey_x, basisKey_y, basisKey_z, geom );
} else {
}
else
{
cerr << "Implement the NodalTetExp!!!!!!" << endl;
//lpe = new StdRegions::StdNodalTetExp( basisKey_x, basisKey_y, basisKey_z, NodalType );
exit(1);
......@@ -259,7 +262,8 @@ int main(int argc, char *argv[])
t[1] = -0.25;
t[2] = 0.5;
if( regionShape == StdRegions::ePyramid ) {
if( regionShape == LibUtilities::ePyramid )
{
solution[0] = Pyr_sol( t[0], t[1], t[2], P, Q, R );
}
......
......@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
exit(1);
}
StdRegions::ExpansionType regionShape = StdRegions::eTetrahedron;
LibUtilities::ShapeType regionShape = LibUtilities::eTetrahedron;
int bType_x_val = atoi(argv[1]);
int bType_y_val = atoi(argv[2]);
int bType_z_val = atoi(argv[3]);
......@@ -222,7 +222,8 @@ int main(int argc, char *argv[])
// Evaulate solution at x = y = z = 0 and print error
Array<OneD, NekDouble> t = Array<OneD, NekDouble>(3);
if( regionShape == StdRegions::eTetrahedron ) {
if( regionShape == LibUtilities::eTetrahedron )
{
solution[0] = Tet_sol( t[0], t[1], t[2], P, Q, R );
}
......
......@@ -2,7 +2,7 @@
<test>
<description>Project2D Deformed Quad Lagrange basis P=6 Q=7</description>
<executable>LocProject2D</executable>
<parameters>3 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 8 8 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 Deformed Quad Modified basis P=6 Q=7</description>
<executable>LocProject2D</executable>
<parameters>3 4 4 6 6 7 7 0.0 0.0 1.0 0.0 1.5 1.5 0.0 1.0</parameters>
<parameters>4 4 4 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 Deformed Quad Ortho basis P=4 Q=5</description>
<executable>LocProject2D</executable>
<parameters>3 1 1 6 6 7 7 0.0 0.0 1.0 0.0 1.5 1.5 0.0 1.0</parameters>
<parameters>4 1 1 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>3 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 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">1.81771e-15</value>
......@@ -11,4 +11,4 @@
<value tolerance="1e-11">1.06581e-14</value>
</metric>
</metrics>
</test>
\ No newline at end of file
</test>
......@@ -2,7 +2,7 @@
<test>
<description>Project2D Quad Modified basis P=4 Q=5</description>
<executable>LocProject2D</executable>
<parameters>3 4 4 6 6 7 7 0.0 0.0 1.0 0.0 1.0 1.0 0.0 1.0</parameters>
<parameters>4 4 4 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.24683e-13</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Project2D Quad Orthogonal basis P=4 Q=5</description>
<executable>LocProject2D</executable>
<parameters>3 1 1 6 6 7 7 0.0 0.0 1.0 0.0 1.0 1.0 0.0 1.0</parameters>
<parameters>4 1 1 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">2.06086e-15</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Project2D Triangle Modified basis P=6 Q=7</description>
<executable>LocProject2D</executable>
<parameters>2 4 5 6 6 7 7 0.0 0.0 1.0 1.0 0.5 1.0</parameters>
<parameters>3 4 5 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.43556e-14</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Project2D Triangle Nodal basis P=6 Q=7</description>
<executable>LocProject2D</executable>
<parameters>2 11 11 6 6 7 7 0.0 0.0 1.0 1.0 0.5 1.0</parameters>
<parameters>3 11 11 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>Project2D Triangle Orthogonal basis P=6 Q=7</description>
<executable>LocProject2D</executable>
<parameters>2 1 2 6 6 7 7 0.0 0.0 1.0 1.0 0.5 1.0</parameters>
<parameters>3 1 2 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.25467e-15</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Project3D Deformed Hex Lagrange basis P=6 Q=7</description>
<executable>LocProject3D</executable>
<parameters>7 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 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>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.00820104</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Project3D Deformed Hex Modified basis P=6 Q=7</description>
<executable>LocProject3D</executable>
<parameters>7 4 4 4 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 4 4 4 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,7 +2,7 @@
<test>
<description>Project3D Deformed Hex Ortho basis P=6 Q=7</description>
<executable>LocProject3D</executable>
<parameters>7 1 1 1 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 1 1 1 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,7 +2,7 @@
<test>
<description>Project3D Hex Lagrange basis P=6 Q=7</description>
<executable>LocProject3D</executable>
<parameters>7 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 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>
......
......@@ -2,7 +2,7 @@
<test>
<description>Project3D Hex Modified basis P=6 Q=7</description>
<executable>LocProject3D</executable>
<parameters>7 4 4 4 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 4 4 4 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.65299e-11</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Project3D Hex Ortho basis P=6 Q=7</description>
<executable>LocProject3D</executable>
<parameters>7 1 1 1 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 1 1 1 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.41906e-14</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Project3D Prism Modified basis P=6 Q=7</description>
<executable>LocProject3D</executable>
<parameters>6 4 4 5 6 6 6 7 7 6 0 0 0 1 0 0 1 1 0 0 1 0 0.5 0 1 0.5 1 1</parameters>
<parameters>7 4 4 5 6 6 6 7 7 6 0 0 0 1 0 0 1 1 0 0 1 0 0.5 0 1 0.5 1 1</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-8">5.16422e-12</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Project3D Prism Ortho basis P=6 Q=7</description>
<executable>LocProject3D</executable>
<parameters>6 1 1 2 6 6 6 7 7 6 0 0 0 1 0 0 1 1 0 0 1 0 0.5 0 1 0.5 1 1</parameters>
<parameters>7 1 1 2 6 6 6 7 7 6 0 0 0 1 0 0 1 1 0 0 1 0 0.5 0 1 0.5 1 1</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">5.42088e-15</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Project3D Tet Modified basis P=6 Q=7</description>
<executable>LocProject3D</executable>
<parameters>4 4 5 6 6 6 6 7 7 7 0 0 0 1 0 0 0 1 0 0 0 1</parameters>
<parameters>5 4 5 6 6 6 6 7 7 7 0 0 0 1 0 0 0 1 0 0 0 1</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">1.89448e-13</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Project3D Tet Ortho basis P=6 Q=7</description>
<executable>LocProject3D</executable>
<parameters>4 1 2 3 6 6 6 7 7 7 0 0 0 1 0 0 0 1 0 0 0 1</parameters>
<parameters>5 1 2 3 6 6 6 7 7 7 0 0 0 1 0 0 0 1 0 0 0 1</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">4.91242e-16</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>LocProject_Diff2D Lin. Deformed Quad Lagrange Basis P=6, Q=7</description>
<executable>LocProject_Diff2D</executable>
<parameters>3 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 8 8 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,7 +2,7 @@
<test>
<description>LocProject_Diff2D Lin. Deformed Quad Mod. Basis P=6, Q=7</description>
<executable>LocProject_Diff2D</executable>
<parameters>3 4 4 6 6 7 7 0.0 0.0 1.0 0.0 1.5 1.5 0.0 1.0</parameters>
<parameters>4 4 4 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,7 +2,7 @@
<test>
<description>LocProject_Diff2D Lin. Deformed Quad Ortho Basis, P=4, Q=5</description>
<executable>LocProject_Diff2D</executable>
<parameters>3 1 1 6 6 7 7 0.0 0.0 1.0 0.0 1.5 1.5 0.0 1.0</parameters>
<parameters>4 1 1 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,7 +2,7 @@
<test>
<description>LocProject_Diff2D Reg. Quad Lagrange Basis P=6, Q=7</description>
<executable>LocProject_Diff2D</executable>
<parameters>3 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 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>
......
......@@ -2,7 +2,7 @@
<test>
<description>LocProject_Diff2D Reg. Quad Mod. Basis P=6, Q=7</description>
<executable>LocProject_Diff2D</executable>
<parameters>3 4 4 6 6 7 7 0.0 0.0 1.0 0.0 1.0 1.0 0.0 1.0</parameters>
<parameters>4 4 4 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-08">5.64604e-13</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>LocProject_Diff2D Reg. Quad Ortho Basis, P=4, Q=5</description>
<executable>LocProject_Diff2D</executable>
<parameters>3 1 1 6 6 7 7 0.0 0.0 1.0 0.0 1.0 1.0 0.0 1.0</parameters>
<parameters>4 1 1 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.43909e-14</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>LocProject_Diff2D Tri Mod. Basis P=6, Q=7</description>
<executable>LocProject_Diff2D</executable>
<parameters>2 4 5 6 6 7 7 0.0 0.0 1.0 1.0 0.5 1.0</parameters>
<parameters>3 4 5 6 6 7 7 0.0 0.0 1.0 1.0 0.5 1.0</parameters>
<metrics>
<metric type="L2" id="1">