Skip to content

FFD box fix for nonplanar faces #1742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bigfooted merged 7 commits into from
Sep 20, 2022
Merged

FFD box fix for nonplanar faces #1742

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
553b82e
FFD box uses supporting point in the middle of the face to avoid ambi…
bigfooted Aug 23, 2022
6af15d9
Merge branch 'develop' into update_FFDBox
bigfooted Aug 29, 2022
a486095
Merge branch 'develop' into update_FFDBox
bigfooted Sep 11, 2022
d372d26
Merge branch 'develop' into update_FFDBox
bigfooted Sep 14, 2022
c88e7ae
Merge branch 'develop' into update_FFDBox
bigfooted Sep 15, 2022
cfbfba0
implementation of github review comments (formatting and deleting mem…
bigfooted Sep 20, 2022
7daff78
Apply suggestions from code review
pcarruscag Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
implementation of github review comments (formatting and deleting mem… 
…ory)
  • Loading branch information
@bigfooted
bigfooted committed Sep 20, 2022
commit cfbfba0cb2aa0f34702e0ab8c9111e5c32c04f83
34 changes: 25 additions & 9 deletions Common/src/grid_movement/CFreeFormDefBox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,25 @@ CFreeFormDefBox::CFreeFormDefBox(const unsigned short Degree[], unsigned short B
CFreeFormDefBox::~CFreeFormDefBox(void) {
unsigned short iOrder, jOrder, kOrder, iCornerPoints, iDim;

for (iOrder = 0; iOrder < lOrder; iOrder++)
for (jOrder = 0; jOrder < mOrder; jOrder++)
for (iOrder = 0; iOrder < lOrder; iOrder++){
for (jOrder = 0; jOrder < mOrder; jOrder++){
for (kOrder = 0; kOrder < nOrder; kOrder++) {
delete [] Coord_Control_Points[iOrder][jOrder][kOrder];
delete [] ParCoord_Control_Points[iOrder][jOrder][kOrder];
delete [] Coord_Control_Points_Copy[iOrder][jOrder][kOrder];
if (Coord_SupportCP != nullptr) delete [] Coord_SupportCP[iOrder][jOrder][kOrder];
Copy link
Copy Markdown
Member

@pcarruscag pcarruscag Sep 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is each of the dimensions allocated with 'new'? If so the middle arrays are being leaked.

Copy link
Copy Markdown
Contributor Author

@bigfooted bigfooted Sep 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I should first delete [] array[i][j][k], then delete [] array[i][j] then delete [] array[i] ?

Copy link
Copy Markdown
Member

@pcarruscag pcarruscag Sep 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If all the dimensions are allocated with new, yes, unfortunately.

Copy link
Copy Markdown
Contributor Author

@bigfooted bigfooted Sep 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, looks like it, also for all the other variables there

}
delete [] Coord_Control_Points[iOrder][jOrder];
delete [] ParCoord_Control_Points[iOrder][jOrder];
delete [] Coord_Control_Points_Copy[iOrder][jOrder];
if (Coord_SupportCP != nullptr) delete [] Coord_SupportCP[iOrder][jOrder];
}
delete [] Coord_Control_Points[iOrder];
delete [] ParCoord_Control_Points[iOrder];
delete [] Coord_Control_Points_Copy[iOrder];
if (Coord_SupportCP != nullptr) delete [] Coord_SupportCP[iOrder];
}

delete [] Coord_Control_Points;
delete [] ParCoord_Control_Points;
delete [] Coord_Control_Points_Copy;
Expand Down Expand Up @@ -979,7 +990,8 @@ bool CFreeFormDefBox::GetPointFFD(CGeometry *geometry, CConfig *config, unsigned
bool spherical = (config->GetFFD_CoordSystem() == SPHERICAL);
bool polar = (config->GetFFD_CoordSystem() == POLAR);

// indices of the FFD box. Note that the front face is labelled 0,1,2,3 and the back face is 4,5,6,7
/*--- indices of the FFD box. Note that the front face is labelled 0,1,2,3 and the back face is 4,5,6,7 ---*/

unsigned short Index[6][5] = {
{0,1,2,3,0}, // front side
{1,5,6,2,1}, // right side
Expand All @@ -988,21 +1000,19 @@ bool CFreeFormDefBox::GetPointFFD(CGeometry *geometry, CConfig *config, unsigned
{4,5,1,0,4}, // bottom side
{4,7,6,5,4}}; // back side

/*--- The current approach is to subdivide each of the 6 faces of the hexahedral FFD box into 4 triangles
/*--- The current approach is to subdivide each of the 6 faces of the hexahedral FFD box into 4 triangles
by defining a supporting middle point. This allows nonplanar FFD boxes.
Note that the definition of the FFD box is as follows: the FFD box is a 6-sided die and we are looking at the side "1".
The opposite side is side "6".
If we are looking at side "1", we define the nodes counterclockwise.
If we are looking at side "6", we define the face clockwise ---*/


unsigned short nDim = geometry->GetnDim();

su2double Coord[3] = {0.0, 0.0, 0.0};
for (unsigned short iDim = 0; iDim < nDim; iDim++)
Coord[iDim] = geometry->nodes->GetCoord(iPoint, iDim);


su2double X_0, Y_0, Z_0, Xbar, Ybar, Zbar;

if (cylindrical) {
Expand All @@ -1029,16 +1039,22 @@ bool CFreeFormDefBox::GetPointFFD(CGeometry *geometry, CConfig *config, unsigned

}

// loop over the faces of the FFD box
/*--- loop over the faces of the FFD box ---*/

for (unsigned short iVar = 0; iVar < 6; iVar++) {

su2double P[3] = {0.0, 0.0, 0.0};
// every face needs an interpolated middle point for the triangles

/*--- every face needs an interpolated middle point for the triangles ---*/

for (int p = 0; p < 4; p++){
P[0] += 0.25*Coord_Corner_Points[Index[iVar][p]][0];
P[1] += 0.25*Coord_Corner_Points[Index[iVar][p]][1];
P[2] += 0.25*Coord_Corner_Points[Index[iVar][p]][2];
}
// loop over the 4 triangles making up the FFD box. The sign is equal for all distances

/*--- loop over the 4 triangles making up the FFD box. The sign is equal for all distances ---*/

for (unsigned short jVar = 0; jVar < 4; jVar++) {
su2double Distance_Point = geometry->Point2Plane_Distance(Coord,
Coord_Corner_Points[Index[iVar][jVar]],
Expand Down