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 well path modeling

Browse Source 
* Improve handling of MD at first target
* When sea level well target is disabled, update MD of first target
* Show well target spheres by default, allow toggling of spheres
* Activate well target modifiers when clicking on well targets
* Remove selection update causing an unstable 3D view
* Improve display and handling of multiple locations
* Add special 3D target for tie in well target
* Add slider to tie in MD input field
* Show MD in well path target table
* Delete all well path laterals when deleting a well path

* Python : Add lateral to parent well
* Python : Add perforation interval
This commit is contained in:
Magne Sjaastad
2021-08-13 16:48:33 +02:00
committed by GitHub
parent 40bd4c285a
commit 8dbb1d5ccd
50 changed files with 1377 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/ModelVisualization/CMakeLists_files.cmake
View File

@@ -59,6 +59,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RivWellDiskPartMgr.h
${CMAKE_CURRENT_LIST_DIR}/RivElementVectorResultPartMgr.h
${CMAKE_CURRENT_LIST_DIR}/RivPolylinePartMgr.h
${CMAKE_CURRENT_LIST_DIR}/RivCellFilterPartMgr.h
${CMAKE_CURRENT_LIST_DIR}/RivDrawableSpheres.h
)
set (SOURCE_GROUP_SOURCE_FILES
@@ -116,6 +117,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RivWellDiskPartMgr.cpp
${CMAKE_CURRENT_LIST_DIR}/RivElementVectorResultPartMgr.cpp
${CMAKE_CURRENT_LIST_DIR}/RivPolylinePartMgr.cpp
${CMAKE_CURRENT_LIST_DIR}/RivCellFilterPartMgr.cpp
${CMAKE_CURRENT_LIST_DIR}/RivDrawableSpheres.cpp
)
list(APPEND CODE_HEADER_FILES

84
ApplicationLibCode/ModelVisualization/RivDrawableSpheres.cpp Normal file
View File

@@ -0,0 +1,84 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2021 - Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RivDrawableSpheres.h"
#include "cvfRay.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivDrawableSpheres::RivDrawableSpheres()
: cvf::DrawableVectors()
, m_radius( 1.0 )
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivDrawableSpheres::RivDrawableSpheres( cvf::String vectorMatrixUniformName, cvf::String colorUniformName )
: cvf::DrawableVectors( vectorMatrixUniformName, colorUniformName )
, m_radius( 1.0 )
{
}
//--------------------------------------------------------------------------------------------------
/// Estimate the intersection of a sphere by the sphere inscribed in a bounding box
//--------------------------------------------------------------------------------------------------
bool RivDrawableSpheres::rayIntersectCreateDetail( const cvf::Ray& ray,
cvf::Vec3d* intersectionPoint,
cvf::ref<cvf::HitDetail>* hitDetail ) const
{
if ( m_centerCoordArray.isNull() ) return false;
for ( size_t i = 0; i < m_centerCoordArray->size(); i++ )
{
cvf::BoundingBox bb;
cvf::Vec3f center = m_centerCoordArray->get( i );
cvf::Vec3f corner1 = cvf::Vec3f( center.x() + m_radius, center.y() + m_radius, center.z() + m_radius );
cvf::Vec3f corner2 = cvf::Vec3f( center.x() - m_radius, center.y() - m_radius, center.z() - m_radius );
bb.add( corner1 );
bb.add( corner2 );
if ( ray.boxIntersect( bb, intersectionPoint ) )
{
return true;
}
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivDrawableSpheres::setRadius( float radius )
{
m_radius = radius;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivDrawableSpheres::setCenterCoords( cvf::Vec3fArray* vertexArray )
{
m_centerCoordArray = vertexArray;
}

39
ApplicationLibCode/ModelVisualization/RivDrawableSpheres.h Normal file
View File

@@ -0,0 +1,39 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2021 - Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cvfDrawableVectors.h"
class RivDrawableSpheres : public cvf::DrawableVectors
{
public:
RivDrawableSpheres();
RivDrawableSpheres( cvf::String vectorMatrixUniformName, cvf::String colorUniformName );
bool rayIntersectCreateDetail( const cvf::Ray& ray,
cvf::Vec3d* intersectionPoint,
cvf::ref<cvf::HitDetail>* hitDetail ) const override;
void setRadius( float radius );
void setCenterCoords( cvf::Vec3fArray* vertexArray );
private:
cvf::ref<cvf::Vec3fArray> m_centerCoordArray; // Coordinates for sphere center
float m_radius; // Sphere radius
};

15
ApplicationLibCode/ModelVisualization/RivWellPathPartMgr.cpp
View File

@@ -53,6 +53,7 @@
#include "RimWellPathValve.h"
#include "Riv3dWellLogPlanePartMgr.h"
#include "RivDrawableSpheres.h"
#include "RivFishbonesSubsPartMgr.h"
#include "RivObjectSourceInfo.h"
#include "RivPartPriority.h"
@@ -789,14 +790,14 @@ void RivWellPathPartMgr::buildWellPathParts( const caf::DisplayCoordTransform* d
colors->add( sphereColor );
}
cvf::ref<cvf::DrawableVectors> vectorDrawable;
cvf::ref<RivDrawableSpheres> vectorDrawable;
if ( RiaGuiApplication::instance()->useShaders() )
{
vectorDrawable = new cvf::DrawableVectors( "u_transformationMatrix", "u_color" );
vectorDrawable = new RivDrawableSpheres( "u_transformationMatrix", "u_color" );
}
else
{
vectorDrawable = new cvf::DrawableVectors();
vectorDrawable = new RivDrawableSpheres();
}
vectorDrawable->setVectors( vertices.p(), vecRes.p() );
@@ -814,12 +815,20 @@ void RivWellPathPartMgr::buildWellPathParts( const caf::DisplayCoordTransform* d
cvf::GeometryUtils::createSphere( cellRadius, 15, 15, &builder );
vectorDrawable->setGlyph( builder.trianglesUShort().p(), builder.vertices().p() );
{
vectorDrawable->setRadius( cellRadius );
vectorDrawable->setCenterCoords( vertices.p() );
}
cvf::ref<cvf::Part> part = new cvf::Part;
part->setName( "RivWellPathPartMgr_WellTargetSpheres" );
part->setDrawable( vectorDrawable.p() );
part->setEffect( new cvf::Effect() );
auto sourceInfo = new RivObjectSourceInfo( geoDef );
part->setSourceInfo( sourceInfo );
m_spherePart = part;
}
}