Fix datafiles

[kjetilbjorke]

Currently sim2sumo finds all paths to datafiles with valid filetypes .DATA, .afi and .in. However only the stem name are used as table name (and not the subfolders). Hence if two datafiles has same stem the random first one will be chosen, not taking into account the seedpoint (or datafile:) given in the config file. This does not fix that, but it does at least prioritize the .DATA file over .afi and .afi over .in making the results consistent over an ensemble. This tries to fix that 😅

[equinor-ruaj]

Tests are failing (seemingly) due to the "from" branch being on a fork.
Could you remake the PR on a branch directly from this repo?

[equinor-ruaj]

The tests should also be updated to match the code changes.
In tests/test_functions.py:

• Completely remove the test test_find_datafiles_no_seedpoint(tmp_path) - The function that is tested has been removed.
• Remove the import of find_datafiles_no_seedpoint at the top of the file - The function has been removed
• In test_find_datafiles_reek() change datafiles = find_datafiles(None, {}) to datafiles = find_datafiles(None)
• Update the test parameters to test_create_config_dict():
  • Should be

@pytest.mark.parametrize(
    "config,nrdatafiles,nrsubmodules",
    [
        ({}, 5, 4),
        (
            {
                "datafile": {
                    "3_R001_REEK": {"summary": {"column_keys": "F*P*"}}
                }
            },
            1,
            2,
        ),
        (
            {"datafile": {"3_R001_REEK": ["summary", "rft"]}},
            1,
            3,
        ),
        ({"datafile": ["3_R001_REEK", "OOGRE_PF.in"]}, 2, 4),
        ({"datafile": ["3_R001_REEK"]}, 1, 4),
        ({"datafile": ["3_R001_REEK-1.DATA"]}, 1, 4),
        ({"datafile": ["OOGRE_IX.afi"]}, 1, 4),
        ({"datafile": ["opm/model/OOGRE_OPM.DATA"]}, 1, 4),
        ({"grid3d": True}, 5, 4),
    ],
)

[kjetilbjorke]

Tests updated as mentioned in 4132fcf.

[equinor-ruaj]

lgtm

[equinor-ruaj]

Tests failing here due to failing Azure login since PR is from a fork.
Tests passing when running locally so merging should be OK.