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

Use correct result name for Void ratio (#10969)

Browse Source 
Use correct result name for Void ratio
Enable porosity calculator for imported inp data
Add model validation check for export/show model
Fix last res. layer not being splitted into subelements
Add model validation check in file exporter
Bump version to dev.04
This commit is contained in:
jonjenssen
2023-12-18 15:03:08 +01:00
committed by GitHub
parent 9e1a09bcf9
commit 858c1227bc
8 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModelGenerator.cpp
View File

@@ -33,6 +33,8 @@
#include "cafHexGridIntersectionTools/cafHexGridIntersectionTools.h"
#include <ranges>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -572,39 +574,31 @@ void RigFaultReactivationModelGenerator::splitLargeLayers( std::map<double, cvf:
{
std::vector<cvf::Vec3d> additionalPoints;
std::pair<double, cvf::Vec3d> prevLayer;
std::vector<int> newKLayers;
std::vector<int> newKLayers;
bool first = true;
int k = 0;
const int nLayers = (int)layers.size();
const int nKLayers = (int)kLayers.size();
const int nLayers = (int)layers.size();
int n = 0;
auto kv = std::views::keys( layers );
std::vector<double> keys{ kv.begin(), kv.end() };
auto vv = std::views::values( layers );
std::vector<cvf::Vec3d> vals{ vv.begin(), vv.end() };
for ( auto& layer : layers )
for ( int k = 0; k < nLayers; k++ )
{
if ( n++ == ( nLayers - 1 ) ) break;
if ( first )
if ( k > 0 )
{
prevLayer = layer;
first = false;
newKLayers.push_back( kLayers[k++] );
continue;
}
if ( std::abs( prevLayer.first - layer.first ) > maxHeight )
{
const auto& points = interpolateExtraPoints( prevLayer.second, layer.second, maxHeight );
for ( auto& p : points )
if ( std::abs( keys[k] - keys[k - 1] ) > maxHeight )
{
additionalPoints.push_back( p );
newKLayers.push_back( kLayers[k - 1] );
const auto& points = interpolateExtraPoints( vals[k - 1], vals[k], maxHeight );
for ( auto& p : points )
{
additionalPoints.push_back( p );
newKLayers.push_back( kLayers[k - 1] );
}
}
}
prevLayer = layer;
newKLayers.push_back( kLayers[k++] );
if ( k < nKLayers ) newKLayers.push_back( kLayers[k] );
}
for ( auto& p : additionalPoints )