subscript 1.16.2__tar.gz → 1.16.3__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {subscript-1.16.2 → subscript-1.16.3}/PKG-INFO +3 -1
- {subscript-1.16.2 → subscript-1.16.3}/README.md +2 -0
- subscript-1.16.3/docs/scripts/fmuobs.rst +16 -0
- {subscript-1.16.2 → subscript-1.16.3}/pyproject.toml +5 -3
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/fmu_copy_revision/fmu_copy_revision.py +21 -19
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/fmuobs/fmuobs.py +39 -11
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/fmuobs/parsers.py +70 -14
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/fmuobs/util.py +8 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/fmuobs/writers.py +2 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/version.py +3 -3
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript.egg-info/PKG-INFO +3 -1
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript.egg-info/SOURCES.txt +3 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript.egg-info/scm_file_list.json +3 -0
- subscript-1.16.3/src/subscript.egg-info/scm_version.json +8 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_fmu_copy_revision.py +36 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_fmuobs.py +103 -1
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_fmuobs_parsers.py +10 -0
- subscript-1.16.3/tests/testdata_fmuobs/mixed_supported_unsupported.obs +14 -0
- subscript-1.16.3/tests/testdata_fmuobs/only_unsupported.obs +1 -0
- subscript-1.16.3/tests/testdata_fmuobs/summary_block.obs +17 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_gravity/HIST.UNRST +1 -1
- subscript-1.16.2/docs/scripts/fmuobs.rst +0 -9
- subscript-1.16.2/src/subscript.egg-info/scm_version.json +0 -8
- {subscript-1.16.2 → subscript-1.16.3}/.github/dependabot.yml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/.github/workflows/codecov.yml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/.github/workflows/linting.yml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/.github/workflows/publish.yml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/.github/workflows/subscript.yml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/.gitignore +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/LICENSE +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/SECURITY.md +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/ci/testkomodo.sh +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/Makefile +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/_static/equinor-logo.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/_static/equinor-logo2.jpg +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/_static/equinor-logo2.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/_static/equinor_logo.jpg +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/_static/equinor_logo_only.jpg +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/_templates/layout.html +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/conf.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/contributing.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/history.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/index.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/make.bat +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/overview.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/bjobsusers.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/casegen_upcars.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/check_swatinit.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/convert_grid_format.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/create_date_files.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/csv2ofmvol.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/csv_merge.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/csv_stack.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/eclcompress.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/ecldiff2roff.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/field_statistics.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/fmu_copy_revision.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/grav_subs_maps.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/grav_subs_points.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/images/Pack_sim_overview.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/images/Summaryplot-ensemble.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/images/Summaryplot-ert.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/images/Summaryplot-normalizeexample.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/images/Workflow_sector2fluxnum.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/images/casegen_upcars_geometry.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/images/check_swatinit_scatter.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/images/check_swatinit_volplot.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/images/ecl-swat-initialization.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/images/make_check_swatinit_images.sh +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/images/resinsight_wells_project_example.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/interp_relperm.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/merge_rft_ertobs.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/merge_unrst_files.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/ofmvol2csv.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/pack_sim.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/params2csv.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/presentvalue.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/prtvol2csv.csv +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/prtvol2csv.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/restartthinner.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/rmsecl_volumetrics.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/sector2fluxnum.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/summaryplot.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/sunsch.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/sw_model_utilities.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/vfp2csv.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/scripts/welltest_dpds.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/docs/usage.rst +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/setup.cfg +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/bjobsusers/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/bjobsusers/bjobsusers.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/casegen_upcars/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/casegen_upcars/casegen_upcars.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/casegen_upcars/model.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/casegen_upcars/udf.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/casegen_upcars/udf_arg_parser.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/check_swatinit/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/check_swatinit/check_swatinit.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/check_swatinit/constants.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/check_swatinit/pillarmodel.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/check_swatinit/plotter.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/convert_grid_format/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/convert_grid_format/convert_grid_format.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/create_date_files/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/create_date_files/create_date_files.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/csv2ofmvol/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/csv2ofmvol/csv2ofmvol.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/csv_merge/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/csv_merge/csv_merge.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/csv_stack/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/csv_stack/csv_stack.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/eclcompress/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/eclcompress/allowlist.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/eclcompress/eclcompress.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/ecldiff2roff/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/ecldiff2roff/ecldiff2roff.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/field_statistics/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/field_statistics/field_statistics.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/fmu_copy_revision/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/fmuobs/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/grav_subs_maps/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/grav_subs_maps/grav_subs_maps.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/grav_subs_points/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/grav_subs_points/grav_subs_points.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/hook_implementations/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/hook_implementations/forward_model_steps.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/interp_relperm/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/interp_relperm/interp_relperm.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/legacy/duf +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/legacy/eclmanual +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/legacy/ertwatch +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/legacy/list_rms_usage +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/legacy/nosim +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/legacy/runeclipse +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/merge_rft_ertobs/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/merge_rft_ertobs/merge_rft_ertobs.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/merge_unrst_files/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/merge_unrst_files/merge_unrst_files.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/ofmvol2csv/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/ofmvol2csv/ofmvol2csv.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/pack_sim/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/pack_sim/pack_sim.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/params2csv/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/params2csv/params2csv.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/presentvalue/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/presentvalue/presentvalue.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/prtvol2csv/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/prtvol2csv/prtvol2csv.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/restartthinner/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/restartthinner/restartthinner.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/rmsecl_volumetrics/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/rmsecl_volumetrics/rmsecl_volumetrics.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/sector2fluxnum/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/sector2fluxnum/completions.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/sector2fluxnum/datafile_obj.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/sector2fluxnum/flux_obj.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/sector2fluxnum/flux_util.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/sector2fluxnum/fluxfile_obj.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/sector2fluxnum/sector2fluxnum.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/summaryplot/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/summaryplot/summaryplot.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/sunsch/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/sunsch/sunsch.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/sunsch/time_vector.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/sw_model_utilities/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/sw_model_utilities/sw_model_utilities.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/vfp2csv/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/vfp2csv/vfp2csv.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/welltest_dpds/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript/welltest_dpds/welltest_dpds.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript.egg-info/dependency_links.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript.egg-info/entry_points.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript.egg-info/requires.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/src/subscript.egg-info/top_level.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/__init__.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline/test_summaryplotter_mpl_test_cmd_args0.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline/test_summaryplotter_mpl_test_cmd_args1.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline/test_summaryplotter_mpl_test_cmd_args10.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline/test_summaryplotter_mpl_test_cmd_args11.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline/test_summaryplotter_mpl_test_cmd_args2.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline/test_summaryplotter_mpl_test_cmd_args3.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline/test_summaryplotter_mpl_test_cmd_args4.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline/test_summaryplotter_mpl_test_cmd_args5.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline/test_summaryplotter_mpl_test_cmd_args6.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline/test_summaryplotter_mpl_test_cmd_args7.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline/test_summaryplotter_mpl_test_cmd_args8.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline/test_summaryplotter_mpl_test_cmd_args9.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args0.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args1.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args10.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args11.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args2.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args3.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args4.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args5.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args6.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args7.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args8.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args9.png +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/conftest.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/edit/drogon.trans +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/grid/drogon.faults +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/grid/drogon.grid +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/grid/drogon.multnum +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/grid/drogon.multregt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/grid/drogon.perm +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/grid/drogon.poro +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/props/drogon.pvt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/props/drogon.sattab +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/props/drogon.swatinit +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/regions/drogon.eqlnum +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/regions/drogon.fipnum +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/regions/drogon.fipzon +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/regions/drogon.pvtnum +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/regions/drogon.satnum +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/runspec/drogon.dimens +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/runspec/drogon.eqldims +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/runspec/drogon.gridopts +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/runspec/drogon.regdims +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/runspec/drogon.tabdims +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/schedule/55_33-1.sch +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/schedule/55_33-1.wells +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/schedule/drogon_hist.sch +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/schedule/vfp/A-1.inc +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/schedule/vfp/A-2.inc +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/schedule/vfp/A-3.inc +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/schedule/vfp/A-4.inc +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/solution/drogon.equil +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/solution/drogon.rxvd +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/solution/drogon.thpres +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/include/summary/drogon.summary +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/drogon/eclipse/model/DROGON-0.DATA +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/grid/reek.faults +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/grid/reek.grid +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/grid/reek.multflt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/grid/reek.multz +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/grid/reek.perm +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/grid/reek.poro +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/props/let-sgof.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/props/let-swof.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/props/reek.endpoints +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/props/reek.pvt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/props/reek.swatinit +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/props/sgof.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/props/swof.inc +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/props/swof.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/regions/reek.eqlnum +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/regions/reek.fipnum +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/schedule/reek_history.sch +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/solution/reek.equil +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/include/summary/reek.smry +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/model/2_R001_REEK-0.DATA +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/model/2_R001_REEK-0.ECLEND +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/model/2_R001_REEK-0.EGRID +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/model/2_R001_REEK-0.INIT +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/model/2_R001_REEK-0.LOG +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/model/2_R001_REEK-0.PRT +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/model/2_R001_REEK-0.RFT +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/model/2_R001_REEK-0.SMSPEC +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/model/2_R001_REEK-0.UNRST +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/model/2_R001_REEK-0.UNSMRY +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/eclipse/model/parameters.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/parameters.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/rms/README +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/rms/reek.rms10.1.3/.master +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/reek/rms/reek.rms11.1.0/.master +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/vfp/GasProd.VFP +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/vfp/pd2.VFP +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/welltest/eclipse/model/DROGON_DST_PLT-0.SMSPEC +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/data/welltest/eclipse/model/DROGON_DST_PLT-0.UNSMRY +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_bjobsusers.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_casegen_upcars.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_check_swatinit.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_check_swatinit_simulators.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_convert_grid_format.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_create_date_files.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_csv2ofmvol.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_csv_merge.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_csv_stack.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_docs.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_eclcompress.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_ecldiff2roff.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_eclinit2roff.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_field_statistics.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_fmuobs_writers.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_grav_subs_maps.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_grav_subs_points.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_hook_implementations.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_interp_relperm.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_merge_rft_ertobs.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_merge_unrst_files.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_ofmvol2csv.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_pack_sim.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_params2csv.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_presentvalue.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_prtvol2csv.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_restartthinner.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_rmsecl_volumetrics.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_sector2fluxnum.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_subscriptlogger.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_summaryplot.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_sunsch.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_sw_model_utilities.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_vfp2csv.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/test_welltest_dpds.py +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_casegen_upcars/demo_large_scale.yaml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_casegen_upcars/demo_small_scale.yaml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_casegen_upcars/dump_value.tmpl +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_casegen_upcars/upcars_eclipse_ref_lg.tmpl +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_casegen_upcars/upcars_eclipse_ref_ss.tmpl +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_eclcompress/permxyz.grdecl +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/config_example.yml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/ERTBOX.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/Geogrid.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/files.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_B_P1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_B_P1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_C_P2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_C_P2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_A_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_A_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_B_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_B_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_C_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_C_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F3_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F3_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F3_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F3_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F3_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F3_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_B_P1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_B_P1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_C_P2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_C_P2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ERTBOX.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_A_P1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_A_P1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_A_P2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_A_P2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_B_P1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_B_P1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_C_P2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_C_P2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--nactive_A_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--nactive_A_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--nactive_B_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--nactive_B_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--nactive_C_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--nactive_C_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_A_F1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_A_F1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_A_F2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_A_F2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_A_F3_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_A_F3_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_B_F1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_B_F1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_B_F2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_B_F2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_B_F3_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_B_F3_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_C_F1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_C_F1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_C_F2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_C_F2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_C_F3_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_C_F3_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_A_P1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_A_P1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_A_P2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_A_P2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_B_P1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_B_P1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_C_P2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_C_P2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox_A.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox_B.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox_C.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/mean_A_GRF1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/mean_A_GRF1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/mean_A_GRF2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/mean_A_GRF2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/mean_B_GRF2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/mean_B_GRF2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/result_field_files.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/stdev_A_GRF1_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/stdev_A_GRF1_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/stdev_A_GRF2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/stdev_A_GRF2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/stdev_B_GRF2_0.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/stdev_B_GRF2_3.roff +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/temporary_field_files.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/ert/model/0readme +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/fmuconfig/output/global_variables.yml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_field_statistics/rms/output/aps/ERTBOX.EGRID +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_fmuobs/drogon_wbhp_rft_wct_gor_tracer_4d.obs +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_fmuobs/ert-doc.csv +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_fmuobs/ert-doc.obs +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_fmuobs/ert-doc.yml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_fmuobs/fmu-ensemble-obs.yml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_fmuobs/hist_obs_wells.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_fmuobs/ri-obs.csv +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_fmuobs/summary_obs_without_date.obs +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_gravity/HIST.EGRID +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_gravity/HIST.INIT +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_gravity/global_variables.yml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_gravity/grav_subs_maps.yml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_gravity/grav_subs_points.yml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_gravity/seabed.gri +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_gravity/station_coordinates.csv +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_interp_relperm/cfg.yml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_interp_relperm/sgof_base.inc +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_interp_relperm/sgof_opt.inc +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_interp_relperm/sgof_pes.inc +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_interp_relperm/swof_base.inc +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_interp_relperm/swof_opt.inc +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_interp_relperm/swof_pes.inc +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_merge_rft_ertobs/drogon/gendata_rft.csv +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A2.obs +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A2.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A3.obs +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A3.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A4.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A4_1.obs +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A5.obs +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A5.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A6.obs +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A6.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_merge_rft_ertobs/drogon/rft/well_date_rft.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_merge_unrst_files/HIST.UNRST +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_merge_unrst_files/PRED.UNRST +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_ofmvol2csv/fileA.vol +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_ofmvol2csv/fileB.vol +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_ofmvol2csv/fileC.vol +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_ofmvol2csv/ofm_example.vol +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_prtvol2csv/0readme.txt +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_prtvol2csv/DROGON_FIPNUM.PRT +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_prtvol2csv/DROGON_FIPZON.PRT +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_prtvol2csv/DROGON_INACTIVE_FIPNUM.PRT +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_prtvol2csv/DROGON_NOBAL_FLOW.PRT +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_prtvol2csv/DROGON_NO_INITIAL_BALANCE.PRT +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_prtvol2csv/DROGON_NO_INITIAL_BALANCE_FLOW.PRT +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sector2fluxnum/DUMPFLUX_TEST.DATA +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sector2fluxnum/DUMPFLUX_TEST.EGRID +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sector2fluxnum/DUMPFLUX_TEST.FLUX +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sector2fluxnum/OUT_COARSE.FLUX +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sector2fluxnum/TEST.DATA +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sector2fluxnum/TEST.EGRID +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sector2fluxnum/TEST.INIT +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sector2fluxnum/TEST.UNRST +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sunsch/config.yml +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sunsch/emptyinit.sch +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sunsch/foo1.sch +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sunsch/footemplate.sch +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sunsch/initwithdates.sch +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sunsch/merge2.sch +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sunsch/mergeme.sch +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/testdata_sunsch/options3.sch +0 -0
- {subscript-1.16.2 → subscript-1.16.3}/tests/utils.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: subscript
|
|
3
|
-
Version: 1.16.
|
|
3
|
+
Version: 1.16.3
|
|
4
4
|
Summary: Equinor's collection of subsurface reservoir modelling scripts
|
|
5
5
|
Author-email: Equinor <rnyb@equinor.com>
|
|
6
6
|
License-Expression: GPL-3.0-only
|
|
@@ -72,6 +72,8 @@ Dynamic: license-file
|
|
|
72
72
|

