OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve property linking

Browse Source 
* Allow linking of property filters across cases with same IJK size
* Recalculate when grid is replaced
Find dependencies between calculations and order them accordingly
This commit is contained in:
Magne Sjaastad
2022-11-22 10:22:17 +01:00
committed by GitHub
parent 10d5246644
commit a74b168e03
10 changed files with 143 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationLibCode/FileInterface/RifReaderOpmRft.cpp
View File

@@ -778,7 +778,7 @@ void RifReaderOpmRft::identifyAnnulusBranches( RifRftSegment& segmentRef, const
seglenstForBranch[branchId] = values;
}
std::set<size_t> annulusBranchIds;
std::set<int> annulusBranchIds;
for ( auto branchId : tubingIds )
{
@@ -801,7 +801,7 @@ void RifReaderOpmRft::identifyAnnulusBranches( RifRftSegment& segmentRef, const
const double distanceTubingAnnulus = 0.1;
if ( std::fabs( ( std::fabs( diff ) - distanceTubingAnnulus ) ) < epsilon )
{
size_t annulusBranchId = ( diff > 0 ) ? candidateBranchId : branchId;
int annulusBranchId = ( diff > 0 ) ? candidateBranchId : branchId;
segmentRef.setBranchType( annulusBranchId, RiaDefines::RftBranchType::RFT_ANNULUS );
annulusBranchIds.insert( annulusBranchId );
@@ -818,9 +818,9 @@ void RifReaderOpmRft::reassignBranchIndices( RifRftSegment& segmentRef )
{
auto tubingBranchIds = segmentRef.tubingBranchIds();
size_t oneBasedBranchIndex = 1;
int oneBasedBranchIndex = 1;
std::map<size_t, size_t> newOneBasedBranchIndex;
std::map<int, int> newOneBasedBranchIndex;
for ( auto branchId : tubingBranchIds )
{
auto previsousIndex = segmentRef.oneBasedBranchIndexForBranchId( branchId );

2
ApplicationLibCode/FileInterface/RifRftSegment.cpp
View File

@@ -381,7 +381,7 @@ int RifRftSegment::segmentIndexFromSegmentNumber( int segmentNumber ) const
{
auto segment = m_topology[i];
if ( segment.segNo() == segmentNumber ) return i;
if ( segment.segNo() == segmentNumber ) return static_cast<int>( i );
}
return -1;