diff --git a/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.cpp index 4211b821e7..4fb1fa62af 100644 --- a/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.cpp @@ -127,6 +127,7 @@ void RivWellConnectionsPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasi std::pair injProdFluxPair = flowResults->injectorProducerPairFluxes(injectorName, producerName, static_cast(frameIndex)); //if ( fabs(injProdFluxPair.first) < 1e-3 && fabs(injProdFluxPair.second) < 1e-3 ) continue; // Todo : Needs threshold in Gui + if ( injProdFluxPair.first == 0.0 && injProdFluxPair.second == 0.0 ) continue; float width = fluxWidthScale * (isProducer ? injProdFluxPair.second: injProdFluxPair.first); @@ -145,7 +146,7 @@ void RivWellConnectionsPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasi cvf::Vec3f endPoint = cvf::Vec3f(wellHeadTop + (3* pipeRadius * (otherWellHeadTop - wellHeadTop).getNormalized())); cvf::ref part = new cvf::Part; - cvf::ref geo = createArrow(startPoint, endPoint, width, isProducer); + cvf::ref geo = createArrowGeometry(startPoint, endPoint, width, isProducer); part->setDrawable(geo.p()); caf::SurfaceEffectGenerator surfaceGen(cvf::Color4f(otherWell->wellPipeColor()), caf::PO_1); @@ -160,7 +161,7 @@ void RivWellConnectionsPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasi } -cvf::ref< cvf::DrawableGeo> RivWellConnectionsPartMgr::createArrow(const cvf::Vec3f& startPoint, +cvf::ref< cvf::DrawableGeo> RivWellConnectionsPartMgr::createArrowGeometry(const cvf::Vec3f& startPoint, const cvf::Vec3f& endPoint, double width, bool useArrowEnd) diff --git a/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.h b/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.h index dcb49befb5..187b689e1c 100644 --- a/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.h @@ -50,7 +50,7 @@ public: void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, size_t frameIndex); private: - cvf::ref< cvf::DrawableGeo> createArrow(const cvf::Vec3f& startPoint, + cvf::ref< cvf::DrawableGeo> createArrowGeometry(const cvf::Vec3f& startPoint, const cvf::Vec3f& endPoint, double width, bool useArrowEnd); diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h index 64a3943b64..3392729044 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h @@ -109,7 +109,7 @@ private: std::map< RigFlowDiagResultAddress, cvf::ref > m_resultSets; std::map< RigFlowDiagResultAddress, cvf::ref > m_resultStatistics; - using InjectorProducerCommunicationMap = std::map, std::pair >; + using InjectorProducerCommunicationMap = std::map< std::pair, std::pair >; std::vector m_injProdPairFluxCommunicationTimesteps; };