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

Support older clang.

Browse Source 
Bump version to dev.05
This commit is contained in:
jonjenssen 2023-12-19 12:52:18 +01:00 committed by Magne Sjaastad
parent 850b1a1894
commit d6ae8188e0
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationLibCode/ReservoirDataModel/RigFaultReactivationModelGenerator.cpp
View File

@ -33,8 +33,6 @@
#include "cafHexGridIntersectionTools/cafHexGridIntersectionTools.h" #include "cafHexGridIntersectionTools/cafHexGridIntersectionTools.h"
#include <ranges>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -579,10 +577,14 @@ void RigFaultReactivationModelGenerator::splitLargeLayers( std::map<double, cvf:
const int nLayers = (int)layers.size(); const int nLayers = (int)layers.size();
const int nKLayers = (int)kLayers.size(); const int nKLayers = (int)kLayers.size();
auto kv = std::views::keys( layers ); std::vector<double> keys;
std::vector<double> keys{ kv.begin(), kv.end() }; std::vector<cvf::Vec3d> vals;
auto vv = std::views::values( layers );
std::vector<cvf::Vec3d> vals{ vv.begin(), vv.end() }; for ( auto& layer : layers )
{
keys.push_back( layer.first );
vals.push_back( layer.second );
}
for ( int k = 0; k < nLayers; k++ ) for ( int k = 0; k < nLayers; k++ )
{ {

2
ResInsightVersion.cmake
View File

@ -11,7 +11,7 @@ set(RESINSIGHT_VERSION_TEXT "-dev")
# Must be unique and increasing within one combination of major/minor/patch version # Must be unique and increasing within one combination of major/minor/patch version
# The uniqueness of this text is independent of RESINSIGHT_VERSION_TEXT # The uniqueness of this text is independent of RESINSIGHT_VERSION_TEXT
# Format of text must be ".xx" # Format of text must be ".xx"
set(RESINSIGHT_DEV_VERSION ".04") set(RESINSIGHT_DEV_VERSION ".05")
# https://github.com/CRAVA/crava/tree/master/libs/nrlib # https://github.com/CRAVA/crava/tree/master/libs/nrlib
set(NRLIB_GITHUB_SHA "ba35d4359882f1c6f5e9dc30eb95fe52af50fd6f") set(NRLIB_GITHUB_SHA "ba35d4359882f1c6f5e9dc30eb95fe52af50fd6f")