Commit e288615d authored by Dennis Gläser's avatar Dennis Gläser
Browse files

Merge branch 'feature/support-occ-7.5' into 'master'

Feature/support occ 7.5

See merge request tools/frackit!178
parents 083ac020 8b69061f
Pipeline #2420 passed with stage
in 8 minutes and 45 seconds
......@@ -255,18 +255,12 @@ protected:
// map all fragments to this new index
const bool isDeleted = intersection.IsDeleted(entityShape);
const auto& generated = intersection.Generated(entityShape);
const auto& modified = intersection.Modified(entityShape);
if (!isDeleted && generated.IsEmpty() && modified.IsEmpty())
if (!isDeleted && modified.IsEmpty())
{
newIndexMap.Bind(entityShape, entityIdx);
newList.Append(entityShape);
}
for (const auto& fragment : generated)
{
if (!newIndexMap.IsBound(fragment)) newIndexMap.Bind(fragment, entityIdx);
if (!newList.Contains(fragment)) newList.Append(fragment);
}
for (const auto& fragment : modified)
{
if (!newIndexMap.IsBound(fragment)) newIndexMap.Bind(fragment, entityIdx);
......@@ -348,20 +342,14 @@ protected:
// map all fragments to this new index
const bool isDeleted = fragmentAlgo.IsDeleted(shape);
const auto& generated = fragmentAlgo.Generated(shape);
const auto& modified = fragmentAlgo.Modified(shape);
auto& newList = newFragmentLists[subDomainIdx];
auto& newMap = newFragmentMaps[subDomainIdx];
if (!isDeleted && generated.IsEmpty() && modified.IsEmpty())
if (!isDeleted && modified.IsEmpty())
{
newMap.Bind(shape, entityIdx);
newList.Append(shape);
}
for (const auto& fragment : generated)
{
if (!newMap.IsBound(fragment)) newMap.Bind(fragment, entityIdx);
if (!newList.Contains(fragment)) newList.Append(fragment);
}
for (const auto& fragment : modified)
{
if (!newMap.IsBound(fragment)) newMap.Bind(fragment, entityIdx);
......@@ -385,15 +373,11 @@ protected:
// store the fragments of this sub-domain
const bool isDeleted = fragmentAlgo.IsDeleted(domainShape);
const auto& generated = fragmentAlgo.Generated(domainShape);
const auto& modified = fragmentAlgo.Modified(domainShape);
auto& sdFragmentList = subDomainFragmentLists_[subDomainIdx];
if (!isDeleted && generated.IsEmpty() && modified.IsEmpty())
if (!isDeleted && modified.IsEmpty())
sdFragmentList.Append(domainShape);
for (const auto& fragment : generated)
if (!sdFragmentList.Contains(fragment))
sdFragmentList.Append(fragment);
for (const auto& fragment : modified)
if (!sdFragmentList.Contains(fragment))
sdFragmentList.Append(fragment);
......
......@@ -37,7 +37,9 @@ int main()
using Cylinder = Cylinder<ctype>;
using Segment = typename Cylinder::Segment;
std::vector<ctype> scales({1.0e-5, 1, 1e5});
// With OCC7.3.0 it works until 1e-5/1e5
// With OCC7.5.0 it works until 1e-4/1e4
std::vector<ctype> scales({1.0e-4, 1, 1e4});
for (auto f : scales)
{
std::cout << "Checking scale factor " << f << std::endl;
......
Supports Markdown
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