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

Copy changes from dev-branch into main

Browse Source 
History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad
2023-10-23 08:12:19 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp
View File

@@ -76,7 +76,7 @@ void RimWellPathGroup::addChildWellPath( RimWellPath* wellPath )
RimWellPath::copyCompletionSettings( wellPath, this );
}
if ( !this->wellPathGeometry()->wellPathPoints().empty() )
if ( !wellPathGeometry()->wellPathPoints().empty() )
{
m_childWellPaths.push_back( wellPath );
createWellPathGeometry();
@@ -360,7 +360,7 @@ void RimWellPathGroup::makeMoreLevelsIfNecessary()
{
if ( m_childWellPaths.size() <= 1u ) return;
auto wellPathPoints = this->wellPathGeometry()->wellPathPoints();
auto wellPathPoints = wellPathGeometry()->wellPathPoints();
auto comp = []( const cvf::Vec3d& lhs, const cvf::Vec3d& rhs )
{