From 62396147c9c63efcb16ff1bd0a95e7e8b96249ff Mon Sep 17 00:00:00 2001 From: Eivind Jahren Date: Fri, 26 Jan 2024 11:52:36 +0100 Subject: [PATCH] Remove deprecated .h headers --- applications/resdata/convert.c | 8 +- applications/resdata/grdecl_grid.c | 8 +- applications/resdata/grdecl_test.c | 4 +- applications/resdata/grid_dump.c | 4 +- applications/resdata/grid_dump_ascii.c | 4 +- applications/resdata/grid_info.c | 4 +- applications/resdata/kw_extract.cpp | 16 +- applications/resdata/kw_list.c | 6 +- applications/resdata/load_test.c | 4 +- applications/resdata/make_grid.c | 4 +- applications/resdata/rd_pack.c | 12 +- applications/resdata/rd_unpack.c | 12 +- applications/resdata/select_test.c | 6 +- applications/resdata/sum_write.cpp | 10 +- applications/resdata/view_summary.cpp | 4 +- applications/well/ri_well_test.c | 6 +- applications/well/segment_info.c | 26 +- applications/well/well_CF_dump.c | 6 +- lib/CMakeLists.txt | 4 - lib/build_config.h.in | 50 -- lib/build_config.hpp.in | 51 +- lib/ert_api_config.h.in | 17 - lib/ert_api_config.hpp.in | 18 +- lib/geometry/geo_pointset.cpp | 2 +- lib/geometry/geo_polygon.cpp | 2 +- lib/geometry/geo_polygon_collection.cpp | 2 +- lib/geometry/geo_region.cpp | 2 +- lib/geometry/geo_surface.cpp | 2 +- lib/geometry/geo_util.cpp | 2 +- lib/geometry/tests/geo_polygon.cpp | 2 +- lib/geometry/tests/geo_polygon_collection.cpp | 2 +- lib/geometry/tests/geo_surface.cpp | 2 +- lib/geometry/tests/geo_util_xlines.cpp | 2 +- lib/include/ert/geometry/geo_pointset.h | 7 - lib/include/ert/geometry/geo_polygon.h | 7 - .../ert/geometry/geo_polygon_collection.h | 7 - lib/include/ert/geometry/geo_region.h | 7 - lib/include/ert/geometry/geo_region.hpp | 2 +- lib/include/ert/geometry/geo_surface.h | 7 - lib/include/ert/geometry/geo_util.h | 7 - lib/include/ert/util/buffer_string.h | 7 - lib/include/ert/util/hash.h | 7 - lib/include/ert/util/hash_node.h | 7 - lib/include/ert/util/hash_sll.h | 7 - lib/include/ert/util/lookup_table.h | 7 - lib/include/ert/util/mzran.h | 7 - lib/include/ert/util/node_ctype.h | 7 - lib/include/ert/util/node_data.h | 7 - lib/include/ert/util/parser.h | 7 - lib/include/ert/util/path_stack.h | 7 - lib/include/ert/util/perm_vector.h | 7 - lib/include/ert/util/rd_version.h | 7 - lib/include/ert/util/rng.h | 7 - lib/include/ert/util/statistics.h | 7 - lib/include/ert/util/string_util.h | 7 - lib/include/ert/util/stringlist.h | 7 - lib/include/ert/util/test_util.h | 7 - lib/include/ert/util/test_work_area.h | 7 - lib/include/ert/util/thread_pool1.h | 35 -- lib/include/ert/util/type_macros.h | 7 - lib/include/ert/util/type_macros.hpp | 2 +- lib/include/ert/util/type_vector_functions.h | 7 - lib/include/ert/util/util.h | 454 ------------------ lib/include/ert/util/util.hpp | 454 +++++++++++++++++- lib/include/ert/util/util_endian.h | 31 -- .../util/{util_unlink.h => util_unlink.hpp} | 0 lib/include/ert/util/vector.h | 7 - lib/include/resdata/fault_block.h | 7 - lib/include/resdata/fault_block_layer.h | 7 - lib/include/resdata/fortio.h | 2 +- lib/include/resdata/grid_dims.h | 7 - lib/include/resdata/layer.h | 7 - lib/include/resdata/nnc_info.h | 7 - lib/include/resdata/nnc_vector.h | 7 - lib/include/resdata/rd_coarse_cell.h | 7 - lib/include/resdata/rd_endian_flip.h | 7 - lib/include/resdata/rd_file.h | 7 - lib/include/resdata/rd_file_kw.h | 7 - lib/include/resdata/rd_file_kw.hpp | 2 +- lib/include/resdata/rd_file_view.h | 7 - lib/include/resdata/rd_grav.h | 7 - lib/include/resdata/rd_grav_common.h | 7 - lib/include/resdata/rd_grid.h | 7 - lib/include/resdata/rd_grid_dims.h | 7 - lib/include/resdata/rd_init_file.h | 7 - lib/include/resdata/rd_io_config.h | 7 - lib/include/resdata/rd_kw.h | 7 - lib/include/resdata/rd_kw_grdecl.h | 7 - lib/include/resdata/rd_kw_magic.h | 7 - lib/include/resdata/rd_nnc_data.h | 7 - lib/include/resdata/rd_nnc_export.h | 7 - lib/include/resdata/rd_nnc_geometry.h | 7 - lib/include/resdata/rd_region.h | 7 - lib/include/resdata/rd_rft_cell.h | 7 - lib/include/resdata/rd_rft_file.h | 7 - lib/include/resdata/rd_rft_node.h | 7 - lib/include/resdata/rd_rst_file.h | 7 - lib/include/resdata/rd_rsthead.h | 7 - lib/include/resdata/rd_smspec.h | 7 - lib/include/resdata/rd_subsidence.h | 7 - lib/include/resdata/rd_sum.h | 7 - lib/include/resdata/rd_sum_data.h | 7 - lib/include/resdata/rd_sum_index.h | 7 - lib/include/resdata/rd_sum_tstep.h | 7 - lib/include/resdata/rd_sum_vector.h | 7 - lib/include/resdata/rd_type.h | 7 - lib/include/resdata/rd_units.h | 7 - lib/include/resdata/rd_util.h | 7 - .../resdata/well/well_branch_collection.h | 7 - lib/include/resdata/well/well_conn.h | 7 - .../resdata/well/well_conn_collection.h | 7 - lib/include/resdata/well/well_const.h | 7 - lib/include/resdata/well/well_info.h | 7 - lib/include/resdata/well/well_rseg_loader.h | 7 - lib/include/resdata/well/well_segment.h | 7 - .../resdata/well/well_segment_collection.h | 7 - lib/include/resdata/well/well_state.h | 7 - lib/include/resdata/well/well_ts.h | 7 - lib/resdata/FortIO.cpp | 2 +- lib/resdata/fortio.c | 4 +- lib/resdata/grid_dims.cpp | 2 +- lib/resdata/nnc_info.cpp | 2 +- lib/resdata/nnc_vector.cpp | 2 +- lib/resdata/rd_coarse_cell.cpp | 2 +- lib/resdata/rd_file.cpp | 2 +- lib/resdata/rd_file_kw.cpp | 2 +- lib/resdata/rd_grav.cpp | 2 +- lib/resdata/rd_grav_common.cpp | 2 +- lib/resdata/rd_grid.cpp | 2 +- lib/resdata/rd_grid_cache.cpp | 2 +- lib/resdata/rd_grid_dims.cpp | 2 +- lib/resdata/rd_init_file.cpp | 2 +- lib/resdata/rd_io_config.cpp | 2 +- lib/resdata/rd_kw.cpp | 2 +- lib/resdata/rd_kw_grdecl.cpp | 2 +- lib/resdata/rd_region.cpp | 2 +- lib/resdata/rd_rft_cell.cpp | 2 +- lib/resdata/rd_rft_file.cpp | 2 +- lib/resdata/rd_rft_node.cpp | 2 +- lib/resdata/rd_rst_file.cpp | 2 +- lib/resdata/rd_rsthead.cpp | 2 +- lib/resdata/rd_smspec.cpp | 2 +- lib/resdata/rd_subsidence.cpp | 2 +- lib/resdata/rd_sum.cpp | 4 +- lib/resdata/rd_sum_data.cpp | 2 +- lib/resdata/rd_sum_file_data.cpp | 6 +- lib/resdata/rd_sum_tstep.cpp | 2 +- lib/resdata/rd_sum_vector.cpp | 2 +- lib/resdata/rd_type.cpp | 2 +- lib/resdata/rd_util.cpp | 2 +- lib/resdata/smspec_node.cpp | 2 +- lib/resdata/tests/rd_file.cpp | 2 +- lib/resdata/tests/rd_file_equinor.cpp | 2 +- lib/resdata/tests/rd_file_view.cpp | 2 +- lib/resdata/tests/rd_filenames.cpp | 2 +- lib/resdata/tests/rd_fmt.cpp | 2 +- lib/resdata/tests/rd_fortio.cpp | 2 +- lib/resdata/tests/rd_grid_add_nnc.cpp | 2 +- lib/resdata/tests/rd_grid_copy.cpp | 2 +- lib/resdata/tests/rd_grid_create.cpp | 2 +- lib/resdata/tests/rd_grid_dims.cpp | 2 +- lib/resdata/tests/rd_grid_dx_dy_dz.cpp | 2 +- lib/resdata/tests/rd_grid_init_fwrite.cpp | 2 +- lib/resdata/tests/rd_grid_lgr_name.cpp | 2 +- lib/resdata/tests/rd_grid_volume.cpp | 2 +- lib/resdata/tests/rd_init_file.cpp | 2 +- lib/resdata/tests/rd_kw_equal.cpp | 2 +- lib/resdata/tests/rd_kw_fread.cpp | 2 +- lib/resdata/tests/rd_kw_grdecl.cpp | 2 +- lib/resdata/tests/rd_kw_init.cpp | 2 +- lib/resdata/tests/rd_layer.cpp | 2 +- lib/resdata/tests/rd_layer_equinor.cpp | 2 +- lib/resdata/tests/rd_lgr_test.cpp | 2 +- lib/resdata/tests/rd_make_date_no_shift.cpp | 2 +- lib/resdata/tests/rd_make_date_shift.cpp | 2 +- lib/resdata/tests/rd_month_range.cpp | 2 +- .../tests/rd_nnc_data_equinor_root.cpp | 2 +- lib/resdata/tests/rd_nnc_export.cpp | 2 +- lib/resdata/tests/rd_nnc_export_get_tran.cpp | 2 +- lib/resdata/tests/rd_nnc_export_intersect.cpp | 2 +- lib/resdata/tests/rd_nnc_index_list.cpp | 2 +- lib/resdata/tests/rd_nnc_index_list_grid.cpp | 2 +- lib/resdata/tests/rd_nnc_info_test.cpp | 2 +- lib/resdata/tests/rd_nnc_pair.cpp | 2 +- lib/resdata/tests/rd_nnc_test.cpp | 2 +- lib/resdata/tests/rd_path_access.cpp | 2 +- lib/resdata/tests/rd_restart_test.cpp | 2 +- lib/resdata/tests/rd_rft.cpp | 2 +- lib/resdata/tests/rd_rft_cell.cpp | 2 +- lib/resdata/tests/rd_smspec_node.cpp | 2 +- lib/resdata/tests/rd_sum_case_exists.cpp | 2 +- .../tests/rd_sum_data_intermediate_test.cpp | 6 +- .../tests/rd_sum_report_step_compatible.cpp | 2 +- .../tests/rd_sum_report_step_equal.cpp | 2 +- lib/resdata/tests/rd_sum_restart.cpp | 6 +- lib/resdata/tests/rd_sum_test.cpp | 2 +- lib/resdata/tests/rd_sum_writer.cpp | 2 +- lib/resdata/tests/rft_test.cpp | 2 +- lib/resdata/tests/test_rd_file_index.cpp | 2 +- lib/resdata/tests/test_rd_nnc_data.cpp | 2 +- lib/resdata/tests/test_transactions.cpp | 2 +- lib/resdata/tests/well_branch_collection.cpp | 2 +- lib/resdata/tests/well_conn.cpp | 2 +- lib/resdata/tests/well_conn_CF.cpp | 2 +- lib/resdata/tests/well_conn_collection.cpp | 2 +- lib/resdata/tests/well_conn_load.cpp | 2 +- lib/resdata/tests/well_dualp.cpp | 2 +- lib/resdata/tests/well_info.cpp | 2 +- lib/resdata/tests/well_lgr_load.cpp | 2 +- lib/resdata/tests/well_segment.cpp | 2 +- .../tests/well_segment_branch_conn_load.cpp | 2 +- lib/resdata/tests/well_segment_collection.cpp | 2 +- lib/resdata/tests/well_segment_conn.cpp | 2 +- lib/resdata/tests/well_segment_conn_load.cpp | 2 +- lib/resdata/tests/well_segment_load.cpp | 2 +- lib/resdata/tests/well_state.cpp | 2 +- lib/resdata/tests/well_state_load.cpp | 2 +- .../tests/well_state_load_missing_RSEG.cpp | 2 +- lib/resdata/tests/well_ts.cpp | 2 +- lib/resdata/well_branch_collection.cpp | 2 +- lib/resdata/well_conn.cpp | 2 +- lib/resdata/well_conn_collection.cpp | 2 +- lib/resdata/well_info.cpp | 2 +- lib/resdata/well_rseg_loader.cpp | 2 +- lib/resdata/well_segment.cpp | 2 +- lib/resdata/well_segment_collection.cpp | 2 +- lib/resdata/well_state.cpp | 2 +- lib/resdata/well_ts.cpp | 2 +- lib/util/ert/util/template_type.h | 41 -- lib/util/hash.cpp | 2 +- lib/util/hash_node.cpp | 2 +- lib/util/hash_sll.cpp | 2 +- lib/util/lookup_table.cpp | 2 +- lib/util/mzran.cpp | 2 +- lib/util/node_ctype.cpp | 2 +- lib/util/node_data.cpp | 2 +- lib/util/parser.cpp | 2 +- lib/util/path.cpp | 2 +- lib/util/path_stack.cpp | 2 +- lib/util/perm_vector.cpp | 2 +- lib/util/rd_version.cpp | 2 +- lib/util/rng.cpp | 2 +- lib/util/string_util.cpp | 2 +- lib/util/stringlist.cpp | 2 +- lib/util/test_util.cpp | 4 +- lib/util/test_work_area.cpp | 2 +- lib/util/tests/ert_util_abort_gnu_tests.cpp | 2 +- .../tests/ert_util_alloc_file_components.cpp | 2 +- lib/util/tests/ert_util_before_after.cpp | 2 +- lib/util/tests/ert_util_binary_split.cpp | 2 +- lib/util/tests/ert_util_chdir.cpp | 2 +- lib/util/tests/ert_util_clamp.cpp | 2 +- lib/util/tests/ert_util_copy_file.cpp | 2 +- lib/util/tests/ert_util_cwd_test.cpp | 2 +- lib/util/tests/ert_util_datetime.cpp | 2 +- lib/util/tests/ert_util_file_readable.cpp | 2 +- lib/util/tests/ert_util_mkdir_p.cpp | 2 +- lib/util/tests/ert_util_normal_path.cpp | 2 +- lib/util/tests/ert_util_parent_path.cpp | 2 +- lib/util/tests/ert_util_path_stack_test.cpp | 2 +- lib/util/tests/ert_util_ping.cpp | 2 +- lib/util/tests/ert_util_realpath.cpp | 2 +- lib/util/tests/ert_util_relpath_test.cpp | 2 +- lib/util/tests/ert_util_rng.cpp | 2 +- lib/util/tests/ert_util_spawn.cpp | 2 +- lib/util/tests/ert_util_sscan_test.cpp | 2 +- lib/util/tests/ert_util_strcat_test.cpp | 2 +- lib/util/tests/ert_util_stringlist_test.cpp | 2 +- lib/util/tests/ert_util_strstr_int_format.cpp | 2 +- lib/util/util.cpp | 4 +- lib/util/util_abort.cpp | 2 +- lib/util/util_getuid.cpp | 2 +- lib/util/util_lfs.c | 2 +- lib/util/util_lockf.cpp | 2 +- lib/util/util_opendir.cpp | 2 +- lib/util/util_spawn.cpp | 2 +- lib/util/util_symlink.cpp | 2 +- lib/util/util_unlink.cpp | 2 +- lib/util/util_zlib.cpp | 2 +- lib/util/vector.cpp | 2 +- lib/util/vector_template.cpp.in | 2 +- lib/vector_template.h.in | 135 ------ lib/vector_template.hpp.in | 119 ++++- 283 files changed, 891 insertions(+), 1566 deletions(-) delete mode 100644 lib/build_config.h.in delete mode 100644 lib/ert_api_config.h.in delete mode 100644 lib/include/ert/geometry/geo_pointset.h delete mode 100644 lib/include/ert/geometry/geo_polygon.h delete mode 100644 lib/include/ert/geometry/geo_polygon_collection.h delete mode 100644 lib/include/ert/geometry/geo_region.h delete mode 100644 lib/include/ert/geometry/geo_surface.h delete mode 100644 lib/include/ert/geometry/geo_util.h delete mode 100644 lib/include/ert/util/buffer_string.h delete mode 100644 lib/include/ert/util/hash.h delete mode 100644 lib/include/ert/util/hash_node.h delete mode 100644 lib/include/ert/util/hash_sll.h delete mode 100644 lib/include/ert/util/lookup_table.h delete mode 100644 lib/include/ert/util/mzran.h delete mode 100644 lib/include/ert/util/node_ctype.h delete mode 100644 lib/include/ert/util/node_data.h delete mode 100644 lib/include/ert/util/parser.h delete mode 100644 lib/include/ert/util/path_stack.h delete mode 100644 lib/include/ert/util/perm_vector.h delete mode 100644 lib/include/ert/util/rd_version.h delete mode 100644 lib/include/ert/util/rng.h delete mode 100644 lib/include/ert/util/statistics.h delete mode 100644 lib/include/ert/util/string_util.h delete mode 100644 lib/include/ert/util/stringlist.h delete mode 100644 lib/include/ert/util/test_util.h delete mode 100644 lib/include/ert/util/test_work_area.h delete mode 100644 lib/include/ert/util/thread_pool1.h delete mode 100644 lib/include/ert/util/type_macros.h delete mode 100644 lib/include/ert/util/type_vector_functions.h delete mode 100644 lib/include/ert/util/util.h delete mode 100644 lib/include/ert/util/util_endian.h rename lib/include/ert/util/{util_unlink.h => util_unlink.hpp} (100%) delete mode 100644 lib/include/ert/util/vector.h delete mode 100644 lib/include/resdata/fault_block.h delete mode 100644 lib/include/resdata/fault_block_layer.h delete mode 100644 lib/include/resdata/grid_dims.h delete mode 100644 lib/include/resdata/layer.h delete mode 100644 lib/include/resdata/nnc_info.h delete mode 100644 lib/include/resdata/nnc_vector.h delete mode 100644 lib/include/resdata/rd_coarse_cell.h delete mode 100644 lib/include/resdata/rd_endian_flip.h delete mode 100644 lib/include/resdata/rd_file.h delete mode 100644 lib/include/resdata/rd_file_kw.h delete mode 100644 lib/include/resdata/rd_file_view.h delete mode 100644 lib/include/resdata/rd_grav.h delete mode 100644 lib/include/resdata/rd_grav_common.h delete mode 100644 lib/include/resdata/rd_grid.h delete mode 100644 lib/include/resdata/rd_grid_dims.h delete mode 100644 lib/include/resdata/rd_init_file.h delete mode 100644 lib/include/resdata/rd_io_config.h delete mode 100644 lib/include/resdata/rd_kw.h delete mode 100644 lib/include/resdata/rd_kw_grdecl.h delete mode 100644 lib/include/resdata/rd_kw_magic.h delete mode 100644 lib/include/resdata/rd_nnc_data.h delete mode 100644 lib/include/resdata/rd_nnc_export.h delete mode 100644 lib/include/resdata/rd_nnc_geometry.h delete mode 100644 lib/include/resdata/rd_region.h delete mode 100644 lib/include/resdata/rd_rft_cell.h delete mode 100644 lib/include/resdata/rd_rft_file.h delete mode 100644 lib/include/resdata/rd_rft_node.h delete mode 100644 lib/include/resdata/rd_rst_file.h delete mode 100644 lib/include/resdata/rd_rsthead.h delete mode 100644 lib/include/resdata/rd_smspec.h delete mode 100644 lib/include/resdata/rd_subsidence.h delete mode 100644 lib/include/resdata/rd_sum.h delete mode 100644 lib/include/resdata/rd_sum_data.h delete mode 100644 lib/include/resdata/rd_sum_index.h delete mode 100644 lib/include/resdata/rd_sum_tstep.h delete mode 100644 lib/include/resdata/rd_sum_vector.h delete mode 100644 lib/include/resdata/rd_type.h delete mode 100644 lib/include/resdata/rd_units.h delete mode 100644 lib/include/resdata/rd_util.h delete mode 100644 lib/include/resdata/well/well_branch_collection.h delete mode 100644 lib/include/resdata/well/well_conn.h delete mode 100644 lib/include/resdata/well/well_conn_collection.h delete mode 100644 lib/include/resdata/well/well_const.h delete mode 100644 lib/include/resdata/well/well_info.h delete mode 100644 lib/include/resdata/well/well_rseg_loader.h delete mode 100644 lib/include/resdata/well/well_segment.h delete mode 100644 lib/include/resdata/well/well_segment_collection.h delete mode 100644 lib/include/resdata/well/well_state.h delete mode 100644 lib/include/resdata/well/well_ts.h delete mode 100644 lib/util/ert/util/template_type.h delete mode 100644 lib/vector_template.h.in diff --git a/applications/resdata/convert.c b/applications/resdata/convert.c index 9d3946bfef..95f3b9aa29 100644 --- a/applications/resdata/convert.c +++ b/applications/resdata/convert.c @@ -21,12 +21,12 @@ #include #include -#include +#include -#include +#include #include -#include -#include +#include +#include void file_convert(const char *src_file, const char *target_file, rd_file_enum file_type, bool fmt_src) { diff --git a/applications/resdata/grdecl_grid.c b/applications/resdata/grdecl_grid.c index 2cf16da338..3ceb4e3980 100644 --- a/applications/resdata/grdecl_grid.c +++ b/applications/resdata/grdecl_grid.c @@ -19,11 +19,11 @@ #include #include -#include +#include -#include -#include -#include +#include +#include +#include int main(int argc, char **argv) { FILE *stream = util_fopen(argv[1], "r"); diff --git a/applications/resdata/grdecl_test.c b/applications/resdata/grdecl_test.c index dfe639b50c..a7e5a4e81b 100644 --- a/applications/resdata/grdecl_test.c +++ b/applications/resdata/grdecl_test.c @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include int main(int argc, char **argv) { FILE *stream = util_fopen(argv[1], "r"); diff --git a/applications/resdata/grid_dump.c b/applications/resdata/grid_dump.c index afd460f5d1..8ceb69d71e 100644 --- a/applications/resdata/grid_dump.c +++ b/applications/resdata/grid_dump.c @@ -19,9 +19,9 @@ #include #include -#include +#include -#include +#include int main(int argc, char **argv) { if (argc < 2) { diff --git a/applications/resdata/grid_dump_ascii.c b/applications/resdata/grid_dump_ascii.c index 597b272d7c..54bcbcba34 100644 --- a/applications/resdata/grid_dump_ascii.c +++ b/applications/resdata/grid_dump_ascii.c @@ -19,9 +19,9 @@ #include #include -#include +#include -#include +#include int main(int argc, char **argv) { if (argc < 2) { diff --git a/applications/resdata/grid_info.c b/applications/resdata/grid_info.c index b3126aa329..21c3f62a9a 100644 --- a/applications/resdata/grid_info.c +++ b/applications/resdata/grid_info.c @@ -19,9 +19,9 @@ #include #include -#include +#include -#include +#include int main(int argc, char **argv) { if (argc < 2) { diff --git a/applications/resdata/kw_extract.cpp b/applications/resdata/kw_extract.cpp index 04460586b2..0633f0d3db 100644 --- a/applications/resdata/kw_extract.cpp +++ b/applications/resdata/kw_extract.cpp @@ -2,16 +2,16 @@ #include #include -#include -#include -#include +#include +#include +#include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include /** This file will extract all occurences of kw1,kw2,...,kwn from the diff --git a/applications/resdata/kw_list.c b/applications/resdata/kw_list.c index ec6757a5b8..28305c1100 100644 --- a/applications/resdata/kw_list.c +++ b/applications/resdata/kw_list.c @@ -21,10 +21,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include void kw_list(const char *filename) { fortio_type *fortio; diff --git a/applications/resdata/load_test.c b/applications/resdata/load_test.c index fd1643825e..6e04f24688 100644 --- a/applications/resdata/load_test.c +++ b/applications/resdata/load_test.c @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include void test_case(const char *base, bool load_all) { char *grid_file = rd_alloc_filename(NULL, base, RD_EGRID_FILE, false, 0); diff --git a/applications/resdata/make_grid.c b/applications/resdata/make_grid.c index 83adce4b99..0dfb41f79a 100644 --- a/applications/resdata/make_grid.c +++ b/applications/resdata/make_grid.c @@ -19,9 +19,9 @@ #include #include -#include +#include -#include +#include int main(int argc, char **argv) { if (argc != 5) { diff --git a/applications/resdata/rd_pack.c b/applications/resdata/rd_pack.c index 20ecdab317..e5da89694e 100644 --- a/applications/resdata/rd_pack.c +++ b/applications/resdata/rd_pack.c @@ -18,13 +18,13 @@ #include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include int main(int argc, char **argv) { int num_files = argc - 1; diff --git a/applications/resdata/rd_unpack.c b/applications/resdata/rd_unpack.c index b09c8adb58..cea4a06f62 100644 --- a/applications/resdata/rd_unpack.c +++ b/applications/resdata/rd_unpack.c @@ -18,13 +18,13 @@ #include -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include void unpack_file(const char *filename) { rd_file_enum target_type = RD_OTHER_FILE; diff --git a/applications/resdata/select_test.c b/applications/resdata/select_test.c index f34427003d..a4a4e6aa46 100644 --- a/applications/resdata/select_test.c +++ b/applications/resdata/select_test.c @@ -19,10 +19,10 @@ #include #include -#include -#include +#include +#include -#include +#include int main(int argc, char **argv) { const char *path = argv[1]; diff --git a/applications/resdata/sum_write.cpp b/applications/resdata/sum_write.cpp index 019b0cc69c..da84afae71 100644 --- a/applications/resdata/sum_write.cpp +++ b/applications/resdata/sum_write.cpp @@ -1,12 +1,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include /* The summary data is stored in two different files: diff --git a/applications/resdata/view_summary.cpp b/applications/resdata/view_summary.cpp index 35967113e7..5ad7503a06 100644 --- a/applications/resdata/view_summary.cpp +++ b/applications/resdata/view_summary.cpp @@ -2,13 +2,13 @@ #include #include -#include +#include #ifdef ERT_HAVE_GETOPT #include #endif -#include +#include #include #include diff --git a/applications/well/ri_well_test.c b/applications/well/ri_well_test.c index 705429b895..be38bcd80b 100644 --- a/applications/well/ri_well_test.c +++ b/applications/well/ri_well_test.c @@ -16,9 +16,9 @@ for more details. */ -#include -#include -#include +#include +#include +#include /* This is a small test program which will load the well information in diff --git a/applications/well/segment_info.c b/applications/well/segment_info.c index b5fec6fd8f..e7251fd5a1 100644 --- a/applications/well/segment_info.c +++ b/applications/well/segment_info.c @@ -19,19 +19,19 @@ #include #include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include int main(int argc, char **argv) { const char *Xfile = argv[1]; diff --git a/applications/well/well_CF_dump.c b/applications/well/well_CF_dump.c index 5f5bece82a..d945d773cc 100644 --- a/applications/well/well_CF_dump.c +++ b/applications/well/well_CF_dump.c @@ -16,9 +16,9 @@ for more details. */ -#include -#include -#include +#include +#include +#include int main(int argc, char **argv) { char *grid_file = argv[1]; diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 43650c27d6..132cae855c 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -25,7 +25,6 @@ endif() foreach(type int double long time_t float) set(TYPE ${type}) set(SIGNED_TYPE true) - configure_file(vector_template.h.in include/ert/util/${type}_vector.h) configure_file(vector_template.hpp.in include/ert/util/${type}_vector.hpp) configure_file(util/vector_template.cpp.in ${type}_vector.cpp) list(APPEND opt_srcs ${CMAKE_CURRENT_BINARY_DIR}/${type}_vector.cpp) @@ -34,7 +33,6 @@ endforeach() foreach(type bool size_t) set(TYPE ${type}) set(SIGNED_TYPE false) - configure_file(vector_template.h.in include/ert/util/${type}_vector.h) configure_file(vector_template.hpp.in include/ert/util/${type}_vector.hpp) configure_file(util/vector_template.cpp.in ${type}_vector.cpp) list(APPEND opt_srcs ${CMAKE_CURRENT_BINARY_DIR}/${type}_vector.cpp) @@ -44,8 +42,6 @@ if(ZLIB_FOUND) list(APPEND opt_srcs util/util_zlib.cpp) endif() -configure_file(build_config.h.in include/ert/util/build_config.h) -configure_file(ert_api_config.h.in include/ert/util/ert_api_config.h) configure_file(build_config.hpp.in include/ert/util/build_config.hpp) configure_file(ert_api_config.hpp.in include/ert/util/ert_api_config.hpp) diff --git a/lib/build_config.h.in b/lib/build_config.h.in deleted file mode 100644 index ef808d7405..0000000000 --- a/lib/build_config.h.in +++ /dev/null @@ -1,50 +0,0 @@ -#cmakedefine HAVE_GMTIME_R -#cmakedefine HAVE_TIMEGM -#cmakedefine HAVE_LOCALTIME_R -#cmakedefine HAVE_REALPATH -#cmakedefine HAVE__USLEEP -#cmakedefine HAVE_FNMATCH -#cmakedefine HAVE_FTRUNCATE -#cmakedefine HAVE_POSIX_CHDIR -#cmakedefine HAVE_WINDOWS_CHDIR -#cmakedefine HAVE_POSIX_GETCWD -#cmakedefine HAVE_WINDOWS_GETCWD -#cmakedefine HAVE_TZNAME -#cmakedefine HAVE_ROUND -#cmakedefine HAVE_VA_COPY -#cmakedefine HAVE_SIGBUS -#cmakedefine HAVE_PTHREAD -#cmakedefine HAVE_PID_T -#cmakedefine HAVE_EXECINFO -#cmakedefine HAVE_FORK -#cmakedefine HAVE_POSIX_MKDIR -#cmakedefine HAVE_WINDOWS_MKDIR -#cmakedefine HAVE_GETPWUID -#cmakedefine HAVE_FSYNC -#cmakedefine HAVE_CHMOD -#cmakedefine HAVE_MODE_T -#cmakedefine HAVE_CXX_SHARED_PTR -#cmakedefine HAVE_POSIX_UNLINK -#cmakedefine HAVE_WINDOWS_UNLINK -#cmakedefine HAVE_SIGHANDLER_T - -#cmakedefine HAVE_POSIX_ACCESS -#cmakedefine HAVE_WINDOWS__ACCESS -#cmakedefine HAVE_WINDOWS_GET_TEMP_PATH -#cmakedefine HAVE_WINDOWS_TZNAME - -#ifdef HAVE_VA_COPY -#define UTIL_VA_COPY(target,src) va_copy(target,src) -#else -#define UTIL_VA_COPY(target,src) target = src -#endif - -#ifdef HAVE_FORK -#ifdef HAVE_PTHREAD -#ifdef HAVE_EXECINFO -#ifdef HAVE_GETPWUID - -#endif -#endif -#endif -#endif diff --git a/lib/build_config.hpp.in b/lib/build_config.hpp.in index 3c81293d5b..ef808d7405 100644 --- a/lib/build_config.hpp.in +++ b/lib/build_config.hpp.in @@ -1 +1,50 @@ -#include +#cmakedefine HAVE_GMTIME_R +#cmakedefine HAVE_TIMEGM +#cmakedefine HAVE_LOCALTIME_R +#cmakedefine HAVE_REALPATH +#cmakedefine HAVE__USLEEP +#cmakedefine HAVE_FNMATCH +#cmakedefine HAVE_FTRUNCATE +#cmakedefine HAVE_POSIX_CHDIR +#cmakedefine HAVE_WINDOWS_CHDIR +#cmakedefine HAVE_POSIX_GETCWD +#cmakedefine HAVE_WINDOWS_GETCWD +#cmakedefine HAVE_TZNAME +#cmakedefine HAVE_ROUND +#cmakedefine HAVE_VA_COPY +#cmakedefine HAVE_SIGBUS +#cmakedefine HAVE_PTHREAD +#cmakedefine HAVE_PID_T +#cmakedefine HAVE_EXECINFO +#cmakedefine HAVE_FORK +#cmakedefine HAVE_POSIX_MKDIR +#cmakedefine HAVE_WINDOWS_MKDIR +#cmakedefine HAVE_GETPWUID +#cmakedefine HAVE_FSYNC +#cmakedefine HAVE_CHMOD +#cmakedefine HAVE_MODE_T +#cmakedefine HAVE_CXX_SHARED_PTR +#cmakedefine HAVE_POSIX_UNLINK +#cmakedefine HAVE_WINDOWS_UNLINK +#cmakedefine HAVE_SIGHANDLER_T + +#cmakedefine HAVE_POSIX_ACCESS +#cmakedefine HAVE_WINDOWS__ACCESS +#cmakedefine HAVE_WINDOWS_GET_TEMP_PATH +#cmakedefine HAVE_WINDOWS_TZNAME + +#ifdef HAVE_VA_COPY +#define UTIL_VA_COPY(target,src) va_copy(target,src) +#else +#define UTIL_VA_COPY(target,src) target = src +#endif + +#ifdef HAVE_FORK +#ifdef HAVE_PTHREAD +#ifdef HAVE_EXECINFO +#ifdef HAVE_GETPWUID + +#endif +#endif +#endif +#endif diff --git a/lib/ert_api_config.h.in b/lib/ert_api_config.h.in deleted file mode 100644 index ea8bb79b25..0000000000 --- a/lib/ert_api_config.h.in +++ /dev/null @@ -1,17 +0,0 @@ -#cmakedefine ERT_HAVE_ZLIB -#cmakedefine ERT_HAVE_ISFINITE -#cmakedefine ERT_HAVE_GETOPT -#cmakedefine ERT_HAVE_UNISTD -#cmakedefine ERT_HAVE_SPAWN -#cmakedefine ERT_HAVE_OPENDIR -#cmakedefine ERT_HAVE_SYMLINK -#cmakedefine ERT_HAVE_READLINKAT -#cmakedefine ERT_HAVE_READLINKAT_DECLARATION -#cmakedefine ERT_HAVE_GLOB -#cmakedefine ERT_HAVE_GETUID -#cmakedefine ERT_HAVE_REGEXP -#cmakedefine ERT_HAVE_LOCKF -#cmakedefine ERT_TIME_T_64BIT_ACCEPT_PRE1970 -#cmakedefine ERT_WINDOWS_LFS -#cmakedefine ERT_HAVE_PING -#cmakedefine PING_CMD "@PING_PATH@" \ No newline at end of file diff --git a/lib/ert_api_config.hpp.in b/lib/ert_api_config.hpp.in index 78411e4360..ea8bb79b25 100644 --- a/lib/ert_api_config.hpp.in +++ b/lib/ert_api_config.hpp.in @@ -1 +1,17 @@ -#include +#cmakedefine ERT_HAVE_ZLIB +#cmakedefine ERT_HAVE_ISFINITE +#cmakedefine ERT_HAVE_GETOPT +#cmakedefine ERT_HAVE_UNISTD +#cmakedefine ERT_HAVE_SPAWN +#cmakedefine ERT_HAVE_OPENDIR +#cmakedefine ERT_HAVE_SYMLINK +#cmakedefine ERT_HAVE_READLINKAT +#cmakedefine ERT_HAVE_READLINKAT_DECLARATION +#cmakedefine ERT_HAVE_GLOB +#cmakedefine ERT_HAVE_GETUID +#cmakedefine ERT_HAVE_REGEXP +#cmakedefine ERT_HAVE_LOCKF +#cmakedefine ERT_TIME_T_64BIT_ACCEPT_PRE1970 +#cmakedefine ERT_WINDOWS_LFS +#cmakedefine ERT_HAVE_PING +#cmakedefine PING_CMD "@PING_PATH@" \ No newline at end of file diff --git a/lib/geometry/geo_pointset.cpp b/lib/geometry/geo_pointset.cpp index 8d38623262..f89dae42b2 100644 --- a/lib/geometry/geo_pointset.cpp +++ b/lib/geometry/geo_pointset.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lib/geometry/geo_polygon.cpp b/lib/geometry/geo_polygon.cpp index b2b474d2a0..d53b7c38c6 100644 --- a/lib/geometry/geo_polygon.cpp +++ b/lib/geometry/geo_polygon.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/geometry/geo_polygon_collection.cpp b/lib/geometry/geo_polygon_collection.cpp index f6a122003e..0eff09d3eb 100644 --- a/lib/geometry/geo_polygon_collection.cpp +++ b/lib/geometry/geo_polygon_collection.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/geometry/geo_region.cpp b/lib/geometry/geo_region.cpp index 2ff78b92b8..28ad78e2cd 100644 --- a/lib/geometry/geo_region.cpp +++ b/lib/geometry/geo_region.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/geometry/geo_surface.cpp b/lib/geometry/geo_surface.cpp index 5c39a467ec..d46900c253 100644 --- a/lib/geometry/geo_surface.cpp +++ b/lib/geometry/geo_surface.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/geometry/geo_util.cpp b/lib/geometry/geo_util.cpp index c6031f3420..6ce9d68abe 100644 --- a/lib/geometry/geo_util.cpp +++ b/lib/geometry/geo_util.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include diff --git a/lib/geometry/tests/geo_polygon.cpp b/lib/geometry/tests/geo_polygon.cpp index 23c408bed2..c5eadc3f5a 100644 --- a/lib/geometry/tests/geo_polygon.cpp +++ b/lib/geometry/tests/geo_polygon.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/geometry/tests/geo_polygon_collection.cpp b/lib/geometry/tests/geo_polygon_collection.cpp index 4a7979f14b..6e3e417726 100644 --- a/lib/geometry/tests/geo_polygon_collection.cpp +++ b/lib/geometry/tests/geo_polygon_collection.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/geometry/tests/geo_surface.cpp b/lib/geometry/tests/geo_surface.cpp index 5f8a528d06..c9f06f0a43 100644 --- a/lib/geometry/tests/geo_surface.cpp +++ b/lib/geometry/tests/geo_surface.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/geometry/tests/geo_util_xlines.cpp b/lib/geometry/tests/geo_util_xlines.cpp index a21850e653..ec2ec2ccda 100644 --- a/lib/geometry/tests/geo_util_xlines.cpp +++ b/lib/geometry/tests/geo_util_xlines.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include diff --git a/lib/include/ert/geometry/geo_pointset.h b/lib/include/ert/geometry/geo_pointset.h deleted file mode 100644 index 8589cf317c..0000000000 --- a/lib/include/ert/geometry/geo_pointset.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/geometry/geo_polygon.h b/lib/include/ert/geometry/geo_polygon.h deleted file mode 100644 index 3762193b45..0000000000 --- a/lib/include/ert/geometry/geo_polygon.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/geometry/geo_polygon_collection.h b/lib/include/ert/geometry/geo_polygon_collection.h deleted file mode 100644 index 618058edc3..0000000000 --- a/lib/include/ert/geometry/geo_polygon_collection.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/geometry/geo_region.h b/lib/include/ert/geometry/geo_region.h deleted file mode 100644 index 1cb49024bf..0000000000 --- a/lib/include/ert/geometry/geo_region.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/geometry/geo_region.hpp b/lib/include/ert/geometry/geo_region.hpp index ef6772eca7..fbecb0ccb5 100644 --- a/lib/include/ert/geometry/geo_region.hpp +++ b/lib/include/ert/geometry/geo_region.hpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include diff --git a/lib/include/ert/geometry/geo_surface.h b/lib/include/ert/geometry/geo_surface.h deleted file mode 100644 index 1753232897..0000000000 --- a/lib/include/ert/geometry/geo_surface.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/geometry/geo_util.h b/lib/include/ert/geometry/geo_util.h deleted file mode 100644 index 0f67a7b312..0000000000 --- a/lib/include/ert/geometry/geo_util.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/buffer_string.h b/lib/include/ert/util/buffer_string.h deleted file mode 100644 index 911dfcc545..0000000000 --- a/lib/include/ert/util/buffer_string.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - These functions are very deprecated and should not be used further. -*/ - -const char *buffer_fread_string(buffer_type *buffer); -char *buffer_fread_alloc_string(buffer_type *buffer); -void buffer_fwrite_string(buffer_type *buffer, const char *string); diff --git a/lib/include/ert/util/hash.h b/lib/include/ert/util/hash.h deleted file mode 100644 index 283b6f7e09..0000000000 --- a/lib/include/ert/util/hash.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/hash_node.h b/lib/include/ert/util/hash_node.h deleted file mode 100644 index 0fc9549f56..0000000000 --- a/lib/include/ert/util/hash_node.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/hash_sll.h b/lib/include/ert/util/hash_sll.h deleted file mode 100644 index 796a324206..0000000000 --- a/lib/include/ert/util/hash_sll.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/lookup_table.h b/lib/include/ert/util/lookup_table.h deleted file mode 100644 index 2097639e4a..0000000000 --- a/lib/include/ert/util/lookup_table.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/mzran.h b/lib/include/ert/util/mzran.h deleted file mode 100644 index 1ca0fc83a0..0000000000 --- a/lib/include/ert/util/mzran.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/node_ctype.h b/lib/include/ert/util/node_ctype.h deleted file mode 100644 index 70314cac3f..0000000000 --- a/lib/include/ert/util/node_ctype.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/node_data.h b/lib/include/ert/util/node_data.h deleted file mode 100644 index ff1af191e2..0000000000 --- a/lib/include/ert/util/node_data.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/parser.h b/lib/include/ert/util/parser.h deleted file mode 100644 index 8ccfb696d7..0000000000 --- a/lib/include/ert/util/parser.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/path_stack.h b/lib/include/ert/util/path_stack.h deleted file mode 100644 index da2e46bc12..0000000000 --- a/lib/include/ert/util/path_stack.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/perm_vector.h b/lib/include/ert/util/perm_vector.h deleted file mode 100644 index f7a4ca2d14..0000000000 --- a/lib/include/ert/util/perm_vector.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/rd_version.h b/lib/include/ert/util/rd_version.h deleted file mode 100644 index 29496a4d34..0000000000 --- a/lib/include/ert/util/rd_version.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/rng.h b/lib/include/ert/util/rng.h deleted file mode 100644 index e0d559cac3..0000000000 --- a/lib/include/ert/util/rng.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/statistics.h b/lib/include/ert/util/statistics.h deleted file mode 100644 index 49c0f5d458..0000000000 --- a/lib/include/ert/util/statistics.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/string_util.h b/lib/include/ert/util/string_util.h deleted file mode 100644 index 6798b64a3a..0000000000 --- a/lib/include/ert/util/string_util.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/stringlist.h b/lib/include/ert/util/stringlist.h deleted file mode 100644 index f9a1609fb4..0000000000 --- a/lib/include/ert/util/stringlist.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/test_util.h b/lib/include/ert/util/test_util.h deleted file mode 100644 index 8045a747f4..0000000000 --- a/lib/include/ert/util/test_util.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/test_work_area.h b/lib/include/ert/util/test_work_area.h deleted file mode 100644 index b4b67e0aab..0000000000 --- a/lib/include/ert/util/test_work_area.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/thread_pool1.h b/lib/include/ert/util/thread_pool1.h deleted file mode 100644 index 4d740cc621..0000000000 --- a/lib/include/ert/util/thread_pool1.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - Copyright (C) 2011 Equinor ASA, Norway. - - The file 'thread_pool1.h' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#ifndef ERT_THREAD_POOL_H -#define ERT_THREAD_POOL_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct thread_pool_struct thread_pool_type; - -void thread_pool_join(thread_pool_type *); -thread_pool_type *thread_pool_alloc(int); -void thread_pool_add_job(thread_pool_type *, void *(*)(void *), void *); -void thread_pool_free(thread_pool_type *); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/lib/include/ert/util/type_macros.h b/lib/include/ert/util/type_macros.h deleted file mode 100644 index 92ba3b82ba..0000000000 --- a/lib/include/ert/util/type_macros.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/type_macros.hpp b/lib/include/ert/util/type_macros.hpp index 9ba30000b9..48b5d84a7e 100644 --- a/lib/include/ert/util/type_macros.hpp +++ b/lib/include/ert/util/type_macros.hpp @@ -5,7 +5,7 @@ extern "C" { #endif -#include +#include /** diff --git a/lib/include/ert/util/type_vector_functions.h b/lib/include/ert/util/type_vector_functions.h deleted file mode 100644 index f93cb1693c..0000000000 --- a/lib/include/ert/util/type_vector_functions.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/ert/util/util.h b/lib/include/ert/util/util.h deleted file mode 100644 index 52b1032464..0000000000 --- a/lib/include/ert/util/util.h +++ /dev/null @@ -1,454 +0,0 @@ -/* - Copyright (C) 2011 Equinor ASA, Norway. - - The file 'util.h' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#ifndef ERT_UTIL_H -#define ERT_UTIL_H - -#include -#include -#include -#include -#include -#include - -#include - -#ifdef ERT_HAVE_GETUID -#include -#endif - -#ifdef ERT_WINDOWS -#define UTIL_PATH_SEP_STRING \ - "\\" /* A \0 terminated separator used when we want a (char *) instance. */ -#define UTIL_PATH_SEP_CHAR \ - '\\' /* A simple character used when we want an actual char instance (i.e. not a pointer). */ -#else -#define UTIL_PATH_SEP_STRING \ - "/" /* A \0 terminated separator used when we want a (char *) instance. */ -#define UTIL_PATH_SEP_CHAR \ - '/' /* A simple character used when we want an actual char instance (i.e. not a pointer). */ -#endif - -#define UTIL_WINDOWS_PATH_SEP_CHAR '\\' -#define UTIL_POSIX_PATH_SEP_CHAR '/' - -#define UTIL_NEWLINE_STRING " \n" -#define UTIL_DEFAULT_MKDIR_MODE \ - 0777 /* Directories are by default created with mode a+rwx - and then comes the umask ... */ - -#ifdef __cplusplus -extern "C" { -#endif - -/* - These ifdefs are an attempt to support large files (> 2GB) - transparently on both Windows and Linux. See source file - libert_util/src/util_lfs.c for more details. - - During the configure step CMAKE should check the size of (void *) - and set the ERT_WINDOWS_LFS variable to true if a 64 bit platform is - detected. -*/ - -#ifdef ERT_WINDOWS_LFS -typedef struct _stat64 stat_type; -typedef __int64 offset_type; -#else -typedef struct stat stat_type; -#ifdef HAVE_FSEEKO -typedef off_t offset_type; -#else -typedef long offset_type; -#endif -#endif - -typedef void(walk_file_callback_ftype)( - const char *, /* The current directory */ - const char *, /* The current file / directory */ - void *); /* Arbitrary argument */ - -typedef bool(walk_dir_callback_ftype)( - const char *, /* The current directory */ - const char *, /* The current file / directory */ - int, /* The current depth in the file hiearcrcy. */ - void *); /* Arbitrary argument */ - -char *util_get_timezone(void); -time_t util_make_datetime_utc(int, int, int, int, int, int); -bool util_make_datetime_utc_validated(int sec, int min, int hour, int mday, - int month, int year, time_t *t); -time_t util_make_date_utc(int, int, int); -time_t util_make_pure_date_utc(time_t t); -void util_inplace_forward_seconds_utc(time_t *t, double seconds); -void util_inplace_forward_days_utc(time_t *t, double days); - -time_t util_file_mtime(const char *file); -double util_difftime(time_t, time_t, int *, int *, int *, int *); -double util_difftime_days(time_t, time_t); -double util_difftime_seconds(time_t start_time, time_t end_time); -bool util_after(time_t t, time_t limit); -bool util_before(time_t t, time_t limit); -bool util_file_newer(const char *file, time_t t0); -bool util_file_older(const char *file, time_t t0); - -char *util_alloc_date_string_utc(time_t t); -char *util_alloc_date_stamp_utc(void); - -double util_pow10(double x); -bool util_char_in(char c, int, const char *); -char *util_alloc_sprintf_va(const char *fmt, va_list ap); -char *util_alloc_sprintf(const char *, ...); -char *util_realloc_sprintf(char *, const char *, ...); -bool util_fscanf_date_utc(FILE *, time_t *); -bool util_sscanf_date_utc(const char *, time_t *); -bool util_sscanf_isodate(const char *, time_t *); -bool util_sscanf_percent(const char *string, double *value); -bool util_is_executable(const char *); -bool util_entry_exists(const char *entry); -bool util_file_exists(const char *); -bool util_is_abs_path(const char *); -char *util_alloc_abs_path(const char *path); -char *util_alloc_rel_path(const char *__root_path, const char *path); -bool util_fmt_bit8(const char *); -bool util_fmt_bit8_stream(FILE *); -char *util_strstr_int_format(const char *string); -int util_int_format_count(const char *string); -bool util_mkdir_p(const char *path); -void util_make_path(const char *); -char *util_newest_file(const char *, const char *); -double util_file_difftime(const char *, const char *); -bool util_file_update_required(const char *, const char *); -size_t util_file_size(const char *); -size_t util_fd_size(int fd); -void util_clear_directory(const char *path, bool strict_uid, bool unlink_root); -void util_unlink_existing(const char *filename); -void util_strupr(char *); -bool util_string_equal(const char *s1, const char *s2); -char *util_alloc_strupr_copy(const char *); -void util_string_tr(char *, char, char); -bool util_copy_stream(FILE *, FILE *, size_t, void *, bool abort_on_error); -void util_move_file(const char *src_file, const char *target_file); -void util_move_file4(const char *src_name, const char *target_name, - const char *src_path, const char *target_path); -bool util_copy_file(const char *, const char *); -bool util_copy_file__(const char *src_file, const char *target_file, - size_t buffer_size, void *buffer, bool abort_on_error); -char *util_alloc_cwd(void); -bool util_is_cwd(const char *path); -char *util_alloc_normal_path(const char *input_path); -char *util_alloc_realpath(const char *); -char *util_alloc_realpath__(const char *input_path); -bool util_string_match(const char *string, const char *pattern); -bool util_string_has_wildcard(const char *s); -bool util_file_readable(const char *file); -bool util_entry_readable(const char *entry); -bool util_entry_writable(const char *entry); -bool util_ftruncate(FILE *stream, long size); - -void util_usleep(unsigned long micro_seconds); - -int util_roundf(float x); -int util_round(double x); - -offset_type util_ftell(FILE *stream); -int util_fseek(FILE *stream, offset_type offset, int whence); -void util_rewind(FILE *stream); -int util_stat(const char *filename, stat_type *stat_info); -int util_fstat(int fileno, stat_type *stat_info); - -#ifdef ERT_HAVE_OPENDIR -void util_copy_directory_content(const char *src_path, const char *target_path); -void util_copy_directory(const char *, const char *); -void util_walk_directory(const char *root_path, - walk_file_callback_ftype *file_callback, - void *file_callback_arg, - walk_dir_callback_ftype *dir_callback, - void *dir_callback_arg); -#endif - -#ifdef ERT_HAVE_GETUID -uid_t util_get_entry_uid(const char *file); -mode_t util_getmode(const char *filename); -bool util_addmode_if_owner(const char *filename, mode_t add_mode); -bool util_delmode_if_owner(const char *filename, mode_t del_mode); -bool util_chmod_if_owner(const char *filename, mode_t new_mode); -#endif - -int util_forward_line(FILE *, bool *); -void util_rewind_line(FILE *); - -int util_count_content_file_lines(FILE *); -FILE *util_mkdir_fopen(const char *filename, const char *mode); -int util_fmove(FILE *stream, long offset, long shift); -FILE *util_fopen(const char *, const char *); -FILE *util_fopen__(const char *filename, const char *mode); -bool util_fopen_test(const char *, const char *); -char *util_split_alloc_dirname(const char *input_path); -char *util_split_alloc_filename(const char *input_path); -void util_alloc_file_components(const char *, char **, char **, char **); -//char * util_realloc_full_path(char * , const char *, const char *); -char *util_alloc_tmp_file(const char *, const char *, bool); -char *util_fscanf_alloc_line(FILE *, bool *); -char *util_fscanf_alloc_token(FILE *); -void util_fskip_token(FILE *); -void util_fskip_space(FILE *, bool *); -void util_fskip_chars(FILE *, const char *, bool *); -void util_fskip_cchars(FILE *, const char *, bool *); -bool util_fscanf_int(FILE *, int *); -bool util_fscanf_bool(FILE *stream, bool *value); -bool util_sscanf_bool(const char *, bool *); -bool util_sscanf_octal_int(const char *buffer, int *value); -int util_strcmp_int(const char *s1, const char *s2); -int util_strcmp_float(const char *s1, const char *s2); -bool util_sscanf_int(const char *, int *); -const char *util_parse_int(const char *, int *, bool *); -const char *util_skip_sep(const char *, const char *, bool *); -bool util_sscanf_double(const char *, double *); -//char * util_alloc_full_path(const char *, const char *); -char *util_alloc_filename(const char *, const char *, const char *); -char *util_realloc_filename(char *, const char *, const char *, const char *); -char *util_alloc_strip_copy(const char *); -char *util_alloc_string_sum(const char **, int); -char *util_strcat_realloc(char *, const char *); -char *util_alloc_string_copy(const char *); -char **util_stringlist_append_copy(char **, int, const char *); -char **util_stringlist_append_ref(char **, int, const char *); -char **util_alloc_stringlist_copy(char const *const *, int); -void util_split_string(const char *, const char *, int *, char ***); -void util_path_split(const char *, int *, char ***); -char *util_alloc_parent_path(const char *path); -void util_binary_split_string(const char *, const char *, bool, char **, - char **); -void util_binary_split_string_from_max_length(const char *, const char *, int, - char **, char **); -char *util_alloc_joined_string(const char **, int, const char *); -char *util_alloc_multiline_string(const char **, int); -char *util_string_replace_alloc(const char *, const char *, const char *); -char *util_string_replacen_alloc(const char *, int, const char **, - const char **); -int util_string_replace_inplace(char **, const char *, const char *); -char *util_string_strip_chars_alloc(const char *, const char *); -char *util_realloc_string_copy(char *, const char *); -char *util_realloc_substring_copy(char *, const char *, int N); -char *util_realloc_dequoted_string(char *); -char *util_alloc_dequoted_copy(const char *s); -void util_free_stringlist(char **, int); -void util_free_NULL_terminated_stringlist(char **string_list); -char *util_alloc_substring_copy(const char *, int offset, int N); -bool util_is_directory(const char *); -bool util_is_file(const char *); - -void util_set_datetime_values_utc(time_t, int *, int *, int *, int *, int *, - int *); -void util_set_date_values_utc(time_t, int *, int *, int *); - -bool util_is_first_day_in_month_utc(time_t t); - -unsigned int util_dev_urandom_seed(); -unsigned int util_clock_seed(void); -void util_fread_dev_random(int, char *); -void util_fread_dev_urandom(int, char *); -bool util_string_isspace(const char *s); - -char *util_alloc_dump_filename(void); -void util_abort_test_set_intercept_function(const char *); -bool util_addr2line_lookup(const void *, char **, char **, int *); -void util_exit(const char *fmt, ...); -void util_install_signals(void); -void util_update_signals(void); - -void *util_realloc(void *, size_t); -void *util_malloc(size_t); -void *util_calloc(size_t elements, size_t element_size); -void *util_realloc_copy(void *org_ptr, const void *src, size_t byte_size); -void *util_alloc_copy(const void *, size_t); -void util_double_to_float(float *, const double *, int); -void util_float_to_double(double *, const float *, int); - -int util_get_month_nr(const char *); - -char *util_fread_alloc_file_content(const char *, int *); -void util_fwrite_string(const char *, FILE *); -char *util_fread_realloc_string(char *, FILE *); -char *util_fread_alloc_string(FILE *); -void util_fskip_string(FILE *stream); -void util_endian_flip_vector(void *data, int element_size, int elements); - -void util_clamp_double(double *value, double limit1, double limit2); -double util_double_vector_mean(int, const double *); -double util_double_vector_stddev(int, const double *); -void util_double_vector_max_min(int, const double *, double *, double *); -void util_update_double_max_min(double, double *, double *); -void util_update_float_max_min(float, float *, float *); -void util_update_int_max_min(int, int *, int *); -float util_float_max(float, float); -long int util_long_max(long int a, long int b); -int util_int_max(int, int); -double util_double_max(double, double); -float util_float_min(float, float); -int util_int_min(int, int); -size_t util_size_t_min(size_t a, size_t b); -size_t util_size_t_max(size_t a, size_t b); -time_t util_time_t_min(time_t a, time_t b); -time_t util_time_t_max(time_t a, time_t b); -double util_double_min(double, double); -void util_fskip_lines(FILE *, int); -bool util_same_file(const char *, const char *); -void util_fread(void *, size_t, size_t, FILE *, const char *); -void util_fwrite(const void *, size_t, size_t, FILE *, const char *); -time_t util_fread_time_t(FILE *stream); -int util_fread_int(FILE *); -long util_fread_long(FILE *); -bool util_fread_bool(FILE *); -double util_fread_double(FILE *stream); -void util_fwrite_offset(offset_type, FILE *); -void util_fwrite_size_t(size_t, FILE *); -void util_fwrite_int(int, FILE *); -void util_fwrite_long(long, FILE *); -void util_fwrite_bool(bool, FILE *); -void util_fwrite_time_t(time_t, FILE *); -void util_fwrite_double(double, FILE *); -void util_fwrite_int_vector(const int *, int, FILE *, const char *); -void util_fwrite_double_vector(const double *, int, FILE *, const char *); -void util_fread_char_vector(char *, int, FILE *, const char *); -int util_type_get_id(const void *data); - -bool util_sscanf_bytesize(const char *, size_t *); -int util_get_current_linenr(FILE *stream); - -void util_fskip_int(FILE *stream); -void util_fskip_long(FILE *stream); -void util_fskip_bool(FILE *stream); -bool util_fseek_string(FILE *stream, const char *string, bool skip_string, - bool case_sensitive); -char *util_fscanf_alloc_upto(FILE *stream, const char *stop_string, - bool include_stop_string); -bool util_files_equal(const char *file1, const char *file2); -double util_kahan_sum(const double *data, size_t N); -bool util_double_approx_equal(double d1, double d2); -bool util_double_approx_equal__(double d1, double d2, double rel_eps, - double abs_eps); -bool util_float_approx_equal__(float d1, float d2, float rel_eps, - float abs_eps); -int util_fnmatch(const char *pattern, const char *string); -void util_time_utc(time_t *t, struct tm *ts); - -bool util_is_link(const char *); // Will always return false on windows -int util_chdir(const char *path); -bool util_chdir_file(const char *filename); - -#ifdef ERT_HAVE_UNISTD -#include -bool util_access(const char *entry, mode_t mode); -#else -bool util_access(const char *entry, int mode); -#define F_OK 0 -#define R_OK 4 -#define W_OK 2 -#define X_OK 1 -#endif - -#define UTIL_FWRITE_SCALAR(s, stream) \ - { \ - if (fwrite(&s, sizeof s, 1, stream) != 1) \ - util_abort("%s: write failed: %s\n", __func__, strerror(errno)); \ - } - -#define UTIL_FREAD_SCALAR(s, stream) \ - { \ - int fread_return = fread(&s, sizeof s, 1, stream); \ - if (fread_return == 0) { \ - if (errno == 0) \ - util_abort("%s: read failed - premature EOF\n", __func__); \ - \ - util_abort("%s: read failed: %s\n", __func__, strerror(errno)); \ - } \ - } - -#define UTIL_FWRITE_VECTOR(s, n, stream) \ - { \ - if (fwrite(s, sizeof s, (n), stream) != (n)) \ - util_abort("%s: write failed: %s \n", __func__, strerror(errno)); \ - } -#define UTIL_FREAD_VECTOR(s, n, stream) \ - { \ - if (fread(s, sizeof s, (n), stream) != (n)) \ - util_abort("%s: read failed: %s \n", __func__, strerror(errno)); \ - } - -#define CONTAINS_HEADER(TYPE) \ - int util_sorted_contains_##TYPE(const TYPE *data, int size, TYPE value) -CONTAINS_HEADER(int); -CONTAINS_HEADER(time_t); -CONTAINS_HEADER(size_t); -#undef CONTAINS_HEADER - -typedef void util_abort_handler_t(const char *filename, int lineno, - const char *function, const char *message, - const char *backtrace); -void util_set_abort_handler(util_abort_handler_t *); - -#ifdef _MSC_VER -#define util_abort(fmt, ...) \ - util_abort__(__FILE__, __func__, __LINE__, fmt, __VA_ARGS__) -#elif __GNUC__ -/* Also clang defines the __GNUC__ symbol */ -#define util_abort(fmt, ...) \ - util_abort__(__FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__) -#endif - -/* Conditional section below here */ - -void util_abort__(const char *file, const char *function, int line, - const char *fmt, ...); -void util_abort_signal(int); - -#ifdef ERT_HAVE_ZLIB -void util_compress_buffer(const void *, int, void *, unsigned long *); -int util_fread_sizeof_compressed(FILE *stream); -void util_fread_compressed(void *, FILE *); -void *util_fread_alloc_compressed(FILE *); -void util_fwrite_compressed(const void *, int, FILE *); -#endif - -#ifdef ERT_HAVE_SYMLINK -void util_make_slink(const char *, const char *); -char *util_alloc_link_target(const char *link); -#ifdef ERT_HAVE_READLINKAT -char *util_alloc_atlink_target(const char *path, const char *link); -#endif -#endif - -#ifdef ERT_HAVE_SPAWN -pid_t util_spawn(const char *executable, int argc, const char **argv, - const char *stdout_file, const char *stderr_file); -int util_spawn_blocking(const char *executable, int argc, const char **argv, - const char *stdout_file, const char *stderr_file); -#endif - -#ifdef ERT_HAVE_LOCKF -FILE *util_fopen_lockf(const char *, const char *); -bool util_try_lockf(const char *, mode_t, int *); -#endif - -#include "util_unlink.h" - -#ifdef __cplusplus -} -#endif -#endif diff --git a/lib/include/ert/util/util.hpp b/lib/include/ert/util/util.hpp index 7fba105cb7..04b6905ced 100644 --- a/lib/include/ert/util/util.hpp +++ b/lib/include/ert/util/util.hpp @@ -1,6 +1,454 @@ -#ifndef UTIL_CXX -#define UTIL_CXX +#ifndef ERT_UTIL_H +#define ERT_UTIL_H -#include +/* + Copyright (C) 2011 Equinor ASA, Norway. + The file 'util.hpp' is part of ERT - Ensemble based Reservoir Tool. + + ERT is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ERT is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. + + See the GNU General Public License at + for more details. +*/ + +#include +#include +#include +#include +#include +#include + +#include + +#ifdef ERT_HAVE_GETUID +#include +#endif + +#ifdef ERT_WINDOWS +#define UTIL_PATH_SEP_STRING \ + "\\" /* A \0 terminated separator used when we want a (char *) instance. */ +#define UTIL_PATH_SEP_CHAR \ + '\\' /* A simple character used when we want an actual char instance (i.e. not a pointer). */ +#else +#define UTIL_PATH_SEP_STRING \ + "/" /* A \0 terminated separator used when we want a (char *) instance. */ +#define UTIL_PATH_SEP_CHAR \ + '/' /* A simple character used when we want an actual char instance (i.e. not a pointer). */ +#endif + +#define UTIL_WINDOWS_PATH_SEP_CHAR '\\' +#define UTIL_POSIX_PATH_SEP_CHAR '/' + +#define UTIL_NEWLINE_STRING " \n" +#define UTIL_DEFAULT_MKDIR_MODE \ + 0777 /* Directories are by default created with mode a+rwx - and then comes the umask ... */ + +#ifdef __cplusplus +extern "C" { +#endif + +/* + These ifdefs are an attempt to support large files (> 2GB) + transparently on both Windows and Linux. See source file + libert_util/src/util_lfs.c for more details. + + During the configure step CMAKE should check the size of (void *) + and set the ERT_WINDOWS_LFS variable to true if a 64 bit platform is + detected. +*/ + +#ifdef ERT_WINDOWS_LFS +typedef struct _stat64 stat_type; +typedef __int64 offset_type; +#else +typedef struct stat stat_type; +#ifdef HAVE_FSEEKO +typedef off_t offset_type; +#else +typedef long offset_type; +#endif +#endif + +typedef void(walk_file_callback_ftype)( + const char *, /* The current directory */ + const char *, /* The current file / directory */ + void *); /* Arbitrary argument */ + +typedef bool(walk_dir_callback_ftype)( + const char *, /* The current directory */ + const char *, /* The current file / directory */ + int, /* The current depth in the file hiearcrcy. */ + void *); /* Arbitrary argument */ + +char *util_get_timezone(void); +time_t util_make_datetime_utc(int, int, int, int, int, int); +bool util_make_datetime_utc_validated(int sec, int min, int hour, int mday, + int month, int year, time_t *t); +time_t util_make_date_utc(int, int, int); +time_t util_make_pure_date_utc(time_t t); +void util_inplace_forward_seconds_utc(time_t *t, double seconds); +void util_inplace_forward_days_utc(time_t *t, double days); + +time_t util_file_mtime(const char *file); +double util_difftime(time_t, time_t, int *, int *, int *, int *); +double util_difftime_days(time_t, time_t); +double util_difftime_seconds(time_t start_time, time_t end_time); +bool util_after(time_t t, time_t limit); +bool util_before(time_t t, time_t limit); +bool util_file_newer(const char *file, time_t t0); +bool util_file_older(const char *file, time_t t0); + +char *util_alloc_date_string_utc(time_t t); +char *util_alloc_date_stamp_utc(void); + +double util_pow10(double x); +bool util_char_in(char c, int, const char *); +char *util_alloc_sprintf_va(const char *fmt, va_list ap); +char *util_alloc_sprintf(const char *, ...); +char *util_realloc_sprintf(char *, const char *, ...); +bool util_fscanf_date_utc(FILE *, time_t *); +bool util_sscanf_date_utc(const char *, time_t *); +bool util_sscanf_isodate(const char *, time_t *); +bool util_sscanf_percent(const char *string, double *value); +bool util_is_executable(const char *); +bool util_entry_exists(const char *entry); +bool util_file_exists(const char *); +bool util_is_abs_path(const char *); +char *util_alloc_abs_path(const char *path); +char *util_alloc_rel_path(const char *__root_path, const char *path); +bool util_fmt_bit8(const char *); +bool util_fmt_bit8_stream(FILE *); +char *util_strstr_int_format(const char *string); +int util_int_format_count(const char *string); +bool util_mkdir_p(const char *path); +void util_make_path(const char *); +char *util_newest_file(const char *, const char *); +double util_file_difftime(const char *, const char *); +bool util_file_update_required(const char *, const char *); +size_t util_file_size(const char *); +size_t util_fd_size(int fd); +void util_clear_directory(const char *path, bool strict_uid, bool unlink_root); +void util_unlink_existing(const char *filename); +void util_strupr(char *); +bool util_string_equal(const char *s1, const char *s2); +char *util_alloc_strupr_copy(const char *); +void util_string_tr(char *, char, char); +bool util_copy_stream(FILE *, FILE *, size_t, void *, bool abort_on_error); +void util_move_file(const char *src_file, const char *target_file); +void util_move_file4(const char *src_name, const char *target_name, + const char *src_path, const char *target_path); +bool util_copy_file(const char *, const char *); +bool util_copy_file__(const char *src_file, const char *target_file, + size_t buffer_size, void *buffer, bool abort_on_error); +char *util_alloc_cwd(void); +bool util_is_cwd(const char *path); +char *util_alloc_normal_path(const char *input_path); +char *util_alloc_realpath(const char *); +char *util_alloc_realpath__(const char *input_path); +bool util_string_match(const char *string, const char *pattern); +bool util_string_has_wildcard(const char *s); +bool util_file_readable(const char *file); +bool util_entry_readable(const char *entry); +bool util_entry_writable(const char *entry); +bool util_ftruncate(FILE *stream, long size); + +void util_usleep(unsigned long micro_seconds); + +int util_roundf(float x); +int util_round(double x); + +offset_type util_ftell(FILE *stream); +int util_fseek(FILE *stream, offset_type offset, int whence); +void util_rewind(FILE *stream); +int util_stat(const char *filename, stat_type *stat_info); +int util_fstat(int fileno, stat_type *stat_info); + +#ifdef ERT_HAVE_OPENDIR +void util_copy_directory_content(const char *src_path, const char *target_path); +void util_copy_directory(const char *, const char *); +void util_walk_directory(const char *root_path, + walk_file_callback_ftype *file_callback, + void *file_callback_arg, + walk_dir_callback_ftype *dir_callback, + void *dir_callback_arg); +#endif + +#ifdef ERT_HAVE_GETUID +uid_t util_get_entry_uid(const char *file); +mode_t util_getmode(const char *filename); +bool util_addmode_if_owner(const char *filename, mode_t add_mode); +bool util_delmode_if_owner(const char *filename, mode_t del_mode); +bool util_chmod_if_owner(const char *filename, mode_t new_mode); +#endif + +int util_forward_line(FILE *, bool *); +void util_rewind_line(FILE *); + +int util_count_content_file_lines(FILE *); +FILE *util_mkdir_fopen(const char *filename, const char *mode); +int util_fmove(FILE *stream, long offset, long shift); +FILE *util_fopen(const char *, const char *); +FILE *util_fopen__(const char *filename, const char *mode); +bool util_fopen_test(const char *, const char *); +char *util_split_alloc_dirname(const char *input_path); +char *util_split_alloc_filename(const char *input_path); +void util_alloc_file_components(const char *, char **, char **, char **); +//char * util_realloc_full_path(char * , const char *, const char *); +char *util_alloc_tmp_file(const char *, const char *, bool); +char *util_fscanf_alloc_line(FILE *, bool *); +char *util_fscanf_alloc_token(FILE *); +void util_fskip_token(FILE *); +void util_fskip_space(FILE *, bool *); +void util_fskip_chars(FILE *, const char *, bool *); +void util_fskip_cchars(FILE *, const char *, bool *); +bool util_fscanf_int(FILE *, int *); +bool util_fscanf_bool(FILE *stream, bool *value); +bool util_sscanf_bool(const char *, bool *); +bool util_sscanf_octal_int(const char *buffer, int *value); +int util_strcmp_int(const char *s1, const char *s2); +int util_strcmp_float(const char *s1, const char *s2); +bool util_sscanf_int(const char *, int *); +const char *util_parse_int(const char *, int *, bool *); +const char *util_skip_sep(const char *, const char *, bool *); +bool util_sscanf_double(const char *, double *); +//char * util_alloc_full_path(const char *, const char *); +char *util_alloc_filename(const char *, const char *, const char *); +char *util_realloc_filename(char *, const char *, const char *, const char *); +char *util_alloc_strip_copy(const char *); +char *util_alloc_string_sum(const char **, int); +char *util_strcat_realloc(char *, const char *); +char *util_alloc_string_copy(const char *); +char **util_stringlist_append_copy(char **, int, const char *); +char **util_stringlist_append_ref(char **, int, const char *); +char **util_alloc_stringlist_copy(char const *const *, int); +void util_split_string(const char *, const char *, int *, char ***); +void util_path_split(const char *, int *, char ***); +char *util_alloc_parent_path(const char *path); +void util_binary_split_string(const char *, const char *, bool, char **, + char **); +void util_binary_split_string_from_max_length(const char *, const char *, int, + char **, char **); +char *util_alloc_joined_string(const char **, int, const char *); +char *util_alloc_multiline_string(const char **, int); +char *util_string_replace_alloc(const char *, const char *, const char *); +char *util_string_replacen_alloc(const char *, int, const char **, + const char **); +int util_string_replace_inplace(char **, const char *, const char *); +char *util_string_strip_chars_alloc(const char *, const char *); +char *util_realloc_string_copy(char *, const char *); +char *util_realloc_substring_copy(char *, const char *, int N); +char *util_realloc_dequoted_string(char *); +char *util_alloc_dequoted_copy(const char *s); +void util_free_stringlist(char **, int); +void util_free_NULL_terminated_stringlist(char **string_list); +char *util_alloc_substring_copy(const char *, int offset, int N); +bool util_is_directory(const char *); +bool util_is_file(const char *); + +void util_set_datetime_values_utc(time_t, int *, int *, int *, int *, int *, + int *); +void util_set_date_values_utc(time_t, int *, int *, int *); + +bool util_is_first_day_in_month_utc(time_t t); + +unsigned int util_dev_urandom_seed(); +unsigned int util_clock_seed(void); +void util_fread_dev_random(int, char *); +void util_fread_dev_urandom(int, char *); +bool util_string_isspace(const char *s); + +char *util_alloc_dump_filename(void); +void util_abort_test_set_intercept_function(const char *); +bool util_addr2line_lookup(const void *, char **, char **, int *); +void util_exit(const char *fmt, ...); +void util_install_signals(void); +void util_update_signals(void); + +void *util_realloc(void *, size_t); +void *util_malloc(size_t); +void *util_calloc(size_t elements, size_t element_size); +void *util_realloc_copy(void *org_ptr, const void *src, size_t byte_size); +void *util_alloc_copy(const void *, size_t); +void util_double_to_float(float *, const double *, int); +void util_float_to_double(double *, const float *, int); + +int util_get_month_nr(const char *); + +char *util_fread_alloc_file_content(const char *, int *); +void util_fwrite_string(const char *, FILE *); +char *util_fread_realloc_string(char *, FILE *); +char *util_fread_alloc_string(FILE *); +void util_fskip_string(FILE *stream); +void util_endian_flip_vector(void *data, int element_size, int elements); + +void util_clamp_double(double *value, double limit1, double limit2); +double util_double_vector_mean(int, const double *); +double util_double_vector_stddev(int, const double *); +void util_double_vector_max_min(int, const double *, double *, double *); +void util_update_double_max_min(double, double *, double *); +void util_update_float_max_min(float, float *, float *); +void util_update_int_max_min(int, int *, int *); +float util_float_max(float, float); +long int util_long_max(long int a, long int b); +int util_int_max(int, int); +double util_double_max(double, double); +float util_float_min(float, float); +int util_int_min(int, int); +size_t util_size_t_min(size_t a, size_t b); +size_t util_size_t_max(size_t a, size_t b); +time_t util_time_t_min(time_t a, time_t b); +time_t util_time_t_max(time_t a, time_t b); +double util_double_min(double, double); +void util_fskip_lines(FILE *, int); +bool util_same_file(const char *, const char *); +void util_fread(void *, size_t, size_t, FILE *, const char *); +void util_fwrite(const void *, size_t, size_t, FILE *, const char *); +time_t util_fread_time_t(FILE *stream); +int util_fread_int(FILE *); +long util_fread_long(FILE *); +bool util_fread_bool(FILE *); +double util_fread_double(FILE *stream); +void util_fwrite_offset(offset_type, FILE *); +void util_fwrite_size_t(size_t, FILE *); +void util_fwrite_int(int, FILE *); +void util_fwrite_long(long, FILE *); +void util_fwrite_bool(bool, FILE *); +void util_fwrite_time_t(time_t, FILE *); +void util_fwrite_double(double, FILE *); +void util_fwrite_int_vector(const int *, int, FILE *, const char *); +void util_fwrite_double_vector(const double *, int, FILE *, const char *); +void util_fread_char_vector(char *, int, FILE *, const char *); +int util_type_get_id(const void *data); + +bool util_sscanf_bytesize(const char *, size_t *); +int util_get_current_linenr(FILE *stream); + +void util_fskip_int(FILE *stream); +void util_fskip_long(FILE *stream); +void util_fskip_bool(FILE *stream); +bool util_fseek_string(FILE *stream, const char *string, bool skip_string, + bool case_sensitive); +char *util_fscanf_alloc_upto(FILE *stream, const char *stop_string, + bool include_stop_string); +bool util_files_equal(const char *file1, const char *file2); +double util_kahan_sum(const double *data, size_t N); +bool util_double_approx_equal(double d1, double d2); +bool util_double_approx_equal__(double d1, double d2, double rel_eps, + double abs_eps); +bool util_float_approx_equal__(float d1, float d2, float rel_eps, + float abs_eps); +int util_fnmatch(const char *pattern, const char *string); +void util_time_utc(time_t *t, struct tm *ts); + +bool util_is_link(const char *); // Will always return false on windows +int util_chdir(const char *path); +bool util_chdir_file(const char *filename); + +#ifdef ERT_HAVE_UNISTD +#include +bool util_access(const char *entry, mode_t mode); +#else +bool util_access(const char *entry, int mode); +#define F_OK 0 +#define R_OK 4 +#define W_OK 2 +#define X_OK 1 +#endif + +#define UTIL_FWRITE_SCALAR(s, stream) \ + { \ + if (fwrite(&s, sizeof s, 1, stream) != 1) \ + util_abort("%s: write failed: %s\n", __func__, strerror(errno)); \ + } + +#define UTIL_FREAD_SCALAR(s, stream) \ + { \ + int fread_return = fread(&s, sizeof s, 1, stream); \ + if (fread_return == 0) { \ + if (errno == 0) \ + util_abort("%s: read failed - premature EOF\n", __func__); \ + \ + util_abort("%s: read failed: %s\n", __func__, strerror(errno)); \ + } \ + } + +#define UTIL_FWRITE_VECTOR(s, n, stream) \ + { \ + if (fwrite(s, sizeof s, (n), stream) != (n)) \ + util_abort("%s: write failed: %s \n", __func__, strerror(errno)); \ + } +#define UTIL_FREAD_VECTOR(s, n, stream) \ + { \ + if (fread(s, sizeof s, (n), stream) != (n)) \ + util_abort("%s: read failed: %s \n", __func__, strerror(errno)); \ + } + +#define CONTAINS_HEADER(TYPE) \ + int util_sorted_contains_##TYPE(const TYPE *data, int size, TYPE value) +CONTAINS_HEADER(int); +CONTAINS_HEADER(time_t); +CONTAINS_HEADER(size_t); +#undef CONTAINS_HEADER + +typedef void util_abort_handler_t(const char *filename, int lineno, + const char *function, const char *message, + const char *backtrace); +void util_set_abort_handler(util_abort_handler_t *); + +#ifdef _MSC_VER +#define util_abort(fmt, ...) \ + util_abort__(__FILE__, __func__, __LINE__, fmt, __VA_ARGS__) +#elif __GNUC__ +/* Also clang defines the __GNUC__ symbol */ +#define util_abort(fmt, ...) \ + util_abort__(__FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__) +#endif + +/* Conditional section below here */ + +void util_abort__(const char *file, const char *function, int line, + const char *fmt, ...); +void util_abort_signal(int); + +#ifdef ERT_HAVE_ZLIB +void util_compress_buffer(const void *, int, void *, unsigned long *); +int util_fread_sizeof_compressed(FILE *stream); +void util_fread_compressed(void *, FILE *); +void *util_fread_alloc_compressed(FILE *); +void util_fwrite_compressed(const void *, int, FILE *); +#endif + +#ifdef ERT_HAVE_SYMLINK +void util_make_slink(const char *, const char *); +char *util_alloc_link_target(const char *link); +#ifdef ERT_HAVE_READLINKAT +char *util_alloc_atlink_target(const char *path, const char *link); +#endif +#endif + +#ifdef ERT_HAVE_SPAWN +pid_t util_spawn(const char *executable, int argc, const char **argv, + const char *stdout_file, const char *stderr_file); +int util_spawn_blocking(const char *executable, int argc, const char **argv, + const char *stdout_file, const char *stderr_file); +#endif + +#ifdef ERT_HAVE_LOCKF +FILE *util_fopen_lockf(const char *, const char *); +bool util_try_lockf(const char *, mode_t, int *); +#endif + +#include "util_unlink.hpp" + +#ifdef __cplusplus +} +#endif #endif diff --git a/lib/include/ert/util/util_endian.h b/lib/include/ert/util/util_endian.h deleted file mode 100644 index 267c29f375..0000000000 --- a/lib/include/ert/util/util_endian.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - Copyright (C) 2012 Equinor ASA, Norway. - - The file 'util_endian.h' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#ifndef ERT_UTIL_ENDIAN_H -#define ERT_UTIL_ENDIAN_H - -#ifdef __cplusplus -extern "C" { -#endif - -void util_endian_flip_vector(void *data, int element_size, int elements); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/lib/include/ert/util/util_unlink.h b/lib/include/ert/util/util_unlink.hpp similarity index 100% rename from lib/include/ert/util/util_unlink.h rename to lib/include/ert/util/util_unlink.hpp diff --git a/lib/include/ert/util/vector.h b/lib/include/ert/util/vector.h deleted file mode 100644 index 3cc2314fa8..0000000000 --- a/lib/include/ert/util/vector.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/fault_block.h b/lib/include/resdata/fault_block.h deleted file mode 100644 index 33c6eb0a8d..0000000000 --- a/lib/include/resdata/fault_block.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/fault_block_layer.h b/lib/include/resdata/fault_block_layer.h deleted file mode 100644 index 44145a8247..0000000000 --- a/lib/include/resdata/fault_block_layer.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/fortio.h b/lib/include/resdata/fortio.h index 29506eb890..3b5e5e41a8 100644 --- a/lib/include/resdata/fortio.h +++ b/lib/include/resdata/fortio.h @@ -26,7 +26,7 @@ extern "C" { #include #include -#include +#include #include typedef enum { diff --git a/lib/include/resdata/grid_dims.h b/lib/include/resdata/grid_dims.h deleted file mode 100644 index e66d27d5f0..0000000000 --- a/lib/include/resdata/grid_dims.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/layer.h b/lib/include/resdata/layer.h deleted file mode 100644 index ed0f62ac9b..0000000000 --- a/lib/include/resdata/layer.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/nnc_info.h b/lib/include/resdata/nnc_info.h deleted file mode 100644 index de5c44c3f6..0000000000 --- a/lib/include/resdata/nnc_info.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/nnc_vector.h b/lib/include/resdata/nnc_vector.h deleted file mode 100644 index 067b7d609e..0000000000 --- a/lib/include/resdata/nnc_vector.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_coarse_cell.h b/lib/include/resdata/rd_coarse_cell.h deleted file mode 100644 index 791be99191..0000000000 --- a/lib/include/resdata/rd_coarse_cell.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_endian_flip.h b/lib/include/resdata/rd_endian_flip.h deleted file mode 100644 index 83b1e62668..0000000000 --- a/lib/include/resdata/rd_endian_flip.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_file.h b/lib/include/resdata/rd_file.h deleted file mode 100644 index f510f1073c..0000000000 --- a/lib/include/resdata/rd_file.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_file_kw.h b/lib/include/resdata/rd_file_kw.h deleted file mode 100644 index cba8144a4d..0000000000 --- a/lib/include/resdata/rd_file_kw.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_file_kw.hpp b/lib/include/resdata/rd_file_kw.hpp index f81f16f6bd..f532bd00af 100644 --- a/lib/include/resdata/rd_file_kw.hpp +++ b/lib/include/resdata/rd_file_kw.hpp @@ -7,7 +7,7 @@ extern "C" { #include -#include +#include #include #include diff --git a/lib/include/resdata/rd_file_view.h b/lib/include/resdata/rd_file_view.h deleted file mode 100644 index 91716c472b..0000000000 --- a/lib/include/resdata/rd_file_view.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_grav.h b/lib/include/resdata/rd_grav.h deleted file mode 100644 index 12e54adf86..0000000000 --- a/lib/include/resdata/rd_grav.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_grav_common.h b/lib/include/resdata/rd_grav_common.h deleted file mode 100644 index bc44af9765..0000000000 --- a/lib/include/resdata/rd_grav_common.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_grid.h b/lib/include/resdata/rd_grid.h deleted file mode 100644 index 405b359cf2..0000000000 --- a/lib/include/resdata/rd_grid.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_grid_dims.h b/lib/include/resdata/rd_grid_dims.h deleted file mode 100644 index bf3ed38ac5..0000000000 --- a/lib/include/resdata/rd_grid_dims.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_init_file.h b/lib/include/resdata/rd_init_file.h deleted file mode 100644 index 50a0c3d059..0000000000 --- a/lib/include/resdata/rd_init_file.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_io_config.h b/lib/include/resdata/rd_io_config.h deleted file mode 100644 index fd23eac204..0000000000 --- a/lib/include/resdata/rd_io_config.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_kw.h b/lib/include/resdata/rd_kw.h deleted file mode 100644 index 93f7690d0c..0000000000 --- a/lib/include/resdata/rd_kw.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_kw_grdecl.h b/lib/include/resdata/rd_kw_grdecl.h deleted file mode 100644 index 366a9afd1a..0000000000 --- a/lib/include/resdata/rd_kw_grdecl.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_kw_magic.h b/lib/include/resdata/rd_kw_magic.h deleted file mode 100644 index 2fcabeef27..0000000000 --- a/lib/include/resdata/rd_kw_magic.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_nnc_data.h b/lib/include/resdata/rd_nnc_data.h deleted file mode 100644 index 2fa2033058..0000000000 --- a/lib/include/resdata/rd_nnc_data.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_nnc_export.h b/lib/include/resdata/rd_nnc_export.h deleted file mode 100644 index eb7bbb03ca..0000000000 --- a/lib/include/resdata/rd_nnc_export.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_nnc_geometry.h b/lib/include/resdata/rd_nnc_geometry.h deleted file mode 100644 index c5520809a0..0000000000 --- a/lib/include/resdata/rd_nnc_geometry.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_region.h b/lib/include/resdata/rd_region.h deleted file mode 100644 index 97035f9069..0000000000 --- a/lib/include/resdata/rd_region.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_rft_cell.h b/lib/include/resdata/rd_rft_cell.h deleted file mode 100644 index 52d5dc411b..0000000000 --- a/lib/include/resdata/rd_rft_cell.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_rft_file.h b/lib/include/resdata/rd_rft_file.h deleted file mode 100644 index 8da1a521ed..0000000000 --- a/lib/include/resdata/rd_rft_file.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_rft_node.h b/lib/include/resdata/rd_rft_node.h deleted file mode 100644 index faa08d1386..0000000000 --- a/lib/include/resdata/rd_rft_node.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_rst_file.h b/lib/include/resdata/rd_rst_file.h deleted file mode 100644 index d10fb5c91c..0000000000 --- a/lib/include/resdata/rd_rst_file.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_rsthead.h b/lib/include/resdata/rd_rsthead.h deleted file mode 100644 index 679198fbc8..0000000000 --- a/lib/include/resdata/rd_rsthead.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_smspec.h b/lib/include/resdata/rd_smspec.h deleted file mode 100644 index 1de6582ebd..0000000000 --- a/lib/include/resdata/rd_smspec.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_subsidence.h b/lib/include/resdata/rd_subsidence.h deleted file mode 100644 index af04dd8dfa..0000000000 --- a/lib/include/resdata/rd_subsidence.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_sum.h b/lib/include/resdata/rd_sum.h deleted file mode 100644 index 07a5553332..0000000000 --- a/lib/include/resdata/rd_sum.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_sum_data.h b/lib/include/resdata/rd_sum_data.h deleted file mode 100644 index ea633a1fdf..0000000000 --- a/lib/include/resdata/rd_sum_data.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_sum_index.h b/lib/include/resdata/rd_sum_index.h deleted file mode 100644 index 9709a63ed3..0000000000 --- a/lib/include/resdata/rd_sum_index.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_sum_tstep.h b/lib/include/resdata/rd_sum_tstep.h deleted file mode 100644 index 27faf358f0..0000000000 --- a/lib/include/resdata/rd_sum_tstep.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_sum_vector.h b/lib/include/resdata/rd_sum_vector.h deleted file mode 100644 index 4528fb8f9e..0000000000 --- a/lib/include/resdata/rd_sum_vector.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_type.h b/lib/include/resdata/rd_type.h deleted file mode 100644 index 4c6295d565..0000000000 --- a/lib/include/resdata/rd_type.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_units.h b/lib/include/resdata/rd_units.h deleted file mode 100644 index 2a9bfea362..0000000000 --- a/lib/include/resdata/rd_units.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/rd_util.h b/lib/include/resdata/rd_util.h deleted file mode 100644 index 1ef3f5ba28..0000000000 --- a/lib/include/resdata/rd_util.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/well/well_branch_collection.h b/lib/include/resdata/well/well_branch_collection.h deleted file mode 100644 index 9e7d20b6dd..0000000000 --- a/lib/include/resdata/well/well_branch_collection.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/well/well_conn.h b/lib/include/resdata/well/well_conn.h deleted file mode 100644 index d76f4cb124..0000000000 --- a/lib/include/resdata/well/well_conn.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/well/well_conn_collection.h b/lib/include/resdata/well/well_conn_collection.h deleted file mode 100644 index ec38f7ca6c..0000000000 --- a/lib/include/resdata/well/well_conn_collection.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/well/well_const.h b/lib/include/resdata/well/well_const.h deleted file mode 100644 index 6f83d36a67..0000000000 --- a/lib/include/resdata/well/well_const.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/well/well_info.h b/lib/include/resdata/well/well_info.h deleted file mode 100644 index 4bc5fef4d5..0000000000 --- a/lib/include/resdata/well/well_info.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/well/well_rseg_loader.h b/lib/include/resdata/well/well_rseg_loader.h deleted file mode 100644 index b0a4d247ce..0000000000 --- a/lib/include/resdata/well/well_rseg_loader.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/well/well_segment.h b/lib/include/resdata/well/well_segment.h deleted file mode 100644 index 76011c3885..0000000000 --- a/lib/include/resdata/well/well_segment.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/well/well_segment_collection.h b/lib/include/resdata/well/well_segment_collection.h deleted file mode 100644 index 290c8b638c..0000000000 --- a/lib/include/resdata/well/well_segment_collection.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/well/well_state.h b/lib/include/resdata/well/well_state.h deleted file mode 100644 index d4bb315802..0000000000 --- a/lib/include/resdata/well/well_state.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/include/resdata/well/well_ts.h b/lib/include/resdata/well/well_ts.h deleted file mode 100644 index bd23fc6617..0000000000 --- a/lib/include/resdata/well/well_ts.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - Warning: The resdata code has changed to be compiled as a C++ project. This - header file is retained for a period for compatibility, but you are encouraged - to switch to include the new hpp header directly in your code. -*/ - -#include diff --git a/lib/resdata/FortIO.cpp b/lib/resdata/FortIO.cpp index db9aef7559..354cfdc462 100644 --- a/lib/resdata/FortIO.cpp +++ b/lib/resdata/FortIO.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include diff --git a/lib/resdata/fortio.c b/lib/resdata/fortio.c index 2c2d5f6b47..0e9af52d39 100644 --- a/lib/resdata/fortio.c +++ b/lib/resdata/fortio.c @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include #define FORTIO_ID 345116 diff --git a/lib/resdata/grid_dims.cpp b/lib/resdata/grid_dims.cpp index 184d9046ba..2fbed57d7c 100644 --- a/lib/resdata/grid_dims.cpp +++ b/lib/resdata/grid_dims.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include diff --git a/lib/resdata/nnc_info.cpp b/lib/resdata/nnc_info.cpp index d83b3b0e8c..3cb5a3181b 100644 --- a/lib/resdata/nnc_info.cpp +++ b/lib/resdata/nnc_info.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/resdata/nnc_vector.cpp b/lib/resdata/nnc_vector.cpp index c140d8647f..5428db3b71 100644 --- a/lib/resdata/nnc_vector.cpp +++ b/lib/resdata/nnc_vector.cpp @@ -3,7 +3,7 @@ #include -#include +#include #include #include diff --git a/lib/resdata/rd_coarse_cell.cpp b/lib/resdata/rd_coarse_cell.cpp index aef3bc3b9c..1a6abd1e67 100644 --- a/lib/resdata/rd_coarse_cell.cpp +++ b/lib/resdata/rd_coarse_cell.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/rd_file.cpp b/lib/resdata/rd_file.cpp index d3ffab86c2..8c89f40bc0 100644 --- a/lib/resdata/rd_file.cpp +++ b/lib/resdata/rd_file.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/resdata/rd_file_kw.cpp b/lib/resdata/rd_file_kw.cpp index e59d262b1c..0ce3b0efda 100644 --- a/lib/resdata/rd_file_kw.cpp +++ b/lib/resdata/rd_file_kw.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/rd_grav.cpp b/lib/resdata/rd_grav.cpp index 1f87744f57..dae92ab784 100644 --- a/lib/resdata/rd_grav.cpp +++ b/lib/resdata/rd_grav.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/rd_grav_common.cpp b/lib/resdata/rd_grav_common.cpp index 46de8d7ff8..79328c444f 100644 --- a/lib/resdata/rd_grav_common.cpp +++ b/lib/resdata/rd_grav_common.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/rd_grid.cpp b/lib/resdata/rd_grid.cpp index 6bafbd4918..ed3636f4e8 100644 --- a/lib/resdata/rd_grid.cpp +++ b/lib/resdata/rd_grid.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/resdata/rd_grid_cache.cpp b/lib/resdata/rd_grid_cache.cpp index 104ed49fd8..07b11d0908 100644 --- a/lib/resdata/rd_grid_cache.cpp +++ b/lib/resdata/rd_grid_cache.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/rd_grid_dims.cpp b/lib/resdata/rd_grid_dims.cpp index 9bdcc91f26..8376ed621e 100644 --- a/lib/resdata/rd_grid_dims.cpp +++ b/lib/resdata/rd_grid_dims.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/rd_init_file.cpp b/lib/resdata/rd_init_file.cpp index a27cb86d58..48c249428f 100644 --- a/lib/resdata/rd_init_file.cpp +++ b/lib/resdata/rd_init_file.cpp @@ -12,7 +12,7 @@ certainly not be used to query for e.g. relperm properties. */ -#include +#include #include #include diff --git a/lib/resdata/rd_io_config.cpp b/lib/resdata/rd_io_config.cpp index ed947f39b5..2ebd9f8ad2 100644 --- a/lib/resdata/rd_io_config.cpp +++ b/lib/resdata/rd_io_config.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/rd_kw.cpp b/lib/resdata/rd_kw.cpp index f86d7f984e..485213676b 100644 --- a/lib/resdata/rd_kw.cpp +++ b/lib/resdata/rd_kw.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/rd_kw_grdecl.cpp b/lib/resdata/rd_kw_grdecl.cpp index e9d8969a2f..04bb0ce858 100644 --- a/lib/resdata/rd_kw_grdecl.cpp +++ b/lib/resdata/rd_kw_grdecl.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/rd_region.cpp b/lib/resdata/rd_region.cpp index 8c69fa8295..a2168886c8 100644 --- a/lib/resdata/rd_region.cpp +++ b/lib/resdata/rd_region.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/rd_rft_cell.cpp b/lib/resdata/rd_rft_cell.cpp index b1a8099ddb..0e1053b047 100644 --- a/lib/resdata/rd_rft_cell.cpp +++ b/lib/resdata/rd_rft_cell.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/rd_rft_file.cpp b/lib/resdata/rd_rft_file.cpp index d69b5f2a63..72906302e5 100644 --- a/lib/resdata/rd_rft_file.cpp +++ b/lib/resdata/rd_rft_file.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/rd_rft_node.cpp b/lib/resdata/rd_rft_node.cpp index f2af6f966c..3a1e510c00 100644 --- a/lib/resdata/rd_rft_node.cpp +++ b/lib/resdata/rd_rft_node.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/rd_rst_file.cpp b/lib/resdata/rd_rst_file.cpp index 87a5346f30..ab19c28719 100644 --- a/lib/resdata/rd_rst_file.cpp +++ b/lib/resdata/rd_rst_file.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/resdata/rd_rsthead.cpp b/lib/resdata/rd_rsthead.cpp index 037759c226..dd6ef0fa65 100644 --- a/lib/resdata/rd_rsthead.cpp +++ b/lib/resdata/rd_rsthead.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include #include diff --git a/lib/resdata/rd_smspec.cpp b/lib/resdata/rd_smspec.cpp index 0089ea38dd..950b5fe132 100644 --- a/lib/resdata/rd_smspec.cpp +++ b/lib/resdata/rd_smspec.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include #include "detail/util/path.hpp" diff --git a/lib/resdata/rd_subsidence.cpp b/lib/resdata/rd_subsidence.cpp index 61786ca925..697cebd486 100644 --- a/lib/resdata/rd_subsidence.cpp +++ b/lib/resdata/rd_subsidence.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/rd_sum.cpp b/lib/resdata/rd_sum.cpp index 5d2da6bfc8..c62b0728f6 100644 --- a/lib/resdata/rd_sum.cpp +++ b/lib/resdata/rd_sum.cpp @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lib/resdata/rd_sum_data.cpp b/lib/resdata/rd_sum_data.cpp index e12150e07f..6ea58db41f 100644 --- a/lib/resdata/rd_sum_data.cpp +++ b/lib/resdata/rd_sum_data.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/resdata/rd_sum_file_data.cpp b/lib/resdata/rd_sum_file_data.cpp index 829cd54747..c2f6a18fa2 100644 --- a/lib/resdata/rd_sum_file_data.cpp +++ b/lib/resdata/rd_sum_file_data.cpp @@ -5,9 +5,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "detail/resdata/rd_sum_file_data.hpp" #include "detail/resdata/rd_unsmry_loader.hpp" diff --git a/lib/resdata/rd_sum_tstep.cpp b/lib/resdata/rd_sum_tstep.cpp index d47749b518..f94a01fe39 100644 --- a/lib/resdata/rd_sum_tstep.cpp +++ b/lib/resdata/rd_sum_tstep.cpp @@ -3,7 +3,7 @@ #include -#include +#include #include #include diff --git a/lib/resdata/rd_sum_vector.cpp b/lib/resdata/rd_sum_vector.cpp index 76098f4d46..15148317c3 100644 --- a/lib/resdata/rd_sum_vector.cpp +++ b/lib/resdata/rd_sum_vector.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/rd_type.cpp b/lib/resdata/rd_type.cpp index 66059803e0..f3a7868850 100644 --- a/lib/resdata/rd_type.cpp +++ b/lib/resdata/rd_type.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #define RD_TYPE_NAME_CHAR "CHAR" diff --git a/lib/resdata/rd_util.cpp b/lib/resdata/rd_util.cpp index 75b74a9209..c6ddd054a0 100644 --- a/lib/resdata/rd_util.cpp +++ b/lib/resdata/rd_util.cpp @@ -6,7 +6,7 @@ #include -#include +#include #include #include #include diff --git a/lib/resdata/smspec_node.cpp b/lib/resdata/smspec_node.cpp index 09d04391bb..72390d5b0c 100644 --- a/lib/resdata/smspec_node.cpp +++ b/lib/resdata/smspec_node.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/resdata/tests/rd_file.cpp b/lib/resdata/tests/rd_file.cpp index bd60bbe6da..2e45a612df 100644 --- a/lib/resdata/tests/rd_file.cpp +++ b/lib/resdata/tests/rd_file.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_file_equinor.cpp b/lib/resdata/tests/rd_file_equinor.cpp index ad890aaebc..c9540ec9a9 100644 --- a/lib/resdata/tests/rd_file_equinor.cpp +++ b/lib/resdata/tests/rd_file_equinor.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_file_view.cpp b/lib/resdata/tests/rd_file_view.cpp index 02f0edb27b..7dd111ba6f 100644 --- a/lib/resdata/tests/rd_file_view.cpp +++ b/lib/resdata/tests/rd_file_view.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_filenames.cpp b/lib/resdata/tests/rd_filenames.cpp index 1311f5581e..92e025b03a 100644 --- a/lib/resdata/tests/rd_filenames.cpp +++ b/lib/resdata/tests/rd_filenames.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include diff --git a/lib/resdata/tests/rd_fmt.cpp b/lib/resdata/tests/rd_fmt.cpp index adb16b5a33..71f223a780 100644 --- a/lib/resdata/tests/rd_fmt.cpp +++ b/lib/resdata/tests/rd_fmt.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_fortio.cpp b/lib/resdata/tests/rd_fortio.cpp index 94185a0b6a..02870335d9 100644 --- a/lib/resdata/tests/rd_fortio.cpp +++ b/lib/resdata/tests/rd_fortio.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_grid_add_nnc.cpp b/lib/resdata/tests/rd_grid_add_nnc.cpp index 37cf773f6e..2121b6e2e4 100644 --- a/lib/resdata/tests/rd_grid_add_nnc.cpp +++ b/lib/resdata/tests/rd_grid_add_nnc.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_grid_copy.cpp b/lib/resdata/tests/rd_grid_copy.cpp index c96349ca71..82b14dd654 100644 --- a/lib/resdata/tests/rd_grid_copy.cpp +++ b/lib/resdata/tests/rd_grid_copy.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/rd_grid_create.cpp b/lib/resdata/tests/rd_grid_create.cpp index f925ec76e3..14614c2d2f 100644 --- a/lib/resdata/tests/rd_grid_create.cpp +++ b/lib/resdata/tests/rd_grid_create.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/rd_grid_dims.cpp b/lib/resdata/tests/rd_grid_dims.cpp index 1c8a48f54c..068f0fc7eb 100644 --- a/lib/resdata/tests/rd_grid_dims.cpp +++ b/lib/resdata/tests/rd_grid_dims.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_grid_dx_dy_dz.cpp b/lib/resdata/tests/rd_grid_dx_dy_dz.cpp index 292cb544d4..08aa072727 100644 --- a/lib/resdata/tests/rd_grid_dx_dy_dz.cpp +++ b/lib/resdata/tests/rd_grid_dx_dy_dz.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_grid_init_fwrite.cpp b/lib/resdata/tests/rd_grid_init_fwrite.cpp index 085fb320f2..f97b3da7c6 100644 --- a/lib/resdata/tests/rd_grid_init_fwrite.cpp +++ b/lib/resdata/tests/rd_grid_init_fwrite.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_grid_lgr_name.cpp b/lib/resdata/tests/rd_grid_lgr_name.cpp index cf95892a10..87ec21e54e 100644 --- a/lib/resdata/tests/rd_grid_lgr_name.cpp +++ b/lib/resdata/tests/rd_grid_lgr_name.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_grid_volume.cpp b/lib/resdata/tests/rd_grid_volume.cpp index 646c1667e3..14492eb9b7 100644 --- a/lib/resdata/tests/rd_grid_volume.cpp +++ b/lib/resdata/tests/rd_grid_volume.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_init_file.cpp b/lib/resdata/tests/rd_init_file.cpp index 0e04feb3fe..947b64809e 100644 --- a/lib/resdata/tests/rd_init_file.cpp +++ b/lib/resdata/tests/rd_init_file.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_kw_equal.cpp b/lib/resdata/tests/rd_kw_equal.cpp index e915742ba5..596715a17d 100644 --- a/lib/resdata/tests/rd_kw_equal.cpp +++ b/lib/resdata/tests/rd_kw_equal.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_kw_fread.cpp b/lib/resdata/tests/rd_kw_fread.cpp index d59429bdbd..55af4d2e1d 100644 --- a/lib/resdata/tests/rd_kw_fread.cpp +++ b/lib/resdata/tests/rd_kw_fread.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_kw_grdecl.cpp b/lib/resdata/tests/rd_kw_grdecl.cpp index 9c15732f0c..213c010b28 100644 --- a/lib/resdata/tests/rd_kw_grdecl.cpp +++ b/lib/resdata/tests/rd_kw_grdecl.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_kw_init.cpp b/lib/resdata/tests/rd_kw_init.cpp index 8b3e518161..941a9f09d9 100644 --- a/lib/resdata/tests/rd_kw_init.cpp +++ b/lib/resdata/tests/rd_kw_init.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/rd_layer.cpp b/lib/resdata/tests/rd_layer.cpp index f93f4678fd..91746828a7 100644 --- a/lib/resdata/tests/rd_layer.cpp +++ b/lib/resdata/tests/rd_layer.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include "detail/resdata/layer_cxx.hpp" diff --git a/lib/resdata/tests/rd_layer_equinor.cpp b/lib/resdata/tests/rd_layer_equinor.cpp index fb2fc295b1..56d4ab2bfb 100644 --- a/lib/resdata/tests/rd_layer_equinor.cpp +++ b/lib/resdata/tests/rd_layer_equinor.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_lgr_test.cpp b/lib/resdata/tests/rd_lgr_test.cpp index a20ae7881a..0e21e30052 100644 --- a/lib/resdata/tests/rd_lgr_test.cpp +++ b/lib/resdata/tests/rd_lgr_test.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_make_date_no_shift.cpp b/lib/resdata/tests/rd_make_date_no_shift.cpp index 78bd60d578..85c414a4ad 100644 --- a/lib/resdata/tests/rd_make_date_no_shift.cpp +++ b/lib/resdata/tests/rd_make_date_no_shift.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/rd_make_date_shift.cpp b/lib/resdata/tests/rd_make_date_shift.cpp index b745bc39ca..88b509154a 100644 --- a/lib/resdata/tests/rd_make_date_shift.cpp +++ b/lib/resdata/tests/rd_make_date_shift.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/rd_month_range.cpp b/lib/resdata/tests/rd_month_range.cpp index b9cede0b21..589821dd1d 100644 --- a/lib/resdata/tests/rd_month_range.cpp +++ b/lib/resdata/tests/rd_month_range.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/rd_nnc_data_equinor_root.cpp b/lib/resdata/tests/rd_nnc_data_equinor_root.cpp index abf660f452..25c504b01b 100644 --- a/lib/resdata/tests/rd_nnc_data_equinor_root.cpp +++ b/lib/resdata/tests/rd_nnc_data_equinor_root.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_nnc_export.cpp b/lib/resdata/tests/rd_nnc_export.cpp index beacceb5b2..e821910b68 100644 --- a/lib/resdata/tests/rd_nnc_export.cpp +++ b/lib/resdata/tests/rd_nnc_export.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_nnc_export_get_tran.cpp b/lib/resdata/tests/rd_nnc_export_get_tran.cpp index 6cb3ee6600..315db70ef7 100644 --- a/lib/resdata/tests/rd_nnc_export_get_tran.cpp +++ b/lib/resdata/tests/rd_nnc_export_get_tran.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_nnc_export_intersect.cpp b/lib/resdata/tests/rd_nnc_export_intersect.cpp index 32fb7f7799..72c8cdf3a0 100644 --- a/lib/resdata/tests/rd_nnc_export_intersect.cpp +++ b/lib/resdata/tests/rd_nnc_export_intersect.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/resdata/tests/rd_nnc_index_list.cpp b/lib/resdata/tests/rd_nnc_index_list.cpp index 0f49f48f96..ca112deec6 100644 --- a/lib/resdata/tests/rd_nnc_index_list.cpp +++ b/lib/resdata/tests/rd_nnc_index_list.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_nnc_index_list_grid.cpp b/lib/resdata/tests/rd_nnc_index_list_grid.cpp index 6ec6ffd4f7..0f3fbaa428 100644 --- a/lib/resdata/tests/rd_nnc_index_list_grid.cpp +++ b/lib/resdata/tests/rd_nnc_index_list_grid.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_nnc_info_test.cpp b/lib/resdata/tests/rd_nnc_info_test.cpp index 085f1f1a0b..a83dd82890 100644 --- a/lib/resdata/tests/rd_nnc_info_test.cpp +++ b/lib/resdata/tests/rd_nnc_info_test.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_nnc_pair.cpp b/lib/resdata/tests/rd_nnc_pair.cpp index f8f0f39e9d..263574e64f 100644 --- a/lib/resdata/tests/rd_nnc_pair.cpp +++ b/lib/resdata/tests/rd_nnc_pair.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/rd_nnc_test.cpp b/lib/resdata/tests/rd_nnc_test.cpp index db8b29cd85..be3919e2a8 100644 --- a/lib/resdata/tests/rd_nnc_test.cpp +++ b/lib/resdata/tests/rd_nnc_test.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_path_access.cpp b/lib/resdata/tests/rd_path_access.cpp index bf8fb997cc..44181b1a9a 100644 --- a/lib/resdata/tests/rd_path_access.cpp +++ b/lib/resdata/tests/rd_path_access.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_restart_test.cpp b/lib/resdata/tests/rd_restart_test.cpp index b8d669d89a..63bca0b83e 100644 --- a/lib/resdata/tests/rd_restart_test.cpp +++ b/lib/resdata/tests/rd_restart_test.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/rd_rft.cpp b/lib/resdata/tests/rd_rft.cpp index 63363db980..ef77984f55 100644 --- a/lib/resdata/tests/rd_rft.cpp +++ b/lib/resdata/tests/rd_rft.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_rft_cell.cpp b/lib/resdata/tests/rd_rft_cell.cpp index c4a37afba8..cc4a02a26a 100644 --- a/lib/resdata/tests/rd_rft_cell.cpp +++ b/lib/resdata/tests/rd_rft_cell.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_smspec_node.cpp b/lib/resdata/tests/rd_smspec_node.cpp index f0577f3c96..1f298104c0 100644 --- a/lib/resdata/tests/rd_smspec_node.cpp +++ b/lib/resdata/tests/rd_smspec_node.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_sum_case_exists.cpp b/lib/resdata/tests/rd_sum_case_exists.cpp index 2fc5eb826b..0c227244de 100644 --- a/lib/resdata/tests/rd_sum_case_exists.cpp +++ b/lib/resdata/tests/rd_sum_case_exists.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rd_sum_data_intermediate_test.cpp b/lib/resdata/tests/rd_sum_data_intermediate_test.cpp index 47e9d66d57..e65506dcb7 100644 --- a/lib/resdata/tests/rd_sum_data_intermediate_test.cpp +++ b/lib/resdata/tests/rd_sum_data_intermediate_test.cpp @@ -1,9 +1,9 @@ #include -#include +#include #include -#include -#include +#include +#include #include #include diff --git a/lib/resdata/tests/rd_sum_report_step_compatible.cpp b/lib/resdata/tests/rd_sum_report_step_compatible.cpp index ceb38042d8..96c91b3ca4 100644 --- a/lib/resdata/tests/rd_sum_report_step_compatible.cpp +++ b/lib/resdata/tests/rd_sum_report_step_compatible.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/rd_sum_report_step_equal.cpp b/lib/resdata/tests/rd_sum_report_step_equal.cpp index b6e13fe453..54598e8c00 100644 --- a/lib/resdata/tests/rd_sum_report_step_equal.cpp +++ b/lib/resdata/tests/rd_sum_report_step_equal.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/rd_sum_restart.cpp b/lib/resdata/tests/rd_sum_restart.cpp index 7ae66d687e..7689f2aac2 100644 --- a/lib/resdata/tests/rd_sum_restart.cpp +++ b/lib/resdata/tests/rd_sum_restart.cpp @@ -1,9 +1,9 @@ #include -#include +#include #include -#include -#include +#include +#include #include #include diff --git a/lib/resdata/tests/rd_sum_test.cpp b/lib/resdata/tests/rd_sum_test.cpp index e119cace2e..5da110bacf 100644 --- a/lib/resdata/tests/rd_sum_test.cpp +++ b/lib/resdata/tests/rd_sum_test.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/rd_sum_writer.cpp b/lib/resdata/tests/rd_sum_writer.cpp index 9937df4101..93b19054c0 100644 --- a/lib/resdata/tests/rd_sum_writer.cpp +++ b/lib/resdata/tests/rd_sum_writer.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/rft_test.cpp b/lib/resdata/tests/rft_test.cpp index 15fe4a7a8d..f76ed02632 100644 --- a/lib/resdata/tests/rft_test.cpp +++ b/lib/resdata/tests/rft_test.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include int main(int argc, char **argv) { if (argc != 2) diff --git a/lib/resdata/tests/test_rd_file_index.cpp b/lib/resdata/tests/test_rd_file_index.cpp index 145e791b7b..389214747e 100644 --- a/lib/resdata/tests/test_rd_file_index.cpp +++ b/lib/resdata/tests/test_rd_file_index.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/test_rd_nnc_data.cpp b/lib/resdata/tests/test_rd_nnc_data.cpp index a9ed959598..6be117886f 100644 --- a/lib/resdata/tests/test_rd_nnc_data.cpp +++ b/lib/resdata/tests/test_rd_nnc_data.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/test_transactions.cpp b/lib/resdata/tests/test_transactions.cpp index bd04f0632c..f997d95153 100644 --- a/lib/resdata/tests/test_transactions.cpp +++ b/lib/resdata/tests/test_transactions.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/well_branch_collection.cpp b/lib/resdata/tests/well_branch_collection.cpp index 3644d4f1c9..54ecd42ea9 100644 --- a/lib/resdata/tests/well_branch_collection.cpp +++ b/lib/resdata/tests/well_branch_collection.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/well_conn.cpp b/lib/resdata/tests/well_conn.cpp index 60612a1c37..4250e781d0 100644 --- a/lib/resdata/tests/well_conn.cpp +++ b/lib/resdata/tests/well_conn.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/well_conn_CF.cpp b/lib/resdata/tests/well_conn_CF.cpp index c316289d83..c621ab43d2 100644 --- a/lib/resdata/tests/well_conn_CF.cpp +++ b/lib/resdata/tests/well_conn_CF.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/well_conn_collection.cpp b/lib/resdata/tests/well_conn_collection.cpp index 7c1258a754..67c25330ed 100644 --- a/lib/resdata/tests/well_conn_collection.cpp +++ b/lib/resdata/tests/well_conn_collection.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/well_conn_load.cpp b/lib/resdata/tests/well_conn_load.cpp index 085ed9e7a6..06dafd6c15 100644 --- a/lib/resdata/tests/well_conn_load.cpp +++ b/lib/resdata/tests/well_conn_load.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/well_dualp.cpp b/lib/resdata/tests/well_dualp.cpp index a7102c8288..0c2e75dc05 100644 --- a/lib/resdata/tests/well_dualp.cpp +++ b/lib/resdata/tests/well_dualp.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/well_info.cpp b/lib/resdata/tests/well_info.cpp index cc00e01e6a..374b651fcd 100644 --- a/lib/resdata/tests/well_info.cpp +++ b/lib/resdata/tests/well_info.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/well_lgr_load.cpp b/lib/resdata/tests/well_lgr_load.cpp index ebb43aa09b..d8a93a73b5 100644 --- a/lib/resdata/tests/well_lgr_load.cpp +++ b/lib/resdata/tests/well_lgr_load.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/well_segment.cpp b/lib/resdata/tests/well_segment.cpp index 7639a74317..c03a66bac9 100644 --- a/lib/resdata/tests/well_segment.cpp +++ b/lib/resdata/tests/well_segment.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/well_segment_branch_conn_load.cpp b/lib/resdata/tests/well_segment_branch_conn_load.cpp index f471c7754f..ed5958555a 100644 --- a/lib/resdata/tests/well_segment_branch_conn_load.cpp +++ b/lib/resdata/tests/well_segment_branch_conn_load.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/well_segment_collection.cpp b/lib/resdata/tests/well_segment_collection.cpp index a6b8b28e39..6f75dd8e18 100644 --- a/lib/resdata/tests/well_segment_collection.cpp +++ b/lib/resdata/tests/well_segment_collection.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/well_segment_conn.cpp b/lib/resdata/tests/well_segment_conn.cpp index ec54918cc0..666b7d1a9e 100644 --- a/lib/resdata/tests/well_segment_conn.cpp +++ b/lib/resdata/tests/well_segment_conn.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/well_segment_conn_load.cpp b/lib/resdata/tests/well_segment_conn_load.cpp index ee8567692c..1f4fc09b70 100644 --- a/lib/resdata/tests/well_segment_conn_load.cpp +++ b/lib/resdata/tests/well_segment_conn_load.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/well_segment_load.cpp b/lib/resdata/tests/well_segment_load.cpp index dab23e7095..628101ca14 100644 --- a/lib/resdata/tests/well_segment_load.cpp +++ b/lib/resdata/tests/well_segment_load.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/well_state.cpp b/lib/resdata/tests/well_state.cpp index a4a0cac2b3..af90079a60 100644 --- a/lib/resdata/tests/well_state.cpp +++ b/lib/resdata/tests/well_state.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lib/resdata/tests/well_state_load.cpp b/lib/resdata/tests/well_state_load.cpp index 444acf6a9e..b60fc5bc13 100644 --- a/lib/resdata/tests/well_state_load.cpp +++ b/lib/resdata/tests/well_state_load.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/well_state_load_missing_RSEG.cpp b/lib/resdata/tests/well_state_load_missing_RSEG.cpp index 80bb85925c..eb0a532753 100644 --- a/lib/resdata/tests/well_state_load_missing_RSEG.cpp +++ b/lib/resdata/tests/well_state_load_missing_RSEG.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/tests/well_ts.cpp b/lib/resdata/tests/well_ts.cpp index 3549884775..29f1d2ed28 100644 --- a/lib/resdata/tests/well_ts.cpp +++ b/lib/resdata/tests/well_ts.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/well_branch_collection.cpp b/lib/resdata/well_branch_collection.cpp index f18e0c8684..f3a84e72c4 100644 --- a/lib/resdata/well_branch_collection.cpp +++ b/lib/resdata/well_branch_collection.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include #include diff --git a/lib/resdata/well_conn.cpp b/lib/resdata/well_conn.cpp index 4ba70a29bd..62231b077e 100644 --- a/lib/resdata/well_conn.cpp +++ b/lib/resdata/well_conn.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/well_conn_collection.cpp b/lib/resdata/well_conn_collection.cpp index c21580c31d..4a8d984f7f 100644 --- a/lib/resdata/well_conn_collection.cpp +++ b/lib/resdata/well_conn_collection.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include #include diff --git a/lib/resdata/well_info.cpp b/lib/resdata/well_info.cpp index 9ea69caa24..07bfcd20c2 100644 --- a/lib/resdata/well_info.cpp +++ b/lib/resdata/well_info.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/well_rseg_loader.cpp b/lib/resdata/well_rseg_loader.cpp index a8203f0e19..545b77193e 100644 --- a/lib/resdata/well_rseg_loader.cpp +++ b/lib/resdata/well_rseg_loader.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include #include diff --git a/lib/resdata/well_segment.cpp b/lib/resdata/well_segment.cpp index aa99a4e49e..237e84b8ad 100644 --- a/lib/resdata/well_segment.cpp +++ b/lib/resdata/well_segment.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/lib/resdata/well_segment_collection.cpp b/lib/resdata/well_segment_collection.cpp index 2549f69ced..53e6dad3e9 100644 --- a/lib/resdata/well_segment_collection.cpp +++ b/lib/resdata/well_segment_collection.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include #include diff --git a/lib/resdata/well_state.cpp b/lib/resdata/well_state.cpp index e2d4cdcbcc..8c5e1955c4 100644 --- a/lib/resdata/well_state.cpp +++ b/lib/resdata/well_state.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/resdata/well_ts.cpp b/lib/resdata/well_ts.cpp index a10267226d..a37df5a6a4 100644 --- a/lib/resdata/well_ts.cpp +++ b/lib/resdata/well_ts.cpp @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include diff --git a/lib/util/ert/util/template_type.h b/lib/util/ert/util/template_type.h deleted file mode 100644 index 5d24944b16..0000000000 --- a/lib/util/ert/util/template_type.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef ERT_TEMPLATE_TYPE_H -#define ERT_TEMPLATE_TYPE_H - -#include - -#include - -#ifdef ERT_HAVE_REGEXP -#include -#endif //ERT_HAVE_REGEXP - -#define TEMPLATE_TYPE_ID 7781045 - -struct template_struct { - UTIL_TYPE_ID_DECLARATION; - char * - template_file; /* The template file - if internalize_template == false this filename can contain keys which will be replaced at instantiation time. */ - char * - template_buffer; /* The content of the template buffer; only has valid content if internalize_template == true. */ - bool - internalize_template; /* Should the template be loadad and internalized at template_alloc(). */ - subst_list_type - *arg_list; /* Key-value mapping established at alloc time. */ - char * - arg_string; /* A string representation of the arguments - ONLY used for a _get_ function. */ -#ifdef ERT_HAVE_REGEXP - regex_t start_regexp; - regex_t end_regexp; -#endif -}; - -#ifdef ERT_HAVE_REGEXP -typedef struct loop_struct loop_type; -void template_init_loop_regexp(struct template_struct *); -int template_eval_loop(const struct template_struct *, buffer_type *buffer, - int global_offset, struct loop_struct *); -void template_eval_loops(const struct template_struct *template, - buffer_type *buffer); -#endif //ERT_HAVE_REGEXP - -#endif //ERT_TEMPLATE_TYPE_H diff --git a/lib/util/hash.cpp b/lib/util/hash.cpp index 2f295aae76..da84c10361 100644 --- a/lib/util/hash.cpp +++ b/lib/util/hash.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #ifdef __cplusplus diff --git a/lib/util/hash_node.cpp b/lib/util/hash_node.cpp index 4c50432b28..073c7e567c 100644 --- a/lib/util/hash_node.cpp +++ b/lib/util/hash_node.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/lib/util/hash_sll.cpp b/lib/util/hash_sll.cpp index 95887bd00e..d6a4893ce7 100644 --- a/lib/util/hash_sll.cpp +++ b/lib/util/hash_sll.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include diff --git a/lib/util/lookup_table.cpp b/lib/util/lookup_table.cpp index 313afae9e3..244eefea1a 100644 --- a/lib/util/lookup_table.cpp +++ b/lib/util/lookup_table.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/util/mzran.cpp b/lib/util/mzran.cpp index 8ed17cacb5..3fcf3a9e76 100644 --- a/lib/util/mzran.cpp +++ b/lib/util/mzran.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include diff --git a/lib/util/node_ctype.cpp b/lib/util/node_ctype.cpp index 8a0e966d4e..a677bad920 100644 --- a/lib/util/node_ctype.cpp +++ b/lib/util/node_ctype.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include const char *node_ctype_name(node_ctype ctype) { diff --git a/lib/util/node_data.cpp b/lib/util/node_data.cpp index 742b7f21f8..118f37acc6 100644 --- a/lib/util/node_data.cpp +++ b/lib/util/node_data.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/util/parser.cpp b/lib/util/parser.cpp index 75ad1da8d1..ff46437273 100644 --- a/lib/util/parser.cpp +++ b/lib/util/parser.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #define PARSER_ESCAPE_CHAR '\\' diff --git a/lib/util/path.cpp b/lib/util/path.cpp index 6ca190cdb8..912158397b 100644 --- a/lib/util/path.cpp +++ b/lib/util/path.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include "detail/util/path.hpp" diff --git a/lib/util/path_stack.cpp b/lib/util/path_stack.cpp index d50c9754c0..6a85166c64 100644 --- a/lib/util/path_stack.cpp +++ b/lib/util/path_stack.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include /** diff --git a/lib/util/perm_vector.cpp b/lib/util/perm_vector.cpp index 0808afa3df..e19e992213 100644 --- a/lib/util/perm_vector.cpp +++ b/lib/util/perm_vector.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #define PERM_VECTOR_TYPE_ID 661433 diff --git a/lib/util/rd_version.cpp b/lib/util/rd_version.cpp index 0b187d77f1..7001957500 100644 --- a/lib/util/rd_version.cpp +++ b/lib/util/rd_version.cpp @@ -1,4 +1,4 @@ -#include +#include #include #define xstr(s) #s diff --git a/lib/util/rng.cpp b/lib/util/rng.cpp index 453ed94e7b..ae7fdc9dc8 100644 --- a/lib/util/rng.cpp +++ b/lib/util/rng.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/util/string_util.cpp b/lib/util/string_util.cpp index 1fca3def6e..a0f3d83990 100644 --- a/lib/util/string_util.cpp +++ b/lib/util/string_util.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/util/stringlist.cpp b/lib/util/stringlist.cpp index 876cd02b52..37aeb9ccea 100644 --- a/lib/util/stringlist.cpp +++ b/lib/util/stringlist.cpp @@ -14,7 +14,7 @@ #include #endif -#include +#include #include #include diff --git a/lib/util/test_util.cpp b/lib/util/test_util.cpp index db42bc3aee..b0e9d4eee5 100644 --- a/lib/util/test_util.cpp +++ b/lib/util/test_util.cpp @@ -5,10 +5,10 @@ #include #include "ert/util/build_config.hpp" -#include +#include #include #include -#include +#include void test_error_exit(const char *fmt, ...) { char *s; diff --git a/lib/util/test_work_area.cpp b/lib/util/test_work_area.cpp index f238c2ea69..4dac7796d6 100644 --- a/lib/util/test_work_area.cpp +++ b/lib/util/test_work_area.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include "detail/util/path.hpp" diff --git a/lib/util/tests/ert_util_abort_gnu_tests.cpp b/lib/util/tests/ert_util_abort_gnu_tests.cpp index 7037c0e067..f17ecf3a53 100644 --- a/lib/util/tests/ert_util_abort_gnu_tests.cpp +++ b/lib/util/tests/ert_util_abort_gnu_tests.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include void test_assert_util_abort(const char *function_name, void(void *), void *arg); diff --git a/lib/util/tests/ert_util_alloc_file_components.cpp b/lib/util/tests/ert_util_alloc_file_components.cpp index 76399b6575..d822d8b2b7 100644 --- a/lib/util/tests/ert_util_alloc_file_components.cpp +++ b/lib/util/tests/ert_util_alloc_file_components.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include void checkPath(const char *path, const char *directory, const char *base_name, diff --git a/lib/util/tests/ert_util_before_after.cpp b/lib/util/tests/ert_util_before_after.cpp index 5afc0170ab..1bb85009d9 100644 --- a/lib/util/tests/ert_util_before_after.cpp +++ b/lib/util/tests/ert_util_before_after.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include int main(int argc, char **argv) { time_t t1 = util_make_date_utc(1, 1, 2000); diff --git a/lib/util/tests/ert_util_binary_split.cpp b/lib/util/tests/ert_util_binary_split.cpp index 93dc5b11fd..dbb18456f1 100644 --- a/lib/util/tests/ert_util_binary_split.cpp +++ b/lib/util/tests/ert_util_binary_split.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include void test_split(const char *test_string, bool split_on_first, const char *true1, const char *true2) { diff --git a/lib/util/tests/ert_util_chdir.cpp b/lib/util/tests/ert_util_chdir.cpp index f44d4dda03..98f9e6001b 100644 --- a/lib/util/tests/ert_util_chdir.cpp +++ b/lib/util/tests/ert_util_chdir.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include void test_chdir() { diff --git a/lib/util/tests/ert_util_clamp.cpp b/lib/util/tests/ert_util_clamp.cpp index 05ba43b0a8..238ec1fe55 100644 --- a/lib/util/tests/ert_util_clamp.cpp +++ b/lib/util/tests/ert_util_clamp.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include int main(int argc, char **argv) { diff --git a/lib/util/tests/ert_util_copy_file.cpp b/lib/util/tests/ert_util_copy_file.cpp index 73a22e12c0..18f57cc24d 100644 --- a/lib/util/tests/ert_util_copy_file.cpp +++ b/lib/util/tests/ert_util_copy_file.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include void test_copy_file(const char *executable) { diff --git a/lib/util/tests/ert_util_cwd_test.cpp b/lib/util/tests/ert_util_cwd_test.cpp index bbc0aaf34d..0538b1adfd 100644 --- a/lib/util/tests/ert_util_cwd_test.cpp +++ b/lib/util/tests/ert_util_cwd_test.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include int main(int argc, char **argv) { diff --git a/lib/util/tests/ert_util_datetime.cpp b/lib/util/tests/ert_util_datetime.cpp index 16cee307b6..b8cd613e67 100644 --- a/lib/util/tests/ert_util_datetime.cpp +++ b/lib/util/tests/ert_util_datetime.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include int main(int argc, char **argv) { diff --git a/lib/util/tests/ert_util_file_readable.cpp b/lib/util/tests/ert_util_file_readable.cpp index f6ce0c9251..67c1cea219 100644 --- a/lib/util/tests/ert_util_file_readable.cpp +++ b/lib/util/tests/ert_util_file_readable.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include void assert_equal(bool equal) { diff --git a/lib/util/tests/ert_util_mkdir_p.cpp b/lib/util/tests/ert_util_mkdir_p.cpp index bfcdf13b91..91c0892dc7 100644 --- a/lib/util/tests/ert_util_mkdir_p.cpp +++ b/lib/util/tests/ert_util_mkdir_p.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include int main(int argc, char **argv) { diff --git a/lib/util/tests/ert_util_normal_path.cpp b/lib/util/tests/ert_util_normal_path.cpp index 5d9be97a7a..1ca8456247 100644 --- a/lib/util/tests/ert_util_normal_path.cpp +++ b/lib/util/tests/ert_util_normal_path.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include void test_path(const char *input_path, const char *expected_path) { char *normal_path = util_alloc_normal_path(input_path); diff --git a/lib/util/tests/ert_util_parent_path.cpp b/lib/util/tests/ert_util_parent_path.cpp index 5f6d1f28db..99c4db38e1 100644 --- a/lib/util/tests/ert_util_parent_path.cpp +++ b/lib/util/tests/ert_util_parent_path.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include void test_path(const char *expected_parent, const char *input_path) { diff --git a/lib/util/tests/ert_util_path_stack_test.cpp b/lib/util/tests/ert_util_path_stack_test.cpp index 7f49b30fe6..22732ad648 100644 --- a/lib/util/tests/ert_util_path_stack_test.cpp +++ b/lib/util/tests/ert_util_path_stack_test.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/util/tests/ert_util_ping.cpp b/lib/util/tests/ert_util_ping.cpp index a2be160b7c..c40dd9028e 100644 --- a/lib/util/tests/ert_util_ping.cpp +++ b/lib/util/tests/ert_util_ping.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include int main(int argc, char **argv) { test_install_SIGNALS(); diff --git a/lib/util/tests/ert_util_realpath.cpp b/lib/util/tests/ert_util_realpath.cpp index 7dcd0e3a27..9f47310a59 100644 --- a/lib/util/tests/ert_util_realpath.cpp +++ b/lib/util/tests/ert_util_realpath.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include diff --git a/lib/util/tests/ert_util_relpath_test.cpp b/lib/util/tests/ert_util_relpath_test.cpp index f8b661f3df..0e69d4ab01 100644 --- a/lib/util/tests/ert_util_relpath_test.cpp +++ b/lib/util/tests/ert_util_relpath_test.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include void test_path(int nr, const char *root, const char *path, diff --git a/lib/util/tests/ert_util_rng.cpp b/lib/util/tests/ert_util_rng.cpp index ff135fdccf..f4106b3d6b 100644 --- a/lib/util/tests/ert_util_rng.cpp +++ b/lib/util/tests/ert_util_rng.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/lib/util/tests/ert_util_spawn.cpp b/lib/util/tests/ert_util_spawn.cpp index 9573dd7ecb..0fe03e461a 100644 --- a/lib/util/tests/ert_util_spawn.cpp +++ b/lib/util/tests/ert_util_spawn.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include static const char *stdout_msg = "stdout_xxx"; diff --git a/lib/util/tests/ert_util_sscan_test.cpp b/lib/util/tests/ert_util_sscan_test.cpp index 0f210784c0..828aa4f64e 100644 --- a/lib/util/tests/ert_util_sscan_test.cpp +++ b/lib/util/tests/ert_util_sscan_test.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include void test_sscanf_bool() { diff --git a/lib/util/tests/ert_util_strcat_test.cpp b/lib/util/tests/ert_util_strcat_test.cpp index dd8a62f58d..7a784ec5a8 100644 --- a/lib/util/tests/ert_util_strcat_test.cpp +++ b/lib/util/tests/ert_util_strcat_test.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include void test_strcat(char *s1, const char *s2, const char *expected) { diff --git a/lib/util/tests/ert_util_stringlist_test.cpp b/lib/util/tests/ert_util_stringlist_test.cpp index 218f9b479a..4440e0bcfa 100644 --- a/lib/util/tests/ert_util_stringlist_test.cpp +++ b/lib/util/tests/ert_util_stringlist_test.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/util/tests/ert_util_strstr_int_format.cpp b/lib/util/tests/ert_util_strstr_int_format.cpp index c938c39124..bd7f5b7a99 100644 --- a/lib/util/tests/ert_util_strstr_int_format.cpp +++ b/lib/util/tests/ert_util_strstr_int_format.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include void test_util_strstr() { diff --git a/lib/util/util.cpp b/lib/util/util.cpp index f54462f3e9..f233d3d92b 100644 --- a/lib/util/util.cpp +++ b/lib/util/util.cpp @@ -21,7 +21,7 @@ #include #include -#include "ert/util/build_config.h" +#include "ert/util/build_config.hpp" #include @@ -74,7 +74,7 @@ #error "Could not determine if this is a 32 bit or 64 bit computer?" #endif -#include +#include /* Macros for endian flipping. The macros create a new endian-flipped diff --git a/lib/util/util_abort.cpp b/lib/util/util_abort.cpp index 164896a413..15fad34ab5 100644 --- a/lib/util/util_abort.cpp +++ b/lib/util/util_abort.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include using fmt::format; using fmt::print; diff --git a/lib/util/util_getuid.cpp b/lib/util/util_getuid.cpp index 7a737e99ca..fa5981ddd1 100644 --- a/lib/util/util_getuid.cpp +++ b/lib/util/util_getuid.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include diff --git a/lib/util/util_lfs.c b/lib/util/util_lfs.c index 2c03f144ea..4b248d60d9 100644 --- a/lib/util/util_lfs.c +++ b/lib/util/util_lfs.c @@ -53,7 +53,7 @@ 'offset_type' in util.h, and all file operations should use that type. */ -#include +#include offset_type util_ftell(FILE *stream) { #ifdef ERT_WINDOWS_LFS diff --git a/lib/util/util_lockf.cpp b/lib/util/util_lockf.cpp index 0a0896f237..c9ba0dc758 100644 --- a/lib/util/util_lockf.cpp +++ b/lib/util/util_lockf.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/util/util_opendir.cpp b/lib/util/util_opendir.cpp index 38a5493187..73dd11d66b 100644 --- a/lib/util/util_opendir.cpp +++ b/lib/util/util_opendir.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/lib/util/util_spawn.cpp b/lib/util/util_spawn.cpp index dfb2ba29ec..db394a92c9 100644 --- a/lib/util/util_spawn.cpp +++ b/lib/util/util_spawn.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include extern char **environ; diff --git a/lib/util/util_symlink.cpp b/lib/util/util_symlink.cpp index 9a87484481..4077f58fbb 100644 --- a/lib/util/util_symlink.cpp +++ b/lib/util/util_symlink.cpp @@ -4,7 +4,7 @@ #include "ert/util/build_config.hpp" #include -#include +#include #ifndef ERT_HAVE_SYMLINK diff --git a/lib/util/util_unlink.cpp b/lib/util/util_unlink.cpp index ca612d87c0..f1d37582de 100644 --- a/lib/util/util_unlink.cpp +++ b/lib/util/util_unlink.cpp @@ -1,6 +1,6 @@ #include "ert/util/build_config.hpp" -#include +#include #if defined(HAVE_WINDOWS_UNLINK) diff --git a/lib/util/util_zlib.cpp b/lib/util/util_zlib.cpp index ac9e8d7eae..81dc54cdc6 100644 --- a/lib/util/util_zlib.cpp +++ b/lib/util/util_zlib.cpp @@ -5,7 +5,7 @@ #include -#include +#include /** This function reads data from the input pointer data, and writes a diff --git a/lib/util/vector.cpp b/lib/util/vector.cpp index 3d1fc00895..f30ff62c75 100644 --- a/lib/util/vector.cpp +++ b/lib/util/vector.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/util/vector_template.cpp.in b/lib/util/vector_template.cpp.in index a1bfd3c8a0..d699b5b9a1 100644 --- a/lib/util/vector_template.cpp.in +++ b/lib/util/vector_template.cpp.in @@ -99,7 +99,7 @@ #include #include -#include +#include #include #ifdef __cplusplus diff --git a/lib/vector_template.h.in b/lib/vector_template.h.in deleted file mode 100644 index 8850800e2e..0000000000 --- a/lib/vector_template.h.in +++ /dev/null @@ -1,135 +0,0 @@ -/* - Copyright (C) 2011 Equinor ASA, Norway. - - The file 'vector_template.h' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#ifndef ERT_@TYPE@_VECTOR_H -#define ERT_@TYPE@_VECTOR_H -#ifdef __cplusplus -extern "C" { -#endif -#include -#include - -#include -#include - -typedef struct @TYPE@_vector_struct @TYPE@_vector_type; -typedef @TYPE@ (@TYPE@_ftype) (@TYPE@); - - - int @TYPE@_vector_lookup_bin( const @TYPE@_vector_type * limits , @TYPE@ value , int guess); - int @TYPE@_vector_lookup_bin__( const @TYPE@_vector_type * limits , @TYPE@ value , int guess); - void @TYPE@_vector_inplace_div( @TYPE@_vector_type * vector , const @TYPE@_vector_type * inv_factor); - void @TYPE@_vector_inplace_mul( @TYPE@_vector_type * vector , const @TYPE@_vector_type * factor); - void @TYPE@_vector_inplace_add( @TYPE@_vector_type * vector , const @TYPE@_vector_type * delta); - void @TYPE@_vector_inplace_sub( @TYPE@_vector_type * vector , const @TYPE@_vector_type * delta); - void @TYPE@_vector_set_read_only( @TYPE@_vector_type * vector , bool read_only); - bool @TYPE@_vector_get_read_only( const @TYPE@_vector_type * vector ); - void @TYPE@_vector_memcpy_data( @TYPE@ * target, const @TYPE@_vector_type * src ); - void @TYPE@_vector_memcpy_from_data( @TYPE@_vector_type * target , const @TYPE@ * src , int src_size ); - void @TYPE@_vector_memcpy( @TYPE@_vector_type * target , const @TYPE@_vector_type * src); - void @TYPE@_vector_memcpy_data_block( @TYPE@_vector_type * target , const @TYPE@_vector_type * src , int target_offset , int src_offset , int len); - bool @TYPE@_vector_growable( const @TYPE@_vector_type * vector); - void @TYPE@_vector_select_unique(@TYPE@_vector_type * vector); - @TYPE@_vector_type * @TYPE@_vector_alloc( int init_size , @TYPE@ ); - @TYPE@_vector_type * @TYPE@_vector_alloc_private_wrapper(int init_size, @TYPE@ default_value , @TYPE@ * data , int alloc_size); - @TYPE@_vector_type * @TYPE@_vector_alloc_shared_wrapper(int init_size, @TYPE@ default_value , @TYPE@ * data , int alloc_size); - @TYPE@_vector_type * @TYPE@_vector_alloc_strided_copy( const @TYPE@_vector_type * src , int start , int stop , int stride ); - @TYPE@_vector_type * @TYPE@_vector_alloc_copy( const @TYPE@_vector_type * src); - void @TYPE@_vector_imul(@TYPE@_vector_type * vector, int index, @TYPE@ factor); - void @TYPE@_vector_scale(@TYPE@_vector_type * vector, @TYPE@ factor); - void @TYPE@_vector_div(@TYPE@_vector_type * vector, @TYPE@ divisor); - @TYPE@ @TYPE@_vector_reverse_iget(const @TYPE@_vector_type * vector , int index); - @TYPE@ @TYPE@_vector_iget(const @TYPE@_vector_type * , int); - @TYPE@ @TYPE@_vector_safe_iget(const @TYPE@_vector_type * , int); - @TYPE@ @TYPE@_vector_get_min(const @TYPE@_vector_type * vector); - @TYPE@ @TYPE@_vector_get_max(const @TYPE@_vector_type * vector); - int @TYPE@_vector_get_min_index(const @TYPE@_vector_type * vector, bool reverse); - int @TYPE@_vector_get_max_index(const @TYPE@_vector_type * vector, bool reverse); - @TYPE@ @TYPE@_vector_iadd( @TYPE@_vector_type * vector , int index , @TYPE@ delta); - void @TYPE@_vector_resize( @TYPE@_vector_type * vector , int new_size , @TYPE@ default_value ); - void @TYPE@_vector_iset(@TYPE@_vector_type * , int , @TYPE@); - void @TYPE@_vector_iset_block(@TYPE@_vector_type * vector , int index , int block_size , @TYPE@ value); - void @TYPE@_vector_idel_block( @TYPE@_vector_type * vector , int index , int block_size); - @TYPE@ @TYPE@_vector_idel( @TYPE@_vector_type * vector , int index); - @TYPE@ @TYPE@_vector_del_value( @TYPE@_vector_type * vector , @TYPE@ del_value); - void @TYPE@_vector_insert( @TYPE@_vector_type * vector , int index , @TYPE@ value); - void @TYPE@_vector_append(@TYPE@_vector_type * , @TYPE@); - void @TYPE@_vector_free_container(@TYPE@_vector_type * vector); - void @TYPE@_vector_free(@TYPE@_vector_type *); - void @TYPE@_vector_free__(void *); - void @TYPE@_vector_free_data(@TYPE@_vector_type *); - void @TYPE@_vector_reset(@TYPE@_vector_type *); - void @TYPE@_vector_reset__(void * __vector); - int @TYPE@_vector_size(const @TYPE@_vector_type * ); - void @TYPE@_vector_lshift(@TYPE@_vector_type * vector , int shift); - void @TYPE@_vector_rshift(@TYPE@_vector_type * vector , int shift); - @TYPE@ @TYPE@_vector_pop(@TYPE@_vector_type * vector); - @TYPE@ @TYPE@_vector_get_first(const @TYPE@_vector_type * vector); - @TYPE@ @TYPE@_vector_get_last(const @TYPE@_vector_type * ); - @TYPE@ * @TYPE@_vector_get_ptr(const @TYPE@_vector_type * ); - @TYPE@ * @TYPE@_vector_alloc_data_copy( const @TYPE@_vector_type * vector ); - const @TYPE@ * @TYPE@_vector_get_const_ptr(const @TYPE@_vector_type * ); - bool @TYPE@_vector_init_linear(@TYPE@_vector_type * vector , @TYPE@ start_value, @TYPE@ end_value, int num_values); - void @TYPE@_vector_init_range(@TYPE@_vector_type * vector , @TYPE@ value1 , @TYPE@ value2 , @TYPE@ delta); - void @TYPE@_vector_set_many(@TYPE@_vector_type * , int , const @TYPE@ * , int ); - void @TYPE@_vector_set_all(@TYPE@_vector_type * vector , @TYPE@ value); - void @TYPE@_vector_append_many(@TYPE@_vector_type * vector , const @TYPE@ * data , int length); - void @TYPE@_vector_append_vector(@TYPE@_vector_type * vector , const @TYPE@_vector_type * other); - void @TYPE@_vector_shrink(@TYPE@_vector_type * ); - @TYPE@ @TYPE@_vector_sum(const @TYPE@_vector_type * ); - @TYPE@ @TYPE@_vector_get_default(const @TYPE@_vector_type * ); - void @TYPE@_vector_set_default(@TYPE@_vector_type * vector, @TYPE@ default_value); - void @TYPE@_vector_append_default(@TYPE@_vector_type * vector , @TYPE@ default_value); - void @TYPE@_vector_iset_default(@TYPE@_vector_type * vector , int index , @TYPE@ default_value); - bool @TYPE@_vector_is_sorted( const @TYPE@_vector_type * vector , bool reverse); - bool @TYPE@_vector_contains(const @TYPE@_vector_type * vector , @TYPE@ value); - bool @TYPE@_vector_contains_sorted(const @TYPE@_vector_type * vector , @TYPE@ value); - int @TYPE@_vector_index(const @TYPE@_vector_type * vector , @TYPE@ value); - int @TYPE@_vector_index_sorted(const @TYPE@_vector_type * vector , @TYPE@ value); - void @TYPE@_vector_sort(@TYPE@_vector_type * vector); - void @TYPE@_vector_rsort(@TYPE@_vector_type * vector); - void @TYPE@_vector_permute(@TYPE@_vector_type * vector , const perm_vector_type * perm); - perm_vector_type * @TYPE@_vector_alloc_sort_perm(const @TYPE@_vector_type * vector); - perm_vector_type * @TYPE@_vector_alloc_rsort_perm(const @TYPE@_vector_type * vector); - void @TYPE@_vector_fprintf(const @TYPE@_vector_type * vector , FILE * stream , const char * name , const char * fmt); - void @TYPE@_vector_fwrite(const @TYPE@_vector_type * vector , FILE * stream); - @TYPE@_vector_type * @TYPE@_vector_fread_alloc( FILE * stream ); - void @TYPE@_vector_fread( @TYPE@_vector_type * vector , FILE * stream ); - void @TYPE@_vector_fwrite_data( const @TYPE@_vector_type * vector , FILE * stream ); - void @TYPE@_vector_fread_data( @TYPE@_vector_type * vector , int size, FILE * stream); - bool @TYPE@_vector_equal(const @TYPE@_vector_type * vector1 , const @TYPE@_vector_type * vector2); - int @TYPE@_vector_first_equal(const @TYPE@_vector_type * vector1, const @TYPE@_vector_type * vector2, int offset); - int @TYPE@_vector_first_not_equal(const @TYPE@_vector_type * vector1, const @TYPE@_vector_type * vector2, int offset); - void @TYPE@_vector_apply(@TYPE@_vector_type * vector , @TYPE@_ftype *func); - int @TYPE@_vector_count_equal( const @TYPE@_vector_type * vector , @TYPE@ cmp_value); - int @TYPE@_vector_element_size( const @TYPE@_vector_type * vector ); - void @TYPE@_vector_range_fill(@TYPE@_vector_type * vector , @TYPE@ limit1 , @TYPE@ delta , @TYPE@ limit2); - void @TYPE@_vector_shift(@TYPE@_vector_type * vector, @TYPE@ delta); - - UTIL_SAFE_CAST_HEADER( @TYPE@_vector ); - UTIL_IS_INSTANCE_HEADER( @TYPE@_vector ); - -#ifdef __cplusplus -} -#endif -#endif -// - - - - diff --git a/lib/vector_template.hpp.in b/lib/vector_template.hpp.in index cc98127f36..8505c529bd 100644 --- a/lib/vector_template.hpp.in +++ b/lib/vector_template.hpp.in @@ -1,7 +1,7 @@ /* Copyright (C) 2011 Equinor ASA, Norway. - The file 'vector_template.hpp' is part of ERT - Ensemble based Reservoir Tool. + The file 'vector_template.h' is part of ERT - Ensemble based Reservoir Tool. ERT is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,9 +16,120 @@ for more details. */ -#ifndef ERT_@TYPE@_VECTOR_CXX -#define ERT_@TYPE@_VECTOR_CXX +#ifndef ERT_@TYPE@_VECTOR_H +#define ERT_@TYPE@_VECTOR_H +#ifdef __cplusplus +extern "C" { +#endif +#include +#include + +#include +#include + +typedef struct @TYPE@_vector_struct @TYPE@_vector_type; +typedef @TYPE@ (@TYPE@_ftype) (@TYPE@); + + + int @TYPE@_vector_lookup_bin( const @TYPE@_vector_type * limits , @TYPE@ value , int guess); + int @TYPE@_vector_lookup_bin__( const @TYPE@_vector_type * limits , @TYPE@ value , int guess); + void @TYPE@_vector_inplace_div( @TYPE@_vector_type * vector , const @TYPE@_vector_type * inv_factor); + void @TYPE@_vector_inplace_mul( @TYPE@_vector_type * vector , const @TYPE@_vector_type * factor); + void @TYPE@_vector_inplace_add( @TYPE@_vector_type * vector , const @TYPE@_vector_type * delta); + void @TYPE@_vector_inplace_sub( @TYPE@_vector_type * vector , const @TYPE@_vector_type * delta); + void @TYPE@_vector_set_read_only( @TYPE@_vector_type * vector , bool read_only); + bool @TYPE@_vector_get_read_only( const @TYPE@_vector_type * vector ); + void @TYPE@_vector_memcpy_data( @TYPE@ * target, const @TYPE@_vector_type * src ); + void @TYPE@_vector_memcpy_from_data( @TYPE@_vector_type * target , const @TYPE@ * src , int src_size ); + void @TYPE@_vector_memcpy( @TYPE@_vector_type * target , const @TYPE@_vector_type * src); + void @TYPE@_vector_memcpy_data_block( @TYPE@_vector_type * target , const @TYPE@_vector_type * src , int target_offset , int src_offset , int len); + bool @TYPE@_vector_growable( const @TYPE@_vector_type * vector); + void @TYPE@_vector_select_unique(@TYPE@_vector_type * vector); + @TYPE@_vector_type * @TYPE@_vector_alloc( int init_size , @TYPE@ ); + @TYPE@_vector_type * @TYPE@_vector_alloc_private_wrapper(int init_size, @TYPE@ default_value , @TYPE@ * data , int alloc_size); + @TYPE@_vector_type * @TYPE@_vector_alloc_shared_wrapper(int init_size, @TYPE@ default_value , @TYPE@ * data , int alloc_size); + @TYPE@_vector_type * @TYPE@_vector_alloc_strided_copy( const @TYPE@_vector_type * src , int start , int stop , int stride ); + @TYPE@_vector_type * @TYPE@_vector_alloc_copy( const @TYPE@_vector_type * src); + void @TYPE@_vector_imul(@TYPE@_vector_type * vector, int index, @TYPE@ factor); + void @TYPE@_vector_scale(@TYPE@_vector_type * vector, @TYPE@ factor); + void @TYPE@_vector_div(@TYPE@_vector_type * vector, @TYPE@ divisor); + @TYPE@ @TYPE@_vector_reverse_iget(const @TYPE@_vector_type * vector , int index); + @TYPE@ @TYPE@_vector_iget(const @TYPE@_vector_type * , int); + @TYPE@ @TYPE@_vector_safe_iget(const @TYPE@_vector_type * , int); + @TYPE@ @TYPE@_vector_get_min(const @TYPE@_vector_type * vector); + @TYPE@ @TYPE@_vector_get_max(const @TYPE@_vector_type * vector); + int @TYPE@_vector_get_min_index(const @TYPE@_vector_type * vector, bool reverse); + int @TYPE@_vector_get_max_index(const @TYPE@_vector_type * vector, bool reverse); + @TYPE@ @TYPE@_vector_iadd( @TYPE@_vector_type * vector , int index , @TYPE@ delta); + void @TYPE@_vector_resize( @TYPE@_vector_type * vector , int new_size , @TYPE@ default_value ); + void @TYPE@_vector_iset(@TYPE@_vector_type * , int , @TYPE@); + void @TYPE@_vector_iset_block(@TYPE@_vector_type * vector , int index , int block_size , @TYPE@ value); + void @TYPE@_vector_idel_block( @TYPE@_vector_type * vector , int index , int block_size); + @TYPE@ @TYPE@_vector_idel( @TYPE@_vector_type * vector , int index); + @TYPE@ @TYPE@_vector_del_value( @TYPE@_vector_type * vector , @TYPE@ del_value); + void @TYPE@_vector_insert( @TYPE@_vector_type * vector , int index , @TYPE@ value); + void @TYPE@_vector_append(@TYPE@_vector_type * , @TYPE@); + void @TYPE@_vector_free_container(@TYPE@_vector_type * vector); + void @TYPE@_vector_free(@TYPE@_vector_type *); + void @TYPE@_vector_free__(void *); + void @TYPE@_vector_free_data(@TYPE@_vector_type *); + void @TYPE@_vector_reset(@TYPE@_vector_type *); + void @TYPE@_vector_reset__(void * __vector); + int @TYPE@_vector_size(const @TYPE@_vector_type * ); + void @TYPE@_vector_lshift(@TYPE@_vector_type * vector , int shift); + void @TYPE@_vector_rshift(@TYPE@_vector_type * vector , int shift); + @TYPE@ @TYPE@_vector_pop(@TYPE@_vector_type * vector); + @TYPE@ @TYPE@_vector_get_first(const @TYPE@_vector_type * vector); + @TYPE@ @TYPE@_vector_get_last(const @TYPE@_vector_type * ); + @TYPE@ * @TYPE@_vector_get_ptr(const @TYPE@_vector_type * ); + @TYPE@ * @TYPE@_vector_alloc_data_copy( const @TYPE@_vector_type * vector ); + const @TYPE@ * @TYPE@_vector_get_const_ptr(const @TYPE@_vector_type * ); + bool @TYPE@_vector_init_linear(@TYPE@_vector_type * vector , @TYPE@ start_value, @TYPE@ end_value, int num_values); + void @TYPE@_vector_init_range(@TYPE@_vector_type * vector , @TYPE@ value1 , @TYPE@ value2 , @TYPE@ delta); + void @TYPE@_vector_set_many(@TYPE@_vector_type * , int , const @TYPE@ * , int ); + void @TYPE@_vector_set_all(@TYPE@_vector_type * vector , @TYPE@ value); + void @TYPE@_vector_append_many(@TYPE@_vector_type * vector , const @TYPE@ * data , int length); + void @TYPE@_vector_append_vector(@TYPE@_vector_type * vector , const @TYPE@_vector_type * other); + void @TYPE@_vector_shrink(@TYPE@_vector_type * ); + @TYPE@ @TYPE@_vector_sum(const @TYPE@_vector_type * ); + @TYPE@ @TYPE@_vector_get_default(const @TYPE@_vector_type * ); + void @TYPE@_vector_set_default(@TYPE@_vector_type * vector, @TYPE@ default_value); + void @TYPE@_vector_append_default(@TYPE@_vector_type * vector , @TYPE@ default_value); + void @TYPE@_vector_iset_default(@TYPE@_vector_type * vector , int index , @TYPE@ default_value); + bool @TYPE@_vector_is_sorted( const @TYPE@_vector_type * vector , bool reverse); + bool @TYPE@_vector_contains(const @TYPE@_vector_type * vector , @TYPE@ value); + bool @TYPE@_vector_contains_sorted(const @TYPE@_vector_type * vector , @TYPE@ value); + int @TYPE@_vector_index(const @TYPE@_vector_type * vector , @TYPE@ value); + int @TYPE@_vector_index_sorted(const @TYPE@_vector_type * vector , @TYPE@ value); + void @TYPE@_vector_sort(@TYPE@_vector_type * vector); + void @TYPE@_vector_rsort(@TYPE@_vector_type * vector); + void @TYPE@_vector_permute(@TYPE@_vector_type * vector , const perm_vector_type * perm); + perm_vector_type * @TYPE@_vector_alloc_sort_perm(const @TYPE@_vector_type * vector); + perm_vector_type * @TYPE@_vector_alloc_rsort_perm(const @TYPE@_vector_type * vector); + void @TYPE@_vector_fprintf(const @TYPE@_vector_type * vector , FILE * stream , const char * name , const char * fmt); + void @TYPE@_vector_fwrite(const @TYPE@_vector_type * vector , FILE * stream); + @TYPE@_vector_type * @TYPE@_vector_fread_alloc( FILE * stream ); + void @TYPE@_vector_fread( @TYPE@_vector_type * vector , FILE * stream ); + void @TYPE@_vector_fwrite_data( const @TYPE@_vector_type * vector , FILE * stream ); + void @TYPE@_vector_fread_data( @TYPE@_vector_type * vector , int size, FILE * stream); + bool @TYPE@_vector_equal(const @TYPE@_vector_type * vector1 , const @TYPE@_vector_type * vector2); + int @TYPE@_vector_first_equal(const @TYPE@_vector_type * vector1, const @TYPE@_vector_type * vector2, int offset); + int @TYPE@_vector_first_not_equal(const @TYPE@_vector_type * vector1, const @TYPE@_vector_type * vector2, int offset); + void @TYPE@_vector_apply(@TYPE@_vector_type * vector , @TYPE@_ftype *func); + int @TYPE@_vector_count_equal( const @TYPE@_vector_type * vector , @TYPE@ cmp_value); + int @TYPE@_vector_element_size( const @TYPE@_vector_type * vector ); + void @TYPE@_vector_range_fill(@TYPE@_vector_type * vector , @TYPE@ limit1 , @TYPE@ delta , @TYPE@ limit2); + void @TYPE@_vector_shift(@TYPE@_vector_type * vector, @TYPE@ delta); -#include + UTIL_SAFE_CAST_HEADER( @TYPE@_vector ); + UTIL_IS_INSTANCE_HEADER( @TYPE@_vector ); +#ifdef __cplusplus +} #endif +#endif +// + + + +