subscript 1.15.1__tar.gz → 1.15.2__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.
Files changed (406) hide show
  1. {subscript-1.15.1 → subscript-1.15.2}/PKG-INFO +1 -1
  2. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/eclcompress/eclcompress.py +5 -2
  3. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/fmuobs/fmuobs.py +32 -31
  4. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/hook_implementations/forward_model_steps.py +17 -0
  5. subscript-1.15.2/src/subscript/merge_unrst_files/merge_unrst_files.py +183 -0
  6. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/restartthinner/restartthinner.py +28 -17
  7. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/summaryplot/summaryplot.py +103 -45
  8. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/version.py +3 -3
  9. {subscript-1.15.1 → subscript-1.15.2}/src/subscript.egg-info/PKG-INFO +1 -1
  10. {subscript-1.15.1 → subscript-1.15.2}/tests/test_eclcompress.py +39 -7
  11. {subscript-1.15.1 → subscript-1.15.2}/tests/test_fmu_copy_revision.py +21 -18
  12. subscript-1.15.2/tests/test_merge_unrst_files.py +275 -0
  13. {subscript-1.15.1 → subscript-1.15.2}/tests/test_summaryplot.py +93 -0
  14. subscript-1.15.1/src/subscript/merge_unrst_files/merge_unrst_files.py +0 -111
  15. subscript-1.15.1/tests/test_merge_unrst_files.py +0 -106
  16. {subscript-1.15.1 → subscript-1.15.2}/.github/dependabot.yml +0 -0
  17. {subscript-1.15.1 → subscript-1.15.2}/.github/workflows/codecov.yml +0 -0
  18. {subscript-1.15.1 → subscript-1.15.2}/.github/workflows/linting.yml +0 -0
  19. {subscript-1.15.1 → subscript-1.15.2}/.github/workflows/publish.yml +0 -0
  20. {subscript-1.15.1 → subscript-1.15.2}/.github/workflows/subscript.yml +0 -0
  21. {subscript-1.15.1 → subscript-1.15.2}/.gitignore +0 -0
  22. {subscript-1.15.1 → subscript-1.15.2}/LICENSE +0 -0
  23. {subscript-1.15.1 → subscript-1.15.2}/README.md +0 -0
  24. {subscript-1.15.1 → subscript-1.15.2}/SECURITY.md +0 -0
  25. {subscript-1.15.1 → subscript-1.15.2}/ci/testkomodo.sh +0 -0
  26. {subscript-1.15.1 → subscript-1.15.2}/docs/Makefile +0 -0
  27. {subscript-1.15.1 → subscript-1.15.2}/docs/_static/equinor-logo.png +0 -0
  28. {subscript-1.15.1 → subscript-1.15.2}/docs/_static/equinor-logo2.jpg +0 -0
  29. {subscript-1.15.1 → subscript-1.15.2}/docs/_static/equinor-logo2.png +0 -0
  30. {subscript-1.15.1 → subscript-1.15.2}/docs/_static/equinor_logo.jpg +0 -0
  31. {subscript-1.15.1 → subscript-1.15.2}/docs/_static/equinor_logo_only.jpg +0 -0
  32. {subscript-1.15.1 → subscript-1.15.2}/docs/_templates/layout.html +0 -0
  33. {subscript-1.15.1 → subscript-1.15.2}/docs/conf.py +0 -0
  34. {subscript-1.15.1 → subscript-1.15.2}/docs/contributing.rst +0 -0
  35. {subscript-1.15.1 → subscript-1.15.2}/docs/history.rst +0 -0
  36. {subscript-1.15.1 → subscript-1.15.2}/docs/index.rst +0 -0
  37. {subscript-1.15.1 → subscript-1.15.2}/docs/make.bat +0 -0
  38. {subscript-1.15.1 → subscript-1.15.2}/docs/overview.rst +0 -0
  39. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/bjobsusers.rst +0 -0
  40. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/casegen_upcars.rst +0 -0
  41. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/check_swatinit.rst +0 -0
  42. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/convert_grid_format.rst +0 -0
  43. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/create_date_files.rst +0 -0
  44. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/csv2ofmvol.rst +0 -0
  45. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/csv_merge.rst +0 -0
  46. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/csv_stack.rst +0 -0
  47. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/eclcompress.rst +0 -0
  48. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/ecldiff2roff.rst +0 -0
  49. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/field_statistics.rst +0 -0
  50. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/fmu_copy_revision.rst +0 -0
  51. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/fmuobs.rst +0 -0
  52. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/grav_subs_maps.rst +0 -0
  53. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/grav_subs_points.rst +0 -0
  54. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/images/Pack_sim_overview.png +0 -0
  55. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/images/Summaryplot-ensemble.png +0 -0
  56. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/images/Summaryplot-ert.png +0 -0
  57. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/images/Summaryplot-normalizeexample.png +0 -0
  58. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/images/Workflow_sector2fluxnum.png +0 -0
  59. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/images/casegen_upcars_geometry.png +0 -0
  60. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/images/check_swatinit_scatter.png +0 -0
  61. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/images/check_swatinit_volplot.png +0 -0
  62. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/images/ecl-swat-initialization.png +0 -0
  63. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/images/make_check_swatinit_images.sh +0 -0
  64. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/images/resinsight_wells_project_example.png +0 -0
  65. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/interp_relperm.rst +0 -0
  66. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/merge_rft_ertobs.rst +0 -0
  67. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/merge_unrst_files.rst +0 -0
  68. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/ofmvol2csv.rst +0 -0
  69. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/pack_sim.rst +0 -0
  70. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/params2csv.rst +0 -0
  71. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/presentvalue.rst +0 -0
  72. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/prtvol2csv.csv +0 -0
  73. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/prtvol2csv.rst +0 -0
  74. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/restartthinner.rst +0 -0
  75. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/rmsecl_volumetrics.rst +0 -0
  76. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/sector2fluxnum.rst +0 -0
  77. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/summaryplot.rst +0 -0
  78. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/sunsch.rst +0 -0
  79. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/sw_model_utilities.rst +0 -0
  80. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/vfp2csv.rst +0 -0
  81. {subscript-1.15.1 → subscript-1.15.2}/docs/scripts/welltest_dpds.rst +0 -0
  82. {subscript-1.15.1 → subscript-1.15.2}/docs/usage.rst +0 -0
  83. {subscript-1.15.1 → subscript-1.15.2}/pyproject.toml +0 -0
  84. {subscript-1.15.1 → subscript-1.15.2}/setup.cfg +0 -0
  85. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/__init__.py +0 -0
  86. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/bjobsusers/__init__.py +0 -0
  87. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/bjobsusers/bjobsusers.py +0 -0
  88. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/casegen_upcars/__init__.py +0 -0
  89. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/casegen_upcars/casegen_upcars.py +0 -0
  90. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/casegen_upcars/model.py +0 -0
  91. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/casegen_upcars/udf.py +0 -0
  92. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/casegen_upcars/udf_arg_parser.py +0 -0
  93. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/check_swatinit/__init__.py +0 -0
  94. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/check_swatinit/check_swatinit.py +0 -0
  95. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/check_swatinit/constants.py +0 -0
  96. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/check_swatinit/pillarmodel.py +0 -0
  97. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/check_swatinit/plotter.py +0 -0
  98. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/convert_grid_format/__init__.py +0 -0
  99. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/convert_grid_format/convert_grid_format.py +0 -0
  100. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/create_date_files/__init__.py +0 -0
  101. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/create_date_files/create_date_files.py +0 -0
  102. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/csv2ofmvol/__init__.py +0 -0
  103. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/csv2ofmvol/csv2ofmvol.py +0 -0
  104. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/csv_merge/__init__.py +0 -0
  105. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/csv_merge/csv_merge.py +0 -0
  106. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/csv_stack/__init__.py +0 -0
  107. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/csv_stack/csv_stack.py +0 -0
  108. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/eclcompress/__init__.py +0 -0
  109. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/eclcompress/allowlist.py +0 -0
  110. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/ecldiff2roff/__init__.py +0 -0
  111. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/ecldiff2roff/ecldiff2roff.py +0 -0
  112. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/field_statistics/__init__.py +0 -0
  113. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/field_statistics/field_statistics.py +0 -0
  114. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/fmu_copy_revision/__init__.py +0 -0
  115. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/fmu_copy_revision/fmu_copy_revision.py +0 -0
  116. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/fmuobs/__init__.py +0 -0
  117. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/fmuobs/parsers.py +0 -0
  118. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/fmuobs/util.py +0 -0
  119. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/fmuobs/writers.py +0 -0
  120. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/grav_subs_maps/__init__.py +0 -0
  121. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/grav_subs_maps/grav_subs_maps.py +0 -0
  122. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/grav_subs_points/__init__.py +0 -0
  123. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/grav_subs_points/grav_subs_points.py +0 -0
  124. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/hook_implementations/__init__.py +0 -0
  125. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/interp_relperm/__init__.py +0 -0
  126. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/interp_relperm/interp_relperm.py +0 -0
  127. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/legacy/duf +0 -0
  128. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/legacy/eclmanual +0 -0
  129. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/legacy/ertwatch +0 -0
  130. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/legacy/list_rms_usage +0 -0
  131. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/legacy/nosim +0 -0
  132. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/legacy/runeclipse +0 -0
  133. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/merge_rft_ertobs/__init__.py +0 -0
  134. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/merge_rft_ertobs/merge_rft_ertobs.py +0 -0
  135. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/merge_unrst_files/__init__.py +0 -0
  136. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/ofmvol2csv/__init__.py +0 -0
  137. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/ofmvol2csv/ofmvol2csv.py +0 -0
  138. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/pack_sim/__init__.py +0 -0
  139. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/pack_sim/pack_sim.py +0 -0
  140. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/params2csv/__init__.py +0 -0
  141. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/params2csv/params2csv.py +0 -0
  142. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/presentvalue/__init__.py +0 -0
  143. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/presentvalue/presentvalue.py +0 -0
  144. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/prtvol2csv/__init__.py +0 -0
  145. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/prtvol2csv/prtvol2csv.py +0 -0
  146. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/restartthinner/__init__.py +0 -0
  147. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/rmsecl_volumetrics/__init__.py +0 -0
  148. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/rmsecl_volumetrics/rmsecl_volumetrics.py +0 -0
  149. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/sector2fluxnum/__init__.py +0 -0
  150. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/sector2fluxnum/completions.py +0 -0
  151. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/sector2fluxnum/datafile_obj.py +0 -0
  152. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/sector2fluxnum/flux_obj.py +0 -0
  153. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/sector2fluxnum/flux_util.py +0 -0
  154. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/sector2fluxnum/fluxfile_obj.py +0 -0
  155. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/sector2fluxnum/sector2fluxnum.py +0 -0
  156. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/summaryplot/__init__.py +0 -0
  157. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/sunsch/__init__.py +0 -0
  158. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/sunsch/sunsch.py +0 -0
  159. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/sunsch/time_vector.py +0 -0
  160. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/sw_model_utilities/__init__.py +0 -0
  161. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/sw_model_utilities/sw_model_utilities.py +0 -0
  162. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/vfp2csv/__init__.py +0 -0
  163. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/vfp2csv/vfp2csv.py +0 -0
  164. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/welltest_dpds/__init__.py +0 -0
  165. {subscript-1.15.1 → subscript-1.15.2}/src/subscript/welltest_dpds/welltest_dpds.py +0 -0
  166. {subscript-1.15.1 → subscript-1.15.2}/src/subscript.egg-info/SOURCES.txt +0 -0
  167. {subscript-1.15.1 → subscript-1.15.2}/src/subscript.egg-info/dependency_links.txt +0 -0
  168. {subscript-1.15.1 → subscript-1.15.2}/src/subscript.egg-info/entry_points.txt +0 -0
  169. {subscript-1.15.1 → subscript-1.15.2}/src/subscript.egg-info/requires.txt +0 -0
  170. {subscript-1.15.1 → subscript-1.15.2}/src/subscript.egg-info/top_level.txt +0 -0
  171. {subscript-1.15.1 → subscript-1.15.2}/tests/__init__.py +0 -0
  172. {subscript-1.15.1 → subscript-1.15.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args0.png +0 -0
  173. {subscript-1.15.1 → subscript-1.15.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args1.png +0 -0
  174. {subscript-1.15.1 → subscript-1.15.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args10.png +0 -0
  175. {subscript-1.15.1 → subscript-1.15.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args11.png +0 -0
  176. {subscript-1.15.1 → subscript-1.15.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args2.png +0 -0
  177. {subscript-1.15.1 → subscript-1.15.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args3.png +0 -0
  178. {subscript-1.15.1 → subscript-1.15.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args4.png +0 -0
  179. {subscript-1.15.1 → subscript-1.15.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args5.png +0 -0
  180. {subscript-1.15.1 → subscript-1.15.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args6.png +0 -0
  181. {subscript-1.15.1 → subscript-1.15.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args7.png +0 -0
  182. {subscript-1.15.1 → subscript-1.15.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args8.png +0 -0
  183. {subscript-1.15.1 → subscript-1.15.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args9.png +0 -0
  184. {subscript-1.15.1 → subscript-1.15.2}/tests/conftest.py +0 -0
  185. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/edit/drogon.trans +0 -0
  186. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/grid/drogon.faults +0 -0
  187. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/grid/drogon.grid +0 -0
  188. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/grid/drogon.multnum +0 -0
  189. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/grid/drogon.multregt +0 -0
  190. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/grid/drogon.perm +0 -0
  191. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/grid/drogon.poro +0 -0
  192. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/props/drogon.pvt +0 -0
  193. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/props/drogon.sattab +0 -0
  194. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/props/drogon.swatinit +0 -0
  195. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/regions/drogon.eqlnum +0 -0
  196. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/regions/drogon.fipnum +0 -0
  197. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/regions/drogon.fipzon +0 -0
  198. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/regions/drogon.pvtnum +0 -0
  199. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/regions/drogon.satnum +0 -0
  200. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/runspec/drogon.dimens +0 -0
  201. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/runspec/drogon.eqldims +0 -0
  202. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/runspec/drogon.gridopts +0 -0
  203. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/runspec/drogon.regdims +0 -0
  204. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/runspec/drogon.tabdims +0 -0
  205. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/schedule/55_33-1.sch +0 -0
  206. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/schedule/55_33-1.wells +0 -0
  207. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/schedule/drogon_hist.sch +0 -0
  208. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/schedule/vfp/A-1.inc +0 -0
  209. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/schedule/vfp/A-2.inc +0 -0
  210. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/schedule/vfp/A-3.inc +0 -0
  211. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/schedule/vfp/A-4.inc +0 -0
  212. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/solution/drogon.equil +0 -0
  213. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/solution/drogon.rxvd +0 -0
  214. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/solution/drogon.thpres +0 -0
  215. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/include/summary/drogon.summary +0 -0
  216. {subscript-1.15.1 → subscript-1.15.2}/tests/data/drogon/eclipse/model/DROGON-0.DATA +0 -0
  217. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/grid/reek.faults +0 -0
  218. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/grid/reek.grid +0 -0
  219. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/grid/reek.multflt +0 -0
  220. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/grid/reek.multz +0 -0
  221. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/grid/reek.perm +0 -0
  222. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/grid/reek.poro +0 -0
  223. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/props/let-sgof.txt +0 -0
  224. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/props/let-swof.txt +0 -0
  225. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/props/reek.endpoints +0 -0
  226. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/props/reek.pvt +0 -0
  227. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/props/reek.swatinit +0 -0
  228. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/props/sgof.txt +0 -0
  229. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/props/swof.inc +0 -0
  230. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/props/swof.txt +0 -0
  231. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/regions/reek.eqlnum +0 -0
  232. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/regions/reek.fipnum +0 -0
  233. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/schedule/reek_history.sch +0 -0
  234. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/solution/reek.equil +0 -0
  235. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/include/summary/reek.smry +0 -0
  236. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.DATA +0 -0
  237. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.ECLEND +0 -0
  238. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.EGRID +0 -0
  239. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.INIT +0 -0
  240. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.LOG +0 -0
  241. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.PRT +0 -0
  242. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.RFT +0 -0
  243. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.SMSPEC +0 -0
  244. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.UNRST +0 -0
  245. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.UNSMRY +0 -0
  246. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/eclipse/model/parameters.txt +0 -0
  247. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/parameters.txt +0 -0
  248. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/rms/README +0 -0
  249. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/rms/reek.rms10.1.3/.master +0 -0
  250. {subscript-1.15.1 → subscript-1.15.2}/tests/data/reek/rms/reek.rms11.1.0/.master +0 -0
  251. {subscript-1.15.1 → subscript-1.15.2}/tests/data/vfp/GasProd.VFP +0 -0
  252. {subscript-1.15.1 → subscript-1.15.2}/tests/data/vfp/pd2.VFP +0 -0
  253. {subscript-1.15.1 → subscript-1.15.2}/tests/data/welltest/eclipse/model/DROGON_DST_PLT-0.SMSPEC +0 -0
  254. {subscript-1.15.1 → subscript-1.15.2}/tests/data/welltest/eclipse/model/DROGON_DST_PLT-0.UNSMRY +0 -0
  255. {subscript-1.15.1 → subscript-1.15.2}/tests/test_bjobsusers.py +0 -0
  256. {subscript-1.15.1 → subscript-1.15.2}/tests/test_casegen_upcars.py +0 -0
  257. {subscript-1.15.1 → subscript-1.15.2}/tests/test_check_swatinit.py +0 -0
  258. {subscript-1.15.1 → subscript-1.15.2}/tests/test_check_swatinit_simulators.py +0 -0
  259. {subscript-1.15.1 → subscript-1.15.2}/tests/test_convert_grid_format.py +0 -0
  260. {subscript-1.15.1 → subscript-1.15.2}/tests/test_create_date_files.py +0 -0
  261. {subscript-1.15.1 → subscript-1.15.2}/tests/test_csv2ofmvol.py +0 -0
  262. {subscript-1.15.1 → subscript-1.15.2}/tests/test_csv_merge.py +0 -0
  263. {subscript-1.15.1 → subscript-1.15.2}/tests/test_csv_stack.py +0 -0
  264. {subscript-1.15.1 → subscript-1.15.2}/tests/test_docs.py +0 -0
  265. {subscript-1.15.1 → subscript-1.15.2}/tests/test_ecldiff2roff.py +0 -0
  266. {subscript-1.15.1 → subscript-1.15.2}/tests/test_eclinit2roff.py +0 -0
  267. {subscript-1.15.1 → subscript-1.15.2}/tests/test_field_statistics.py +0 -0
  268. {subscript-1.15.1 → subscript-1.15.2}/tests/test_fmuobs.py +0 -0
  269. {subscript-1.15.1 → subscript-1.15.2}/tests/test_fmuobs_parsers.py +0 -0
  270. {subscript-1.15.1 → subscript-1.15.2}/tests/test_fmuobs_writers.py +0 -0
  271. {subscript-1.15.1 → subscript-1.15.2}/tests/test_grav_subs_maps.py +0 -0
  272. {subscript-1.15.1 → subscript-1.15.2}/tests/test_grav_subs_points.py +0 -0
  273. {subscript-1.15.1 → subscript-1.15.2}/tests/test_hook_implementations.py +0 -0
  274. {subscript-1.15.1 → subscript-1.15.2}/tests/test_interp_relperm.py +0 -0
  275. {subscript-1.15.1 → subscript-1.15.2}/tests/test_merge_rft_ertobs.py +0 -0
  276. {subscript-1.15.1 → subscript-1.15.2}/tests/test_ofmvol2csv.py +0 -0
  277. {subscript-1.15.1 → subscript-1.15.2}/tests/test_pack_sim.py +0 -0
  278. {subscript-1.15.1 → subscript-1.15.2}/tests/test_params2csv.py +0 -0
  279. {subscript-1.15.1 → subscript-1.15.2}/tests/test_presentvalue.py +0 -0
  280. {subscript-1.15.1 → subscript-1.15.2}/tests/test_prtvol2csv.py +0 -0
  281. {subscript-1.15.1 → subscript-1.15.2}/tests/test_restartthinner.py +0 -0
  282. {subscript-1.15.1 → subscript-1.15.2}/tests/test_rmsecl_volumetrics.py +0 -0
  283. {subscript-1.15.1 → subscript-1.15.2}/tests/test_sector2fluxnum.py +0 -0
  284. {subscript-1.15.1 → subscript-1.15.2}/tests/test_subscriptlogger.py +0 -0
  285. {subscript-1.15.1 → subscript-1.15.2}/tests/test_sunsch.py +0 -0
  286. {subscript-1.15.1 → subscript-1.15.2}/tests/test_sw_model_utilities.py +0 -0
  287. {subscript-1.15.1 → subscript-1.15.2}/tests/test_vfp2csv.py +0 -0
  288. {subscript-1.15.1 → subscript-1.15.2}/tests/test_welltest_dpds.py +0 -0
  289. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_casegen_upcars/demo_large_scale.yaml +0 -0
  290. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_casegen_upcars/demo_small_scale.yaml +0 -0
  291. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_casegen_upcars/dump_value.tmpl +0 -0
  292. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_casegen_upcars/upcars_eclipse_ref_lg.tmpl +0 -0
  293. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_casegen_upcars/upcars_eclipse_ref_ss.tmpl +0 -0
  294. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_eclcompress/permxyz.grdecl +0 -0
  295. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/config_example.yml +0 -0
  296. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/ERTBOX.roff +0 -0
  297. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/Geogrid.roff +0 -0
  298. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/files.txt +0 -0
  299. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P1_0.roff +0 -0
  300. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P1_3.roff +0 -0
  301. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P2_0.roff +0 -0
  302. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P2_3.roff +0 -0
  303. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_B_P1_0.roff +0 -0
  304. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_B_P1_3.roff +0 -0
  305. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_C_P2_0.roff +0 -0
  306. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_C_P2_3.roff +0 -0
  307. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_A_0.roff +0 -0
  308. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_A_3.roff +0 -0
  309. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_B_0.roff +0 -0
  310. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_B_3.roff +0 -0
  311. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_C_0.roff +0 -0
  312. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_C_3.roff +0 -0
  313. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F1_0.roff +0 -0
  314. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F1_3.roff +0 -0
  315. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F2_0.roff +0 -0
  316. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F2_3.roff +0 -0
  317. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F3_0.roff +0 -0
  318. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F3_3.roff +0 -0
  319. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F1_0.roff +0 -0
  320. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F1_3.roff +0 -0
  321. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F2_0.roff +0 -0
  322. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F2_3.roff +0 -0
  323. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F3_0.roff +0 -0
  324. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F3_3.roff +0 -0
  325. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F1_0.roff +0 -0
  326. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F1_3.roff +0 -0
  327. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F2_0.roff +0 -0
  328. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F2_3.roff +0 -0
  329. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F3_0.roff +0 -0
  330. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F3_3.roff +0 -0
  331. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P1_0.roff +0 -0
  332. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P1_3.roff +0 -0
  333. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P2_0.roff +0 -0
  334. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P2_3.roff +0 -0
  335. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_B_P1_0.roff +0 -0
  336. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_B_P1_3.roff +0 -0
  337. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_C_P2_0.roff +0 -0
  338. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_C_P2_3.roff +0 -0
  339. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/ert/model/0readme +0 -0
  340. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/fmuconfig/output/global_variables.yml +0 -0
  341. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_field_statistics/rms/output/aps/ERTBOX.EGRID +0 -0
  342. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_fmuobs/drogon_wbhp_rft_wct_gor_tracer_4d.obs +0 -0
  343. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_fmuobs/ert-doc.csv +0 -0
  344. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_fmuobs/ert-doc.obs +0 -0
  345. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_fmuobs/ert-doc.yml +0 -0
  346. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_fmuobs/fmu-ensemble-obs.yml +0 -0
  347. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_fmuobs/hist_obs_wells.txt +0 -0
  348. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_fmuobs/ri-obs.csv +0 -0
  349. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_fmuobs/summary_obs_without_date.obs +0 -0
  350. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_gravity/HIST.EGRID +0 -0
  351. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_gravity/HIST.INIT +0 -0
  352. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_gravity/HIST.UNRST +0 -0
  353. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_gravity/global_variables.yml +0 -0
  354. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_gravity/grav_subs_maps.yml +0 -0
  355. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_gravity/grav_subs_points.yml +0 -0
  356. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_gravity/seabed.gri +0 -0
  357. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_gravity/station_coordinates.csv +0 -0
  358. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_interp_relperm/cfg.yml +0 -0
  359. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_interp_relperm/sgof_base.inc +0 -0
  360. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_interp_relperm/sgof_opt.inc +0 -0
  361. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_interp_relperm/sgof_pes.inc +0 -0
  362. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_interp_relperm/swof_base.inc +0 -0
  363. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_interp_relperm/swof_opt.inc +0 -0
  364. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_interp_relperm/swof_pes.inc +0 -0
  365. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_merge_rft_ertobs/drogon/gendata_rft.csv +0 -0
  366. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A2.obs +0 -0
  367. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A2.txt +0 -0
  368. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A3.obs +0 -0
  369. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A3.txt +0 -0
  370. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A4.txt +0 -0
  371. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A4_1.obs +0 -0
  372. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A5.obs +0 -0
  373. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A5.txt +0 -0
  374. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A6.obs +0 -0
  375. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A6.txt +0 -0
  376. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_merge_rft_ertobs/drogon/rft/well_date_rft.txt +0 -0
  377. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_merge_unrst_files/HIST.UNRST +0 -0
  378. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_merge_unrst_files/PRED.UNRST +0 -0
  379. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_ofmvol2csv/fileA.vol +0 -0
  380. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_ofmvol2csv/fileB.vol +0 -0
  381. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_ofmvol2csv/fileC.vol +0 -0
  382. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_ofmvol2csv/ofm_example.vol +0 -0
  383. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_prtvol2csv/0readme.txt +0 -0
  384. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_prtvol2csv/DROGON_FIPNUM.PRT +0 -0
  385. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_prtvol2csv/DROGON_FIPZON.PRT +0 -0
  386. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_prtvol2csv/DROGON_INACTIVE_FIPNUM.PRT +0 -0
  387. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_prtvol2csv/DROGON_NOBAL_FLOW.PRT +0 -0
  388. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_prtvol2csv/DROGON_NO_INITIAL_BALANCE.PRT +0 -0
  389. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_prtvol2csv/DROGON_NO_INITIAL_BALANCE_FLOW.PRT +0 -0
  390. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sector2fluxnum/DUMPFLUX_TEST.DATA +0 -0
  391. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sector2fluxnum/DUMPFLUX_TEST.EGRID +0 -0
  392. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sector2fluxnum/DUMPFLUX_TEST.FLUX +0 -0
  393. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sector2fluxnum/OUT_COARSE.FLUX +0 -0
  394. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sector2fluxnum/TEST.DATA +0 -0
  395. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sector2fluxnum/TEST.EGRID +0 -0
  396. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sector2fluxnum/TEST.INIT +0 -0
  397. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sector2fluxnum/TEST.UNRST +0 -0
  398. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sunsch/config.yml +0 -0
  399. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sunsch/emptyinit.sch +0 -0
  400. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sunsch/foo1.sch +0 -0
  401. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sunsch/footemplate.sch +0 -0
  402. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sunsch/initwithdates.sch +0 -0
  403. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sunsch/merge2.sch +0 -0
  404. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sunsch/mergeme.sch +0 -0
  405. {subscript-1.15.1 → subscript-1.15.2}/tests/testdata_sunsch/options3.sch +0 -0
  406. {subscript-1.15.1 → subscript-1.15.2}/tests/utils.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: subscript
3
- Version: 1.15.1
3
+ Version: 1.15.2
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
@@ -31,6 +31,9 @@ DEFAULT_FILES_TO_COMPRESS = [
31
31
  "eclipse/include/grid/*",
32
32
  "eclipse/include/regions/*",
33
33
  "eclipse/include/props/*",
34
+ "flow/include/grid/*",
35
+ "flow/include/regions/*",
36
+ "flow/include/props/*",
34
37
  ]
35
38
 
36
39
  EPILOG = """
@@ -394,8 +397,8 @@ def get_parser() -> argparse.ArgumentParser:
394
397
  help=(
395
398
  "Path to a text file containing one wildcard filepath per line, "
396
399
  "specifying which files to apply compression to. "
397
- "Defaults to everything below eclipse/include, but only if "
398
- "no files are specified on the command line."
400
+ "Defaults to everything below eclipse/include and flow/include, but only "
401
+ "if no files are specified on the command line."
399
402
  ),
400
403
  )
401
404
  parser.add_argument(
@@ -209,16 +209,20 @@ def autoparse_file(filename: str) -> tuple[str | None, pd.DataFrame]:
209
209
  """
210
210
  try:
211
211
  dframe = pd.read_csv(filename, sep=";")
212
+ except ValueError:
213
+ pass
214
+ else:
212
215
  if {"DATE", "VECTOR", "VALUE", "ERROR"}.issubset(
213
216
  set(dframe.columns)
214
217
  ) and not dframe.empty:
215
218
  logger.info("Parsed %s as a ResInsight observation file", filename)
216
219
  return ("resinsight", resinsight_df2df(dframe))
217
- except ValueError:
218
- pass
219
220
 
220
221
  try:
221
222
  dframe = pd.read_csv(filename, sep=",")
223
+ except ValueError:
224
+ pass
225
+ else:
222
226
  if {"CLASS", "LABEL"}.issubset(dframe.columns) and not dframe.empty:
223
227
  logger.info(
224
228
  "Parsed %s as a CSV (internal dataframe format for ertobs) file",
@@ -227,47 +231,44 @@ def autoparse_file(filename: str) -> tuple[str | None, pd.DataFrame]:
227
231
  if "DATE" in dframe:
228
232
  dframe["DATE"] = pd.to_datetime(dframe["DATE"])
229
233
  return ("csv", dframe)
230
- except ValueError:
231
- pass
232
234
 
233
235
  try:
234
236
  obsdict = yaml.safe_load(Path(filename).read_text(encoding="utf8"))
235
- if isinstance(obsdict, dict) and (
236
- obsdict.get("smry", None) or obsdict.get("rft", None)
237
- ):
238
- logger.info("Parsed %s as a YAML file with observations", filename)
239
- return ("yaml", obsdict2df(obsdict))
240
237
  except yaml.scanner.ScannerError as exception:
241
- # This occurs if there are tabs in the file, which is not
242
- # allowed in a YAML file (but it can be present in ERT observation files)
238
+ # Tabs in the file (not allowed in YAML, but valid in ERT obs files)
243
239
  logger.debug("ScannerError while attempting yaml-parsing")
244
240
  logger.debug(str(exception))
245
241
  except ValueError:
246
242
  pass
243
+ else:
244
+ if isinstance(obsdict, dict) and (
245
+ obsdict.get("smry", None) or obsdict.get("rft", None)
246
+ ):
247
+ logger.info("Parsed %s as a YAML file with observations", filename)
248
+ return ("yaml", obsdict2df(obsdict))
247
249
 
248
250
  try:
249
- with open(filename, encoding="utf8") as f_handle:
250
- # This function does not have information on include file paths.
251
- # Accept a FileNotFoundError while parsing, if we encounter that
252
- # it is most likely an ert file, but which needs additional hints
253
- # on where include files are located.
254
- try:
255
- dframe = ertobs2df(f_handle.read())
256
- except FileNotFoundError:
257
- logger.info(
258
- "Parsed %s as an ERT observation file, with include statements",
259
- filename,
260
- )
261
- return ("ert", pd.DataFrame())
262
- if (
263
- {"CLASS", "LABEL"}.issubset(dframe.columns)
264
- and not dframe.empty
265
- and set(dframe["CLASS"]).intersection(set(CLASS_SHORTNAME.keys()))
251
+ content = Path(filename).read_text(encoding="utf8")
252
+ except (OSError, UnicodeDecodeError):
253
+ content = None
254
+ if content is not None:
255
+ try:
256
+ ert_dframe = ertobs2df(content)
257
+ except FileNotFoundError:
258
+ logger.info(
259
+ "Parsed %s as an ERT observation file, with include statements",
260
+ filename,
261
+ )
262
+ return ("ert", pd.DataFrame())
263
+ except ValueError:
264
+ ert_dframe = None
265
+ if ert_dframe is not None and (
266
+ {"CLASS", "LABEL"}.issubset(ert_dframe.columns)
267
+ and not ert_dframe.empty
268
+ and set(ert_dframe["CLASS"]).intersection(set(CLASS_SHORTNAME.keys()))
266
269
  ):
267
270
  logger.info("Parsed %s as an ERT observation file", filename)
268
- return ("ert", dframe)
269
- except ValueError:
270
- pass
271
+ return ("ert", ert_dframe)
271
272
 
272
273
  logger.error(
273
274
  "Unable to parse %s as any supported observation file format", filename
@@ -581,12 +581,27 @@ class MergeUnrstFiles(ForwardModelStepPlugin):
581
581
  "<UNRST2>",
582
582
  "--output",
583
583
  "<OUTPUT>",
584
+ "--priority",
585
+ "<PRIORITY>",
584
586
  ],
585
587
  default_mapping={
586
588
  "<OUTPUT>": "MERGED.UNRST",
589
+ "<PRIORITY>": "hist",
587
590
  },
588
591
  )
589
592
 
593
+ def validate_pre_experiment(self, fm_step_json: ForwardModelStepJSON) -> None:
594
+ errors = []
595
+
596
+ priority = self.private_args.get("<PRIORITY>")
597
+ if priority is not None and priority not in {"hist", "pred"}:
598
+ errors.append(f"<PRIORITY> must be 'hist' or 'pred', got '{priority}'.")
599
+
600
+ if errors:
601
+ raise ForwardModelStepValidationError(
602
+ "Validation failed for MERGE_UNRST_FILES:\n" + "\n".join(errors)
603
+ )
604
+
590
605
  @staticmethod
591
606
  def documentation() -> ForwardModelStepDocumentation | None:
592
607
  return ForwardModelStepDocumentation(
@@ -598,6 +613,8 @@ class MergeUnrstFiles(ForwardModelStepPlugin):
598
613
  DEFINE <RESTART_DIR> iter-3
599
614
  FORWARD_MODEL MERGE_UNRST_FILES(<UNRST1>=..<RESTART_DIR>/<ECLBASE>.UNRST, \
600
615
  <UNRST2>=<ECLBASE>.UNRST, <OUTPUT>=eclipse/model/ECLIPSE_MERGED.UNRST)
616
+ FORWARD_MODEL MERGE_UNRST_FILES(<UNRST1>=..<RESTART_DIR>/<ECLBASE>.UNRST, \
617
+ <UNRST2>=<ECLBASE>.UNRST, <OUTPUT>=MERGED.UNRST, <PRIORITY>=pred)
601
618
 
602
619
  """,
603
620
  )
@@ -0,0 +1,183 @@
1
+ import argparse
2
+ import logging
3
+ from typing import Any
4
+
5
+ import resfo
6
+
7
+ from subscript import __version__, getLogger
8
+
9
+ # Type aliases
10
+ KWEntry = tuple[str, Any]
11
+ Chunk = list[KWEntry]
12
+
13
+
14
+ DESCRIPTION = """Read two ``UNRST`` files and export a merged version. This is useful in
15
+ cases where history and prediction are run separately and one wants to calculate
16
+ differences across dates in the two files. One should give hist file as first positional
17
+ argument and pred file as the second positional argument (i.e. in the order of smallest
18
+ to largest report step numbers).
19
+ """
20
+
21
+
22
+ logger = getLogger(__name__)
23
+ logger.setLevel(logging.INFO)
24
+
25
+
26
+ def get_parser() -> argparse.ArgumentParser:
27
+ """Function to create the argument parser that is going to be served to the user.
28
+
29
+ Returns:
30
+ argparse.ArgumentParser: The argument parser to be served
31
+
32
+ """
33
+ parser = argparse.ArgumentParser(
34
+ prog="merge_unrst_files.py", description=DESCRIPTION
35
+ )
36
+ parser.add_argument("UNRST1", type=str, help="UNRST file 1, history part")
37
+ parser.add_argument("UNRST2", type=str, help="UNRST file 2, prediction part")
38
+ parser.add_argument(
39
+ "-o",
40
+ "--output",
41
+ type=str,
42
+ help="Name of the merged UNRST file",
43
+ default="MERGED.UNRST",
44
+ )
45
+ parser.add_argument(
46
+ "--priority",
47
+ type=str,
48
+ choices=["hist", "pred"],
49
+ default="hist",
50
+ help="Which file to keep on overlapping report steps (default: hist)",
51
+ )
52
+
53
+ parser.add_argument(
54
+ "-v",
55
+ "--version",
56
+ action="version",
57
+ version=f"%(prog)s (subscript version {__version__})",
58
+ )
59
+ return parser
60
+
61
+
62
+ def _get_overlap_interval(
63
+ hist_chunks: list[Chunk],
64
+ pred_chunks: list[Chunk],
65
+ ) -> tuple[int, int] | None:
66
+ """Determine the overlapping interval between hist and pred.
67
+
68
+ The overlap is defined as:
69
+ [max(min_hist, min_pred), min(max_hist, max_pred)]
70
+
71
+ Returns:
72
+ tuple: (overlap_start, overlap_end) or None if no overlap.
73
+ """
74
+ hist_seqnums: list[int] = [
75
+ s for c in hist_chunks if (s := _get_seqnum(c)) is not None
76
+ ]
77
+ pred_seqnums: list[int] = [
78
+ s for c in pred_chunks if (s := _get_seqnum(c)) is not None
79
+ ]
80
+
81
+ if not hist_seqnums or not pred_seqnums:
82
+ return None
83
+
84
+ logger.info(f"Hist report steps: {hist_seqnums}")
85
+ logger.info(f"Pred report steps: {pred_seqnums}")
86
+
87
+ overlap_start = max(hist_seqnums[0], pred_seqnums[0])
88
+ overlap_end = min(hist_seqnums[-1], pred_seqnums[-1])
89
+
90
+ if overlap_start <= overlap_end:
91
+ return (overlap_start, overlap_end)
92
+ return None
93
+
94
+
95
+ def _is_in_interval(seqnum: int | None, interval: tuple[int, int] | None) -> bool:
96
+ """Check if a seqnum falls within the overlap interval."""
97
+ if interval is None or seqnum is None:
98
+ return False
99
+ return interval[0] <= seqnum <= interval[1]
100
+
101
+
102
+ def _split_by_seqnum(data: list[KWEntry]) -> list[Chunk]:
103
+ """Split UNRST keyword list into chunks, one per report step.
104
+
105
+ Each chunk starts with a SEQNUM keyword and contains all keywords
106
+ until the next SEQNUM (or end of data).
107
+
108
+ Args:
109
+ data: List of (keyword, value) tuples as returned by
110
+ resfo.read().
111
+
112
+ Returns:
113
+ List of chunks, where each chunk is a list of
114
+ (keyword, value) tuples.
115
+ """
116
+ chunks: list[Chunk] = []
117
+ current_chunk: Chunk = []
118
+ for kw, val in data:
119
+ if kw == "SEQNUM " and current_chunk:
120
+ chunks.append(current_chunk)
121
+ current_chunk = []
122
+ current_chunk.append((kw, val))
123
+ if current_chunk:
124
+ chunks.append(current_chunk)
125
+ return chunks
126
+
127
+
128
+ def _get_seqnum(chunk: Chunk) -> int | None:
129
+ """Extract the SEQNUM value from a chunk."""
130
+ for kw, val in chunk:
131
+ if kw == "SEQNUM ":
132
+ return int(val[0])
133
+ return None
134
+
135
+
136
+ def main() -> None:
137
+ """Parse command line arguments and run"""
138
+
139
+ args: argparse.Namespace = get_parser().parse_args()
140
+
141
+ logger.info(f"Merge unrst files {args.UNRST1} and {args.UNRST2}.")
142
+ unrst_hist = resfo.read(args.UNRST1)
143
+ unrst_pred = resfo.read(args.UNRST2)
144
+
145
+ hist_chunks = _split_by_seqnum(unrst_hist)
146
+ pred_chunks = _split_by_seqnum(unrst_pred)
147
+
148
+ overlap_interval = _get_overlap_interval(hist_chunks, pred_chunks)
149
+
150
+ if overlap_interval:
151
+ logger.info(
152
+ "Overlapping report step interval detected: "
153
+ f"SEQNUM {overlap_interval[0]} to {overlap_interval[1]}"
154
+ )
155
+ logger.info(f"Keeping {args.priority} data in overlapping interval")
156
+ else:
157
+ logger.info("No overlapping report steps detected.")
158
+
159
+ if args.priority == "hist":
160
+ filtered_hist = hist_chunks
161
+ filtered_pred = [
162
+ c
163
+ for c in pred_chunks
164
+ if not _is_in_interval(_get_seqnum(c), overlap_interval)
165
+ ]
166
+ else:
167
+ filtered_hist = [
168
+ c
169
+ for c in hist_chunks
170
+ if not _is_in_interval(_get_seqnum(c), overlap_interval)
171
+ ]
172
+ filtered_pred = pred_chunks
173
+
174
+ merged = [item for chunk in filtered_hist for item in chunk] + [
175
+ item for chunk in filtered_pred for item in chunk
176
+ ]
177
+
178
+ resfo.write(args.output, merged)
179
+ logger.info(f"Done. Merged file is written to {args.output}")
180
+
181
+
182
+ if __name__ == "__main__":
183
+ main()
@@ -88,30 +88,41 @@ def rd_repacker(rstfilename: str, slicerstindices: list[int], quiet: bool) -> No
88
88
  shutil.move(rstname, tempdir / rstname)
89
89
 
90
90
  with chdir(tempdir):
91
- subprocess.run(
92
- [rd_unpack, rstname],
93
- stdout=subprocess.DEVNULL if quiet else None,
94
- check=True,
91
+ _run_unpack_and_slice(
92
+ rd_unpack, rstname, quiet, slicerstindices, rd_pack
95
93
  )
96
-
97
- for file in Path(".").glob("*.X*"):
98
- index = int(file.suffix.lstrip(".X"))
99
- if index not in slicerstindices:
100
- file.unlink()
101
-
102
- remaining_files = sorted(Path(".").glob("*.X*"))
103
- subprocess.run(
104
- [rd_pack, *[str(f) for f in remaining_files]],
105
- stdout=subprocess.DEVNULL if quiet else None,
106
- check=True,
107
- )
108
-
109
94
  # Move result back up
110
95
  shutil.move(rstname, Path("..") / rstname)
111
96
  finally:
112
97
  shutil.rmtree(tempdir)
113
98
 
114
99
 
100
+ def _run_unpack_and_slice(
101
+ rd_unpack: str,
102
+ rstname: str,
103
+ quiet: bool,
104
+ slicerstindices: list[int],
105
+ rd_pack: str,
106
+ ) -> None:
107
+
108
+ # Unpack the UNRST file first
109
+ subprocess.run(
110
+ [rd_unpack, rstname], stdout=subprocess.DEVNULL if quiet else None, check=True
111
+ )
112
+
113
+ for file in Path(".").glob("*.X*"):
114
+ index = int(file.suffix.lstrip(".X"))
115
+ if index not in slicerstindices:
116
+ file.unlink()
117
+
118
+ remaining_files = sorted(Path(".").glob("*.X*"))
119
+ subprocess.run(
120
+ [rd_pack, *[str(f) for f in remaining_files]],
121
+ stdout=subprocess.DEVNULL if quiet else None,
122
+ check=True,
123
+ )
124
+
125
+
115
126
  def get_restart_indices(rstfilename: str) -> list[int]:
116
127
  """Extract a list of restart indices for a filename.
117
128
 
@@ -26,8 +26,10 @@ import re
26
26
  import sys
27
27
  import termios
28
28
  import tty
29
+ from collections.abc import Callable
29
30
  from multiprocessing import Process
30
31
  from pathlib import Path
32
+ from typing import Any
31
33
 
32
34
  import matplotlib.pyplot as plt
33
35
  import numpy as np
@@ -578,22 +580,24 @@ def split_vectorsdatafiles(
578
580
  for vecdata in vectorsdatafiles:
579
581
  try:
580
582
  sumfn = Summary(vecdata)
581
- datafiles.append(vecdata)
582
-
583
- summaryfiles.append(sumfn)
584
-
585
- # Try to load a corresponding parameter-file for colouring data
586
- paths_to_check = [
587
- Path(vecdata).absolute().parent / relpath / "parameters.txt"
588
- for relpath in ["../..", "../", "."]
589
- ]
590
- for path in paths_to_check:
591
- if path.exists():
592
- parameterfiles.append(str(path.resolve()))
593
- break
594
583
  except OSError:
595
584
  # If we get here, we assume it was an Eclipse vector name.
596
585
  vectors.append(vecdata)
586
+ continue
587
+
588
+ datafiles.append(vecdata)
589
+ summaryfiles.append(sumfn)
590
+
591
+ # Try to load a corresponding parameter-file for colouring data
592
+ paths_to_check = [
593
+ Path(vecdata).absolute().parent / relpath / "parameters.txt"
594
+ for relpath in ["../..", "../", "."]
595
+ ]
596
+ for path in paths_to_check:
597
+ if path.exists():
598
+ parameterfiles.append(str(path.resolve()))
599
+ break
600
+
597
601
  return (summaryfiles, datafiles, vectors, parameterfiles)
598
602
 
599
603
 
@@ -659,40 +663,94 @@ def main() -> None:
659
663
  old_settings = termios.tcgetattr(filedesc)
660
664
  print("Menu: 'q' = quit, 'r' = reload plots")
661
665
  try:
662
- # change terminal settings to allow keyboard
663
- # input without user pressing 'enter'
664
- tty.setcbreak(sys.stdin.fileno())
665
- char = ""
666
- while char != "q" and plotprocess.is_alive():
667
- char = sys.stdin.read(1)
668
- if char == "r":
669
- plotprocess.terminate()
670
- plotprocess = Process(
671
- target=summaryplotter,
672
- kwargs={
673
- "summaryfiles": None, # forces reload
674
- "datafiles": datafiles,
675
- "vectors": vectors,
676
- "colourby": args.colourby,
677
- "maxlabels": args.maxlabels,
678
- "logcolourby": args.logcolourby,
679
- "parameterfiles": parameterfiles,
680
- "histvectors": args.hist,
681
- "normalize": args.normalize,
682
- "singleplot": args.singleplot,
683
- "nolegend": args.nolegend,
684
- "dumpimages": args.dumpimages,
685
- "ensemblemode": args.ensemblemode,
686
- },
687
- )
688
- plotprocess.start()
666
+ # change terminal settings to allow keyboard input without user pressing
667
+ # 'enter'
668
+ tty.setcbreak(filedesc)
669
+ plotprocess = interactive_menu(
670
+ plotprocess,
671
+ summaryplotter,
672
+ datafiles,
673
+ vectors,
674
+ args,
675
+ parameterfiles,
676
+ )
677
+ finally:
678
+ # Always restore terminal settings, even if an error occurs
679
+ termios.tcsetattr(filedesc, termios.TCSADRAIN, old_settings)
680
+ # Close plot windows (running in a subprocess)
681
+ stop_process(plotprocess)
682
+
683
+
684
+ def stop_process(process: Process) -> None:
685
+ if process.is_alive():
686
+ process.terminate()
687
+ process.join(timeout=5)
688
+ if process.is_alive():
689
+ process.kill()
690
+ process.join()
691
+ else:
692
+ process.join()
693
+
694
+
695
+ def restart_plotprocess(
696
+ plotprocess: Process,
697
+ summaryplotter: Callable[..., Any],
698
+ datafiles: list[str],
699
+ vectors: list[str],
700
+ args: argparse.Namespace,
701
+ parameterfiles: list[str],
702
+ ) -> Process:
703
+ stop_process(plotprocess)
704
+ new_process = Process(
705
+ target=summaryplotter,
706
+ kwargs={
707
+ "summaryfiles": None, # forces reload
708
+ "datafiles": datafiles,
709
+ "vectors": vectors,
710
+ "colourby": args.colourby,
711
+ "maxlabels": args.maxlabels,
712
+ "logcolourby": args.logcolourby,
713
+ "parameterfiles": parameterfiles,
714
+ "histvectors": args.hist,
715
+ "normalize": args.normalize,
716
+ "singleplot": args.singleplot,
717
+ "nolegend": args.nolegend,
718
+ "dumpimages": args.dumpimages,
719
+ "ensemblemode": args.ensemblemode,
720
+ },
721
+ )
722
+ new_process.start()
723
+ return new_process
724
+
725
+
726
+ def interactive_menu(
727
+ plotprocess: Process,
728
+ summaryplotter: Callable[..., Any],
729
+ datafiles: list[str],
730
+ vectors: list[str],
731
+ args: argparse.Namespace,
732
+ parameterfiles: list[str],
733
+ ) -> Process:
734
+ char = ""
735
+ while char != "q" and plotprocess.is_alive():
736
+ try:
737
+ char = sys.stdin.read(1)
689
738
  except KeyboardInterrupt:
690
- pass
691
- # We have messed up the terminal, remember to fix:
692
- termios.tcsetattr(filedesc, termios.TCSADRAIN, old_settings)
739
+ break
740
+
741
+ if char == "":
742
+ break
743
+ if char == "r":
744
+ plotprocess = restart_plotprocess(
745
+ plotprocess,
746
+ summaryplotter,
747
+ datafiles,
748
+ vectors,
749
+ args,
750
+ parameterfiles,
751
+ )
693
752
 
694
- # Close plot windows (running in a subprocess)
695
- plotprocess.terminate()
753
+ return plotprocess
696
754
 
697
755
 
698
756
  if __name__ == "__main__":
@@ -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.15.1'
22
- __version_tuple__ = version_tuple = (1, 15, 1)
21
+ __version__ = version = '1.15.2'
22
+ __version_tuple__ = version_tuple = (1, 15, 2)
23
23
 
24
- __commit_id__ = commit_id = 'g3317bd1e5'
24
+ __commit_id__ = commit_id = 'g258eebfdc'
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: subscript
3
- Version: 1.15.1
3
+ Version: 1.15.2
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