Add more tests to check c calls #980
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eivindjahren
force-pushed
the
add_more_tests_of_prototypes
branch
3 times, most recently
from
ed9be14 to
5d5cc5e
Compare
The error given is "ffi_prep_cif_var failed" due to mismatch in arguments.
eivindjahren
force-pushed
the
add_more_tests_of_prototypes
branch
from
5d5cc5e to
c622f98
Compare
berland
reviewed
May 29, 2024
python/tests/rd_tests/test_grav.py
Outdated
|
|
||
| # The init file created here only contains a PORO field. More | ||
| # properties must be added to this before it can be used for | ||
| # any usefull gravity calculations. |
berland
reviewed
May 29, 2024
| assert ResdataUtil.get_num_cpu(str(data_file)) == 4 | ||
|
|
||
|
|
||
| def test_num_cpu_from_data_file_used_if_config_num_cpu_not_set(tmp_path): |
There was a problem hiding this comment.
This test name seems incorrect
eivindjahren
force-pushed
the
add_more_tests_of_prototypes
branch
from
c622f98 to
d5f660f
Compare
berland
reviewed
May 29, 2024
| DIMENS | ||
| 10 10 10 / | ||
| OIL | ||
| UNIFOUT |
There was a problem hiding this comment.
No syntax erorr, but I would not separate the line with OIL and the line with WATER with UNIFOUT. Humans need to view line 7 and 9 together to figure out which phase configuration is active.
berland
reviewed
May 29, 2024
| / | ||
| SOLUTION | ||
| EQUIL | ||
| 3*1000 0 1000 0 0 0 0 / |
There was a problem hiding this comment.
High pressure at shallow depths :)
If it does not matter for values in the test you can have
1000 100 1000 /
instead here to have something slightly more meaningful (item 5 is not relevant in this oil-water problem)
There was a problem hiding this comment.
I think I changed it to what you wanted now.
eivindjahren
force-pushed
the
add_more_tests_of_prototypes
branch
from
35c8cb5 to
22880ee
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also fixes a bug in
Grid.compare.In order to be able to remove the c code safely, we have to ensure all
ReadataPrototypes can still be called. This PR creates tests that tries to call as many of those as possible.The list of covered resdataprotypes are as follows.
python/resdata/__init__.py(no ResdataPrototypes)python/resdata/bin.py(no ResdataPrototypes)python/resdata/geometry/__init__.py(no ResdataPrototypes)python/resdata/geometry/cpolyline.pypython/resdata/geometry/cpolyline_collection.pypython/resdata/geometry/geo_pointset.pypython/resdata/geometry/geo_region.pypython/resdata/geometry/geometry_tools.py(no ResdataPrototypes)python/resdata/geometry/polyline.py(no ResdataPrototypes)python/resdata/geometry/surface.pypython/resdata/geometry/xyz_io.py(no ResdataPrototypes)python/resdata/gravimetry/__init__.py(no ResdataPrototypes)python/resdata/gravimetry/rd_grav.pypython/resdata/gravimetry/rd_subsidence.pypython/resdata/grid/__init__.py(no ResdataPrototypes)python/resdata/grid/cell.py(no ResdataPrototypes)python/resdata/grid/faults/__init__.py(no ResdataPrototypes)python/resdata/grid/faults/fault.py(no ResdataPrototypes)python/resdata/grid/faults/fault_block.pypython/resdata/grid/faults/fault_block_layer.pypython/resdata/grid/faults/fault_collection.py(no ResdataPrototypes)python/resdata/grid/faults/fault_line.py(no ResdataPrototypes)python/resdata/grid/faults/fault_segments.py(no ResdataPrototypes)python/resdata/grid/faults/layer.pypython/resdata/grid/rd_grid.py(relying on equinor tests for lgr)python/resdata/grid/rd_grid_generator.pypython/resdata/grid/rd_region.py(no ResdataPrototypes)python/resdata/rd_type.pypython/resdata/rd_util.pypython/resdata/resfile/__init__.py(no ResdataPrototypes)python/resdata/resfile/fortio.pypython/resdata/resfile/rd_3d_file.py(no ResdataPrototypes)python/resdata/resfile/rd_3dkw.py(no ResdataPrototypes)python/resdata/resfile/rd_file.pypython/resdata/resfile/rd_file_view.pypython/resdata/resfile/rd_init_file.py(no ResdataPrototypes)python/resdata/resfile/rd_kw.pypython/resdata/resfile/rd_restart_file.pypython/resdata/rft/__init__.py(no ResdataPrototypes)python/resdata/rft/rd_rft.py(partially tested through equinor data and difficult to produce data)python/resdata/rft/rd_rft_cell.py(partially tested through equinor data and difficult to produce data)python/resdata/rft/well_trajectory.py(no ResdataPrototypes)python/resdata/summary/__init__.py(no ResdataPrototypes)python/resdata/summary/rd_cmp.py(no ResdataPrototypes)python/resdata/summary/rd_npv.py(no ResdataPrototypes)python/resdata/summary/rd_smspec_node.pypython/resdata/summary/rd_sum.pypython/resdata/summary/rd_sum_keyword_vector.pypython/resdata/summary/rd_sum_node.py(no ResdataPrototypes)python/resdata/summary/rd_sum_tstep.pypython/resdata/summary/rd_sum_var_type.py(no ResdataPrototypes)python/resdata/summary/rd_sum_vector.py(no ResdataPrototypes)python/resdata/util/__init__.py(no ResdataPrototypes)python/resdata/util/enums/__init__.py(no ResdataPrototypes)python/resdata/util/enums/rng_alg_type_enum.py(no ResdataPrototypes)python/resdata/util/enums/rng_init_mode_enum.py(no ResdataPrototypes)python/resdata/util/test/__init__.py(no ResdataPrototypes)python/resdata/util/test/debug_msg.py(no ResdataPrototypes)python/resdata/util/test/extended_testcase.py(no ResdataPrototypes)python/resdata/util/test/import_test_case.py(no ResdataPrototypes)python/resdata/util/test/lint_test_case.py(no ResdataPrototypes)python/resdata/util/test/mock/__init__.py(no ResdataPrototypes)python/resdata/util/test/mock/rd_sum_mock.py(no ResdataPrototypes)python/resdata/util/test/path_context.py(no ResdataPrototypes)python/resdata/util/test/resdata_test_runner.py(no ResdataPrototypes)python/resdata/util/test/source_enumerator.py(no ResdataPrototypes)python/resdata/util/test/test_area.pypython/resdata/util/test/test_run.py(no ResdataPrototypes)python/resdata/util/util/__init__.py(no ResdataPrototypes)python/resdata/util/util/bool_vector.pypython/resdata/util/util/cthread_pool.py(current plan is to remove it)python/resdata/util/util/ctime.pypython/resdata/util/util/cwd_context.py(no ResdataPrototypes)python/resdata/util/util/double_vector.py(through vector_template.py)python/resdata/util/util/hash.pypython/resdata/util/util/install_abort_signals.pypython/resdata/util/util/int_vector.py(through vector_template.py)python/resdata/util/util/lookup_table.pypython/resdata/util/util/permutation_vector.pypython/resdata/util/util/rng.pypython/resdata/util/util/stringlist.pypython/resdata/util/util/thread_pool.py(no ResdataPrototypes)python/resdata/util/util/time_vector.py(through vector_template.py)python/resdata/util/util/vector_template.pypython/resdata/util/util/version.pypython/resdata/version.py(no ResdataPrototypes)python/resdata/well/__init__.py(no ResdataPrototypes)python/resdata/well/well_connection.pypython/resdata/well/well_connection_direction_enum.py(no ResdataPrototypes)python/resdata/well/well_info.pypython/resdata/well/well_segment.py(only through equinor data)python/resdata/well/well_state.py(self._segment_collection_iget is called with equinor data)python/resdata/well/well_time_line.pypython/resdata/well/well_type_enum.py(no ResdataPrototypes)Of special mention is the vector classes which are tested quite a bit, but the c code is also generated from a template, so although all are not strictly covered, it is not that important.
The few remaining untested
ResdataPrototypes are a bit tricky to get to, and it is perhaps not worth it to spend time on it when there is some coverage of it through the equinor testdata.