Pybind rd file view

applications/resdata/rd_pack.cpp

@@ -90,8 +90,7 @@ int main(int argc, char **argv) {
                         filelist.at(i - 1).c_str(), filelist.at(i).c_str());
 
                 prev_report_step = report_step;
-                rd_file_ptr src_file(rd_file_open(filelist.at(i).c_str(), 0),
-                                     &rd_file_close);
+                rd_file_ptr src_file = open_rd_file(filelist.at(i));
                 if (target_type == RD_UNIFIED_RESTART_FILE) {
                     /* Must insert the SEQNUM keyword first. */
                     rd_kw_iset_int(seqnum_kw.get(), 0, report_step);

applications/resdata/rd_unpack.cpp

@@ -16,14 +16,23 @@
    for more details.
 */
 
+#include <cstddef>
+#include <cstdio>
+
+#include <ios>
+#include <memory>
+#include <filesystem>
+#include <string>
+
 #include <ert/util/util.hpp>
 
 #include <resdata/rd_file.hpp>
 #include <resdata/rd_util.hpp>
 #include <resdata/rd_kw.hpp>
 #include <resdata/rd_endian_flip.hpp>
 #include <resdata/rd_kw_magic.hpp>
-#include <filesystem>
+#include <resdata/FortIO.hpp>
+#include <resdata/rd_file_view.hpp>
 
 namespace fs = std::filesystem;
 
@@ -44,9 +53,9 @@ static void unpack_file(const fs::path &filepath) {
         printf("** Warning: when unpacking unified summary files it as "
                "ambigous - starting with 0001  -> \n");
     }
-    rd_file_ptr src_file(rd_file_open(filename.c_str(), 0), &rd_file_close);
+    rd_file_ptr src_file = open_rd_file(filename);
     int size;
-    int offset;
+    size_t offset;
     int report_step = 0;
 
     if (target_type == RD_SUMMARY_FILE)
@@ -55,7 +64,7 @@ static void unpack_file(const fs::path &filepath) {
         size = rd_file_get_num_named_kw(src_file.get(), "SEQNUM");
 
     for (int block_index = 0; block_index < size; block_index++) {
-        rd_file_view_type *active_view;
+        std::shared_ptr<rd::FileView> active_view;
 
         if (target_type == RD_SUMMARY_FILE) {
             active_view = rd_file_get_global_blockview(src_file.get(),
@@ -66,7 +75,7 @@ static void unpack_file(const fs::path &filepath) {
             rd_kw_type *seqnum_kw;
             active_view = rd_file_get_global_blockview(src_file.get(),
                                                        SEQNUM_KW, block_index);
-            seqnum_kw = rd_file_view_iget_named_kw(active_view, SEQNUM_KW, 0);
+            seqnum_kw = active_view->get_kw(SEQNUM_KW, 0);
             report_step = rd_kw_iget_int(seqnum_kw, 0);
             offset = 1;
         }
@@ -81,7 +90,7 @@ static void unpack_file(const fs::path &filepath) {
         fs::path target_file =
             rd::filename(filepath.stem(), target_type, fmt_file, report_step);
         ERT::FortIO fortio_target(target_file, std::ios_base::out, fmt_file);
-        rd_file_view_fwrite(active_view, fortio_target, offset);
+        active_view->write(fortio_target, offset);
     }
 }
 

lib/CMakeLists.txt

@@ -210,13 +210,15 @@ add_resdata_pybind_module(_grid rd_grid_pybind.cpp resdata/grid)
 add_resdata_pybind_module(_kw rd_kw_pybind.cpp resdata/resfile)
 add_resdata_pybind_module(_rsthead rsthead_pybind.cpp resdata/resfile)
 add_resdata_pybind_module(_file rd_file_pybind.cpp resdata/resfile)
+add_resdata_pybind_module(rd_file_view rd_file_view_pybind.cpp resdata/resfile)
 add_resdata_pybind_module(fortio fortio_pybind.cpp resdata/resfile)
 add_resdata_pybind_module(well well_pybind.cpp resdata)
 add_resdata_pybind_module(_subsidence rd_subsidence_pybind.cpp
                           resdata/gravimetry)
 add_resdata_pybind_module(_grav rd_grav_pybind.cpp resdata/gravimetry)
 add_resdata_pybind_module(_rd_sum rd_sum_pybind.cpp resdata/summary)
 add_resdata_pybind_module(_type rd_type_pybind.cpp resdata/types)
+add_resdata_pybind_module(_file_mode file_mode_pybind.cpp resdata)
 
 if(NOT BUILD_TESTS)
   return()
@@ -384,13 +386,6 @@ add_test(
     ${CMAKE_CURRENT_SOURCE_DIR}/resdata/tests/data/num_cpu4
     ${CMAKE_CURRENT_SOURCE_DIR}/resdata/tests/data/num_cpu5)
 
-# The rd_win64 application is not built as a proper test integrated into the
-# CTEST system. Should be invoked manually on Windows.
-if(ERT_WINDOWS)
-  add_executable(rd_lfs resdata/tests/rd_lfs.cpp util/test_util.cpp)
-  target_link_libraries(rd_lfs resdata)
-endif()
-
 #
 # geometry
 #

lib/include/resdata/FortIO.hpp

@@ -71,6 +71,7 @@ class FortIO {
     void fflush() const;
     void rewind() const;
     [[nodiscard]] const char *filename_ref() const;
+    [[nodiscard]] const std::string &filename() const { return m_filename; };
     [[nodiscard]] bool fmt_file() const;
     [[nodiscard]] offset_type ftell() const;
     bool fseek(offset_type offset, int whence);

lib/include/resdata/rd_file.hpp

@@ -6,52 +6,46 @@
 #include <string>
 
 #include <resdata/rd_kw.hpp>
-#include <resdata/rd_file_kw.hpp>
 #include <resdata/rd_file_view.hpp>
 #include <resdata/FortIO.hpp>
 #include <resdata/rd_util.hpp>
-#include <resdata/rd_type.hpp>
+#include <resdata/rd_file_flag.hpp>
 
 #include "ert/util/type_macros.hpp"
 
-#define RD_FILE_FLAGS_ENUM_DEFS                                                \
-    {.value = 1, .name = "RD_FILE_CLOSE_STREAM"},                              \
-        {.value = 2, .name = "RD_FILE_WRITABLE"}
-#define RD_FILE_FLAGS_ENUM_SIZE 2
-
 typedef struct rd_file_struct rd_file_type;
 bool rd_file_load_all(rd_file_type *rd_file);
-rd_file_type *rd_file_open(const char *filename, int flags);
+rd_file_type *rd_file_open(const char *filename,
+                           FileMode flags = FileMode::DEFAULT);
 rd_file_type *rd_file_fast_open(const char *filename,
-                                const char *index_filename, int flags);
+                                const char *index_filename,
+                                FileMode flags = FileMode::DEFAULT);
 bool rd_file_write_index(const rd_file_type *rd_file,
                          const char *index_filename);
 bool rd_file_index_valid(const char *file_name, const char *index_file_name);
 void rd_file_close(rd_file_type *rd_file);
+void rd_file_free(rd_file_type *rd_file);
 rd_kw_type *rd_file_icopy_kw(const rd_file_type *rd_file, int index);
 bool rd_file_has_kw(const rd_file_type *rd_file, const char *kw);
 int rd_file_get_num_named_kw(const rd_file_type *rd_file, const char *kw);
 int rd_file_get_size(const rd_file_type *rd_file);
 const char *rd_file_get_src_file(const rd_file_type *rd_file);
 rd_version_enum rd_file_get_rd_version(const rd_file_type *file);
 void rd_file_fwrite_fortio(const rd_file_type *ec_file, ERT::FortIO &fortio,
-                           int offset);
+                           size_t offset);
 
 int rd_file_get_phases(const rd_file_type *init_file);
 
 bool rd_file_writable(const rd_file_type *rd_file);
-bool rd_file_flags_set(const rd_file_type *rd_file, int flags);
 
 rd_kw_type *rd_file_iget_kw(const rd_file_type *file, int global_index);
 rd_kw_type *rd_file_iget_named_kw(const rd_file_type *file, const char *kw,
                                   int ith);
-rd_file_view_type *rd_file_get_global_blockview(rd_file_type *rd_file,
-                                                const char *kw, int occurence);
-rd_file_view_type *rd_file_alloc_global_blockview(rd_file_type *rd_file,
-                                                  const char *kw,
-                                                  int occurence);
-rd_file_view_type *rd_file_get_global_view(rd_file_type *rd_file);
-rd_file_view_type *rd_file_get_active_view(rd_file_type *rd_file);
+std::shared_ptr<rd::FileView>
+rd_file_get_global_blockview(rd_file_type *rd_file, const char *kw,
+                             int occurence);
+std::shared_ptr<rd::FileView> rd_file_get_global_view(rd_file_type *rd_file);
+std::shared_ptr<rd::FileView> rd_file_get_active_view(rd_file_type *rd_file);
 bool rd_file_save_kw(const rd_file_type *rd_file, const rd_kw_type *rd_kw);
 
 double rd_file_iget_restart_sim_days(const rd_file_type *restart_file,
@@ -63,22 +57,21 @@ int rd_file_get_restart_index(const rd_file_type *restart_file,
 bool rd_file_has_report_step(const rd_file_type *rd_file, int report_step);
 bool rd_file_has_sim_time(const rd_file_type *rd_file, time_t sim_time);
 
-rd_file_view_type *rd_file_get_restart_view(rd_file_type *rd_file,
-                                            int input_index, int report_step,
-                                            time_t sim_time, double sim_days);
-rd_file_view_type *rd_file_get_summary_view(rd_file_type *rd_file,
-                                            int report_step);
+std::shared_ptr<rd::FileView> rd_file_get_summary_view(rd_file_type *rd_file,
+                                                       int report_step);
 
 UTIL_IS_INSTANCE_HEADER(rd_file);
 
 bool rd_file_subselect_block(rd_file_type *rd_file, const char *kw,
                              int occurence);
 
-using rd_file_ptr = std::unique_ptr<rd_file_type, decltype(&rd_file_close)>;
+using rd_file_ptr = std::unique_ptr<rd_file_type, decltype(&rd_file_free)>;
 
-inline rd_file_ptr open_rd_file(const std::string &path, int flags) {
-    return {rd_file_open(path.c_str(), flags), &rd_file_close};
+inline rd_file_ptr open_rd_file(const std::string &path,
+                                FileMode flags = FileMode::DEFAULT) {
+    return {rd_file_open(path.c_str(), flags), &rd_file_free};
 }
-inline rd_file_ptr open_rd_file(const std::filesystem::path &path, int flags) {
-    return {rd_file_open(path.string().c_str(), flags), &rd_file_close};
+inline rd_file_ptr open_rd_file(const std::filesystem::path &path,
+                                FileMode flags = FileMode::DEFAULT) {
+    return {rd_file_open(path.string().c_str(), flags), &rd_file_free};
 }

lib/include/resdata/rd_file_flag.hpp

@@ -0,0 +1,51 @@
+#pragma once
+
+#include <type_traits>
+
+enum class FileMode : int {
+    DEFAULT = 0,
+    CLOSE_STREAM =
+        1, /* This flag will close the underlying FILE object between each access;
+              this is mainly to save filedescriptors in cases where many rd_file
+              instances are open at the same time. */
+    WRITABLE =
+        2 /* This flag opens the file in a mode where it can be updated and modified,
+             but it must still exist and be readable. I.e. this should not compared
+             with the normal: fopen(filename , "w") where an existing file is
+             truncated to zero upon successfull open. */
+};
+
+constexpr FileMode operator|(FileMode lhs, FileMode rhs) {
+    using T = std::underlying_type_t<FileMode>;
+    return static_cast<FileMode>(static_cast<T>(lhs) | static_cast<T>(rhs));
+}
+
+constexpr FileMode operator&(FileMode lhs, FileMode rhs) {
+    using T = std::underlying_type_t<FileMode>;
+    return static_cast<FileMode>(static_cast<T>(lhs) & static_cast<T>(rhs));
+}
+
+constexpr FileMode operator^(FileMode lhs, FileMode rhs) {
+    using T = std::underlying_type_t<FileMode>;
+    return static_cast<FileMode>(static_cast<T>(lhs) ^ static_cast<T>(rhs));
+}
+
+constexpr FileMode operator~(FileMode value) {
+    using T = std::underlying_type_t<FileMode>;
+    return static_cast<FileMode>(~static_cast<T>(value));
+}
+
+constexpr FileMode &operator|=(FileMode &lhs, FileMode rhs) {
+    lhs = lhs | rhs;
+    return lhs;
+}
+
+constexpr FileMode &operator&=(FileMode &lhs, FileMode rhs) {
+    lhs = lhs & rhs;
+    return lhs;
+}
+
+constexpr FileMode &operator^=(FileMode &lhs, FileMode rhs) {
+    lhs = lhs ^ rhs;
+    return lhs;
+}