Skip to content

Commit

Permalink
Merge pull request #1026 from DLR-SC/issue_cells_overlap
Browse files Browse the repository at this point in the history
Reduce tolerance when creating cells via contourCoordinate
  • Loading branch information
joergbrech authored Oct 17, 2024
2 parents e4b77e9 + 791924b commit 8870b8f
Show file tree
Hide file tree
Showing 4 changed files with 28,897 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/wing/CCPACSWingCell.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -910,8 +910,8 @@ void CCPACSWingCell::BuildSkinGeometry(GeometryCache& cache) const
*
* Trim all the faces and store the result
*/
TrimSpanwise(cache, SpanWiseBorder::Inner, m_positioningInnerBorder, 1e-2);
TrimSpanwise(cache, SpanWiseBorder::Outer, m_positioningOuterBorder, 1e-2);
TrimSpanwise(cache, SpanWiseBorder::Inner, m_positioningInnerBorder, 1e-4);
TrimSpanwise(cache, SpanWiseBorder::Outer, m_positioningOuterBorder, 1e-4);
TrimChordwise(cache, ChordWiseBorder::LE, m_positioningLeadingEdge, 1e-2);
TrimChordwise(cache, ChordWiseBorder::TE, m_positioningTrailingEdge, 1e-2);

Expand Down
8 changes: 4 additions & 4 deletions tests/integrationtests/testBug829.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ TEST(Bug829, cell_getLoft)
tigl::CCPACSWing& wing = config.GetWing(1);
tigl::CCPACSWingComponentSegment& componentSegment = static_cast<tigl::CCPACSWingComponentSegment&>(wing.GetComponentSegment(1));

std::vector<double> xmins = {2.195, -0.811, -0.854, -0.908, -0.688, -1.025};
std::vector<double> xmaxs = {2.288, 0.692, 0.346, -0.137, -0.306, -0.760};
std::vector<double> xmins = {2.195, -0.811, -0.854, -0.908, -0.688, -0.994};
std::vector<double> xmaxs = {2.289, 0.682, 0.346, -0.137, -0.358, -0.760};

std::vector<double> ymins = {0.100, 1.776, 28.851, 69.474, 95.367, 95.367};
std::vector<double> ymaxs = {1.834, 5.502, 31.178, 71.526, 96.700, 96.700};
std::vector<double> ymins = {0.100, 1.776, 28.851, 69.474, 95.694, 95.694};
std::vector<double> ymaxs = {1.776, 5.220, 30.575, 71.197, 96.700, 96.700};

for (int i = 1; i<=6; ++i)
{
Expand Down
Loading

0 comments on commit 8870b8f

Please sign in to comment.