Copy changes from dev-branch into main

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

View File

@@ -72,7 +72,7 @@ RimModeledWellPath::~RimModeledWellPath()
//--------------------------------------------------------------------------------------------------
void RimModeledWellPath::createWellPathGeometry()
{
this->setWellPathGeometry( m_geometryDefinition->createWellPathGeometry().p() );
setWellPathGeometry( m_geometryDefinition->createWellPathGeometry().p() );
}
//--------------------------------------------------------------------------------------------------
@@ -295,7 +295,7 @@ void RimModeledWellPath::updateReferencePoint()
RimWellPathTieIn* tieIn = wellPathTieIn();
if ( !tieIn ) return;
auto topLevelModelledWell = dynamic_cast<RimModeledWellPath*>( this->topLevelWellPath() );
auto topLevelModelledWell = dynamic_cast<RimModeledWellPath*>( topLevelWellPath() );
if ( !topLevelModelledWell ) return;
auto refPoint = topLevelModelledWell->geometryDefinition()->anchorPointXyz();