zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: plane : fix 3-plane intersection

Browse Source
This commit is contained in:
mattijs
2010-10-11 16:24:07 +01:00
parent 35ae737f13
commit 3e49bb14e5
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
View File

@ -272,10 +272,10 @@ const Foam::point& Foam::plane::refPoint() const
} }
// Return coefficcients for plane equation: ax + by + cz + d = 0 // Return coefficients for plane equation: ax + by + cz + d = 0
Foam::scalarList Foam::plane::planeCoeffs() const Foam::FixedList<Foam::scalar, 4> Foam::plane::planeCoeffs() const
{ {
scalarList C(4); FixedList<scalar, 4> C(4);
scalar magX = mag(unitVector_.x()); scalar magX = mag(unitVector_.x());
scalar magY = mag(unitVector_.y()); scalar magY = mag(unitVector_.y());
@ -291,8 +291,8 @@ Foam::scalarList Foam::plane::planeCoeffs() const
} }
else else
{ {
C[0] = 0; C[0] = unitVector_.x()/unitVector_.z();
C[1] = 0; C[1] = unitVector_.y()/unitVector_.z();
C[2] = 1; C[2] = 1;
} }
} }
@ -300,14 +300,14 @@ Foam::scalarList Foam::plane::planeCoeffs() const
{ {
if (magY > magZ) if (magY > magZ)
{ {
C[0] = 0; C[0] = unitVector_.x()/unitVector_.y();
C[1] = 1; C[1] = 1;
C[2] = unitVector_.z()/unitVector_.y(); C[2] = unitVector_.z()/unitVector_.y();
} }
else else
{ {
C[0] = 0; C[0] = unitVector_.x()/unitVector_.z();
C[1] = 0; C[1] = unitVector_.y()/unitVector_.z();
C[2] = 1; C[2] = 1;
} }
} }
@ -422,19 +422,18 @@ Foam::point Foam::plane::planePlaneIntersect
const plane& plane3 const plane& plane3
) const ) const
{ {
List<scalarList> pcs(3); FixedList<scalar, 4> coeffs1(planeCoeffs());
pcs[0]= planeCoeffs(); FixedList<scalar, 4> coeffs2(plane2.planeCoeffs());
pcs[1]= plane2.planeCoeffs(); FixedList<scalar, 4> coeffs3(plane3.planeCoeffs());
pcs[2]= plane3.planeCoeffs();
tensor a tensor a
( (
pcs[0][0],pcs[0][1],pcs[0][2], coeffs1[0],coeffs1[1],coeffs1[2],
pcs[1][0],pcs[1][1],pcs[1][2], coeffs2[0],coeffs2[1],coeffs2[2],
pcs[2][0],pcs[2][1],pcs[2][2] coeffs3[0],coeffs3[1],coeffs3[2]
); );
vector b(pcs[0][3],pcs[1][3],pcs[2][3]); vector b(coeffs1[3],coeffs2[3],coeffs3[3]);
return (inv(a) & (-b)); return (inv(a) & (-b));
} }

2
src/OpenFOAM/meshes/primitiveShapes/plane/plane.H
View File

@ -149,7 +149,7 @@ public:
//- Return coefficients for the //- Return coefficients for the
// plane equation: ax + by + cz + d = 0 // plane equation: ax + by + cz + d = 0
scalarList planeCoeffs() const; FixedList<scalar, 4> planeCoeffs() const;
//- Return nearest point in the plane for the given point //- Return nearest point in the plane for the given point
point nearestPoint(const point& p) const; point nearestPoint(const point& p) const;