Commit d88736e8 authored by Gilles MARCKMANN's avatar Gilles MARCKMANN

Add missed modifications in last commit (xmapping).

parent a77e9612
......@@ -41,7 +41,7 @@ int main()
{
std::cout << "Testing for EDGE" << std::endl;
std::vector<point> p = {{0., 0., 0.}, {1., 2., 3.}};
xmapping::xLagrangeMapping mapping(xReferenceElementType::EDGE, p);
xmapping::xLagrangeMapping mapping(xmapping::xReferenceElementType::EDGE, p);
double u, v, w, x, y, z;
if (mapping.inReferenceElement(-2., 0., 0.))
{
......@@ -134,7 +134,7 @@ int main()
std::cout << "Testing for TRI" << std::endl;
std::vector<point> p{{0., 0., 0.}, {1., 2., 3.}, {1., 0., 4.}};
xmapping::xLagrangeMapping mapping(xReferenceElementType::TRI, p);
xmapping::xLagrangeMapping mapping(xmapping::xReferenceElementType::TRI, p);
double u, v, w, x, y, z;
if (mapping.inReferenceElement(-2., 1., 0.))
{
......@@ -284,7 +284,7 @@ int main()
point p3{0., 1., 0.};
*/
xmapping::xLagrangeMapping mapping(xReferenceElementType::QUAD, p);
xmapping::xLagrangeMapping mapping(xmapping::xReferenceElementType::QUAD, p);
double u, v, w, x, y, z;
if (mapping.inReferenceElement(-2., 1., 0.))
{
......@@ -445,7 +445,7 @@ int main()
{
std::cout << "Testing for TET" << std::endl;
std::vector<point> p{{0., 0., 0.}, {1., 0.1, -0.3}, {0.1, 1., -0.1}, {1.1, 0.9, 0.1}};
xmapping::xLagrangeMapping mapping(xReferenceElementType::TET, p);
xmapping::xLagrangeMapping mapping(xmapping::xReferenceElementType::TET, p);
double u, v, w, x, y, z;
if (mapping.inReferenceElement(-2., 1., 0.))
{
......@@ -539,7 +539,7 @@ int main()
}
{
std::vector<point> fp = {p[1], p[0], p[2]};
xmapping::xLagrangeMapping fmapping(xReferenceElementType::TRI, fp);
xmapping::xLagrangeMapping fmapping(xmapping::xReferenceElementType::TRI, fp);
vect na = fmapping.normalVector(0., 0., 0.);
const vect ref_n = {-0.280471562, -0.0677000322, -0.957471884};
unsigned short fv[3] = {1, 0, 2};
......@@ -555,7 +555,7 @@ int main()
{
vect na;
std::vector<point> fp = {p[1], p[3], p[2]};
xmapping::xLagrangeMapping fmapping(xReferenceElementType::TRI, fp);
xmapping::xLagrangeMapping fmapping(xmapping::xReferenceElementType::TRI, fp);
const vect ref_n = {0.2181529734, 0.4144906495, -0.8835195423};
unsigned short fv[3] = {1, 3, 2};
vect n = mapping.normalVector(fv, 0., 0.);
......@@ -571,7 +571,7 @@ int main()
{
vect na;
std::vector<point> fp = {p[0], p[2], p[3]};
xmapping::xLagrangeMapping fmapping(xReferenceElementType::TRI, fp);
xmapping::xLagrangeMapping fmapping(xmapping::xReferenceElementType::TRI, fp);
// mapping.normalVector(&f, 0., 0., 0. , na);
const vect ref_n = {-0.1836284555, 0.1159758666, 0.9761302109};
unsigned short fv[3] = {0, 2, 3};
......@@ -588,7 +588,7 @@ int main()
{
vect na;
std::vector<point> fp = {p[0], p[3], p[1]};
xmapping::xLagrangeMapping fmapping(xReferenceElementType::TRI, fp);
xmapping::xLagrangeMapping fmapping(xmapping::xReferenceElementType::TRI, fp);
const vect ref_n = {0.2972338858, -0.4564663246, 0.8386241778};
unsigned short fv[3] = {0, 3, 1};
vect n = mapping.normalVector(fv, 0., 0.);
......@@ -606,7 +606,7 @@ int main()
std::cout << "Testing for HEX" << std::endl;
std::vector<point> p{{0.1, -0.1, 0.2}, {2.1, -0.1, 0.1}, {2.2, 2.1, 0.}, {0.1, 2.05, -0.3},
{0., 0., 2.1}, {2., 0., 2.12}, {2.08, 2., 2.13}, {0., 2.01, 2.}};
xmapping::xLagrangeMapping mapping(xReferenceElementType::HEX, p);
xmapping::xLagrangeMapping mapping(xmapping::xReferenceElementType::HEX, p);
double u, v, w, x = 0., y, z;
if (mapping.inReferenceElement(-2., 1., 0.))
{
......@@ -704,7 +704,7 @@ int main()
double v = 0.1;
// mapping.normalVector(&f, u, v, -1. , na);
const vect ref_n = {0.05965983094, -0.1555910698, -0.9860183181};
xmapping::xLagrangeMapping fmapping(xReferenceElementType::QUAD, fp);
xmapping::xLagrangeMapping fmapping(xmapping::xReferenceElementType::QUAD, fp);
vect na = -fmapping.normalVector(u, v, 1.);
unsigned short fv[4] = {0, 1, 2, 3};
vect nb = mapping.normalVector(fv, u, v);
......
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