Rename crossSection to intersection in general code

ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.cpp

@@ -122,7 +122,7 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionsToOtherViews(
 
             if ( currGridView && parentView != nullptr && parentView != currGridView )
             {
-                RimIntersectionCollection* destCollection = currGridView->crossSectionCollection();
+                RimIntersectionCollection* destCollection = currGridView->intersectionCollection();
 
                 RimExtrudedCurveIntersection* copy = dynamic_cast<RimExtrudedCurveIntersection*>(
                     intersection->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
@@ -155,7 +155,7 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionBoxesToOtherVi
 
             if ( currGridView && parentView != nullptr && parentView != currGridView )
             {
-                RimIntersectionCollection* destCollection = currGridView->crossSectionCollection();
+                RimIntersectionCollection* destCollection = currGridView->intersectionCollection();
 
                 RimIntersectionBox* copy = dynamic_cast<RimIntersectionBox*>(
                     intersectionBox->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );

ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp

@@ -62,7 +62,7 @@ void RicNewAzimuthDipIntersectionFeature::onActionTriggered( bool isChecked )
     if ( !activeView ) return;
 
     RicNewAzimuthDipIntersectionFeatureCmd* cmd = new RicNewAzimuthDipIntersectionFeatureCmd(
-        activeView->crossSectionCollection() );
+        activeView->intersectionCollection() );
     caf::CmdExecCommandManager::instance()->processExecuteCommand( cmd );
 }
 

ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp

@@ -61,7 +61,7 @@ void RicNewPolylineIntersectionFeature::onActionTriggered( bool isChecked )
     if ( !activeView ) return;
 
     RicNewPolylineIntersectionFeatureCmd* cmd = new RicNewPolylineIntersectionFeatureCmd(
-        activeView->crossSectionCollection() );
+        activeView->intersectionCollection() );
     caf::CmdExecCommandManager::instance()->processExecuteCommand( cmd );
 }
 

ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellIntersectionFeature.cpp

@@ -56,7 +56,7 @@ void RicNewSimWellIntersectionFeature::onActionTriggered( bool isChecked )
     simWell->firstAncestorOrThisOfType( eclView );
     CVF_ASSERT( eclView );
 
-    RicNewSimWellIntersectionCmd* cmd = new RicNewSimWellIntersectionCmd( eclView->crossSectionCollection(), simWell );
+    RicNewSimWellIntersectionCmd* cmd = new RicNewSimWellIntersectionCmd( eclView->intersectionCollection(), simWell );
     caf::CmdExecCommandManager::instance()->processExecuteCommand( cmd );
 }
 

ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp

@@ -63,7 +63,7 @@ void RicNewWellPathIntersectionFeature::onActionTriggered( bool isChecked )
     RimWellPath* wellPath = collection[0];
 
     RicNewWellPathIntersectionFeatureCmd* cmd =
-        new RicNewWellPathIntersectionFeatureCmd( activeView->crossSectionCollection(), wellPath );
+        new RicNewWellPathIntersectionFeatureCmd( activeView->intersectionCollection(), wellPath );
     caf::CmdExecCommandManager::instance()->processExecuteCommand( cmd );
 }
 

ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxAtPosFeature.cpp

