Skip to content

Combine rd_sum related functionality into one #1178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
eivindjahren wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Combine rd_sum related functionality into one #1178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07b89c4
Combine all summary related functionality in one file
eivindjahren Jun 3, 2026
4c6976c
Remove prototypes for functions no longer used outside rd_sum
eivindjahren Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,12 @@ add_library(
util/cxx_string_util.cpp
${opt_srcs}
resdata/rd_rsthead.cpp
resdata/rd_sum_tstep.cpp
resdata/rd_grid_cache.cpp
resdata/smspec_node.cpp
resdata/rd_kw_grdecl.cpp
resdata/rd_file_kw.cpp
resdata/rd_file_view.cpp
resdata/rd_grav.cpp
resdata/rd_smspec.cpp
resdata/rd_unsmry_loader.cpp
resdata/rd_sum_data.cpp
resdata/rd_sum_file_data.cpp
resdata/rd_util.cpp
resdata/rd_kw.cpp
resdata/rd_sum.cpp
Expand Down
57 changes: 0 additions & 57 deletions lib/include/resdata/rd_smspec.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@

typedef struct rd_smspec_struct rd_smspec_type;

const std::vector<float> &
rd_smspec_get_params_default(const rd_smspec_type *rd_smspec);
const rd::smspec_node &
rd_smspec_get_well_completion_var_node(const rd_smspec_type *rd_smspec,
const char *well, const char *var,
int cell_nr);
const rd::smspec_node &
rd_smspec_get_general_var_node(const rd_smspec_type *smspec,
const char *lookup_kw);
const rd::smspec_node &
rd_smspec_iget_node_w_node_index(const rd_smspec_type *smspec, int node_index);
const rd::smspec_node &
Expand All @@ -38,9 +29,6 @@ rd_smspec_iget_node_w_params_index(const rd_smspec_type *smspec,
rd_smspec_install_gen_key() must be updated.
*/

std::vector<int> rd_smspec_alloc_mapping(const rd_smspec_type *self,
const rd_smspec_type *other);
const int *rd_smspec_get_index_map(const rd_smspec_type *smspec);
rd_smspec_var_type rd_smspec_identify_var_type(const char *var);
rd_smspec_type *rd_smspec_alloc_restart_writer(
const char *key_join_string, const char *restart_case, int restart_step,
Expand All @@ -49,47 +37,13 @@ rd_smspec_type *rd_smspec_alloc_restart_writer(
rd_smspec_type *rd_smspec_alloc_writer(const char *key_join_string,
time_t sim_start, bool time_in_days,
int nx, int ny, int nz);
void rd_smspec_fwrite(const rd_smspec_type *smspec, const char *rd_case,
bool fmt_file);

rd_smspec_type *rd_smspec_fread_alloc(const std::string &header_file,
const std::string &key_join_string,
bool include_restart);
void rd_smspec_free(rd_smspec_type *);

int rd_smspec_get_date_day_index(const rd_smspec_type *smspec);
int rd_smspec_get_date_month_index(const rd_smspec_type *smspec);
int rd_smspec_get_date_year_index(const rd_smspec_type *smspec);

int rd_smspec_get_general_var_params_index(const rd_smspec_type *rd_smspec,
const char *lookup_kw);
bool rd_smspec_has_general_var(const rd_smspec_type *rd_smspec,
const char *lookup_kw);
void rd_smspec_select_matching_general_var_list(const rd_smspec_type *smspec,
const char *pattern,
stringlist_type *keys);
stringlist_type *
rd_smspec_alloc_matching_general_var_list(const rd_smspec_type *smspec,
const char *pattern);

int rd_smspec_get_time_seconds(const rd_smspec_type *rd_smspec);
int rd_smspec_get_time_index(const rd_smspec_type *rd_smspec);
time_t rd_smspec_get_start_time(const rd_smspec_type *);
bool rd_smspec_get_formatted(const rd_smspec_type *rd_smspec);
const char *rd_smspec_get_header_file(const rd_smspec_type *rd_smspec);
stringlist_type *rd_smspec_alloc_well_list(const rd_smspec_type *smspec,
const char *pattern);
stringlist_type *rd_smspec_alloc_group_list(const rd_smspec_type *smspec,
const char *pattern);
int rd_smspec_get_first_step(const rd_smspec_type *rd_smspec);
int rd_smspec_get_restart_step(const rd_smspec_type *rd_smspec);
const char *rd_smspec_get_restart_case(const rd_smspec_type *rd_smspec);
const int *rd_smspec_get_grid_dims(const rd_smspec_type *smspec);
int rd_smspec_get_params_size(const rd_smspec_type *smspec);
int rd_smspec_num_nodes(const rd_smspec_type *smspec);
bool rd_smspec_equal(const rd_smspec_type *self, const rd_smspec_type *other);
ert_rd_unit_enum rd_smspec_get_unit_system(const rd_smspec_type *smspec);

const rd::smspec_node *rd_smspec_add_node(rd_smspec_type *rd_smspec,
const rd::smspec_node &node);
const rd::smspec_node *rd_smspec_add_node(rd_smspec_type *rd_smspec,
Expand Down Expand Up @@ -125,14 +79,3 @@ const rd::smspec_node *rd_smspec_add_node(rd_smspec_type *rd_smspec,
const char *unit, const char *lgr,
int lgr_i, int lgr_j, int lgr_k,
float default_value);

using rd_smspec_ptr =
std::unique_ptr<rd_smspec_type, decltype(&rd_smspec_free)>;

inline rd_smspec_ptr read_smspec(const std::string &header_file,
const std::string &key_join_string,
bool include_restart) {
return {
rd_smspec_fread_alloc(header_file, key_join_string, include_restart),
&rd_smspec_free};
}
98 changes: 0 additions & 98 deletions lib/include/resdata/rd_sum_data.hpp
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions lib/include/resdata/rd_sum_tstep.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ extern "C" {
typedef struct rd_sum_tstep_struct rd_sum_tstep_type;

void rd_sum_tstep_free(rd_sum_tstep_type *ministep);
void rd_sum_tstep_free__(void *__ministep);
rd_sum_tstep_type *rd_sum_tstep_alloc_from_file(int report_step,
int ministep_nr,
const rd_kw_type *params_kw,
const char *src_file,
const rd_smspec_type *smspec);

rd_sum_tstep_type *rd_sum_tstep_alloc_new(int report_step, int ministep,
float sim_seconds,
const rd_smspec_type *smspec);
Expand All @@ -30,19 +23,12 @@ void rd_sum_tstep_set_from_node(rd_sum_tstep_type *tstep,
double rd_sum_tstep_get_from_node(const rd_sum_tstep_type *tstep,
const rd::smspec_node &smspec_node);

double rd_sum_tstep_iget(const rd_sum_tstep_type *ministep, int index);
time_t rd_sum_tstep_get_sim_time(const rd_sum_tstep_type *ministep);
double rd_sum_tstep_get_sim_days(const rd_sum_tstep_type *ministep);
double rd_sum_tstep_get_sim_seconds(const rd_sum_tstep_type *ministep);

int rd_sum_tstep_get_report(const rd_sum_tstep_type *ministep);
int rd_sum_tstep_get_ministep(const rd_sum_tstep_type *ministep);

void rd_sum_tstep_fwrite(const rd_sum_tstep_type *ministep,
const int *index_map, int index_map_size,
fortio_type *fortio);
void rd_sum_tstep_iset(rd_sum_tstep_type *tstep, int index, float value);

void rd_sum_tstep_set_from_key(rd_sum_tstep_type *tstep, const char *gen_key,
float value);
double rd_sum_tstep_get_from_key(const rd_sum_tstep_type *tstep,
Expand Down
141 changes: 0 additions & 141 deletions lib/private-include/detail/resdata/rd_sum_file_data.hpp
View file
Open in desktop

This file was deleted.

Loading
Loading