mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Intersection : Add Python support for triangle and result values (#8505)
#8508 Python : Make sure an empty list will be received as empty list in Python Co-authored-by: magnesj <magnesj@users.noreply.github.com>
This commit is contained in:
Magne Sjaastad
GitHub
@@ -20,6 +20,7 @@ set(SOURCE_GROUP_HEADER_FILES
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimcModeledWellPath.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimcWellPath.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimcFractureTemplateCollection.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimcIntersection.h
|
||||
)
|
||||
|
||||
set(SOURCE_GROUP_SOURCE_FILES
|
||||
@@ -44,6 +45,7 @@ set(SOURCE_GROUP_SOURCE_FILES
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimcModeledWellPath.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimcWellPath.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimcFractureTemplateCollection.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimcIntersection.cpp
|
||||
)
|
||||
|
||||
list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
|
||||
|
||||
@@ -32,3 +32,14 @@ RimcDataContainerDouble::RimcDataContainerDouble()
|
||||
CAF_PDM_InitScriptableObject( "Data Container Float" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_doubleValues, "values", "Float Values" );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimcDataContainerDouble* RimcDataContainerDouble::create( const std::vector<double>& values )
|
||||
{
|
||||
auto obj = new RimcDataContainerDouble;
|
||||
obj->m_doubleValues = values;
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
||||
@@ -31,5 +31,7 @@ class RimcDataContainerDouble : public caf::PdmObject
|
||||
public:
|
||||
RimcDataContainerDouble();
|
||||
|
||||
static RimcDataContainerDouble* create( const std::vector<double>& values );
|
||||
|
||||
caf::PdmField<std::vector<double>> m_doubleValues;
|
||||
};
|
||||
|
||||
@@ -37,7 +37,7 @@ RimcElasticProperties_addPropertyScaling::RimcElasticProperties_addPropertyScali
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_formation, "Formation", "", "", "", "Formation" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_facies, "Facies", "", "", "", "Facies" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_property, "Property", "", "", "", "Property" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_scale, "Scale", "", "", "", "Scale" );
|
||||
CAF_PDM_InitScriptableField( &m_scale, "Scale", 1.0, "", "", "", "Scale" );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
365
ApplicationLibCode/ProjectDataModelCommands/RimcIntersection.cpp
Normal file
365
ApplicationLibCode/ProjectDataModelCommands/RimcIntersection.cpp
Normal file
@@ -0,0 +1,365 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2022- 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 "RimcIntersection.h"
|
||||
|
||||
#include "RiaLogging.h"
|
||||
|
||||
#include "RigResultAccessor.h"
|
||||
#include "RigResultAccessorFactory.h"
|
||||
|
||||
#include "Rim2dIntersectionView.h"
|
||||
#include "RimEclipseCase.h"
|
||||
#include "RimEclipseCellColors.h"
|
||||
#include "RimEclipseResultDefinition.h"
|
||||
#include "RimEclipseView.h"
|
||||
#include "RimExtrudedCurveIntersection.h"
|
||||
#include "RimIntersectionResultDefinition.h"
|
||||
|
||||
#include "RimcDataContainerDouble.h"
|
||||
|
||||
#include "RivExtrudedCurveIntersectionGeometryGenerator.h"
|
||||
#include "RivExtrudedCurveIntersectionPartMgr.h"
|
||||
#include "RivIntersectionGeometryGeneratorInterface.h"
|
||||
#include "RivIntersectionHexGridInterface.h"
|
||||
|
||||
#include "cafPdmAbstractFieldScriptingCapability.h"
|
||||
#include "cafPdmFieldScriptingCapability.h"
|
||||
#include "cafPdmFieldScriptingCapabilityCvfVec3d.h"
|
||||
#include "cafPdmObjectScriptingCapability.h"
|
||||
|
||||
#include <memory>
|
||||
|
||||
namespace caf
|
||||
{
|
||||
template <>
|
||||
void caf::AppEnum<RimcTriangleGeometry::GeometryType>::setUp()
|
||||
{
|
||||
addItem( RimcTriangleGeometry::GeometryType::FULL_3D, "FULL_3D", "Full 3DDynamic" );
|
||||
addItem( RimcTriangleGeometry::GeometryType::PROJECTED_TO_PLANE, "PROJECTED_TO_PLANE", "Projected To Plane" );
|
||||
setDefault( RimcTriangleGeometry::GeometryType::FULL_3D );
|
||||
}
|
||||
}; // namespace caf
|
||||
|
||||
CAF_PDM_SOURCE_INIT( RimcTriangleGeometry, "TriangleGeometry" );
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimcTriangleGeometry::RimcTriangleGeometry()
|
||||
{
|
||||
CAF_PDM_InitScriptableObject( "Triangle Geometry" );
|
||||
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_x, "XCoords", "X coords" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_y, "YCoords", "Y coords" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_z, "ZCoords", "Z coords" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_connections, "Connections", "Indices to triangle vertices" );
|
||||
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_meshX, "MeshXCoords", "Mesh X coords" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_meshY, "MeshYCoords", "Mesh Y coords" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_meshZ, "MeshZCoords", "Mesh Z coords" );
|
||||
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_faultMeshX, "FaultMeshXCoords", "Fault Mesh X coords" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_faultMeshY, "FaultmeshYCoords", "Fault Mesh Y coords" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_faultMeshZ, "FaultmeshZCoords", "Fault Mesh Z coords" );
|
||||
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_displayModelOffset, "DisplayModelOffset", "Display Model Offset" );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimcTriangleGeometry* RimcTriangleGeometry::createFromVertices( const std::vector<cvf::Vec3f>& vertices )
|
||||
{
|
||||
std::vector<int> conn;
|
||||
if ( !vertices.empty() )
|
||||
{
|
||||
conn.resize( vertices.size() );
|
||||
std::iota( conn.begin(), conn.end(), 0 );
|
||||
}
|
||||
|
||||
return createFromVerticesAndConnections( vertices, conn );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimcTriangleGeometry* RimcTriangleGeometry::createFromVerticesAndConnections( const std::vector<cvf::Vec3f>& vertices,
|
||||
const std::vector<int>& connections )
|
||||
{
|
||||
auto [xVals, yVals, zVals] = assignCoordinatesToSeparateVectors( vertices );
|
||||
|
||||
auto obj = new RimcTriangleGeometry;
|
||||
obj->m_x = xVals;
|
||||
obj->m_y = yVals;
|
||||
obj->m_z = zVals;
|
||||
|
||||
obj->m_connections = connections;
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimcTriangleGeometry::setMeshVertices( const std::vector<cvf::Vec3f>& vertices )
|
||||
{
|
||||
auto [xVals, yVals, zVals] = assignCoordinatesToSeparateVectors( vertices );
|
||||
|
||||
m_meshX = xVals;
|
||||
m_meshY = yVals;
|
||||
m_meshZ = zVals;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimcTriangleGeometry::setFaultMeshVertices( const std::vector<cvf::Vec3f>& faultMeshVertices )
|
||||
{
|
||||
auto [xVals, yVals, zVals] = assignCoordinatesToSeparateVectors( faultMeshVertices );
|
||||
|
||||
m_faultMeshX = xVals;
|
||||
m_faultMeshY = yVals;
|
||||
m_faultMeshZ = zVals;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimcTriangleGeometry::setDisplayModelOffset( const cvf::Vec3d& offset )
|
||||
{
|
||||
m_displayModelOffset = offset;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::tuple<std::vector<float>, std::vector<float>, std::vector<float>>
|
||||
RimcTriangleGeometry::assignCoordinatesToSeparateVectors( const std::vector<cvf::Vec3f>& vertices )
|
||||
{
|
||||
std::vector<float> xVals;
|
||||
std::vector<float> yVals;
|
||||
std::vector<float> zVals;
|
||||
|
||||
if ( !vertices.empty() )
|
||||
{
|
||||
xVals.reserve( vertices.size() );
|
||||
yVals.reserve( vertices.size() );
|
||||
zVals.reserve( vertices.size() );
|
||||
|
||||
for ( const auto& v : vertices )
|
||||
{
|
||||
xVals.push_back( v.x() );
|
||||
yVals.push_back( v.y() );
|
||||
zVals.push_back( v.z() );
|
||||
}
|
||||
}
|
||||
|
||||
return { xVals, yVals, zVals };
|
||||
}
|
||||
|
||||
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimExtrudedCurveIntersection, RimcExtrudedCurveIntersection_geometry, "geometry" );
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimcExtrudedCurveIntersection_geometry::RimcExtrudedCurveIntersection_geometry( caf::PdmObjectHandle* self )
|
||||
: caf::PdmObjectMethod( self )
|
||||
{
|
||||
CAF_PDM_InitObject( "Intersection Geometry" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_geometryType, "GeometryType", "Geometry Type" );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
caf::PdmObjectHandle* RimcExtrudedCurveIntersection_geometry::execute()
|
||||
{
|
||||
auto intersection = self<RimExtrudedCurveIntersection>();
|
||||
|
||||
auto geoGenerator = RimcExtrudedCurveIntersection_geometry::createGeometryGenerator( intersection, m_geometryType() );
|
||||
if ( geoGenerator && geoGenerator->isAnyGeometryPresent() )
|
||||
{
|
||||
std::vector<cvf::Vec3f> coords;
|
||||
geoGenerator->triangleVxes()->toStdVector( &coords );
|
||||
|
||||
auto triangleGeometry = RimcTriangleGeometry::createFromVertices( coords );
|
||||
|
||||
{
|
||||
auto cellMeshVertices = geoGenerator->cellMeshVxes();
|
||||
if ( cellMeshVertices )
|
||||
{
|
||||
std::vector<cvf::Vec3f> meshCoords;
|
||||
cellMeshVertices->toStdVector( &meshCoords );
|
||||
triangleGeometry->setMeshVertices( meshCoords );
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
auto faultMeshVertices = geoGenerator->faultMeshVxes();
|
||||
if ( faultMeshVertices )
|
||||
{
|
||||
std::vector<cvf::Vec3f> meshCoords;
|
||||
faultMeshVertices->toStdVector( &meshCoords );
|
||||
triangleGeometry->setFaultMeshVertices( meshCoords );
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
RimEclipseView* eclView = nullptr;
|
||||
intersection->firstAncestorOfType( eclView );
|
||||
if ( eclView && eclView->eclipseCase() )
|
||||
{
|
||||
auto offset = eclView->eclipseCase()->displayModelOffset();
|
||||
triangleGeometry->setDisplayModelOffset( offset );
|
||||
}
|
||||
}
|
||||
|
||||
return triangleGeometry;
|
||||
}
|
||||
|
||||
return new RimcTriangleGeometry;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RimcExtrudedCurveIntersection_geometry::resultIsPersistent() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::unique_ptr<caf::PdmObjectHandle> RimcExtrudedCurveIntersection_geometry::defaultResult() const
|
||||
{
|
||||
return std::unique_ptr<caf::PdmObjectHandle>( new RimcTriangleGeometry );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::unique_ptr<RivIntersectionGeometryGeneratorInterface>
|
||||
RimcExtrudedCurveIntersection_geometry::createGeometryGenerator( RimExtrudedCurveIntersection* intersection,
|
||||
RimcTriangleGeometry::GeometryType geometryType )
|
||||
{
|
||||
bool isFlat = false;
|
||||
if ( geometryType == RimcTriangleGeometry::GeometryType::PROJECTED_TO_PLANE ) isFlat = true;
|
||||
|
||||
cvf::Vec3d flattenedPolylineStartPoint;
|
||||
auto polyLines = intersection->polyLines( &flattenedPolylineStartPoint );
|
||||
if ( !polyLines.empty() )
|
||||
{
|
||||
auto direction = intersection->extrusionDirection();
|
||||
auto hexGrid = intersection->createHexGridInterface();
|
||||
auto intersectionGeoGenerator =
|
||||
std::make_unique<RivExtrudedCurveIntersectionGeometryGenerator>( intersection,
|
||||
polyLines,
|
||||
direction,
|
||||
hexGrid.p(),
|
||||
isFlat,
|
||||
flattenedPolylineStartPoint );
|
||||
|
||||
intersectionGeoGenerator->ensureGeometryIsCalculated();
|
||||
|
||||
return intersectionGeoGenerator;
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimExtrudedCurveIntersection,
|
||||
RimcExtrudedCurveIntersection_geometryResult,
|
||||
"geometryResult" );
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimcExtrudedCurveIntersection_geometryResult::RimcExtrudedCurveIntersection_geometryResult( caf::PdmObjectHandle* self )
|
||||
: caf::PdmObjectMethod( self )
|
||||
{
|
||||
CAF_PDM_InitObject( "Geometry Result" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_geometryType, "GeometryType", "Geometry Type" );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
caf::PdmObjectHandle* RimcExtrudedCurveIntersection_geometryResult::execute()
|
||||
{
|
||||
auto intersection = self<RimExtrudedCurveIntersection>();
|
||||
|
||||
auto geoGenerator = RimcExtrudedCurveIntersection_geometry::createGeometryGenerator( intersection, m_geometryType() );
|
||||
if ( geoGenerator && geoGenerator->isAnyGeometryPresent() )
|
||||
{
|
||||
RimEclipseView* eclView = nullptr;
|
||||
intersection->firstAncestorOfType( eclView );
|
||||
if ( !eclView )
|
||||
{
|
||||
RiaLogging::error( "No Eclipse view found. Extraction of intersection result is only supported for "
|
||||
"Eclipse view." );
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
RimEclipseResultDefinition* eclResultDef = nullptr;
|
||||
|
||||
auto intersectionResultDef = intersection->activeSeparateResultDefinition();
|
||||
if ( intersectionResultDef ) eclResultDef = intersectionResultDef->eclipseResultDefinition();
|
||||
|
||||
if ( !eclResultDef ) eclResultDef = eclView->cellResult();
|
||||
|
||||
RigEclipseCaseData* eclipseCase = eclView->eclipseCase()->eclipseCaseData();
|
||||
|
||||
size_t gridIndex = 0;
|
||||
cvf::ref<RigResultAccessor> resultAccessor =
|
||||
RigResultAccessorFactory::createFromResultDefinition( eclipseCase,
|
||||
gridIndex,
|
||||
eclView->currentTimeStep(),
|
||||
eclResultDef );
|
||||
|
||||
auto triToCellIndex = geoGenerator->triangleToCellIndex();
|
||||
std::vector<double> values;
|
||||
values.reserve( triToCellIndex.size() );
|
||||
for ( const auto& i : triToCellIndex )
|
||||
{
|
||||
auto value = resultAccessor->cellScalar( i );
|
||||
values.push_back( value );
|
||||
}
|
||||
|
||||
return RimcDataContainerDouble::create( values );
|
||||
}
|
||||
|
||||
return new RimcDataContainerDouble();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RimcExtrudedCurveIntersection_geometryResult::resultIsPersistent() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::unique_ptr<caf::PdmObjectHandle> RimcExtrudedCurveIntersection_geometryResult::defaultResult() const
|
||||
{
|
||||
return std::unique_ptr<caf::PdmObjectHandle>( new RimcDataContainerDouble );
|
||||
}
|
||||
117
ApplicationLibCode/ProjectDataModelCommands/RimcIntersection.h
Normal file
117
ApplicationLibCode/ProjectDataModelCommands/RimcIntersection.h
Normal file
@@ -0,0 +1,117 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2022- 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 "cafPdmField.h"
|
||||
#include "cafPdmObjectHandle.h"
|
||||
#include "cafPdmObjectMethod.h"
|
||||
#include "cafPdmPtrField.h"
|
||||
|
||||
#include <QString>
|
||||
|
||||
#include "cvfVector3.h"
|
||||
|
||||
class RivIntersectionGeometryGeneratorInterface;
|
||||
class RimExtrudedCurveIntersection;
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
class RimcTriangleGeometry : public caf::PdmObject
|
||||
{
|
||||
CAF_PDM_HEADER_INIT;
|
||||
|
||||
public:
|
||||
enum class GeometryType
|
||||
{
|
||||
FULL_3D,
|
||||
PROJECTED_TO_PLANE,
|
||||
};
|
||||
|
||||
public:
|
||||
RimcTriangleGeometry();
|
||||
|
||||
static RimcTriangleGeometry* createFromVertices( const std::vector<cvf::Vec3f>& vertices );
|
||||
static RimcTriangleGeometry* createFromVerticesAndConnections( const std::vector<cvf::Vec3f>& vertices,
|
||||
const std::vector<int>& connections );
|
||||
|
||||
void setMeshVertices( const std::vector<cvf::Vec3f>& meshVertices );
|
||||
void setFaultMeshVertices( const std::vector<cvf::Vec3f>& faultMeshVertices );
|
||||
void setDisplayModelOffset( const cvf::Vec3d& offset );
|
||||
|
||||
private:
|
||||
static std::tuple<std::vector<float>, std::vector<float>, std::vector<float>>
|
||||
assignCoordinatesToSeparateVectors( const std::vector<cvf::Vec3f>& vertices );
|
||||
|
||||
private:
|
||||
caf::PdmField<std::vector<float>> m_x;
|
||||
caf::PdmField<std::vector<float>> m_y;
|
||||
caf::PdmField<std::vector<float>> m_z;
|
||||
caf::PdmField<std::vector<int>> m_connections;
|
||||
|
||||
caf::PdmField<std::vector<float>> m_meshX;
|
||||
caf::PdmField<std::vector<float>> m_meshY;
|
||||
caf::PdmField<std::vector<float>> m_meshZ;
|
||||
|
||||
caf::PdmField<std::vector<float>> m_faultMeshX;
|
||||
caf::PdmField<std::vector<float>> m_faultMeshY;
|
||||
caf::PdmField<std::vector<float>> m_faultMeshZ;
|
||||
|
||||
caf::PdmField<cvf::Vec3d> m_displayModelOffset;
|
||||
};
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
class RimcExtrudedCurveIntersection_geometry : public caf::PdmObjectMethod
|
||||
{
|
||||
CAF_PDM_HEADER_INIT;
|
||||
|
||||
public:
|
||||
RimcExtrudedCurveIntersection_geometry( caf::PdmObjectHandle* self );
|
||||
|
||||
caf::PdmObjectHandle* execute() override;
|
||||
bool resultIsPersistent() const override;
|
||||
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
|
||||
|
||||
static std::unique_ptr<RivIntersectionGeometryGeneratorInterface>
|
||||
createGeometryGenerator( RimExtrudedCurveIntersection* intersection,
|
||||
RimcTriangleGeometry::GeometryType geometryType );
|
||||
|
||||
private:
|
||||
caf::PdmField<caf::AppEnum<RimcTriangleGeometry::GeometryType>> m_geometryType;
|
||||
};
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
class RimcExtrudedCurveIntersection_geometryResult : public caf::PdmObjectMethod
|
||||
{
|
||||
CAF_PDM_HEADER_INIT;
|
||||
|
||||
public:
|
||||
RimcExtrudedCurveIntersection_geometryResult( caf::PdmObjectHandle* self );
|
||||
|
||||
caf::PdmObjectHandle* execute() override;
|
||||
bool resultIsPersistent() const override;
|
||||
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
|
||||
|
||||
private:
|
||||
caf::PdmField<caf::AppEnum<RimcTriangleGeometry::GeometryType>> m_geometryType;
|
||||
};
|
||||
@@ -43,7 +43,7 @@ RimcStimPlanModelTemplateCollection_appendStimPlanModelTemplate::RimcStimPlanMod
|
||||
{
|
||||
CAF_PDM_InitObject( "Create StimPlan Model Template", "", "", "Create a new StimPlan Model Template" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_eclipseCase, "EclipseCase", "", "", "", "Eclipse Case" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_timeStep, "TimeStep", "", "", "", "Time Step" );
|
||||
CAF_PDM_InitScriptableField( &m_timeStep, "TimeStep", 0, "", "", "", "Time Step" );
|
||||
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_faciesPropertiesFilePath,
|
||||
"FaciesPropertiesFilePath",
|
||||
|
||||
@@ -66,10 +66,7 @@ caf::PdmObjectHandle* RimSummaryCase_summaryVectorValues::execute()
|
||||
}
|
||||
}
|
||||
|
||||
auto dataObject = new RimcDataContainerDouble();
|
||||
dataObject->m_doubleValues = values;
|
||||
|
||||
return dataObject;
|
||||
return RimcDataContainerDouble::create( values );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -142,7 +142,7 @@ RimcSurfaceCollection_newSurface::RimcSurfaceCollection_newSurface( caf::PdmObje
|
||||
{
|
||||
CAF_PDM_InitObject( "New Surface", "", "", "Create a new surface" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_case, "Case", "" );
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_kIndex, "KIndex", "" );
|
||||
CAF_PDM_InitScriptableField( &m_kIndex, "KIndex", 0, "" );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user