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

Fix missing prefix seen in unity builds

Browse Source
This commit is contained in:
Magne Sjaastad
2024-10-20 14:22:32 +02:00
parent 205b29de3c
commit 04799e044e
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/ReservoirDataModel/RigContourMapGrid.cpp
View File

@@ -20,6 +20,8 @@
#include <cmath>
using namespace cvf;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -170,8 +172,8 @@ cvf::Vec2ui RigContourMapGrid::ijFromCellIndex( size_t cellIndex ) const
//--------------------------------------------------------------------------------------------------
cvf::Vec2ui RigContourMapGrid::ijFromLocalPos( const cvf::Vec2d& localPos2d ) const
{
uint i = localPos2d.x() / sampleSpacing();
uint j = localPos2d.y() / sampleSpacing();
uint i = static_cast<uint>( localPos2d.x() / sampleSpacing() );
uint j = static_cast<uint>( localPos2d.y() / sampleSpacing() );
return cvf::Vec2ui( i, j );
}

12
ApplicationLibCode/ReservoirDataModel/RigContourMapGrid.h
View File

@@ -21,6 +21,8 @@
#include "cvfBoundingBox.h"
#include "cvfVector2.h"
using namespace cvf;
//==================================================================================================
///
///
@@ -36,8 +38,8 @@ public:
cvf::Vec2ui numberOfElementsIJ() const;
cvf::Vec2ui numberOfVerticesIJ() const;
uint numberOfCells() const;
uint numberOfValidCells() const;
cvf::uint numberOfCells() const;
cvf::uint numberOfValidCells() const;
size_t numberOfVertices() const;
cvf::Vec3d origin3d() const;
@@ -48,12 +50,12 @@ public:
std::vector<cvf::Vec3d> generateVertices() const;
// Cell index and position conversion
size_t cellIndexFromIJ( uint i, uint j ) const;
size_t vertexIndexFromIJ( uint i, uint j ) const;
size_t cellIndexFromIJ( cvf::uint i, cvf::uint j ) const;
size_t vertexIndexFromIJ( cvf::uint i, cvf::uint j ) const;
cvf::Vec2ui ijFromVertexIndex( size_t gridIndex ) const;
cvf::Vec2ui ijFromCellIndex( size_t mapIndex ) const;
cvf::Vec2ui ijFromLocalPos( const cvf::Vec2d& localPos2d ) const;
cvf::Vec2d cellCenterPosition( uint i, uint j ) const;
cvf::Vec2d cellCenterPosition( cvf::uint i, cvf::uint j ) const;
cvf::Vec2d origin2d() const;
double gridEdgeOffset() const;