OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-27 05:37:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Copy changes from dev-branch into main

Browse Source 
History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad
2023-10-23 09:26:33 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/ModelVisualization/GridBox/RivGridBoxGenerator.cpp
+6 -6
View File
@@ -364,9 +364,9 @@ void RivGridBoxGenerator::createGridBoxFaceParts()
m_gridBoxFaceParts.clear();
CVF_ASSERT( m_displayCoordsBoundingBox.isValid() );
CVF_ASSERT( m_displayCoordsXValues.size() > 0 );
CVF_ASSERT( m_displayCoordsYValues.size() > 0 );
CVF_ASSERT( m_displayCoordsZValues.size() > 0 );
CVF_ASSERT( !m_displayCoordsXValues.empty() );
CVF_ASSERT( !m_displayCoordsYValues.empty() );
CVF_ASSERT( !m_displayCoordsZValues.empty() );
cvf::Vec3d min = m_displayCoordsBoundingBox.min();
cvf::Vec3d max = m_displayCoordsBoundingBox.max();
@@ -456,9 +456,9 @@ void RivGridBoxGenerator::createGridBoxLegendParts()
m_gridBoxLegendParts.clear();
CVF_ASSERT( m_displayCoordsBoundingBox.isValid() );
CVF_ASSERT( m_displayCoordsXValues.size() > 0 );
CVF_ASSERT( m_displayCoordsYValues.size() > 0 );
CVF_ASSERT( m_displayCoordsZValues.size() > 0 );
CVF_ASSERT( !m_displayCoordsXValues.empty() );
CVF_ASSERT( !m_displayCoordsYValues.empty() );
CVF_ASSERT( !m_displayCoordsZValues.empty() );
for ( int edge = POS_Z_POS_X; edge <= NEG_X_NEG_Y; edge++ )
{
ApplicationLibCode/ModelVisualization/GridBox/RivPatchGenerator.cpp
+2 -2
View File
@@ -67,8 +67,8 @@ void RivPatchGenerator::setSubdivisions( const std::vector<double>& uValues, con
//--------------------------------------------------------------------------------------------------
void RivPatchGenerator::generate( cvf::GeometryBuilder* builder )
{
CVF_ASSERT( m_uValues.size() > 0 );
CVF_ASSERT( m_vValues.size() > 0 );
CVF_ASSERT( !m_uValues.empty() );
CVF_ASSERT( !m_vValues.empty() );
size_t numVertices = m_uValues.size() * m_vValues.size();