Copy changes from dev-branch into main

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 08:12:19 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions

View File

@@ -31,6 +31,8 @@ namespace caf
class VecIjk;
};
class RigEclipseWellLogExtractor;
class RifReaderRftInterface
{
public:
@@ -46,5 +48,9 @@ public:
virtual std::set<RifEclipseRftAddress::RftWellLogChannelType> availableWellLogChannels( const QString& wellName ) = 0;
virtual std::set<QString> wellNames() = 0;
virtual void cellIndices( const RifEclipseRftAddress& rftAddress, std::vector<caf::VecIjk>* indices );
// To be moved into Rig structures
std::vector<double> computeMeasuredDepth( const QString& wellName, const QDateTime& timeStep, RigEclipseWellLogExtractor* extractor );
// TODO: Move to protected or private
virtual std::vector<caf::VecIjk> cellIndices( const QString& wellName, const QDateTime& timeStep );
};