Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Remove more unused c code #1015

Merged
merged 5 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions applications/resdata/sum_write.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,7 @@ int main(int argc, char **argv) {
standard.

4: Should the data be output as a unified file, or as a
collection of files - one for each report step. Can be
modified with rd_sum_set_unified_output().
collection of files - one for each report step.

5: The real-world start time of this simulation, as a unix
time_t value.
Expand Down
69 changes: 1 addition & 68 deletions lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ add_library(
resdata/nnc_info.cpp
resdata/rd_grav_common.cpp
resdata/nnc_vector.cpp
resdata/rd_nnc_export.cpp
resdata/rd_nnc_data.cpp
resdata/rd_nnc_geometry.cpp
resdata/layer.cpp
resdata/fault_block.cpp
resdata/fault_block_layer.cpp
Expand All @@ -105,7 +102,6 @@ add_library(
resdata/well_branch_collection.cpp
resdata/well_rseg_loader.cpp
resdata/FortIO.cpp
resdata/RDFilename.cpp
geometry/geo_surface.cpp
geometry/geo_util.cpp
geometry/geo_pointset.cpp
Expand Down Expand Up @@ -260,7 +256,6 @@ foreach(
rd_grid_export
rd_grid_init_fwrite
rd_grid_reset_actnum
rd_nnc_export_intersect
rd_sum_restart
rd_sum_data_intermediate_test
rd_unsmry_loader_test
Expand All @@ -270,7 +265,6 @@ foreach(
rd_kw_fread
rd_kw_grdecl
rd_kw_init
rd_nnc_geometry
rd_nnc_info_test
rd_nnc_vector
rd_rft_cell
Expand All @@ -282,8 +276,6 @@ foreach(
rd_filenames
rd_make_date_no_shift
rd_make_date_shift
test_rd_nnc_data
rd_nnc_pair
well_conn_collection
well_branch_collection
well_conn
Expand Down Expand Up @@ -345,7 +337,7 @@ foreach(test ert_util_unique_ptr)
add_test(NAME ${test} COMMAND ${test})
endforeach()

foreach(test rdxx_kw rdxx_fortio rdxx_filename rdxx_types)
foreach(test rdxx_kw rdxx_fortio rdxx_types)
add_executable(${test} resdata/tests/${test}.cpp)
target_link_libraries(${test} resdata)
add_test(NAME ${test} COMMAND ${test})
Expand All @@ -356,10 +348,6 @@ foreach(
rd_coarse_test
rd_grid_layer_contains
rd_restart_test
rd_nnc_export
rd_nnc_export_get_tran
rd_nnc_data_equinor_root
rd_sum_case_exists
rd_grid_lgr_name
rd_region
rd_grid_cell_contains_wellpath
Expand All @@ -371,8 +359,6 @@ foreach(
rd_dualp
rd_grid_dx_dy_dz
rd_sum_test
rd_sum_report_step_equal
rd_sum_report_step_compatible
rd_file_equinor
rd_fmt
rd_rsthead
Expand Down Expand Up @@ -419,40 +405,6 @@ add_test(NAME rd_coarse_test COMMAND rd_coarse_test
add_test(NAME rd_restart_test COMMAND rd_restart_test
${_resdatapath}/Gurbat/ECLIPSE.UNRST)

add_test(NAME rd_nnc_export_gurbat COMMAND rd_nnc_export
${_resdatapath}/Gurbat/ECLIPSE TRUE)
add_test(NAME rd_nnc_export_10kcase
COMMAND rd_nnc_export ${_resdatapath}/10kcase/TEST10K_FLT_LGR_NNC TRUE)
add_test(NAME rd_nnc_export_dual_poro_diff
COMMAND rd_nnc_export ${_resdatapath}/DualPoro/DUAL_DIFF TRUE)
add_test(NAME rd_nnc_export_dual_poro
COMMAND rd_nnc_export ${_resdatapath}/DualPoro/DUALPORO TRUE)
add_test(NAME rd_nnc_export_nested_lgr_case
COMMAND rd_nnc_export ${_resdatapath}/nestedLGRcase/TESTCASE_NESTEDLGR
TRUE)
add_test(NAME rd_nnc_export_tyrihans
COMMAND rd_nnc_export ${_resdatapath}/TYRIHANS/BASE20150218_MULTFLT
FALSE)

add_test(
NAME rd_nnc_export_get_tran
COMMAND rd_nnc_export_get_tran
${_resdatapath}/Troll/MSW_LGR/2BRANCHES-CCEWELLPATH-NEW-SCH-TUNED-AR3)

add_test(
NAME rd_nnc_data_equinor_root
COMMAND
rd_nnc_data_equinor_root
${_resdatapath}/Troll/MSW_LGR/2BRANCHES-CCEWELLPATH-NEW-SCH-TUNED-AR3
${_resdatapath}/flow-nnc/Simple4/SIMPLE_SUMMARY4)

add_test(
NAME rd_sum_case_exists
COMMAND
rd_sum_case_exists ${_resdatapath}/Gurbat/ECLIPSE
${_resdatapath}/GurbatSummary/missingHeader/ECLIPSE
${_resdatapath}/GurbatSummary/missingData/ECLIPSE)

add_test(
NAME rd_grid_lgr_name
COMMAND
Expand Down Expand Up @@ -541,25 +493,6 @@ add_test(NAME rd_sum_report_step_equal6
COMMAND rd_sum_report_step_equal ${_resdatapath}/Snorre/SNORRE
${_resdatapath}/Snorre2/SNORRE2 FALSE)

add_test(NAME rd_sum_report_step_compatible1
COMMAND rd_sum_report_step_compatible ${_resdatapath}/Gurbat/ECLIPSE
${_resdatapath}/Snorre/SNORRE FALSE)
add_test(NAME rd_sum_report_step_compatible2
COMMAND rd_sum_report_step_compatible ${_resdatapath}/Gurbat/ECLIPSE
${_resdatapath}/Gurbat/ECLIPSE TRUE)
add_test(NAME rd_sum_report_step_compatible3
COMMAND rd_sum_report_step_compatible ${_resdatapath}/Gurbat/ECLIPSE
${_resdatapath}/modGurbat/extraMinistep/ECLIPSE TRUE)
add_test(NAME rd_sum_report_step_compatible4
COMMAND rd_sum_report_step_compatible ${_resdatapath}/Gurbat/ECLIPSE
${_resdatapath}/modGurbat/short/ECLIPSE TRUE)
add_test(NAME rd_sum_report_step_compatible5
COMMAND rd_sum_report_step_compatible ${_resdatapath}/Gurbat/ECLIPSE
${_resdatapath}/modGurbat/enkf/ECLIPSE TRUE)
add_test(NAME rd_sum_report_step_compatible6
COMMAND rd_sum_report_step_equal ${_resdatapath}/Snorre/SNORRE
${_resdatapath}/Snorre2/SNORRE2 FALSE)

add_test(NAME rd_file_equinor
COMMAND rd_file_equinor ${_resdatapath}/Gurbat/ECLIPSE.UNRST
ECLIPSE.UNRST)
Expand Down
21 changes: 0 additions & 21 deletions lib/include/resdata/RDFilename.hpp

This file was deleted.

40 changes: 0 additions & 40 deletions lib/include/resdata/rd_nnc_data.hpp

This file was deleted.

50 changes: 0 additions & 50 deletions lib/include/resdata/rd_nnc_export.hpp

This file was deleted.

36 changes: 0 additions & 36 deletions lib/include/resdata/rd_nnc_geometry.hpp

This file was deleted.

Loading