Work in progress

OPM · Dec 11, 2023 · 7eba8ab · 7eba8ab
1 parent 61a0b86
commit 7eba8ab
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 8 deletions.
diff --git a/ApplicationLibCode/GeoMech/OdbReader/RifInpIncludeReader.h b/ApplicationLibCode/GeoMech/OdbReader/RifInpIncludeReader.h
@@ -17,3 +17,29 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+
+#include <fstream>
+#include <string>
+#include <vector>
+
+//==================================================================================================
+//
+//==================================================================================================
+class RifInpReader
+{
+public:
+    RifInpIncludeReader();
+    ~RifInpIncludeReader() override;
+
+    bool openFile( const std::string& fileName, std::string* errorMessage );
+    bool isOpen() const;
+
+    bool 
+
+
+private:
+    void close();
+
+private:
+    std::ifstream m_stream;
+};
diff --git a/ApplicationLibCode/GeoMech/OdbReader/RifInpReader.cpp b/ApplicationLibCode/GeoMech/OdbReader/RifInpReader.cpp
@@ -643,3 +643,19 @@ void RifInpReader::readIntegrationPointField( const std::string&
 {
     CVF_ASSERT( resultValues );
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+const std::vector<double> RifInpReader::propertyData( std::string propertyName, int partId ) const
+{
+    if ( m_propertyPartData.count( propertyName ) > 0 )
+    {
+        if ( m_propertyPartData.at( propertyName ).count( partId ) > 0 )
+        {
+            return m_propertyPartData.at( propertyName ).at( partId );
+        }
+    }
+
+    return {};
+}
diff --git a/ApplicationLibCode/GeoMech/OdbReader/RifInpReader.h b/ApplicationLibCode/GeoMech/OdbReader/RifInpReader.h
@@ -50,8 +50,6 @@ struct RifInpIncludeEntry
 
 //==================================================================================================
 //
-// Data interface base class
-//
 //==================================================================================================
 class RifInpReader : public RifGeoMechReaderInterface
 {
@@ -94,6 +92,8 @@ class RifInpReader : public RifGeoMechReaderInterface
                                     int                               frameIndex,
                                     std::vector<std::vector<float>*>* resultValues ) override;
 
+    const std::vector<double> propertyData( std::string propertyName, int partId ) const;
+
 private:
     void close();
 
@@ -115,10 +115,11 @@ class RifInpReader : public RifGeoMechReaderInterface
                                 std::vector<RifInpIncludeEntry>&                                         includeEntries );
 
 private:
-    bool                                    m_enableIncludes;
-    std::map<int, std::vector<std::string>> m_partElementSetNames;
-    std::vector<std::string>                m_stepNames;
-    std::vector<RifInpIncludeEntry>         m_includeEntries;
-    std::ifstream                           m_stream;
-    std::filesystem::path                   m_inputPath;
+    bool                                                      m_enableIncludes;
+    std::map<int, std::vector<std::string>>                   m_partElementSetNames;
+    std::vector<std::string>                                  m_stepNames;
+    std::vector<RifInpIncludeEntry>                           m_includeEntries;
+    std::ifstream                                             m_stream;
+    std::filesystem::path                                     m_inputPath;
+    std::map<std::string, std::map<int, std::vector<double>>> m_propertyPartData;
 };