|
|
73
73
|
[](https://www.gnu.org/licenses/gpl-3.0)
|
|
74
74
|
[](https://github.com/astral-sh/ruff)
|
|
75
|
+
[](https://github.com/equinor/subscript/actions/workflows/publish.yml)
|
|
76
|
+
[](https://pypi.org/project/subscript/)
|
|
75
77
|
|
|
76
78
|
**subscript** is Equinor's collection of scripts used for subsurface reservoir modelling.
|
|
77
79
|
|
|
@@ -5,6 +5,8 @@
|
|
|
5
5
|

|
|
6
6
|
[](https://www.gnu.org/licenses/gpl-3.0)
|
|
7
7
|
[](https://github.com/astral-sh/ruff)
|
|
8
|
+
[](https://github.com/equinor/subscript/actions/workflows/publish.yml)
|
|
9
|
+
[](https://pypi.org/project/subscript/)
|
|
8
10
|
|
|
9
11
|
**subscript** is Equinor's collection of scripts used for subsurface reservoir modelling.
|
|
10
12
|
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
|
|
2
|
+
FMUOBS
|
|
3
|
+
======
|
|
4
|
+
|
|
5
|
+
.. argparse::
|
|
6
|
+
:module: subscript.fmuobs.fmuobs
|
|
7
|
+
:func: get_parser
|
|
8
|
+
:prog: fmuobs
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
Unsupported ERT observation keywords
|
|
12
|
+
------------------------------------
|
|
13
|
+
|
|
14
|
+
Newer ERT keywords such as ``RFT_OBSERVATION``, ``BREAKTHROUGH_OBSERVATION`` and ``SEISMIC_OBSERVATION``
|
|
15
|
+
are not supported, and are skipped with a warning. ``LOCALIZATION`` blocks inside
|
|
16
|
+
observations are ignored (also with a warning), while the rest of the observation is kept.
|
|
@@ -5,9 +5,6 @@ requires = [
|
|
|
5
5
|
]
|
|
6
6
|
build-backend = "setuptools.build_meta"
|
|
7
7
|
|
|
8
|
-
[tool.setuptools_scm]
|
|
9
|
-
version_file = "src/subscript/version.py"
|
|
10
|
-
|
|
11
8
|
[project]
|
|
12
9
|
name = "subscript"
|
|
13
10
|
description = "Equinor's collection of subsurface reservoir modelling scripts"
|
|
@@ -128,6 +125,10 @@ FmuObs = "subscript.fmuobs.fmuobs"
|
|
|
128
125
|
Params2Csv = "subscript.params2csv.params2csv"
|
|
129
126
|
FieldStatistics = "subscript.field_statistics.field_statistics"
|
|
130
127
|
|
|
128
|
+
|
|
129
|
+
[tool.setuptools_scm]
|
|
130
|
+
version_file = "src/subscript/version.py"
|
|
131
|
+
|
|
131
132
|
[tool.setuptools]
|
|
132
133
|
script-files = [
|
|
133
134
|
"src/subscript/legacy/duf",
|
|
@@ -232,3 +233,4 @@ combine-as-imports = true
|
|
|
232
233
|
|
|
233
234
|
[tool.ruff.lint.pylint]
|
|
234
235
|
max-args = 35
|
|
236
|
+
max-returns = 7
|
|
@@ -231,6 +231,27 @@ cd $PWD
|
|
|
231
231
|
"""
|
|
232
232
|
|
|
233
233
|
|
|
234
|
+
def _get_size(path: str) -> int:
|
|
235
|
+
disksum = 0
|
|
236
|
+
for filesystemobject in Path(path).rglob("*"):
|
|
237
|
+
try:
|
|
238
|
+
if not filesystemobject.is_symlink():
|
|
239
|
+
disksum += filesystemobject.stat().st_size
|
|
240
|
+
except PermissionError:
|
|
241
|
+
logger.warning(
|
|
242
|
+
"Could not get size of %s, Permission denied", filesystemobject
|
|
243
|
+
)
|
|
244
|
+
return disksum
|
|
245
|
+
|
|
246
|
+
|
|
247
|
+
def _filesize(size: float) -> str:
|
|
248
|
+
for unit in ("B", "K", "M", "G"):
|
|
249
|
+
if size < 1024 or unit == "G":
|
|
250
|
+
break
|
|
251
|
+
size /= 1024
|
|
252
|
+
return f"{size:.1f} {unit}"
|
|
253
|
+
|
|
254
|
+
|
|
234
255
|
def get_parser() -> argparse.ArgumentParser:
|
|
235
256
|
"""Setup parser."""
|
|
236
257
|
|
|
@@ -480,25 +501,6 @@ class CopyFMU:
|
|
|
480
501
|
|
|
481
502
|
freekbytes = free // 1024
|
|
482
503
|
|
|
483
|
-
def _get_size(path: str) -> int:
|
|
484
|
-
disksum = 0
|
|
485
|
-
for filesystemobject in Path(path).rglob("*"):
|
|
486
|
-
try:
|
|
487
|
-
if not filesystemobject.is_symlink():
|
|
488
|
-
disksum += filesystemobject.stat().st_size
|
|
489
|
-
except PermissionError:
|
|
490
|
-
logger.warning(
|
|
491
|
-
"Could not get size of %s, Permission denied", filesystemobject
|
|
492
|
-
)
|
|
493
|
-
return disksum
|
|
494
|
-
|
|
495
|
-
def _filesize(size: float) -> str:
|
|
496
|
-
for unit in ("B", "K", "M", "G"): # noqa: B007
|
|
497
|
-
if size < 1024:
|
|
498
|
-
break
|
|
499
|
-
size /= 1024
|
|
500
|
-
return f"{size:.1f} {unit}"
|
|
501
|
-
|
|
502
504
|
fsize = _get_size(self.source)
|
|
503
505
|
print(f"\n Size of existing revision is: {_filesize(fsize)}\n")
|
|
504
506
|
|
|
@@ -15,11 +15,15 @@ import yaml
|
|
|
15
15
|
|
|
16
16
|
from subscript import __version__, getLogger
|
|
17
17
|
from subscript.fmuobs.parsers import (
|
|
18
|
+
INCLUDE_RE,
|
|
18
19
|
compute_date_from_days,
|
|
19
20
|
ertobs2df,
|
|
21
|
+
filter_comments,
|
|
20
22
|
obsdict2df,
|
|
21
23
|
resinsight_df2df,
|
|
24
|
+
split_ertobs_units,
|
|
22
25
|
)
|
|
26
|
+
from subscript.fmuobs.util import KNOWN_UNSUPPORTED_KEYWORDS
|
|
23
27
|
from subscript.fmuobs.writers import (
|
|
24
28
|
CLASS_SHORTNAME,
|
|
25
29
|
df2ertobs,
|
|
@@ -158,12 +162,12 @@ def validate_internal_dframe(obs_df: pd.DataFrame) -> bool:
|
|
|
158
162
|
if obs_df.empty:
|
|
159
163
|
logger.warning("Observation dataframe empty")
|
|
160
164
|
return True
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
165
|
+
for required_column in ["CLASS", "LABEL"]:
|
|
166
|
+
if required_column not in obs_df:
|
|
167
|
+
logger.error("%s is not in dataframe - not valid", required_column)
|
|
168
|
+
failed = True
|
|
169
|
+
if failed:
|
|
170
|
+
return False
|
|
167
171
|
non_supported_classes = set(obs_df["CLASS"]) - set(CLASS_SHORTNAME.keys())
|
|
168
172
|
if non_supported_classes:
|
|
169
173
|
logger.warning("Unsupported observation classes: %s", non_supported_classes)
|
|
@@ -262,6 +266,19 @@ def autoparse_file(filename: str) -> tuple[str | None, pd.DataFrame]:
|
|
|
262
266
|
return ("ert", pd.DataFrame())
|
|
263
267
|
except ValueError:
|
|
264
268
|
ert_dframe = None
|
|
269
|
+
if (
|
|
270
|
+
ert_dframe is not None
|
|
271
|
+
and ert_dframe.empty
|
|
272
|
+
and KNOWN_UNSUPPORTED_KEYWORDS.intersection(
|
|
273
|
+
units[0] for units in split_ertobs_units(content) if units
|
|
274
|
+
)
|
|
275
|
+
):
|
|
276
|
+
logger.warning(
|
|
277
|
+
"No supported observations found in %s, "
|
|
278
|
+
"check for unsupported ERT observation keywords",
|
|
279
|
+
filename,
|
|
280
|
+
)
|
|
281
|
+
return ("ert", pd.DataFrame())
|
|
265
282
|
if ert_dframe is not None and (
|
|
266
283
|
{"CLASS", "LABEL"}.issubset(ert_dframe.columns)
|
|
267
284
|
and not ert_dframe.empty
|
|
@@ -271,7 +288,10 @@ def autoparse_file(filename: str) -> tuple[str | None, pd.DataFrame]:
|
|
|
271
288
|
return ("ert", ert_dframe)
|
|
272
289
|
|
|
273
290
|
logger.error(
|
|
274
|
-
"Unable to parse %s as any supported observation file format"
|
|
291
|
+
"Unable to parse %s as any supported observation file format. "
|
|
292
|
+
"If it is an ERT observation file, it may use keywords "
|
|
293
|
+
"not supported by fmuobs.",
|
|
294
|
+
filename,
|
|
275
295
|
)
|
|
276
296
|
return (None, pd.DataFrame())
|
|
277
297
|
|
|
@@ -306,13 +326,17 @@ def configure_logging(verbose: bool = False, debug: bool = False) -> None:
|
|
|
306
326
|
if debug:
|
|
307
327
|
loglevel = logging.DEBUG
|
|
308
328
|
|
|
329
|
+
logging.getLogger("subscript.fmuobs").setLevel(loglevel)
|
|
309
330
|
for name in (
|
|
310
|
-
"subscript.fmuobs",
|
|
311
331
|
"subscript.fmuobs.parsers",
|
|
312
332
|
"subscript.fmuobs.writers",
|
|
313
333
|
"subscript.fmuobs.util",
|
|
314
334
|
):
|
|
315
|
-
logging.getLogger(name)
|
|
335
|
+
submodule_logger = logging.getLogger(name)
|
|
336
|
+
submodule_logger.setLevel(loglevel)
|
|
337
|
+
# Records propagate to the handlers of "subscript.fmuobs", so own
|
|
338
|
+
# handlers would print every message twice.
|
|
339
|
+
submodule_logger.handlers.clear()
|
|
316
340
|
|
|
317
341
|
|
|
318
342
|
def fmuobs(
|
|
@@ -335,8 +359,12 @@ def fmuobs(
|
|
|
335
359
|
|
|
336
360
|
# For ERT files, there is the problem of include-file-path. If not-found
|
|
337
361
|
# include filepaths are present, the filetype is ert, but dframe is empty.
|
|
338
|
-
if filetype == "ert"
|
|
339
|
-
|
|
362
|
+
input_str = Path(inputfile).read_text(encoding="utf8") if filetype == "ert" else ""
|
|
363
|
+
if (
|
|
364
|
+
filetype == "ert"
|
|
365
|
+
and dframe.empty
|
|
366
|
+
and INCLUDE_RE.search(filter_comments(input_str))
|
|
367
|
+
):
|
|
340
368
|
if not includedir:
|
|
341
369
|
# Try and error for the location of include files, first in current
|
|
342
370
|
# dir, then in the directory of the input file. The proper default
|
|
@@ -9,6 +9,7 @@ import pandas as pd
|
|
|
9
9
|
|
|
10
10
|
from subscript import getLogger
|
|
11
11
|
from subscript.fmuobs.util import (
|
|
12
|
+
CLASS_SHORTNAME,
|
|
12
13
|
ERT_ALT_DATE_FORMAT,
|
|
13
14
|
ERT_DATE_FORMAT,
|
|
14
15
|
ERT_ISO_DATE_FORMAT,
|
|
@@ -17,6 +18,9 @@ from subscript.fmuobs.util import (
|
|
|
17
18
|
|
|
18
19
|
logger = getLogger(__name__)
|
|
19
20
|
|
|
21
|
+
# Label-less nested blocks that are dropped (with a warning) when parsing
|
|
22
|
+
IGNORED_SUBUNITS = {"LOCALIZATION"}
|
|
23
|
+
|
|
20
24
|
# Regular expressions for matching ERT observation files.
|
|
21
25
|
# Note that lower-case is supported by the regexp's, but might not be supported
|
|
22
26
|
# by ERT.
|
|
@@ -27,7 +31,7 @@ _OBS_LABEL = r"([A-Za-z0-9_\-]+)"
|
|
|
27
31
|
_SEMICOLON = _WHITESPACE + ";" + _WHITESPACE
|
|
28
32
|
|
|
29
33
|
# This avoids nested {}, and avoids capturing trailing ; in matched group
|
|
30
|
-
_OPTIONAL_CURLY_SUBGROUP = r"(\{[A-Za-z=0-9
|
|
34
|
+
_OPTIONAL_CURLY_SUBGROUP = r"(\{[A-Za-z=0-9\+\-\.,_;/\s]*\})?" + _SEMICOLON
|
|
31
35
|
|
|
32
36
|
OBS_ARGS_RE = re.compile(
|
|
33
37
|
_WHITESPACE
|
|
@@ -104,6 +108,24 @@ def mask_curly_braces(string: str, mask_char: str = "X") -> str:
|
|
|
104
108
|
return string
|
|
105
109
|
|
|
106
110
|
|
|
111
|
+
def mask_nested_curly_braces(string: str, mask_char: str = "X") -> str:
|
|
112
|
+
"""Mask all characters inside curly braces (at any nesting depth), leaving
|
|
113
|
+
the outermost braces themselves unmasked in the output length-preserving
|
|
114
|
+
string, so that only top-level separators remain visible."""
|
|
115
|
+
depth = 0
|
|
116
|
+
masked = []
|
|
117
|
+
for char in string:
|
|
118
|
+
if char == "{":
|
|
119
|
+
depth += 1
|
|
120
|
+
if depth > 0 and not (char == "{" and depth == 1):
|
|
121
|
+
masked.append(mask_char)
|
|
122
|
+
else:
|
|
123
|
+
masked.append(char)
|
|
124
|
+
if char == "}":
|
|
125
|
+
depth = max(depth - 1, 0)
|
|
126
|
+
return "".join(masked)
|
|
127
|
+
|
|
128
|
+
|
|
107
129
|
def split_by_sep_in_masked_string(
|
|
108
130
|
string: str, masked_string: str, sep: str = ";"
|
|
109
131
|
) -> list[str]:
|
|
@@ -346,6 +368,12 @@ def flatten_observation_unit(
|
|
|
346
368
|
for subunit_key, subunit_value in obsunit.items()
|
|
347
369
|
if isinstance(subunit_value, dict)
|
|
348
370
|
]
|
|
371
|
+
if not subunit_keys:
|
|
372
|
+
return [obsunit]
|
|
373
|
+
for ignored in [key for key in subunit_keys if key in IGNORED_SUBUNITS]:
|
|
374
|
+
logger.debug("Ignoring unsupported %s block in observation", ignored)
|
|
375
|
+
obsunit = {key: val for key, val in obsunit.items() if key != ignored}
|
|
376
|
+
subunit_keys.remove(ignored)
|
|
349
377
|
if not subunit_keys:
|
|
350
378
|
return [obsunit]
|
|
351
379
|
keyvalue_keys = set(obsunit.keys()) - set(subunit_keys)
|
|
@@ -370,6 +398,27 @@ def flatten_observation_unit(
|
|
|
370
398
|
return obs_subunits
|
|
371
399
|
|
|
372
400
|
|
|
401
|
+
def split_ertobs_units(input_str: str, cwd: str = ".") -> list[list[str]]:
|
|
402
|
+
"""Split a string with ERT observations into its top-level observation
|
|
403
|
+
units, each as a list of whitespace-separated tokens (keyword, label and
|
|
404
|
+
the curly-brace arguments). Include statements are expanded and comments
|
|
405
|
+
removed first.
|
|
406
|
+
|
|
407
|
+
Args:
|
|
408
|
+
input_str: String in ERT observation syntax.
|
|
409
|
+
cwd: Path used when resolving include statements.
|
|
410
|
+
"""
|
|
411
|
+
ertobs_str = expand_includes(filter_comments(input_str), cwd=cwd)
|
|
412
|
+
|
|
413
|
+
# Helper string for splitting correctly on semicolons, braces nested
|
|
414
|
+
# to any depth are masked
|
|
415
|
+
masked_string = mask_nested_curly_braces(ertobs_str)
|
|
416
|
+
return [
|
|
417
|
+
unit_str.replace("{", " {").split()
|
|
418
|
+
for unit_str in split_by_sep_in_masked_string(ertobs_str, masked_string)
|
|
419
|
+
]
|
|
420
|
+
|
|
421
|
+
|
|
373
422
|
def ertobs2df(
|
|
374
423
|
input_str: str, cwd: str = ".", starttime: str | None = None
|
|
375
424
|
) -> pd.DataFrame:
|
|
@@ -389,28 +438,35 @@ def ertobs2df(
|
|
|
389
438
|
Returns:
|
|
390
439
|
pd.DataFrame. The DATE column is always of type datetime64
|
|
391
440
|
"""
|
|
392
|
-
ertobs_str = expand_includes(filter_comments(input_str), cwd=cwd)
|
|
393
|
-
|
|
394
|
-
# Helper string for splitting correctly on semicolons
|
|
395
|
-
masked_string = mask_curly_braces(ertobs_str)
|
|
396
441
|
obs_list = []
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
442
|
+
skipped_keywords: list[str] = []
|
|
443
|
+
for obs_unit_split in split_ertobs_units(input_str, cwd=cwd):
|
|
444
|
+
if obs_unit_split and obs_unit_split[0] not in CLASS_SHORTNAME:
|
|
445
|
+
if obs_unit_split[0] not in skipped_keywords:
|
|
446
|
+
skipped_keywords.append(obs_unit_split[0])
|
|
447
|
+
logger.warning(
|
|
448
|
+
"Unsupported ERT observation keyword %s is skipped",
|
|
449
|
+
obs_unit_split[0],
|
|
450
|
+
)
|
|
451
|
+
continue
|
|
401
452
|
# Two or three components depending on observation type.
|
|
402
453
|
if len(obs_unit_split) < 2:
|
|
403
|
-
print(observation_unit_str)
|
|
404
|
-
print(obs_unit_split)
|
|
405
454
|
raise ValueError
|
|
406
455
|
obs_unit = {"CLASS": obs_unit_split[0], "LABEL": obs_unit_split[1]}
|
|
407
456
|
logger.debug("Parsing observation %s %s", obs_unit["CLASS"], obs_unit["LABEL"])
|
|
408
457
|
if len(obs_unit_split) > 2:
|
|
409
458
|
obs_args = " ".join(obs_unit_split[2:])
|
|
410
459
|
logger.debug("Subunit data: %s", obs_args)
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
460
|
+
parsed_unit = parse_observation_unit(obs_args)
|
|
461
|
+
for ignored in IGNORED_SUBUNITS.intersection(parsed_unit):
|
|
462
|
+
if ignored not in skipped_keywords:
|
|
463
|
+
skipped_keywords.append(ignored)
|
|
464
|
+
logger.warning(
|
|
465
|
+
"Unsupported %s blocks in observations are ignored, "
|
|
466
|
+
"they are not exported",
|
|
467
|
+
ignored,
|
|
468
|
+
)
|
|
469
|
+
for obs_subunit in flatten_observation_unit(parsed_unit):
|
|
414
470
|
obs_list.append({**obs_unit, **obs_subunit})
|
|
415
471
|
else:
|
|
416
472
|
obs_list.append(obs_unit)
|
|
@@ -11,6 +11,14 @@ CLASS_SHORTNAME = {
|
|
|
11
11
|
}
|
|
12
12
|
|
|
13
13
|
|
|
14
|
+
# Valid ERT observation keywords that fmuobs does not (yet) support
|
|
15
|
+
KNOWN_UNSUPPORTED_KEYWORDS = {
|
|
16
|
+
"BREAKTHROUGH_OBSERVATION",
|
|
17
|
+
"RFT_OBSERVATION",
|
|
18
|
+
"SEISMIC_OBSERVATION",
|
|
19
|
+
"SUMMARY",
|
|
20
|
+
}
|
|
21
|
+
|
|
14
22
|
ERT_DATE_FORMAT = "%d/%m/%Y"
|
|
15
23
|
ERT_ISO_DATE_FORMAT = "%Y-%m-%d"
|
|
16
24
|
ERT_ALT_DATE_FORMAT = "%d.%m.%Y" # Not found in doc, but supported by ERT
|
|
@@ -402,6 +402,8 @@ def df2resinsight_df(obs_df: pd.DataFrame) -> pd.DataFrame:
|
|
|
402
402
|
|
|
403
403
|
ri_column_names = ["DATE", "VECTOR", "VALUE", "ERROR"]
|
|
404
404
|
ri_dframe = obs_df.copy()
|
|
405
|
+
if "CLASS" not in ri_dframe:
|
|
406
|
+
return pd.DataFrame(columns=ri_column_names)
|
|
405
407
|
|
|
406
408
|
# Only SUMMARY_OBSERVATION is supported:
|
|
407
409
|
ri_dframe = ri_dframe[ri_dframe["CLASS"] == "SUMMARY_OBSERVATION"].rename(
|
|
@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
|
|
|
18
18
|
commit_id: str | None
|
|
19
19
|
__commit_id__: str | None
|
|
20
20
|
|
|
21
|
-
__version__ = version = '1.16.
|
|
22
|
-
__version_tuple__ = version_tuple = (1, 16,
|
|
21
|
+
__version__ = version = '1.16.3'
|
|
22
|
+
__version_tuple__ = version_tuple = (1, 16, 3)
|
|
23
23
|
|
|
24
|
-
__commit_id__ = commit_id = '
|
|
24
|
+
__commit_id__ = commit_id = 'g46a9e236e'
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: subscript
|
|
3
|
-
Version: 1.16.
|
|
3
|
+
Version: 1.16.3
|
|
4
4
|
Summary: Equinor's collection of subsurface reservoir modelling scripts
|
|
5
5
|
Author-email: Equinor <rnyb@equinor.com>
|
|
6
6
|
License-Expression: GPL-3.0-only
|
|
@@ -72,6 +72,8 @@ Dynamic: license-file
|
|
|
72
72
|

|
|
73
73
|
[](https://www.gnu.org/licenses/gpl-3.0)
|
|
74
74
|
[](https://github.com/astral-sh/ruff)
|
|
75
|
+
[](https://github.com/equinor/subscript/actions/workflows/publish.yml)
|
|
76
|
+
[](https://pypi.org/project/subscript/)
|
|
75
77
|
|
|
76
78
|
**subscript** is Equinor's collection of scripts used for subsurface reservoir modelling.
|
|
77
79
|
|
|
@@ -414,7 +414,10 @@ tests/testdata_fmuobs/ert-doc.obs
|
|
|
414
414
|
tests/testdata_fmuobs/ert-doc.yml
|
|
415
415
|
tests/testdata_fmuobs/fmu-ensemble-obs.yml
|
|
416
416
|
tests/testdata_fmuobs/hist_obs_wells.txt
|
|
417
|
+
tests/testdata_fmuobs/mixed_supported_unsupported.obs
|
|
418
|
+
tests/testdata_fmuobs/only_unsupported.obs
|
|
417
419
|
tests/testdata_fmuobs/ri-obs.csv
|
|
420
|
+
tests/testdata_fmuobs/summary_block.obs
|
|
418
421
|
tests/testdata_fmuobs/summary_obs_without_date.obs
|
|
419
422
|
tests/testdata_gravity/HIST.EGRID
|
|
420
423
|
tests/testdata_gravity/HIST.INIT
|
|
@@ -406,7 +406,10 @@
|
|
|
406
406
|
"tests/testdata_fmuobs/ert-doc.yml",
|
|
407
407
|
"tests/testdata_fmuobs/fmu-ensemble-obs.yml",
|
|
408
408
|
"tests/testdata_fmuobs/hist_obs_wells.txt",
|
|
409
|
+
"tests/testdata_fmuobs/mixed_supported_unsupported.obs",
|
|
410
|
+
"tests/testdata_fmuobs/only_unsupported.obs",
|
|
409
411
|
"tests/testdata_fmuobs/ri-obs.csv",
|
|
412
|
+
"tests/testdata_fmuobs/summary_block.obs",
|
|
410
413
|
"tests/testdata_fmuobs/summary_obs_without_date.obs",
|
|
411
414
|
"tests/testdata_gravity/HIST.EGRID",
|
|
412
415
|
"tests/testdata_gravity/HIST.INIT",
|
|
@@ -417,3 +417,39 @@ def test_profiles_empty_directory_is_copied(datatree, profile, expected, monkeyp
|
|
|
417
417
|
subprocess.run(["fmu_copy_revision"], check=True, input=user_input)
|
|
418
418
|
empty_dir = Path(target) / "empty"
|
|
419
419
|
assert empty_dir.is_dir() is expected
|
|
420
|
+
|
|
421
|
+
|
|
422
|
+
@pytest.mark.parametrize(
|
|
423
|
+
"estimated_size, printed_estimated_size",
|
|
424
|
+
[
|
|
425
|
+
(2, "2.0 B"),
|
|
426
|
+
(2 * 2**10, "2.0 K"),
|
|
427
|
+
(2 * 2**20, "2.0 M"),
|
|
428
|
+
(2 * 2**30, "2.0 G"),
|
|
429
|
+
(2 * 2**40, "2048.0 G"),
|
|
430
|
+
],
|
|
431
|
+
)
|
|
432
|
+
def test_that_check_disk_space_prints_correct_estimated_size(
|
|
433
|
+
datatree, monkeypatch, capsys, estimated_size, printed_estimated_size
|
|
434
|
+
):
|
|
435
|
+
monkeypatch.chdir(datatree)
|
|
436
|
+
monkeypatch.setattr(time, "sleep", lambda _: None)
|
|
437
|
+
free_space = estimated_size
|
|
438
|
+
used_space = 4 * 2**30
|
|
439
|
+
total_space = free_space + used_space
|
|
440
|
+
monkeypatch.setattr(
|
|
441
|
+
fcr.shutil,
|
|
442
|
+
"disk_usage",
|
|
443
|
+
lambda _: (total_space, used_space, free_space),
|
|
444
|
+
)
|
|
445
|
+
|
|
446
|
+
monkeypatch.setattr(fcr, "_get_size", lambda _path: estimated_size)
|
|
447
|
+
|
|
448
|
+
runner = fcr.CopyFMU()
|
|
449
|
+
runner.do_parse_args("")
|
|
450
|
+
runner.source = "20.1.1"
|
|
451
|
+
|
|
452
|
+
runner.check_disk_space()
|
|
453
|
+
|
|
454
|
+
out, _ = capsys.readouterr()
|
|
455
|
+
assert f"Size of existing revision is: {printed_estimated_size}" in out
|
|
@@ -4,13 +4,19 @@ other formats, and test the ERT hook"""
|
|
|
4
4
|
import io
|
|
5
5
|
import logging
|
|
6
6
|
import subprocess
|
|
7
|
+
import sys
|
|
7
8
|
from pathlib import Path
|
|
8
9
|
|
|
9
10
|
import pandas as pd
|
|
10
11
|
import pytest
|
|
11
12
|
import yaml
|
|
12
13
|
|
|
13
|
-
from subscript.fmuobs.fmuobs import
|
|
14
|
+
from subscript.fmuobs.fmuobs import (
|
|
15
|
+
autoparse_file,
|
|
16
|
+
fmuobs,
|
|
17
|
+
main,
|
|
18
|
+
validate_internal_dframe,
|
|
19
|
+
)
|
|
14
20
|
from subscript.fmuobs.parsers import ertobs2df, obsdict2df, resinsight_df2df
|
|
15
21
|
from subscript.fmuobs.writers import df2ertobs, df2obsdict, df2resinsight_df
|
|
16
22
|
|
|
@@ -470,3 +476,99 @@ def test_stdout_guard_does_not_change_log_levels(tmp_path, monkeypatch):
|
|
|
470
476
|
)
|
|
471
477
|
|
|
472
478
|
assert logger.level == logging.WARNING
|
|
479
|
+
|
|
480
|
+
|
|
481
|
+
def test_unsupported_keywords_are_skipped_with_warning(tmp_path, monkeypatch, caplog):
|
|
482
|
+
"""Unsupported keywords and LOCALIZATION blocks must not break parsing"""
|
|
483
|
+
monkeypatch.chdir(tmp_path)
|
|
484
|
+
fmuobs(
|
|
485
|
+
str(TESTDATA_DIR / "mixed_supported_unsupported.obs"),
|
|
486
|
+
csv="out.csv",
|
|
487
|
+
yml="out.yml",
|
|
488
|
+
resinsight="ri.csv",
|
|
489
|
+
ertobs="out.obs",
|
|
490
|
+
)
|
|
491
|
+
dframe = pd.read_csv("out.csv")
|
|
492
|
+
assert set(dframe["CLASS"]) == {"SUMMARY_OBSERVATION", "GENERAL_OBSERVATION"}
|
|
493
|
+
assert "LOCALIZATION" not in dframe.columns
|
|
494
|
+
assert "BREAKTHROUGH_OBSERVATION is skipped" in caplog.text
|
|
495
|
+
assert "RFT_OBSERVATION is skipped" in caplog.text
|
|
496
|
+
assert "SEISMIC_OBSERVATION is skipped" in caplog.text
|
|
497
|
+
assert caplog.text.count("LOCALIZATION blocks in observations are ignored") == 1
|
|
498
|
+
assert len(pd.read_csv("ri.csv", sep=";")) == 1
|
|
499
|
+
|
|
500
|
+
|
|
501
|
+
def test_only_unsupported_keywords(tmp_path, monkeypatch, caplog):
|
|
502
|
+
"""No crash (and no error) when nothing supported is found"""
|
|
503
|
+
monkeypatch.chdir(tmp_path)
|
|
504
|
+
fmuobs(
|
|
505
|
+
str(TESTDATA_DIR / "only_unsupported.obs"),
|
|
506
|
+
csv="out.csv",
|
|
507
|
+
yml="out.yml",
|
|
508
|
+
resinsight="ri.csv",
|
|
509
|
+
ertobs="out.obs",
|
|
510
|
+
)
|
|
511
|
+
assert "No supported observations found" in caplog.text
|
|
512
|
+
assert not [rec for rec in caplog.records if rec.levelno >= logging.ERROR]
|
|
513
|
+
|
|
514
|
+
|
|
515
|
+
def test_summary_block_with_nested_localization(tmp_path, monkeypatch, caplog):
|
|
516
|
+
monkeypatch.chdir(tmp_path)
|
|
517
|
+
fmuobs(str(TESTDATA_DIR / "summary_block.obs"), csv="out.csv")
|
|
518
|
+
assert "keyword SUMMARY is skipped" in caplog.text
|
|
519
|
+
assert "keyword WELL" not in caplog.text
|
|
520
|
+
assert "keyword }" not in caplog.text
|
|
521
|
+
|
|
522
|
+
|
|
523
|
+
@pytest.mark.parametrize("columns", [{"A": [1]}, {"CLASS": ["X"]}, {"LABEL": ["X"]}])
|
|
524
|
+
def test_validate_internal_dframe_missing_columns(columns, caplog):
|
|
525
|
+
assert not validate_internal_dframe(pd.DataFrame(columns))
|
|
526
|
+
assert "is not in dataframe" in caplog.text
|
|
527
|
+
|
|
528
|
+
|
|
529
|
+
def test_only_unsupported_keywords_in_include(tmp_path, monkeypatch, caplog):
|
|
530
|
+
"""Unsupported keywords inside a resolvable include file are detected"""
|
|
531
|
+
monkeypatch.chdir(tmp_path)
|
|
532
|
+
Path("child.obs").write_text(
|
|
533
|
+
(TESTDATA_DIR / "only_unsupported.obs").read_text(encoding="utf8"),
|
|
534
|
+
encoding="utf8",
|
|
535
|
+
)
|
|
536
|
+
Path("root.obs").write_text("include child.obs;\n", encoding="utf8")
|
|
537
|
+
filetype, dframe = autoparse_file("root.obs")
|
|
538
|
+
assert filetype == "ert"
|
|
539
|
+
assert dframe.empty
|
|
540
|
+
assert "No supported observations found" in caplog.text
|
|
541
|
+
assert not [rec for rec in caplog.records if rec.levelno >= logging.ERROR]
|
|
542
|
+
|
|
543
|
+
|
|
544
|
+
def test_unsupported_keyword_as_label_is_not_unsupported_file(tmp_path, monkeypatch):
|
|
545
|
+
"""Only top-level keywords count, not labels that happen to match"""
|
|
546
|
+
monkeypatch.chdir(tmp_path)
|
|
547
|
+
Path("in.obs").write_text("SMRY_OBSERVATION SUMMARY {VALUE=1;};\n", encoding="utf8")
|
|
548
|
+
filetype, _ = autoparse_file("in.obs")
|
|
549
|
+
assert filetype is None
|
|
550
|
+
|
|
551
|
+
|
|
552
|
+
def test_submodule_warning_printed_once(tmp_path):
|
|
553
|
+
"""Messages from submodule loggers must not be printed by two handlers.
|
|
554
|
+
|
|
555
|
+
caplog cannot detect this as it captures once at the root logger, so the
|
|
556
|
+
actual stdout of a separate process is counted."""
|
|
557
|
+
(tmp_path / "in.obs").write_text(
|
|
558
|
+
"RFT_OBSERVATION rft_obs { CSV=a.csv; PROPERTY=PRESSURE; };\n"
|
|
559
|
+
"SUMMARY_OBSERVATION A {VALUE=1; ERROR=1; DATE=2019-08-01; KEY=WOPR;};\n",
|
|
560
|
+
encoding="utf8",
|
|
561
|
+
)
|
|
562
|
+
result = subprocess.run(
|
|
563
|
+
[
|
|
564
|
+
sys.executable,
|
|
565
|
+
"-c",
|
|
566
|
+
"import sys; from subscript.fmuobs.fmuobs import main; "
|
|
567
|
+
"sys.argv = ['fmuobs', 'in.obs', '--csv', 'o.csv']; main()",
|
|
568
|
+
],
|
|
569
|
+
cwd=tmp_path,
|
|
570
|
+
capture_output=True,
|
|
571
|
+
text=True,
|
|
572
|
+
check=True,
|
|
573
|
+
)
|
|
574
|
+
assert result.stdout.count("keyword RFT_OBSERVATION is skipped") == 1
|
|
@@ -905,3 +905,13 @@ def test_obsdict2df(obsdict, expected_df):
|
|
|
905
905
|
expected_df.sort_index(axis=1),
|
|
906
906
|
check_dtype=False,
|
|
907
907
|
)
|
|
908
|
+
|
|
909
|
+
|
|
910
|
+
def test_localization_with_scientific_notation_value(caplog):
|
|
911
|
+
"""LOCALIZATION blocks are ignored also with exponent values (contains "-")"""
|
|
912
|
+
dframe = ertobs2df(
|
|
913
|
+
"SUMMARY_OBSERVATION A {VALUE = 1; ERROR = 1; DATE = 2019-08-01; KEY = WOPR;"
|
|
914
|
+
" LOCALIZATION { EAST = 462588.52; NORTH = 5934080.96; RADIUS = 1e-3;}; };"
|
|
915
|
+
)
|
|
916
|
+
assert not {"EAST", "NORTH", "RADIUS"} & set(dframe.columns)
|
|
917
|
+
assert "LOCALIZATION blocks in observations are ignored" in caplog.text
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
SUMMARY_OBSERVATION A3_WOPR_VALYSAR_01_08_2019 {VALUE = 266; ERROR = 100; ERROR_MODE = ABS; DATE = 2019-08-01; KEY = WOPRL__1:A3; LOCALIZATION { EAST = 462753.44; NORTH = 5932869.64; RADIUS = 1000.0;}; };
|
|
2
|
+
BREAKTHROUGH_OBSERVATION A1_A5_TRACER { KEY = WTPTWT1:A1; DATE = 2019-02-26; THRESHOLD = 0.000001; ERROR = 30; };
|
|
3
|
+
RFT_OBSERVATION rft_obs {
|
|
4
|
+
CSV=./rft/rft_ertobs.csv;
|
|
5
|
+
PROPERTY=PRESSURE;
|
|
6
|
+
LOCALIZATION {
|
|
7
|
+
RADIUS = 2000.0;
|
|
8
|
+
};
|
|
9
|
+
};
|
|
10
|
+
GENERAL_OBSERVATION AMP_TOP { DATA = AMP_TOP; RESTART=1; OBS_FILE=./seismic/top.txt; };
|
|
11
|
+
SEISMIC_OBSERVATION OBS_MEAN_2025 {
|
|
12
|
+
OBS_FILE = path/to/observations.csv;
|
|
13
|
+
BOUNDARY = path/to/boundary.pol;
|
|
14
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
BREAKTHROUGH_OBSERVATION A1_A5_TRACER { KEY = WTPTWT1:A1; DATE = 2019-02-26; THRESHOLD = 0.000001; ERROR = 30; };
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
SUMMARY {
|
|
2
|
+
VALUES = summary_observations.csv;
|
|
3
|
+
WELL A1 {
|
|
4
|
+
LOCALIZATION {
|
|
5
|
+
EAST = 462588.52;
|
|
6
|
+
NORTH = 5934080.96;
|
|
7
|
+
RADIUS = 1000.0;
|
|
8
|
+
};
|
|
9
|
+
};
|
|
10
|
+
WELL A2 {
|
|
11
|
+
LOCALIZATION {
|
|
12
|
+
EAST = 460994.9;
|
|
13
|
+
NORTH = 5933813.29;
|
|
14
|
+
RADIUS = 1000.0;
|
|
15
|
+
};
|
|
16
|
+
};
|
|
17
|
+
};
|