@@ -55,7 +55,7 @@ void RicIntersectionBoxAtPosFeature::onActionTriggered( bool isChecked )
     RimGridView* activeMainOrComparisonView = RiaApplication::instance()->activeMainOrComparisonGridView();
     if ( activeMainOrComparisonView )
     {
-        RimIntersectionCollection* coll = activeMainOrComparisonView->crossSectionCollection();
+        RimIntersectionCollection* coll = activeMainOrComparisonView->intersectionCollection();
         CVF_ASSERT( coll );
 
         RimIntersectionBox* intersectionBox = new RimIntersectionBox();

ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionFeatureImpl.cpp

@@ -38,7 +38,7 @@ void RicIntersectionFeatureImpl::createIntersectionBoxSlize( const QString&
 
     if ( activeMainOrComparisonView )
     {
-        RimIntersectionCollection* coll = activeMainOrComparisonView->crossSectionCollection();
+        RimIntersectionCollection* coll = activeMainOrComparisonView->intersectionCollection();
         CVF_ASSERT( coll );
 
         cvf::Vec3d domainCoord = activeView->viewer()->viewerCommands()->lastPickPositionInDomainCoords();

ApplicationCode/Commands/RicDeleteItemExec.cpp

@@ -130,11 +130,11 @@ void RicDeleteItemExec::redo()
 
         // Intersections
 
-        RimIntersectionCollection* crossSectionColl;
+        RimIntersectionCollection* intersectionColl;
-        parentObj->firstAncestorOrThisOfType( crossSectionColl );
+        parentObj->firstAncestorOrThisOfType( intersectionColl );
-        if ( view && crossSectionColl )
+        if ( view && intersectionColl )
         {
-            crossSectionColl->syncronize2dIntersectionViews();
+            intersectionColl->syncronize2dIntersectionViews();
             view->scheduleCreateDisplayModelAndRedraw();
         }
         else
@@ -153,7 +153,7 @@ void RicDeleteItemExec::redo()
         if ( gridView && separateIntersectResDefColl )
         {
             gridView->scheduleCreateDisplayModelAndRedraw();
-            gridView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+            gridView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
         }
 
         // SimWell Fractures

ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.cpp

@@ -64,7 +64,7 @@ RivExtrudedCurveIntersectionGeometryGenerator::RivExtrudedCurveIntersectionGeome
                                                                     const RivIntersectionHexGridInterface* grid,
                                                                     bool                                   isFlattened,
                                                                     const cvf::Vec3d& flattenedPolylineStartPoint )
-    : m_crossSection( crossSection )
+    : m_intersection( crossSection )
     , m_polyLines( polylines )
     , m_extrusionDirection( extrusionDirection )
     , m_hexGrid( grid )
@@ -112,7 +112,7 @@ void RivExtrudedCurveIntersectionGeometryGenerator::calculateSegementTransformPr
         cvf::Vec3d displayOffset( 0, 0, 0 );
         {
             RimGridView* gridView = nullptr;
-            m_crossSection->firstAncestorOrThisOfType( gridView );
+            m_intersection->firstAncestorOrThisOfType( gridView );
             if ( gridView && gridView->ownerCase() )
             {
                 displayOffset = gridView->ownerCase()->displayModelOffset();
@@ -254,10 +254,10 @@ void RivExtrudedCurveIntersectionGeometryGenerator::calculateArrays()
             double maxSectionHeightUp   = 0;
             double maxSectionHeightDown = 0;
 
-            if ( m_crossSection->type == RimExtrudedCurveIntersection::CS_AZIMUTHLINE )
+            if ( m_intersection->type == RimExtrudedCurveIntersection::CS_AZIMUTHLINE )
             {
-                maxSectionHeightUp   = m_crossSection->lengthUp();
+                maxSectionHeightUp   = m_intersection->lengthUp();
-                maxSectionHeightDown = m_crossSection->lengthDown();
+                maxSectionHeightDown = m_intersection->lengthDown();
 
                 if ( maxSectionHeightUp + maxSectionHeightDown == 0 )
                 {
@@ -320,7 +320,7 @@ void RivExtrudedCurveIntersectionGeometryGenerator::calculateArrays()
                                                                        &hexPlaneCutTriangleVxes,
                                                                        &cellFaceForEachTriangleEdge );
 
-                if ( m_crossSection->type == RimExtrudedCurveIntersection::CS_AZIMUTHLINE )
+                if ( m_intersection->type == RimExtrudedCurveIntersection::CS_AZIMUTHLINE )
                 {
                     bool hasAnyPointsOnSurface = false;
                     for ( caf::HexGridIntersectionTools::ClipVx vertex : hexPlaneCutTriangleVxes )
@@ -511,7 +511,7 @@ cvf::ref<cvf::DrawableGeo> RivExtrudedCurveIntersectionGeometryGenerator::create
 cvf::ref<cvf::DrawableGeo>
     RivExtrudedCurveIntersectionGeometryGenerator::createLineAlongExtrusionLineDrawable( const std::vector<cvf::Vec3d>& extrusionLine )
 {
-    cvf::ref<caf::DisplayCoordTransform> transform = displayCoordTransform( crossSection() );
+    cvf::ref<caf::DisplayCoordTransform> transform = displayCoordTransform( intersection() );
     std::vector<cvf::Vec3d>              displayCoords;
 
     for ( const auto& pt : extrusionLine )
@@ -537,7 +537,7 @@ cvf::ref<cvf::DrawableGeo> RivExtrudedCurveIntersectionGeometryGenerator::create
 cvf::ref<cvf::DrawableGeo>
     RivExtrudedCurveIntersectionGeometryGenerator::createPointsFromExtrusionLineDrawable( const std::vector<cvf::Vec3d>& extrusionLine )
 {
-    cvf::ref<caf::DisplayCoordTransform> transform = displayCoordTransform( crossSection() );
+    cvf::ref<caf::DisplayCoordTransform> transform = displayCoordTransform( intersection() );
     std::vector<cvf::Vec3d>              displayCoords;
 
     for ( const auto& pt : extrusionLine )
@@ -580,9 +580,9 @@ const cvf::Vec3fArray* RivExtrudedCurveIntersectionGeometryGenerator::triangleVx
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimExtrudedCurveIntersection* RivExtrudedCurveIntersectionGeometryGenerator::crossSection() const
+RimExtrudedCurveIntersection* RivExtrudedCurveIntersectionGeometryGenerator::intersection() const
 {
-    return m_crossSection;
+    return m_intersection;
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.h

@@ -49,7 +49,7 @@ class DrawableGeo;
 class RivExtrudedCurveIntersectionGeometryGenerator : public cvf::Object, public RivIntersectionGeometryGeneratorIF
 {
 public:
-    RivExtrudedCurveIntersectionGeometryGenerator( RimExtrudedCurveIntersection*                       crossSection,
+    RivExtrudedCurveIntersectionGeometryGenerator( RimExtrudedCurveIntersection*                       intersection,
                                       std::vector<std::vector<cvf::Vec3d>>&  polylines,
                                       const cvf::Vec3d&                      extrusionDirection,
                                       const RivIntersectionHexGridInterface* grid,
@@ -77,7 +77,7 @@ public:
         return m_faultMeshLabelAndAnchorPositions;
     }
 
-    RimExtrudedCurveIntersection* crossSection() const;
+    RimExtrudedCurveIntersection* intersection() const;
 
     cvf::Mat4d unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat );
 
@@ -93,7 +93,7 @@ private:
     void calculateSegementTransformPrLinePoint();
     void calculateFlattenedOrOffsetedPolyline();
 
-    RimExtrudedCurveIntersection*                           m_crossSection;
+    RimExtrudedCurveIntersection*                           m_intersection;
     cvf::cref<RivIntersectionHexGridInterface> m_hexGrid;
     const std::vector<std::vector<cvf::Vec3d>> m_polyLines;
     cvf::Vec3d                                 m_extrusionDirection;

ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionPartMgr.cpp

@@ -85,21 +85,21 @@
 ///
 //--------------------------------------------------------------------------------------------------
 RivExtrudedCurveIntersectionPartMgr::RivExtrudedCurveIntersectionPartMgr( RimExtrudedCurveIntersection* rimCrossSection, bool isFlattened )
-    : m_rimCrossSection( rimCrossSection )
+    : m_rimIntersection( rimCrossSection )
     , m_isFlattened( isFlattened )
 {
-    CVF_ASSERT( m_rimCrossSection );
+    CVF_ASSERT( m_rimIntersection );
 
-    m_crossSectionFacesTextureCoords = new cvf::Vec2fArray;
+    m_intersectionFacesTextureCoords = new cvf::Vec2fArray;
 
     cvf::Vec3d flattenedPolylineStartPoint;
 
-    std::vector<std::vector<cvf::Vec3d>> polyLines = m_rimCrossSection->polyLines( &flattenedPolylineStartPoint );
+    std::vector<std::vector<cvf::Vec3d>> polyLines = m_rimIntersection->polyLines( &flattenedPolylineStartPoint );
     if ( polyLines.size() > 0 )
     {
-        cvf::Vec3d                                direction = m_rimCrossSection->extrusionDirection();
+        cvf::Vec3d                                direction = m_rimIntersection->extrusionDirection();
-        cvf::ref<RivIntersectionHexGridInterface> hexGrid   = m_rimCrossSection->createHexGridInterface();
+        cvf::ref<RivIntersectionHexGridInterface> hexGrid   = m_rimIntersection->createHexGridInterface();
-        m_crossSectionGenerator                             = new RivExtrudedCurveIntersectionGeometryGenerator( m_rimCrossSection,
+        m_intersectionGenerator                             = new RivExtrudedCurveIntersectionGeometryGenerator( m_rimIntersection,
                                                                         polyLines,
                                                                         direction,
                                                                         hexGrid.p(),
@@ -113,36 +113,36 @@ RivExtrudedCurveIntersectionPartMgr::RivExtrudedCurveIntersectionPartMgr( RimExt
 //--------------------------------------------------------------------------------------------------
 void RivExtrudedCurveIntersectionPartMgr::applySingleColorEffect()
 {
-    if ( m_crossSectionGenerator.isNull() ) return;
+    if ( m_intersectionGenerator.isNull() ) return;
 
     caf::SurfaceEffectGenerator geometryEffgen( cvf::Color3f::OLIVE, caf::PO_1 );
 
     cvf::ref<cvf::Effect> geometryOnlyEffect = geometryEffgen.generateCachedEffect();
 
-    if ( m_crossSectionFaces.notNull() )
+    if ( m_intersectionFaces.notNull() )
     {
-        m_crossSectionFaces->setEffect( geometryOnlyEffect.p() );
+        m_intersectionFaces->setEffect( geometryOnlyEffect.p() );
     }
 
     // Update mesh colors as well, in case of change
     RiaPreferences* prefs = RiaApplication::instance()->preferences();
 
-    if ( m_crossSectionGridLines.notNull() )
+    if ( m_intersectionGridLines.notNull() )
     {
         cvf::ref<cvf::Effect>    eff;
         caf::MeshEffectGenerator CrossSectionEffGen( prefs->defaultGridLineColors() );
         eff = CrossSectionEffGen.generateCachedEffect();
 
-        m_crossSectionGridLines->setEffect( eff.p() );
+        m_intersectionGridLines->setEffect( eff.p() );
     }
 
-    if ( m_crossSectionFaultGridLines.notNull() )
+    if ( m_intersectionFaultGridLines.notNull() )
     {
         cvf::ref<cvf::Effect>    eff;
         caf::MeshEffectGenerator CrossSectionEffGen( prefs->defaultFaultGridLineColors() );
         eff = CrossSectionEffGen.generateCachedEffect();
 
-        m_crossSectionFaultGridLines->setEffect( eff.p() );
+        m_intersectionFaultGridLines->setEffect( eff.p() );
     }
 }
 
@@ -155,12 +155,12 @@ void RivExtrudedCurveIntersectionPartMgr::updateCellResultColor( size_t
 {
     RivIntersectionResultsColoringTools::calculateIntersectionResultColors( timeStepIndex,
                                                                             !m_isFlattened,
-                                                                            m_rimCrossSection,
+                                                                            m_rimIntersection,
-                                                                            m_crossSectionGenerator.p(),
+                                                                            m_intersectionGenerator.p(),
                                                                             explicitScalarColorMapper,
                                                                             explicitTernaryColorMapper,
-                                                                            m_crossSectionFaces.p(),
+                                                                            m_intersectionFaces.p(),
-                                                                            m_crossSectionFacesTextureCoords.p() );
+                                                                            m_intersectionFacesTextureCoords.p() );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -223,12 +223,12 @@ void RivIntersectionResultsColoringTools::calculateNodeOrElementNodeBasedGeoMech
 //--------------------------------------------------------------------------------------------------
 void RivExtrudedCurveIntersectionPartMgr::generatePartGeometry()
 {
-    if ( m_crossSectionGenerator.isNull() ) return;
+    if ( m_intersectionGenerator.isNull() ) return;
 
     bool useBufferObjects = true;
     // Surface geometry
     {
-        cvf::ref<cvf::DrawableGeo> geo = m_crossSectionGenerator->generateSurface();
+        cvf::ref<cvf::DrawableGeo> geo = m_intersectionGenerator->generateSurface();
         if ( geo.notNull() )
         {
             geo->computeNormals();
@@ -243,20 +243,20 @@ void RivExtrudedCurveIntersectionPartMgr::generatePartGeometry()
             part->setDrawable( geo.p() );
 
             // Set mapping from triangle face index to cell index
-            cvf::ref<RivExtrudedCurveIntersectionSourceInfo> si = new RivExtrudedCurveIntersectionSourceInfo( m_crossSectionGenerator.p() );
+            cvf::ref<RivExtrudedCurveIntersectionSourceInfo> si = new RivExtrudedCurveIntersectionSourceInfo( m_intersectionGenerator.p() );
             part->setSourceInfo( si.p() );
 
             part->updateBoundingBox();
             part->setEnableMask( intersectionCellFaceBit );
             part->setPriority( RivPartPriority::PartType::Intersection );
 
-            m_crossSectionFaces = part;
+            m_intersectionFaces = part;
         }
     }
 
     // Cell Mesh geometry
     {
-        cvf::ref<cvf::DrawableGeo> geoMesh = m_crossSectionGenerator->createMeshDrawable();
+        cvf::ref<cvf::DrawableGeo> geoMesh = m_intersectionGenerator->createMeshDrawable();
         if ( geoMesh.notNull() )
         {
             if ( useBufferObjects )
@@ -272,15 +272,15 @@ void RivExtrudedCurveIntersectionPartMgr::generatePartGeometry()
             part->setEnableMask( intersectionCellMeshBit );
             part->setPriority( RivPartPriority::PartType::MeshLines );
 
-            part->setSourceInfo( new RivMeshLinesSourceInfo( m_rimCrossSection ) );
+            part->setSourceInfo( new RivMeshLinesSourceInfo( m_rimIntersection ) );
 
-            m_crossSectionGridLines = part;
+            m_intersectionGridLines = part;
         }
     }
 
     // Fault Mesh geometry
     {
-        cvf::ref<cvf::DrawableGeo> geoMesh = m_crossSectionGenerator->createFaultMeshDrawable();
+        cvf::ref<cvf::DrawableGeo> geoMesh = m_intersectionGenerator->createFaultMeshDrawable();
         if ( geoMesh.notNull() )
         {
             if ( useBufferObjects )
@@ -296,16 +296,16 @@ void RivExtrudedCurveIntersectionPartMgr::generatePartGeometry()
             part->setEnableMask( intersectionFaultMeshBit );
             part->setPriority( RivPartPriority::PartType::FaultMeshLines );
 
-            part->setSourceInfo( new RivMeshLinesSourceInfo( m_rimCrossSection ) );
+            part->setSourceInfo( new RivMeshLinesSourceInfo( m_rimIntersection ) );
 
-            m_crossSectionFaultGridLines = part;
+            m_intersectionFaultGridLines = part;
         }
     }
     createPolyLineParts( useBufferObjects );
 
     createExtrusionDirParts( useBufferObjects );
 
-    if ( m_isFlattened ) createFaultLabelParts( m_crossSectionGenerator->faultMeshLabelAndAnchorPositions() );
+    if ( m_isFlattened ) createFaultLabelParts( m_intersectionGenerator->faultMeshLabelAndAnchorPositions() );
 
     applySingleColorEffect();
 }
@@ -322,10 +322,10 @@ void RivExtrudedCurveIntersectionPartMgr::createFaultLabelParts( const std::vect
 
     RimFaultInViewCollection* faultInViewColl = nullptr;
 
-    if ( !m_rimCrossSection->activeSeparateResultDefinition() )
+    if ( !m_rimIntersection->activeSeparateResultDefinition() )
     {
         RimEclipseView* eclipseView = nullptr;
-        m_rimCrossSection->firstAncestorOrThisOfType( eclipseView );
+        m_rimIntersection->firstAncestorOrThisOfType( eclipseView );
         if ( eclipseView )
         {
             faultInViewColl = eclipseView->faultCollection();
@@ -351,7 +351,7 @@ void RivExtrudedCurveIntersectionPartMgr::createFaultLabelParts( const std::vect
         drawableText->setTextColor( faultLabelColor );
     }
 
-    cvf::BoundingBox bb                    = m_crossSectionFaces->boundingBox();
+    cvf::BoundingBox bb                    = m_intersectionFaces->boundingBox();
     double           labelZOffset          = bb.extent().z() / 10;
     int              visibleFaultNameCount = 0;
 
@@ -427,11 +427,11 @@ void RivExtrudedCurveIntersectionPartMgr::createPolyLineParts( bool useBufferObj
     m_highlightLineAlongPolyline = nullptr;
     m_highlightPointsForPolyline = nullptr;
 
-    if ( m_rimCrossSection->type == RimExtrudedCurveIntersection::CS_POLYLINE ||
+    if ( m_rimIntersection->type == RimExtrudedCurveIntersection::CS_POLYLINE ||
-         m_rimCrossSection->type == RimExtrudedCurveIntersection::CS_AZIMUTHLINE )
+         m_rimIntersection->type == RimExtrudedCurveIntersection::CS_AZIMUTHLINE )
     {
         {
-            cvf::ref<cvf::DrawableGeo> polylineGeo = m_crossSectionGenerator->createLineAlongPolylineDrawable();
+            cvf::ref<cvf::DrawableGeo> polylineGeo = m_intersectionGenerator->createLineAlongPolylineDrawable();
             if ( polylineGeo.notNull() )
             {
                 if ( useBufferObjects )
@@ -463,7 +463,7 @@ void RivExtrudedCurveIntersectionPartMgr::createPolyLineParts( bool useBufferObj
             }
         }
 
-        cvf::ref<cvf::DrawableGeo> polylinePointsGeo = m_crossSectionGenerator->createPointsFromPolylineDrawable();
+        cvf::ref<cvf::DrawableGeo> polylinePointsGeo = m_intersectionGenerator->createPointsFromPolylineDrawable();
         if ( polylinePointsGeo.notNull() )
         {
             if ( useBufferObjects )
@@ -509,11 +509,11 @@ void RivExtrudedCurveIntersectionPartMgr::createExtrusionDirParts( bool useBuffe
     m_highlightLineAlongExtrusionDir = nullptr;
     m_highlightPointsForExtrusionDir = nullptr;
 
-    if ( m_rimCrossSection->direction() == RimExtrudedCurveIntersection::CS_TWO_POINTS )
+    if ( m_rimIntersection->direction() == RimExtrudedCurveIntersection::CS_TWO_POINTS )
     {
         {
-            cvf::ref<cvf::DrawableGeo> polylineGeo = m_crossSectionGenerator->createLineAlongExtrusionLineDrawable(
+            cvf::ref<cvf::DrawableGeo> polylineGeo = m_intersectionGenerator->createLineAlongExtrusionLineDrawable(
-                m_rimCrossSection->polyLinesForExtrusionDirection() );
+                m_rimIntersection->polyLinesForExtrusionDirection() );
             if ( polylineGeo.notNull() )
             {
                 if ( useBufferObjects )
@@ -545,8 +545,8 @@ void RivExtrudedCurveIntersectionPartMgr::createExtrusionDirParts( bool useBuffe
             }
         }
 
-        cvf::ref<cvf::DrawableGeo> polylinePointsGeo = m_crossSectionGenerator->createPointsFromExtrusionLineDrawable(
+        cvf::ref<cvf::DrawableGeo> polylinePointsGeo = m_intersectionGenerator->createPointsFromExtrusionLineDrawable(
-            m_rimCrossSection->polyLinesForExtrusionDirection() );
+            m_rimIntersection->polyLinesForExtrusionDirection() );
         if ( polylinePointsGeo.notNull() )
         {
             if ( useBufferObjects )
@@ -587,18 +587,18 @@ void RivExtrudedCurveIntersectionPartMgr::createExtrusionDirParts( bool useBuffe
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivExtrudedCurveIntersectionPartMgr::appendNativeCrossSectionFacesToModel( cvf::ModelBasicList* model,
+void RivExtrudedCurveIntersectionPartMgr::appendNativeIntersectionFacesToModel( cvf::ModelBasicList* model,
                                                                    cvf::Transform*      scaleTransform )
 {
-    if ( m_crossSectionFaces.isNull() )
+    if ( m_intersectionFaces.isNull() )
     {
         generatePartGeometry();
     }
 
-    if ( m_crossSectionFaces.notNull() )
+    if ( m_intersectionFaces.notNull() )
     {
-        m_crossSectionFaces->setTransform( scaleTransform );
+        m_intersectionFaces->setTransform( scaleTransform );
-        model->addPart( m_crossSectionFaces.p() );
+        model->addPart( m_intersectionFaces.p() );
     }
 }
 
@@ -607,21 +607,21 @@ void RivExtrudedCurveIntersectionPartMgr::appendNativeCrossSectionFacesToModel(
 //--------------------------------------------------------------------------------------------------
 void RivExtrudedCurveIntersectionPartMgr::appendMeshLinePartsToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform )
 {
-    if ( m_crossSectionGridLines.isNull() )
+    if ( m_intersectionGridLines.isNull() )
     {
         generatePartGeometry();
     }
 
-    if ( m_crossSectionGridLines.notNull() )
+    if ( m_intersectionGridLines.notNull() )
     {
-        m_crossSectionGridLines->setTransform( scaleTransform );
+        m_intersectionGridLines->setTransform( scaleTransform );
-        model->addPart( m_crossSectionGridLines.p() );
+        model->addPart( m_intersectionGridLines.p() );
     }
 
-    if ( m_crossSectionFaultGridLines.notNull() )
+    if ( m_intersectionFaultGridLines.notNull() )
     {
-        m_crossSectionFaultGridLines->setTransform( scaleTransform );
+        m_intersectionFaultGridLines->setTransform( scaleTransform );
-        model->addPart( m_crossSectionFaultGridLines.p() );
+        model->addPart( m_intersectionFaultGridLines.p() );
     }
 
     if ( m_faultMeshLabelLines.notNull() )
@@ -646,7 +646,7 @@ void RivExtrudedCurveIntersectionPartMgr::appendPolylinePartsToModel( Rim3dView&
 {
     Rim2dIntersectionView* curr2dView = dynamic_cast<Rim2dIntersectionView*>( &view );
 
-    if ( m_rimCrossSection->inputPolyLineFromViewerEnabled || ( curr2dView && curr2dView->showDefiningPoints() ) )
+    if ( m_rimIntersection->inputPolyLineFromViewerEnabled || ( curr2dView && curr2dView->showDefiningPoints() ) )
     {
         if ( m_highlightLineAlongPolyline.notNull() )
         {
@@ -661,7 +661,7 @@ void RivExtrudedCurveIntersectionPartMgr::appendPolylinePartsToModel( Rim3dView&
         }
     }
 
-    if ( m_rimCrossSection->inputExtrusionPointsFromViewerEnabled )
+    if ( m_rimIntersection->inputExtrusionPointsFromViewerEnabled )
     {
         if ( m_highlightLineAlongExtrusionDir.notNull() )
         {
@@ -676,7 +676,7 @@ void RivExtrudedCurveIntersectionPartMgr::appendPolylinePartsToModel( Rim3dView&
         }
     }
 
-    if ( m_rimCrossSection->inputTwoAzimuthPointsFromViewerEnabled || ( curr2dView && curr2dView->showDefiningPoints() ) )
+    if ( m_rimIntersection->inputTwoAzimuthPointsFromViewerEnabled || ( curr2dView && curr2dView->showDefiningPoints() ) )
     {
         if ( m_highlightLineAlongPolyline.notNull() )
         {
@@ -697,7 +697,7 @@ void RivExtrudedCurveIntersectionPartMgr::appendPolylinePartsToModel( Rim3dView&
 //--------------------------------------------------------------------------------------------------
 const RimExtrudedCurveIntersection* RivExtrudedCurveIntersectionPartMgr::intersection() const
 {
-    return m_rimCrossSection.p();
+    return m_rimIntersection.p();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -705,5 +705,5 @@ const RimExtrudedCurveIntersection* RivExtrudedCurveIntersectionPartMgr::interse
 //--------------------------------------------------------------------------------------------------
 cvf::Mat4d RivExtrudedCurveIntersectionPartMgr::unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat )
 {
-    return m_crossSectionGenerator->unflattenTransformMatrix( intersectionPointFlat );
+    return m_intersectionGenerator->unflattenTransformMatrix( intersectionPointFlat );
 }

ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionPartMgr.h

@@ -64,14 +64,14 @@ class RivPipeGeometryGenerator;
 class RivExtrudedCurveIntersectionPartMgr : public cvf::Object
 {
 public:
-    explicit RivExtrudedCurveIntersectionPartMgr( RimExtrudedCurveIntersection* rimCrossSection, bool isFlattened = false );
+    explicit RivExtrudedCurveIntersectionPartMgr( RimExtrudedCurveIntersection* rimIntersection, bool isFlattened = false );
 
     void applySingleColorEffect();
     void updateCellResultColor( size_t                        timeStepIndex,
                                 const cvf::ScalarMapper*      explicitScalarColorMapper,
                                 const RivTernaryScalarMapper* explicitTernaryColorMapper );
 
-    void appendNativeCrossSectionFacesToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform );
+    void appendNativeIntersectionFacesToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform );
     void appendMeshLinePartsToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform );
     void appendPolylinePartsToModel( Rim3dView& view, cvf::ModelBasicList* model, cvf::Transform* scaleTransform );
 
@@ -87,13 +87,13 @@ private:
     void createExtrusionDirParts( bool useBufferObjects );
 
 private:
-    caf::PdmPointer<RimExtrudedCurveIntersection> m_rimCrossSection;
+    caf::PdmPointer<RimExtrudedCurveIntersection> m_rimIntersection;
 
-    cvf::ref<RivExtrudedCurveIntersectionGeometryGenerator> m_crossSectionGenerator;
+    cvf::ref<RivExtrudedCurveIntersectionGeometryGenerator> m_intersectionGenerator;
 
-    cvf::ref<cvf::Part> m_crossSectionFaces;
+    cvf::ref<cvf::Part> m_intersectionFaces;
-    cvf::ref<cvf::Part> m_crossSectionGridLines;
+    cvf::ref<cvf::Part> m_intersectionGridLines;
-    cvf::ref<cvf::Part> m_crossSectionFaultGridLines;
+    cvf::ref<cvf::Part> m_intersectionFaultGridLines;
     cvf::ref<cvf::Part> m_faultMeshLabels;
     cvf::ref<cvf::Part> m_faultMeshLabelLines;
     cvf::ref<cvf::Part> m_highlightLineAlongPolyline;
@@ -101,7 +101,7 @@ private:
     cvf::ref<cvf::Part> m_highlightLineAlongExtrusionDir;
     cvf::ref<cvf::Part> m_highlightPointsForExtrusionDir;
 
-    cvf::ref<cvf::Vec2fArray> m_crossSectionFacesTextureCoords;
+    cvf::ref<cvf::Vec2fArray> m_intersectionFacesTextureCoords;
 
     struct RivPipeBranchData
     {

ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionSourceInfo.cpp

@@ -25,9 +25,9 @@
 ///
 //--------------------------------------------------------------------------------------------------
 RivExtrudedCurveIntersectionSourceInfo::RivExtrudedCurveIntersectionSourceInfo( RivExtrudedCurveIntersectionGeometryGenerator* geometryGenerator )
-    : m_crossSectionGeometryGenerator( geometryGenerator )
+    : m_intersectionGeometryGenerator( geometryGenerator )
 {
-    CVF_ASSERT( m_crossSectionGeometryGenerator.notNull() );
+    CVF_ASSERT( m_intersectionGeometryGenerator.notNull() );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -35,9 +35,9 @@ RivExtrudedCurveIntersectionSourceInfo::RivExtrudedCurveIntersectionSourceInfo(
 //--------------------------------------------------------------------------------------------------
 const std::vector<size_t>& RivExtrudedCurveIntersectionSourceInfo::triangleToCellIndex() const
 {
-    CVF_ASSERT( m_crossSectionGeometryGenerator.notNull() );
+    CVF_ASSERT( m_intersectionGeometryGenerator.notNull() );
 
-    return m_crossSectionGeometryGenerator->triangleToCellIndex();
+    return m_intersectionGeometryGenerator->triangleToCellIndex();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -46,9 +46,9 @@ const std::vector<size_t>& RivExtrudedCurveIntersectionSourceInfo::triangleToCel
 std::array<cvf::Vec3f, 3> RivExtrudedCurveIntersectionSourceInfo::triangle( int triangleIdx ) const
 {
     std::array<cvf::Vec3f, 3> tri;
-    tri[0] = ( *m_crossSectionGeometryGenerator->triangleVxes() )[triangleIdx * 3];
+    tri[0] = ( *m_intersectionGeometryGenerator->triangleVxes() )[triangleIdx * 3];
-    tri[1] = ( *m_crossSectionGeometryGenerator->triangleVxes() )[triangleIdx * 3 + 1];
+    tri[1] = ( *m_intersectionGeometryGenerator->triangleVxes() )[triangleIdx * 3 + 1];
-    tri[2] = ( *m_crossSectionGeometryGenerator->triangleVxes() )[triangleIdx * 3 + 2];
+    tri[2] = ( *m_intersectionGeometryGenerator->triangleVxes() )[triangleIdx * 3 + 2];
 
     return tri;
 }
@@ -56,7 +56,7 @@ std::array<cvf::Vec3f, 3> RivExtrudedCurveIntersectionSourceInfo::triangle( int
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimExtrudedCurveIntersection* RivExtrudedCurveIntersectionSourceInfo::crossSection() const
+RimExtrudedCurveIntersection* RivExtrudedCurveIntersectionSourceInfo::intersection() const
 {
-    return m_crossSectionGeometryGenerator->crossSection();
+    return m_intersectionGeometryGenerator->intersection();
 }

ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionSourceInfo.h

@@ -33,8 +33,8 @@ public:
 
     const std::vector<size_t>& triangleToCellIndex() const;
     std::array<cvf::Vec3f, 3>  triangle( int triangleIdx ) const;
-    RimExtrudedCurveIntersection*           crossSection() const;
+    RimExtrudedCurveIntersection*           intersection() const;
 
 private:
-    cvf::cref<RivExtrudedCurveIntersectionGeometryGenerator> m_crossSectionGeometryGenerator;
+    cvf::cref<RivExtrudedCurveIntersectionGeometryGenerator> m_intersectionGeometryGenerator;
 };

ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp

@@ -186,7 +186,7 @@ void RivIntersectionBoxPartMgr::updatePartEffect()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivIntersectionBoxPartMgr::appendNativeCrossSectionFacesToModel( cvf::ModelBasicList* model,
+void RivIntersectionBoxPartMgr::appendNativeIntersectionFacesToModel( cvf::ModelBasicList* model,
                                                                       cvf::Transform*      scaleTransform )
 {
     if ( m_intersectionBoxFaces.isNull() && m_intersectionBoxGridLines.isNull() )

ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.h

@@ -57,7 +57,7 @@ public:
     void applySingleColorEffect();
     void updateCellResultColor( size_t timeStepIndex );
 
-    void appendNativeCrossSectionFacesToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform );
+    void appendNativeIntersectionFacesToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform );
     void appendMeshLinePartsToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform );
 
 private:

ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp

@@ -544,7 +544,7 @@ void Rim2dIntersectionView::onCreateDisplayModel()
 
     m_intersectionVizModel->removeAllParts();
 
-    m_flatIntersectionPartMgr->appendNativeCrossSectionFacesToModel( m_intersectionVizModel.p(), scaleTransform() );
+    m_flatIntersectionPartMgr->appendNativeIntersectionFacesToModel( m_intersectionVizModel.p(), scaleTransform() );
     m_flatIntersectionPartMgr->appendMeshLinePartsToModel( m_intersectionVizModel.p(), scaleTransform() );
     m_flatIntersectionPartMgr->appendPolylinePartsToModel( *this, m_intersectionVizModel.p(), scaleTransform() );
 

ApplicationCode/ProjectDataModel/Rim3dView.cpp

@@ -138,8 +138,8 @@ Rim3dView::Rim3dView( void )
 
     CAF_PDM_InitFieldNoDefault( &m_comparisonView, "ComparisonView", "Comparison View", "", "", "" );
 
-    m_crossSectionVizModel = new cvf::ModelBasicList;
+    m_intersectionVizModel = new cvf::ModelBasicList;
-    m_crossSectionVizModel->setName( "CrossSectionModel" );
+    m_intersectionVizModel->setName( "CrossSectionModel" );
 
     m_highlightVizModel = new cvf::ModelBasicList;
     m_highlightVizModel->setName( "HighlightModel" );

ApplicationCode/ProjectDataModel/Rim3dView.h

@@ -248,7 +248,7 @@ protected:
 
     // 3D display model data
     cvf::ref<cvf::ModelBasicList> m_wellPathPipeVizModel;
-    cvf::ref<cvf::ModelBasicList> m_crossSectionVizModel;
+    cvf::ref<cvf::ModelBasicList> m_intersectionVizModel;
     cvf::ref<RivWellPathsPartMgr> m_wellPathsPartManager;
 
 private:

ApplicationCode/ProjectDataModel/RimEclipseCase.cpp

@@ -523,7 +523,7 @@ void RimEclipseCase::updateFormationNamesData()
 
                 view->scheduleGeometryRegen( PROPERTY_FILTERED );
                 view->scheduleCreateDisplayModelAndRedraw();
-                eclView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+                eclView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
             }
         }
     }

ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp

@@ -554,7 +554,7 @@ void RimEclipseResultDefinition::loadDataAndUpdate()
                 viewLinker->updateCellResult();
             }
             RimGridView* eclView = dynamic_cast<RimGridView*>( view );
-            if ( eclView ) eclView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+            if ( eclView ) eclView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
         }
     }
 
@@ -564,7 +564,7 @@ void RimEclipseResultDefinition::loadDataAndUpdate()
     {
         if ( view ) view->scheduleCreateDisplayModelAndRedraw();
         RimGridView* gridView = dynamic_cast<RimGridView*>( view );
-        if ( gridView ) gridView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+        if ( gridView ) gridView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
     }
 
     RimCellEdgeColors* cellEdgeColors = nullptr;

ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp

@@ -742,7 +742,7 @@ void RimEclipseStatisticsCase::updateConnectedEditorsAndReservoirViews()
             // (from Octave) a full display model rebuild is required
             reservoirViews[i]->hasUserRequestedAnimation = true;
             reservoirViews[i]->scheduleCreateDisplayModelAndRedraw();
-            reservoirViews[i]->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+            reservoirViews[i]->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
         }
     }
 

ApplicationCode/ProjectDataModel/RimEclipseView.cpp

@@ -529,12 +529,12 @@ void RimEclipseView::onCreateDisplayModel()
 
     // Cross sections
 
-    m_crossSectionVizModel->removeAllParts();
+    m_intersectionVizModel->removeAllParts();
-    m_crossSectionCollection->rebuildGeometry();
+    m_intersectionCollection->rebuildGeometry();
-    m_crossSectionCollection->appendPartsToModel( *this,
+    m_intersectionCollection->appendPartsToModel( *this,
-                                                  m_crossSectionVizModel.p(),
+                                                  m_intersectionVizModel.p(),
                                                   m_reservoirGridPartManager->scaleTransform() );
-    nativeOrOverrideViewer()->addStaticModelOnce( m_crossSectionVizModel.p(), isUsingOverrideViewer() );
+    nativeOrOverrideViewer()->addStaticModelOnce( m_intersectionVizModel.p(), isUsingOverrideViewer() );
 
     // Well path model
 
@@ -794,11 +794,11 @@ void RimEclipseView::updateVisibleGeometriesAndCellColors()
     if ( ( this->hasUserRequestedAnimation() && this->cellResult()->hasResult() ) ||
          this->cellResult()->isTernarySaturationSelected() )
     {
-        m_crossSectionCollection->updateCellResultColor( m_currentTimeStep );
+        m_intersectionCollection->updateCellResultColor( m_currentTimeStep );
     }
     else
     {
-        m_crossSectionCollection->applySingleColorEffect();
+        m_intersectionCollection->applySingleColorEffect();
     }
 }
 
@@ -1633,7 +1633,7 @@ void RimEclipseView::calculateCompletionTypeAndRedrawIfRequired()
     {
         this->loadDataAndUpdate();
 
-        std::vector<RimExtrudedCurveIntersection*> intersections = m_crossSectionCollection->intersections();
+        std::vector<RimExtrudedCurveIntersection*> intersections = m_intersectionCollection->intersections();
         for ( auto intersection : intersections )
         {
             if ( intersection && intersection->correspondingIntersectionView() )
@@ -1741,7 +1741,7 @@ void RimEclipseView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
 
     uiTreeOrdering.add( faultCollection() );
     uiTreeOrdering.add( annotationCollection() );
-    uiTreeOrdering.add( crossSectionCollection() );
+    uiTreeOrdering.add( intersectionCollection() );
 
     uiTreeOrdering.add( m_rangeFilterCollection() );
     uiTreeOrdering.add( m_propertyFilterCollection() );

ApplicationCode/ProjectDataModel/RimFaultInView.cpp

@@ -76,7 +76,7 @@ void RimFaultInView::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
         if ( reservoirView )
         {
             reservoirView->scheduleCreateDisplayModelAndRedraw();
-            reservoirView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+            reservoirView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
         }
     }
 }

ApplicationCode/ProjectDataModel/RimFaultInViewCollection.cpp

@@ -130,7 +130,7 @@ void RimFaultInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* chan
     if ( &faultLabelColor == changedField )
     {
         parentView()->scheduleReservoirGridGeometryRegen();
-        parentView()->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+        parentView()->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
     }
 
     if ( &showFaultFaces == changedField || &showOppositeFaultFaces == changedField ||
@@ -139,7 +139,7 @@ void RimFaultInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* chan
          &faultResult == changedField || &showNNCs == changedField || &hideNncsWhenNoResultIsAvailable == changedField )
     {
         parentView()->scheduleCreateDisplayModelAndRedraw();
-        parentView()->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+        parentView()->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
     }
 
     if ( &showFaultLabel == changedField )

ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp

@@ -693,7 +693,7 @@ void RimGeoMechCase::updateFormationNamesData()
 
                 view->scheduleGeometryRegen( PROPERTY_FILTERED );
                 view->scheduleCreateDisplayModelAndRedraw();
-                geomView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+                geomView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
             }
         }
     }

ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp

@@ -352,7 +352,7 @@ void RimGeoMechResultDefinition::fieldChangedByUi( const caf::PdmFieldHandle* ch
             if ( view )
             {
                 view->scheduleCreateDisplayModelAndRedraw();
-                view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+                view->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
             }
 
             if ( dynamic_cast<RimGeoMechCellColors*>( this ) )

ApplicationCode/ProjectDataModel/RimGeoMechView.cpp

@@ -289,10 +289,10 @@ void RimGeoMechView::onCreateDisplayModel()
 
     // Cross sections
 
-    m_crossSectionVizModel->removeAllParts();
+    m_intersectionVizModel->removeAllParts();
-    m_crossSectionCollection->rebuildGeometry();
+    m_intersectionCollection->rebuildGeometry();
-    m_crossSectionCollection->appendPartsToModel( *this, m_crossSectionVizModel.p(), scaleTransform() );
+    m_intersectionCollection->appendPartsToModel( *this, m_intersectionVizModel.p(), scaleTransform() );
-    nativeOrOverrideViewer()->addStaticModelOnce( m_crossSectionVizModel.p(), isUsingOverrideViewer() );
+    nativeOrOverrideViewer()->addStaticModelOnce( m_intersectionVizModel.p(), isUsingOverrideViewer() );
 
     // If the animation was active before recreating everything, make viewer view current frame
 
@@ -304,7 +304,7 @@ void RimGeoMechView::onCreateDisplayModel()
     {
         onUpdateLegends();
         m_vizLogic->updateStaticCellColors( -1 );
-        m_crossSectionCollection->applySingleColorEffect();
+        m_intersectionCollection->applySingleColorEffect();
 
         m_overlayInfoConfig()->update3DInfo();
     }
@@ -384,17 +384,17 @@ void RimGeoMechView::onUpdateDisplayModelForCurrentTimeStep()
 
         if ( this->cellResult()->hasResult() )
         {
-            m_crossSectionCollection->updateCellResultColor( m_currentTimeStep );
+            m_intersectionCollection->updateCellResultColor( m_currentTimeStep );
         }
         else
         {
-            m_crossSectionCollection->applySingleColorEffect();
+            m_intersectionCollection->applySingleColorEffect();
         }
     }
     else
     {
         m_vizLogic->updateStaticCellColors( -1 );
-        m_crossSectionCollection->applySingleColorEffect();
+        m_intersectionCollection->applySingleColorEffect();
 
         nativeOrOverrideViewer()->animationControl()->slotPause(); // To avoid animation timer spinning in the background
     }
@@ -908,7 +908,7 @@ void RimGeoMechView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
     uiTreeOrdering.add( m_tensorResults() );
     uiTreeOrdering.add( &m_intersectionResultDefCollection );
 
-    uiTreeOrdering.add( m_crossSectionCollection() );
+    uiTreeOrdering.add( m_intersectionCollection() );
 
     uiTreeOrdering.add( m_rangeFilterCollection() );
     uiTreeOrdering.add( m_propertyFilterCollection() );

ApplicationCode/ProjectDataModel/RimGridView.cpp

@@ -62,9 +62,9 @@ RimGridView::RimGridView()
     m_overrideRangeFilterCollection.uiCapability()->setUiHidden( true );
     m_overrideRangeFilterCollection.xmlCapability()->disableIO();
 
-    CAF_PDM_InitFieldNoDefault( &m_crossSectionCollection, "CrossSections", "Intersections", "", "", "" );
+    CAF_PDM_InitFieldNoDefault( &m_intersectionCollection, "CrossSections", "Intersections", "", "", "" );
-    m_crossSectionCollection.uiCapability()->setUiHidden( true );
+    m_intersectionCollection.uiCapability()->setUiHidden( true );
-    m_crossSectionCollection = new RimIntersectionCollection();
+    m_intersectionCollection = new RimIntersectionCollection();
 
     CAF_PDM_InitFieldNoDefault( &m_intersectionResultDefCollection,
                                 "IntersectionResultDefColl",
@@ -119,7 +119,7 @@ RimGridView::~RimGridView( void )
 
     delete m_rangeFilterCollection;
     delete m_overrideRangeFilterCollection;
-    delete m_crossSectionCollection;
+    delete m_intersectionCollection;
     delete m_gridCollection;
 }
 
@@ -156,9 +156,9 @@ cvf::ref<cvf::UByteArray> RimGridView::currentTotalCellVisibility()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimIntersectionCollection* RimGridView::crossSectionCollection() const
+RimIntersectionCollection* RimGridView::intersectionCollection() const
 {
-    return m_crossSectionCollection();
+    return m_intersectionCollection();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -425,7 +425,7 @@ void RimGridView::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
 {
     if ( changedField == &scaleZ )
     {
-        m_crossSectionCollection->updateIntersectionBoxGeometry();
+        m_intersectionCollection->updateIntersectionBoxGeometry();
     }
 
     Rim3dView::fieldChangedByUi( changedField, oldValue, newValue );

ApplicationCode/ProjectDataModel/RimGridView.h

@@ -45,7 +45,7 @@ public:
 
     cvf::ref<cvf::UByteArray> currentTotalCellVisibility();
 
-    RimIntersectionCollection*                  crossSectionCollection() const;
+    RimIntersectionCollection*                  intersectionCollection() const;
     RimIntersectionResultsDefinitionCollection* separateIntersectionResultsCollection() const;
     RimAnnotationInViewCollection*              annotationCollection() const;
 
@@ -83,7 +83,7 @@ protected:
     void initAfterRead() override;
 
 protected: // Fields
-    caf::PdmChildField<RimIntersectionCollection*> m_crossSectionCollection;
+    caf::PdmChildField<RimIntersectionCollection*> m_intersectionCollection;
 
     caf::PdmChildField<RimIntersectionResultsDefinitionCollection*> m_intersectionResultDefCollection;
 

ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp

@@ -131,7 +131,7 @@ void RimIntersectionCollection::appendPartsToModel( Rim3dView&           view,
     {
         if ( cs->isActive() )
         {
-            cs->intersectionPartMgr()->appendNativeCrossSectionFacesToModel( model, scaleTransform );
+            cs->intersectionPartMgr()->appendNativeIntersectionFacesToModel( model, scaleTransform );
             cs->intersectionPartMgr()->appendMeshLinePartsToModel( model, scaleTransform );
             cs->intersectionPartMgr()->appendPolylinePartsToModel( view, model, scaleTransform );
         }
@@ -141,7 +141,7 @@ void RimIntersectionCollection::appendPartsToModel( Rim3dView&           view,
     {
         if ( cs->isActive() )
         {
-            cs->intersectionBoxPartMgr()->appendNativeCrossSectionFacesToModel( model, scaleTransform );
+            cs->intersectionBoxPartMgr()->appendNativeIntersectionFacesToModel( model, scaleTransform );
             cs->intersectionBoxPartMgr()->appendMeshLinePartsToModel( model, scaleTransform );
 
             if ( cs->show3dManipulator() )

ApplicationCode/ProjectDataModel/RimIntersectionResultsDefinitionCollection.cpp

@@ -92,7 +92,7 @@ void RimIntersectionResultsDefinitionCollection::fieldChangedByUi( const caf::Pd
     if ( gridView )
     {
         gridView->scheduleCreateDisplayModelAndRedraw();
-        gridView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+        gridView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
     }
 }
 

ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp

@@ -269,7 +269,7 @@ void RimRegularLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* change
 
         view->updateDisplayModelForCurrentTimeStepAndRedraw();
 
-        view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+        view->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
     }
 
     // Update stim plan templates if relevant

ApplicationCode/ProjectDataModel/RimScaleLegendConfig.cpp

@@ -190,7 +190,7 @@ void RimScaleLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* changedF
 
         view->updateDisplayModelForCurrentTimeStepAndRedraw();
 
-        view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+        view->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
     }
 
     // Update stim plan templates if relevant

ApplicationCode/ProjectDataModel/RimSimWellInView.cpp

@@ -473,7 +473,7 @@ bool RimSimWellInView::isWellCellsVisible() const
 
     if ( !this->showWellCells() ) return false;
 
-    if ( reservoirView->crossSectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;
+    if ( reservoirView->intersectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;
 
     if ( reservoirView->wellCollection()->showWellsIntersectingVisibleCells() &&
          reservoirView->rangeFilterCollection()->hasActiveFilters() )
@@ -514,7 +514,7 @@ bool RimSimWellInView::isWellPipeVisible( size_t frameIndex ) const
 
     if ( !this->showWellPipe() ) return false;
 
-    if ( reservoirView->crossSectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;
+    if ( reservoirView->intersectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;
 
     if ( reservoirView->wellCollection()->showWellsIntersectingVisibleCells() &&
          ( reservoirView->rangeFilterCollection()->hasActiveFilters() ||
@@ -556,7 +556,7 @@ bool RimSimWellInView::isWellSpheresVisible( size_t frameIndex ) const
 
     if ( !this->showWellSpheres() ) return false;
 
-    if ( reservoirView->crossSectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;
+    if ( reservoirView->intersectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;
 
     if ( reservoirView->wellCollection()->showWellsIntersectingVisibleCells() &&
          reservoirView->rangeFilterCollection()->hasActiveFilters() )

ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp

@@ -495,7 +495,7 @@ void RimSimWellInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* ch
     {
         if ( m_reservoirView )
         {
-            m_reservoirView->crossSectionCollection()->recomputeSimWellBranchData();
+            m_reservoirView->intersectionCollection()->recomputeSimWellBranchData();
         }
 
         for ( RimSimWellInView* w : wells )

ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.cpp

@@ -159,7 +159,7 @@ void RimTernaryLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* change
         }
 
         view->updateDisplayModelForCurrentTimeStepAndRedraw();
-        view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+        view->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
     }
 }
 

ApplicationCode/ProjectDataModel/RimViewController.cpp

@@ -727,7 +727,7 @@ void RimViewController::scheduleCreateDisplayModelAndRedrawForDependentView() co
 
     if ( this->isResultColorControlled() && this->managedView() )
     {
-        this->managedView()->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+        this->managedView()->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
     }
 }
 

ApplicationCode/ProjectDataModel/RimViewLinker.cpp

@@ -162,7 +162,7 @@ void RimViewLinker::updateCellResult()
                         }
 
                         eclipseView->scheduleCreateDisplayModelAndRedraw();
-                        eclipseView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+                        eclipseView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
                     }
 
                     eclipseView->cellResult()->updateIconState();
@@ -196,7 +196,7 @@ void RimViewLinker::updateCellResult()
                         }
 
                         geoView->scheduleCreateDisplayModelAndRedraw();
-                        geoView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
+                        geoView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
                     }
 
                     geoView->cellResult()->updateIconState();

ApplicationCode/SocketInterface/RiaNNCCommands.cpp

@@ -596,7 +596,7 @@ public:
                         // generated data (from Octave) a full display model rebuild is required
                         m_currentReservoir->reservoirViews[i]->scheduleCreateDisplayModelAndRedraw();
                         m_currentReservoir->reservoirViews[i]
-                            ->crossSectionCollection()
+                            ->intersectionCollection()
                             ->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
                     }
                 }

ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp

@@ -736,7 +736,7 @@ public:
                         // generated data (from Octave) a full display model rebuild is required
                         m_currentReservoir->reservoirViews[i]->scheduleCreateDisplayModelAndRedraw();
                         m_currentReservoir->reservoirViews[i]
-                            ->crossSectionCollection()
+                            ->intersectionCollection()
                             ->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
                     }
                 }
@@ -1127,7 +1127,7 @@ public:
                         // generated data (from Octave) a full display model rebuild is required
                         m_currentReservoir->reservoirViews[i]->scheduleCreateDisplayModelAndRedraw();
                         m_currentReservoir->reservoirViews[i]
-                            ->crossSectionCollection()
+                            ->intersectionCollection()
                             ->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
                     }
                 }

ApplicationCode/UserInterface/RiuViewerCommands.cpp

@@ -301,7 +301,7 @@ void RiuViewerCommands::displayContextMenu( QMouseEvent* event )
                                       &m_currentGridIdx );
                 m_currentFaceIndex = cvf::StructGridInterface::NO_FACE;
 
-                RiuSelectionItem* selItem = new RiuGeneralSelectionItem( crossSectionSourceInfo->crossSection() );
+                RiuSelectionItem* selItem = new RiuGeneralSelectionItem( crossSectionSourceInfo->intersection() );
                 Riu3dSelectionManager::instance()->setSelectedItem( selItem, Riu3dSelectionManager::RUI_TEMPORARY );
 
                 if ( gridView )
@@ -831,7 +831,7 @@ void RiuViewerCommands::handlePickAction( int winPosX, int winPosY, Qt::Keyboard
                 bool allowActiveViewChange = dynamic_cast<Rim2dIntersectionView*>( m_viewer->ownerViewWindow() ) ==
                                              nullptr;
 
-                RiuMainWindow::instance()->selectAsCurrentItem( crossSectionSourceInfo->crossSection(),
+                RiuMainWindow::instance()->selectAsCurrentItem( crossSectionSourceInfo->intersection(),
                                                                 allowActiveViewChange );
             }
             else if ( intersectionBoxSourceInfo )
@@ -1146,7 +1146,7 @@ void RiuViewerCommands::findCellAndGridIndex( Rim3dView*                       m
     RimEclipseCase* eclipseCase = nullptr;
 
     if ( RimIntersectionResultDefinition* sepInterResDef =
-             crossSectionSourceInfo->crossSection()->activeSeparateResultDefinition() )
+             crossSectionSourceInfo->intersection()->activeSeparateResultDefinition() )
     {
         if ( sepInterResDef->isEclipseResultDefinition() )
         {

ApplicationCode/UserInterface/RiuViewerCommands.h

@@ -71,7 +71,7 @@ public:
 
 private:
     void findCellAndGridIndex( Rim3dView*                       mainOrComparisonView,
-                               const RivExtrudedCurveIntersectionSourceInfo* crossSectionSourceInfo,
+                               const RivExtrudedCurveIntersectionSourceInfo* intersectionSourceInfo,
                                cvf::uint                        firstPartTriangleIndex,
                                size_t*                          cellIndex,
                                size_t*                          gridIndex );