#273 Undefined grid faults between cells where one or both are inactive is now sorted into a seaparate predefined fault section.

This commit is contained in:
Jacob Støren
2016-08-22 13:24:46 +02:00
parent 37099929d6
commit cf93a67b5e
6 changed files with 55 additions and 12 deletions
@@ -198,21 +198,35 @@ void RimFaultCollection::syncronizeFaults()
std::sort(sortedFaults.begin(), sortedFaults.end(), faultComparator);
cvf::ref<RigFault> undefinedFaults;
cvf::ref<RigFault> undefinedFaultsWInactive;
for (size_t i = 0; i < sortedFaults.size(); i++)
{
if (sortedFaults[i]->name().compare(RimDefines::undefinedGridFaultName(), Qt::CaseInsensitive) == 0)
QString faultName = sortedFaults[i]->name();
if (faultName.compare(RimDefines::undefinedGridFaultName(), Qt::CaseInsensitive) == 0)
{
undefinedFaults = sortedFaults[i];
}
if(faultName.startsWith(RimDefines::undefinedGridFaultName(), Qt::CaseInsensitive)
&& faultName.contains("Inactive"))
{
undefinedFaultsWInactive = sortedFaults[i];
}
}
if (undefinedFaults.notNull())
{
sortedFaults.erase(undefinedFaults.p());
rigFaults.push_back(undefinedFaults.p());
}
if(undefinedFaultsWInactive.notNull())
{
sortedFaults.erase(undefinedFaultsWInactive.p());
rigFaults.push_back(undefinedFaultsWInactive.p());
}
for (size_t i = 0; i < sortedFaults.size(); i++)
{
rigFaults.push_back(sortedFaults[i].p());