subscript 1.16.0__tar.gz → 1.16.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 (477) hide show
  1. {subscript-1.16.0 → subscript-1.16.2}/PKG-INFO +1 -1
  2. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/fmuobs/fmuobs.py +25 -10
  3. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/fmuobs/writers.py +6 -5
  4. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/hook_implementations/forward_model_steps.py +27 -25
  5. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/sunsch/sunsch.py +1 -0
  6. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/version.py +3 -3
  7. {subscript-1.16.0 → subscript-1.16.2}/src/subscript.egg-info/PKG-INFO +1 -1
  8. subscript-1.16.2/src/subscript.egg-info/scm_version.json +8 -0
  9. {subscript-1.16.0 → subscript-1.16.2}/tests/test_fmuobs.py +53 -22
  10. {subscript-1.16.0 → subscript-1.16.2}/tests/test_fmuobs_writers.py +8 -0
  11. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_gravity/HIST.UNRST +1 -1
  12. subscript-1.16.0/src/subscript.egg-info/scm_version.json +0 -8
  13. {subscript-1.16.0 → subscript-1.16.2}/.github/dependabot.yml +0 -0
  14. {subscript-1.16.0 → subscript-1.16.2}/.github/workflows/codecov.yml +0 -0
  15. {subscript-1.16.0 → subscript-1.16.2}/.github/workflows/linting.yml +0 -0
  16. {subscript-1.16.0 → subscript-1.16.2}/.github/workflows/publish.yml +0 -0
  17. {subscript-1.16.0 → subscript-1.16.2}/.github/workflows/subscript.yml +0 -0
  18. {subscript-1.16.0 → subscript-1.16.2}/.gitignore +0 -0
  19. {subscript-1.16.0 → subscript-1.16.2}/LICENSE +0 -0
  20. {subscript-1.16.0 → subscript-1.16.2}/README.md +0 -0
  21. {subscript-1.16.0 → subscript-1.16.2}/SECURITY.md +0 -0
  22. {subscript-1.16.0 → subscript-1.16.2}/ci/testkomodo.sh +0 -0
  23. {subscript-1.16.0 → subscript-1.16.2}/docs/Makefile +0 -0
  24. {subscript-1.16.0 → subscript-1.16.2}/docs/_static/equinor-logo.png +0 -0
  25. {subscript-1.16.0 → subscript-1.16.2}/docs/_static/equinor-logo2.jpg +0 -0
  26. {subscript-1.16.0 → subscript-1.16.2}/docs/_static/equinor-logo2.png +0 -0
  27. {subscript-1.16.0 → subscript-1.16.2}/docs/_static/equinor_logo.jpg +0 -0
  28. {subscript-1.16.0 → subscript-1.16.2}/docs/_static/equinor_logo_only.jpg +0 -0
  29. {subscript-1.16.0 → subscript-1.16.2}/docs/_templates/layout.html +0 -0
  30. {subscript-1.16.0 → subscript-1.16.2}/docs/conf.py +0 -0
  31. {subscript-1.16.0 → subscript-1.16.2}/docs/contributing.rst +0 -0
  32. {subscript-1.16.0 → subscript-1.16.2}/docs/history.rst +0 -0
  33. {subscript-1.16.0 → subscript-1.16.2}/docs/index.rst +0 -0
  34. {subscript-1.16.0 → subscript-1.16.2}/docs/make.bat +0 -0
  35. {subscript-1.16.0 → subscript-1.16.2}/docs/overview.rst +0 -0
  36. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/bjobsusers.rst +0 -0
  37. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/casegen_upcars.rst +0 -0
  38. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/check_swatinit.rst +0 -0
  39. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/convert_grid_format.rst +0 -0
  40. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/create_date_files.rst +0 -0
  41. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/csv2ofmvol.rst +0 -0
  42. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/csv_merge.rst +0 -0
  43. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/csv_stack.rst +0 -0
  44. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/eclcompress.rst +0 -0
  45. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/ecldiff2roff.rst +0 -0
  46. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/field_statistics.rst +0 -0
  47. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/fmu_copy_revision.rst +0 -0
  48. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/fmuobs.rst +0 -0
  49. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/grav_subs_maps.rst +0 -0
  50. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/grav_subs_points.rst +0 -0
  51. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/images/Pack_sim_overview.png +0 -0
  52. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/images/Summaryplot-ensemble.png +0 -0
  53. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/images/Summaryplot-ert.png +0 -0
  54. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/images/Summaryplot-normalizeexample.png +0 -0
  55. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/images/Workflow_sector2fluxnum.png +0 -0
  56. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/images/casegen_upcars_geometry.png +0 -0
  57. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/images/check_swatinit_scatter.png +0 -0
  58. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/images/check_swatinit_volplot.png +0 -0
  59. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/images/ecl-swat-initialization.png +0 -0
  60. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/images/make_check_swatinit_images.sh +0 -0
  61. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/images/resinsight_wells_project_example.png +0 -0
  62. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/interp_relperm.rst +0 -0
  63. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/merge_rft_ertobs.rst +0 -0
  64. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/merge_unrst_files.rst +0 -0
  65. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/ofmvol2csv.rst +0 -0
  66. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/pack_sim.rst +0 -0
  67. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/params2csv.rst +0 -0
  68. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/presentvalue.rst +0 -0
  69. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/prtvol2csv.csv +0 -0
  70. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/prtvol2csv.rst +0 -0
  71. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/restartthinner.rst +0 -0
  72. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/rmsecl_volumetrics.rst +0 -0
  73. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/sector2fluxnum.rst +0 -0
  74. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/summaryplot.rst +0 -0
  75. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/sunsch.rst +0 -0
  76. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/sw_model_utilities.rst +0 -0
  77. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/vfp2csv.rst +0 -0
  78. {subscript-1.16.0 → subscript-1.16.2}/docs/scripts/welltest_dpds.rst +0 -0
  79. {subscript-1.16.0 → subscript-1.16.2}/docs/usage.rst +0 -0
  80. {subscript-1.16.0 → subscript-1.16.2}/pyproject.toml +0 -0
  81. {subscript-1.16.0 → subscript-1.16.2}/setup.cfg +0 -0
  82. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/__init__.py +0 -0
  83. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/bjobsusers/__init__.py +0 -0
  84. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/bjobsusers/bjobsusers.py +0 -0
  85. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/casegen_upcars/__init__.py +0 -0
  86. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/casegen_upcars/casegen_upcars.py +0 -0
  87. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/casegen_upcars/model.py +0 -0
  88. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/casegen_upcars/udf.py +0 -0
  89. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/casegen_upcars/udf_arg_parser.py +0 -0
  90. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/check_swatinit/__init__.py +0 -0
  91. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/check_swatinit/check_swatinit.py +0 -0
  92. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/check_swatinit/constants.py +0 -0
  93. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/check_swatinit/pillarmodel.py +0 -0
  94. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/check_swatinit/plotter.py +0 -0
  95. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/convert_grid_format/__init__.py +0 -0
  96. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/convert_grid_format/convert_grid_format.py +0 -0
  97. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/create_date_files/__init__.py +0 -0
  98. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/create_date_files/create_date_files.py +0 -0
  99. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/csv2ofmvol/__init__.py +0 -0
  100. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/csv2ofmvol/csv2ofmvol.py +0 -0
  101. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/csv_merge/__init__.py +0 -0
  102. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/csv_merge/csv_merge.py +0 -0
  103. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/csv_stack/__init__.py +0 -0
  104. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/csv_stack/csv_stack.py +0 -0
  105. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/eclcompress/__init__.py +0 -0
  106. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/eclcompress/allowlist.py +0 -0
  107. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/eclcompress/eclcompress.py +0 -0
  108. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/ecldiff2roff/__init__.py +0 -0
  109. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/ecldiff2roff/ecldiff2roff.py +0 -0
  110. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/field_statistics/__init__.py +0 -0
  111. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/field_statistics/field_statistics.py +0 -0
  112. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/fmu_copy_revision/__init__.py +0 -0
  113. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/fmu_copy_revision/fmu_copy_revision.py +0 -0
  114. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/fmuobs/__init__.py +0 -0
  115. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/fmuobs/parsers.py +0 -0
  116. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/fmuobs/util.py +0 -0
  117. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/grav_subs_maps/__init__.py +0 -0
  118. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/grav_subs_maps/grav_subs_maps.py +0 -0
  119. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/grav_subs_points/__init__.py +0 -0
  120. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/grav_subs_points/grav_subs_points.py +0 -0
  121. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/hook_implementations/__init__.py +0 -0
  122. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/interp_relperm/__init__.py +0 -0
  123. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/interp_relperm/interp_relperm.py +0 -0
  124. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/legacy/duf +0 -0
  125. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/legacy/eclmanual +0 -0
  126. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/legacy/ertwatch +0 -0
  127. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/legacy/list_rms_usage +0 -0
  128. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/legacy/nosim +0 -0
  129. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/legacy/runeclipse +0 -0
  130. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/merge_rft_ertobs/__init__.py +0 -0
  131. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/merge_rft_ertobs/merge_rft_ertobs.py +0 -0
  132. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/merge_unrst_files/__init__.py +0 -0
  133. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/merge_unrst_files/merge_unrst_files.py +0 -0
  134. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/ofmvol2csv/__init__.py +0 -0
  135. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/ofmvol2csv/ofmvol2csv.py +0 -0
  136. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/pack_sim/__init__.py +0 -0
  137. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/pack_sim/pack_sim.py +0 -0
  138. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/params2csv/__init__.py +0 -0
  139. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/params2csv/params2csv.py +0 -0
  140. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/presentvalue/__init__.py +0 -0
  141. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/presentvalue/presentvalue.py +0 -0
  142. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/prtvol2csv/__init__.py +0 -0
  143. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/prtvol2csv/prtvol2csv.py +0 -0
  144. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/restartthinner/__init__.py +0 -0
  145. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/restartthinner/restartthinner.py +0 -0
  146. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/rmsecl_volumetrics/__init__.py +0 -0
  147. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/rmsecl_volumetrics/rmsecl_volumetrics.py +0 -0
  148. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/sector2fluxnum/__init__.py +0 -0
  149. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/sector2fluxnum/completions.py +0 -0
  150. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/sector2fluxnum/datafile_obj.py +0 -0
  151. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/sector2fluxnum/flux_obj.py +0 -0
  152. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/sector2fluxnum/flux_util.py +0 -0
  153. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/sector2fluxnum/fluxfile_obj.py +0 -0
  154. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/sector2fluxnum/sector2fluxnum.py +0 -0
  155. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/summaryplot/__init__.py +0 -0
  156. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/summaryplot/summaryplot.py +0 -0
  157. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/sunsch/__init__.py +0 -0
  158. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/sunsch/time_vector.py +0 -0
  159. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/sw_model_utilities/__init__.py +0 -0
  160. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/sw_model_utilities/sw_model_utilities.py +0 -0
  161. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/vfp2csv/__init__.py +0 -0
  162. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/vfp2csv/vfp2csv.py +0 -0
  163. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/welltest_dpds/__init__.py +0 -0
  164. {subscript-1.16.0 → subscript-1.16.2}/src/subscript/welltest_dpds/welltest_dpds.py +0 -0
  165. {subscript-1.16.0 → subscript-1.16.2}/src/subscript.egg-info/SOURCES.txt +0 -0
  166. {subscript-1.16.0 → subscript-1.16.2}/src/subscript.egg-info/dependency_links.txt +0 -0
  167. {subscript-1.16.0 → subscript-1.16.2}/src/subscript.egg-info/entry_points.txt +0 -0
  168. {subscript-1.16.0 → subscript-1.16.2}/src/subscript.egg-info/requires.txt +0 -0
  169. {subscript-1.16.0 → subscript-1.16.2}/src/subscript.egg-info/scm_file_list.json +0 -0
  170. {subscript-1.16.0 → subscript-1.16.2}/src/subscript.egg-info/top_level.txt +0 -0
  171. {subscript-1.16.0 → subscript-1.16.2}/tests/__init__.py +0 -0
  172. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args0.png +0 -0
  173. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args1.png +0 -0
  174. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args10.png +0 -0
  175. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args11.png +0 -0
  176. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args2.png +0 -0
  177. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args3.png +0 -0
  178. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args4.png +0 -0
  179. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args5.png +0 -0
  180. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args6.png +0 -0
  181. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args7.png +0 -0
  182. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args8.png +0 -0
  183. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline/test_summaryplotter_mpl_test_cmd_args9.png +0 -0
  184. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args0.png +0 -0
  185. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args1.png +0 -0
  186. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args10.png +0 -0
  187. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args11.png +0 -0
  188. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args2.png +0 -0
  189. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args3.png +0 -0
  190. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args4.png +0 -0
  191. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args5.png +0 -0
  192. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args6.png +0 -0
  193. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args7.png +0 -0
  194. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args8.png +0 -0
  195. {subscript-1.16.0 → subscript-1.16.2}/tests/baseline_legacy/test_summaryplotter_mpl_test_cmd_args9.png +0 -0
  196. {subscript-1.16.0 → subscript-1.16.2}/tests/conftest.py +0 -0
  197. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/edit/drogon.trans +0 -0
  198. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/grid/drogon.faults +0 -0
  199. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/grid/drogon.grid +0 -0
  200. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/grid/drogon.multnum +0 -0
  201. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/grid/drogon.multregt +0 -0
  202. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/grid/drogon.perm +0 -0
  203. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/grid/drogon.poro +0 -0
  204. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/props/drogon.pvt +0 -0
  205. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/props/drogon.sattab +0 -0
  206. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/props/drogon.swatinit +0 -0
  207. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/regions/drogon.eqlnum +0 -0
  208. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/regions/drogon.fipnum +0 -0
  209. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/regions/drogon.fipzon +0 -0
  210. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/regions/drogon.pvtnum +0 -0
  211. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/regions/drogon.satnum +0 -0
  212. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/runspec/drogon.dimens +0 -0
  213. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/runspec/drogon.eqldims +0 -0
  214. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/runspec/drogon.gridopts +0 -0
  215. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/runspec/drogon.regdims +0 -0
  216. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/runspec/drogon.tabdims +0 -0
  217. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/schedule/55_33-1.sch +0 -0
  218. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/schedule/55_33-1.wells +0 -0
  219. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/schedule/drogon_hist.sch +0 -0
  220. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/schedule/vfp/A-1.inc +0 -0
  221. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/schedule/vfp/A-2.inc +0 -0
  222. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/schedule/vfp/A-3.inc +0 -0
  223. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/schedule/vfp/A-4.inc +0 -0
  224. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/solution/drogon.equil +0 -0
  225. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/solution/drogon.rxvd +0 -0
  226. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/solution/drogon.thpres +0 -0
  227. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/include/summary/drogon.summary +0 -0
  228. {subscript-1.16.0 → subscript-1.16.2}/tests/data/drogon/eclipse/model/DROGON-0.DATA +0 -0
  229. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/grid/reek.faults +0 -0
  230. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/grid/reek.grid +0 -0
  231. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/grid/reek.multflt +0 -0
  232. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/grid/reek.multz +0 -0
  233. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/grid/reek.perm +0 -0
  234. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/grid/reek.poro +0 -0
  235. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/props/let-sgof.txt +0 -0
  236. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/props/let-swof.txt +0 -0
  237. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/props/reek.endpoints +0 -0
  238. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/props/reek.pvt +0 -0
  239. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/props/reek.swatinit +0 -0
  240. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/props/sgof.txt +0 -0
  241. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/props/swof.inc +0 -0
  242. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/props/swof.txt +0 -0
  243. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/regions/reek.eqlnum +0 -0
  244. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/regions/reek.fipnum +0 -0
  245. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/schedule/reek_history.sch +0 -0
  246. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/solution/reek.equil +0 -0
  247. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/include/summary/reek.smry +0 -0
  248. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.DATA +0 -0
  249. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.ECLEND +0 -0
  250. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.EGRID +0 -0
  251. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.INIT +0 -0
  252. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.LOG +0 -0
  253. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.PRT +0 -0
  254. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.RFT +0 -0
  255. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.SMSPEC +0 -0
  256. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.UNRST +0 -0
  257. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/model/2_R001_REEK-0.UNSMRY +0 -0
  258. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/eclipse/model/parameters.txt +0 -0
  259. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/parameters.txt +0 -0
  260. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/rms/README +0 -0
  261. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/rms/reek.rms10.1.3/.master +0 -0
  262. {subscript-1.16.0 → subscript-1.16.2}/tests/data/reek/rms/reek.rms11.1.0/.master +0 -0
  263. {subscript-1.16.0 → subscript-1.16.2}/tests/data/vfp/GasProd.VFP +0 -0
  264. {subscript-1.16.0 → subscript-1.16.2}/tests/data/vfp/pd2.VFP +0 -0
  265. {subscript-1.16.0 → subscript-1.16.2}/tests/data/welltest/eclipse/model/DROGON_DST_PLT-0.SMSPEC +0 -0
  266. {subscript-1.16.0 → subscript-1.16.2}/tests/data/welltest/eclipse/model/DROGON_DST_PLT-0.UNSMRY +0 -0
  267. {subscript-1.16.0 → subscript-1.16.2}/tests/test_bjobsusers.py +0 -0
  268. {subscript-1.16.0 → subscript-1.16.2}/tests/test_casegen_upcars.py +0 -0
  269. {subscript-1.16.0 → subscript-1.16.2}/tests/test_check_swatinit.py +0 -0
  270. {subscript-1.16.0 → subscript-1.16.2}/tests/test_check_swatinit_simulators.py +0 -0
  271. {subscript-1.16.0 → subscript-1.16.2}/tests/test_convert_grid_format.py +0 -0
  272. {subscript-1.16.0 → subscript-1.16.2}/tests/test_create_date_files.py +0 -0
  273. {subscript-1.16.0 → subscript-1.16.2}/tests/test_csv2ofmvol.py +0 -0
  274. {subscript-1.16.0 → subscript-1.16.2}/tests/test_csv_merge.py +0 -0
  275. {subscript-1.16.0 → subscript-1.16.2}/tests/test_csv_stack.py +0 -0
  276. {subscript-1.16.0 → subscript-1.16.2}/tests/test_docs.py +0 -0
  277. {subscript-1.16.0 → subscript-1.16.2}/tests/test_eclcompress.py +0 -0
  278. {subscript-1.16.0 → subscript-1.16.2}/tests/test_ecldiff2roff.py +0 -0
  279. {subscript-1.16.0 → subscript-1.16.2}/tests/test_eclinit2roff.py +0 -0
  280. {subscript-1.16.0 → subscript-1.16.2}/tests/test_field_statistics.py +0 -0
  281. {subscript-1.16.0 → subscript-1.16.2}/tests/test_fmu_copy_revision.py +0 -0
  282. {subscript-1.16.0 → subscript-1.16.2}/tests/test_fmuobs_parsers.py +0 -0
  283. {subscript-1.16.0 → subscript-1.16.2}/tests/test_grav_subs_maps.py +0 -0
  284. {subscript-1.16.0 → subscript-1.16.2}/tests/test_grav_subs_points.py +0 -0
  285. {subscript-1.16.0 → subscript-1.16.2}/tests/test_hook_implementations.py +0 -0
  286. {subscript-1.16.0 → subscript-1.16.2}/tests/test_interp_relperm.py +0 -0
  287. {subscript-1.16.0 → subscript-1.16.2}/tests/test_merge_rft_ertobs.py +0 -0
  288. {subscript-1.16.0 → subscript-1.16.2}/tests/test_merge_unrst_files.py +0 -0
  289. {subscript-1.16.0 → subscript-1.16.2}/tests/test_ofmvol2csv.py +0 -0
  290. {subscript-1.16.0 → subscript-1.16.2}/tests/test_pack_sim.py +0 -0
  291. {subscript-1.16.0 → subscript-1.16.2}/tests/test_params2csv.py +0 -0
  292. {subscript-1.16.0 → subscript-1.16.2}/tests/test_presentvalue.py +0 -0
  293. {subscript-1.16.0 → subscript-1.16.2}/tests/test_prtvol2csv.py +0 -0
  294. {subscript-1.16.0 → subscript-1.16.2}/tests/test_restartthinner.py +0 -0
  295. {subscript-1.16.0 → subscript-1.16.2}/tests/test_rmsecl_volumetrics.py +0 -0
  296. {subscript-1.16.0 → subscript-1.16.2}/tests/test_sector2fluxnum.py +0 -0
  297. {subscript-1.16.0 → subscript-1.16.2}/tests/test_subscriptlogger.py +0 -0
  298. {subscript-1.16.0 → subscript-1.16.2}/tests/test_summaryplot.py +0 -0
  299. {subscript-1.16.0 → subscript-1.16.2}/tests/test_sunsch.py +0 -0
  300. {subscript-1.16.0 → subscript-1.16.2}/tests/test_sw_model_utilities.py +0 -0
  301. {subscript-1.16.0 → subscript-1.16.2}/tests/test_vfp2csv.py +0 -0
  302. {subscript-1.16.0 → subscript-1.16.2}/tests/test_welltest_dpds.py +0 -0
  303. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_casegen_upcars/demo_large_scale.yaml +0 -0
  304. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_casegen_upcars/demo_small_scale.yaml +0 -0
  305. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_casegen_upcars/dump_value.tmpl +0 -0
  306. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_casegen_upcars/upcars_eclipse_ref_lg.tmpl +0 -0
  307. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_casegen_upcars/upcars_eclipse_ref_ss.tmpl +0 -0
  308. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_eclcompress/permxyz.grdecl +0 -0
  309. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/config_example.yml +0 -0
  310. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/ERTBOX.roff +0 -0
  311. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/Geogrid.roff +0 -0
  312. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/files.txt +0 -0
  313. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P1_0.roff +0 -0
  314. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P1_3.roff +0 -0
  315. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P2_0.roff +0 -0
  316. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P2_3.roff +0 -0
  317. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_B_P1_0.roff +0 -0
  318. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_B_P1_3.roff +0 -0
  319. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_C_P2_0.roff +0 -0
  320. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_C_P2_3.roff +0 -0
  321. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_A_0.roff +0 -0
  322. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_A_3.roff +0 -0
  323. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_B_0.roff +0 -0
  324. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_B_3.roff +0 -0
  325. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_C_0.roff +0 -0
  326. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_C_3.roff +0 -0
  327. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F1_0.roff +0 -0
  328. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F1_3.roff +0 -0
  329. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F2_0.roff +0 -0
  330. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F2_3.roff +0 -0
  331. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F3_0.roff +0 -0
  332. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F3_3.roff +0 -0
  333. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F1_0.roff +0 -0
  334. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F1_3.roff +0 -0
  335. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F2_0.roff +0 -0
  336. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F2_3.roff +0 -0
  337. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F3_0.roff +0 -0
  338. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F3_3.roff +0 -0
  339. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F1_0.roff +0 -0
  340. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F1_3.roff +0 -0
  341. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F2_0.roff +0 -0
  342. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F2_3.roff +0 -0
  343. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F3_0.roff +0 -0
  344. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F3_3.roff +0 -0
  345. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P1_0.roff +0 -0
  346. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P1_3.roff +0 -0
  347. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P2_0.roff +0 -0
  348. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P2_3.roff +0 -0
  349. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_B_P1_0.roff +0 -0
  350. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_B_P1_3.roff +0 -0
  351. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_C_P2_0.roff +0 -0
  352. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_C_P2_3.roff +0 -0
  353. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ERTBOX.roff +0 -0
  354. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_A_P1_0.roff +0 -0
  355. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_A_P1_3.roff +0 -0
  356. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_A_P2_0.roff +0 -0
  357. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_A_P2_3.roff +0 -0
  358. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_B_P1_0.roff +0 -0
  359. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_B_P1_3.roff +0 -0
  360. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_C_P2_0.roff +0 -0
  361. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--mean_C_P2_3.roff +0 -0
  362. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--nactive_A_0.roff +0 -0
  363. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--nactive_A_3.roff +0 -0
  364. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--nactive_B_0.roff +0 -0
  365. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--nactive_B_3.roff +0 -0
  366. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--nactive_C_0.roff +0 -0
  367. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--nactive_C_3.roff +0 -0
  368. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_A_F1_0.roff +0 -0
  369. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_A_F1_3.roff +0 -0
  370. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_A_F2_0.roff +0 -0
  371. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_A_F2_3.roff +0 -0
  372. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_A_F3_0.roff +0 -0
  373. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_A_F3_3.roff +0 -0
  374. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_B_F1_0.roff +0 -0
  375. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_B_F1_3.roff +0 -0
  376. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_B_F2_0.roff +0 -0
  377. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_B_F2_3.roff +0 -0
  378. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_B_F3_0.roff +0 -0
  379. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_B_F3_3.roff +0 -0
  380. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_C_F1_0.roff +0 -0
  381. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_C_F1_3.roff +0 -0
  382. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_C_F2_0.roff +0 -0
  383. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_C_F2_3.roff +0 -0
  384. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_C_F3_0.roff +0 -0
  385. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--prob_C_F3_3.roff +0 -0
  386. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_A_P1_0.roff +0 -0
  387. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_A_P1_3.roff +0 -0
  388. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_A_P2_0.roff +0 -0
  389. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_A_P2_3.roff +0 -0
  390. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_B_P1_0.roff +0 -0
  391. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_B_P1_3.roff +0 -0
  392. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_C_P2_0.roff +0 -0
  393. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox--stdev_C_P2_3.roff +0 -0
  394. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox_A.roff +0 -0
  395. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox_B.roff +0 -0
  396. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/ertbox_C.roff +0 -0
  397. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/mean_A_GRF1_0.roff +0 -0
  398. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/mean_A_GRF1_3.roff +0 -0
  399. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/mean_A_GRF2_0.roff +0 -0
  400. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/mean_A_GRF2_3.roff +0 -0
  401. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/mean_B_GRF2_0.roff +0 -0
  402. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/mean_B_GRF2_3.roff +0 -0
  403. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/result_field_files.txt +0 -0
  404. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/stdev_A_GRF1_0.roff +0 -0
  405. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/stdev_A_GRF1_3.roff +0 -0
  406. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/stdev_A_GRF2_0.roff +0 -0
  407. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/stdev_A_GRF2_3.roff +0 -0
  408. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/stdev_B_GRF2_0.roff +0 -0
  409. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/stdev_B_GRF2_3.roff +0 -0
  410. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata2/temporary_field_files.txt +0 -0
  411. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/ert/model/0readme +0 -0
  412. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/fmuconfig/output/global_variables.yml +0 -0
  413. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_field_statistics/rms/output/aps/ERTBOX.EGRID +0 -0
  414. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_fmuobs/drogon_wbhp_rft_wct_gor_tracer_4d.obs +0 -0
  415. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_fmuobs/ert-doc.csv +0 -0
  416. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_fmuobs/ert-doc.obs +0 -0
  417. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_fmuobs/ert-doc.yml +0 -0
  418. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_fmuobs/fmu-ensemble-obs.yml +0 -0
  419. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_fmuobs/hist_obs_wells.txt +0 -0
  420. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_fmuobs/ri-obs.csv +0 -0
  421. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_fmuobs/summary_obs_without_date.obs +0 -0
  422. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_gravity/HIST.EGRID +0 -0
  423. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_gravity/HIST.INIT +0 -0
  424. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_gravity/global_variables.yml +0 -0
  425. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_gravity/grav_subs_maps.yml +0 -0
  426. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_gravity/grav_subs_points.yml +0 -0
  427. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_gravity/seabed.gri +0 -0
  428. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_gravity/station_coordinates.csv +0 -0
  429. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_interp_relperm/cfg.yml +0 -0
  430. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_interp_relperm/sgof_base.inc +0 -0
  431. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_interp_relperm/sgof_opt.inc +0 -0
  432. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_interp_relperm/sgof_pes.inc +0 -0
  433. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_interp_relperm/swof_base.inc +0 -0
  434. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_interp_relperm/swof_opt.inc +0 -0
  435. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_interp_relperm/swof_pes.inc +0 -0
  436. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_merge_rft_ertobs/drogon/gendata_rft.csv +0 -0
  437. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A2.obs +0 -0
  438. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A2.txt +0 -0
  439. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A3.obs +0 -0
  440. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A3.txt +0 -0
  441. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A4.txt +0 -0
  442. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A4_1.obs +0 -0
  443. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A5.obs +0 -0
  444. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A5.txt +0 -0
  445. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A6.obs +0 -0
  446. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A6.txt +0 -0
  447. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_merge_rft_ertobs/drogon/rft/well_date_rft.txt +0 -0
  448. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_merge_unrst_files/HIST.UNRST +0 -0
  449. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_merge_unrst_files/PRED.UNRST +0 -0
  450. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_ofmvol2csv/fileA.vol +0 -0
  451. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_ofmvol2csv/fileB.vol +0 -0
  452. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_ofmvol2csv/fileC.vol +0 -0
  453. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_ofmvol2csv/ofm_example.vol +0 -0
  454. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_prtvol2csv/0readme.txt +0 -0
  455. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_prtvol2csv/DROGON_FIPNUM.PRT +0 -0
  456. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_prtvol2csv/DROGON_FIPZON.PRT +0 -0
  457. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_prtvol2csv/DROGON_INACTIVE_FIPNUM.PRT +0 -0
  458. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_prtvol2csv/DROGON_NOBAL_FLOW.PRT +0 -0
  459. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_prtvol2csv/DROGON_NO_INITIAL_BALANCE.PRT +0 -0
  460. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_prtvol2csv/DROGON_NO_INITIAL_BALANCE_FLOW.PRT +0 -0
  461. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sector2fluxnum/DUMPFLUX_TEST.DATA +0 -0
  462. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sector2fluxnum/DUMPFLUX_TEST.EGRID +0 -0
  463. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sector2fluxnum/DUMPFLUX_TEST.FLUX +0 -0
  464. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sector2fluxnum/OUT_COARSE.FLUX +0 -0
  465. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sector2fluxnum/TEST.DATA +0 -0
  466. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sector2fluxnum/TEST.EGRID +0 -0
  467. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sector2fluxnum/TEST.INIT +0 -0
  468. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sector2fluxnum/TEST.UNRST +0 -0
  469. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sunsch/config.yml +0 -0
  470. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sunsch/emptyinit.sch +0 -0
  471. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sunsch/foo1.sch +0 -0
  472. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sunsch/footemplate.sch +0 -0
  473. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sunsch/initwithdates.sch +0 -0
  474. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sunsch/merge2.sch +0 -0
  475. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sunsch/mergeme.sch +0 -0
  476. {subscript-1.16.0 → subscript-1.16.2}/tests/testdata_sunsch/options3.sch +0 -0
  477. {subscript-1.16.0 → subscript-1.16.2}/tests/utils.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: subscript
3
- Version: 1.16.0
3
+ Version: 1.16.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
@@ -293,6 +293,28 @@ def main() -> None:
293
293
  )
294
294
 
295
295
 
296
+ def configure_logging(verbose: bool = False, debug: bool = False) -> None:
297
+ """Configure log levels for fmuobs and its submodules.
298
+
299
+ The ERT workflow hook captures log output from the Python process, so we
300
+ must explicitly control the package logger levels here to avoid leaking
301
+ INFO/DEBUG output in default runs.
302
+ """
303
+ loglevel = logging.WARNING
304
+ if verbose:
305
+ loglevel = logging.INFO
306
+ if debug:
307
+ loglevel = logging.DEBUG
308
+
309
+ for name in (
310
+ "subscript.fmuobs",
311
+ "subscript.fmuobs.parsers",
312
+ "subscript.fmuobs.writers",
313
+ "subscript.fmuobs.util",
314
+ ):
315
+ logging.getLogger(name).setLevel(loglevel)
316
+
317
+
296
318
  def fmuobs(
297
319
  inputfile: str,
298
320
  ertobs: str | None = None,
@@ -305,16 +327,9 @@ def fmuobs(
305
327
  includedir: str | None = None,
306
328
  ) -> None:
307
329
  """Alternative to main() with named arguments"""
308
- if verbose or debug:
309
- if __MAGIC_STDOUT__ in {csv, yml, ertobs}:
310
- raise SystemExit("Don't use verbose/debug when writing to stdout")
311
- loglevel = logging.INFO
312
- if debug:
313
- loglevel = logging.DEBUG
314
- logger.setLevel(loglevel)
315
- getLogger("subscript.fmuobs.parsers").setLevel(loglevel)
316
- getLogger("subscript.fmuobs.writers").setLevel(loglevel)
317
- getLogger("subscript.fmuobs.util").setLevel(loglevel)
330
+ if (verbose or debug) and __MAGIC_STDOUT__ in {csv, yml, ertobs}:
331
+ raise SystemExit("Don't use verbose/debug when writing to stdout")
332
+ configure_logging(verbose=verbose, debug=debug)
318
333
 
319
334
  (filetype, dframe) = autoparse_file(inputfile)
320
335
 
@@ -130,7 +130,7 @@ def dfhistory2ertobs(obs_df: pd.DataFrame) -> str:
130
130
  if "SEGMENT" not in history_df:
131
131
  history_df["SEGMENT"] = "DEFAULT"
132
132
  else:
133
- history_df["SEGMENT"] = history_obs_df["SEGMENT"].fillna(value="DEFAULT")
133
+ history_df["SEGMENT"] = history_df["SEGMENT"].fillna(value="DEFAULT")
134
134
  ertobs_str += "HISTORY_OBSERVATION " + str(histlabel) + " \n"
135
135
  ertobs_str += "{\n"
136
136
  # Write statements for the implicit DEFAULT segment.
@@ -279,7 +279,8 @@ def summary_df2obsdict(smry_df: pd.DataFrame) -> list[dict]:
279
279
 
280
280
  def convert_dframe_date_to_str(dframe: pd.DataFrame) -> pd.DataFrame:
281
281
  """Convert the DATE column in a dataframe to a string.
282
- Replace "NaT" (Not-a-Time) with np.nan after conversion
282
+ Replace string representations of missing values "NaT" (Not-a-Time), "NaN" and "nan"
283
+ with np.nan after conversion
283
284
 
284
285
  Returns a copy of the dataframe if something is modified
285
286
 
@@ -291,11 +292,11 @@ def convert_dframe_date_to_str(dframe: pd.DataFrame) -> pd.DataFrame:
291
292
  Returns:
292
293
  pd.DataFrame: DATE as a string type
293
294
  """
295
+ na_strings = ["NaT", "NaN", "nan"]
294
296
  if "DATE" in dframe:
295
297
  dframe = dframe.copy()
296
- dframe["DATE"] = (
297
- dframe["DATE"].astype(str).replace(["NaT", "NaN", "nan"], np.nan)
298
- )
298
+ date_str = dframe["DATE"].astype(str)
299
+ dframe["DATE"] = date_str.mask(date_str.isin(na_strings), np.nan)
299
300
 
300
301
  return dframe
301
302
 
@@ -59,8 +59,8 @@ It has capability to:
59
59
 
60
60
  DEFINE <CASEGEN_CONFIG_FILE> <RUNPATH>/model.yaml
61
61
  DEFINE <CASEGEN_ECLIPSE_TEMPLATE> <CONFIG_PATH>/../input/config/eclipse.tmpl
62
- FORWARD_MODEL CASEGEN_UPCARS(<CONFIG>=<CASEGEN_CONFIG_FILE>, \
63
- <ECLIPSE_TEMPLATE>=<CASEGEN_ECLIPSE_TEMPLATE>, \
62
+ FORWARD_MODEL CASEGEN_UPCARS(<CONFIG>=<CASEGEN_CONFIG_FILE>, \\
63
+ <ECLIPSE_TEMPLATE>=<CASEGEN_ECLIPSE_TEMPLATE>, \\
64
64
  <ECLIPSE_OUTPUT>=<ECLIPSE_NAME>-<IENS>)
65
65
 
66
66
  """,
@@ -145,6 +145,7 @@ class CreateDateFiles(ForwardModelStepPlugin):
145
145
  FORWARD_MODEL CREATE_DATE_FILES(<GLOBVARFILE>=\
146
146
  "fmuconfig/output/global_variables.yml",\
147
147
  <SINGLEDATES>="SEISMIC_HIST_DATES", <DIFFDATES>="SEISMIC_DIFF_DATES")
148
+
148
149
  """,
149
150
  )
150
151
 
@@ -231,10 +232,9 @@ argument.
231
232
  FORWARD_MODEL ECLCOMPRESS(<FILES>=paths_to_compress.txt)
232
233
 
233
234
  where ``paths_to_compress.txt`` contains a list of files or filepaths to
234
- compress.
235
+ compress:
235
236
 
236
237
  .. code-block:: text
237
- :caption: paths_to_compress.txt
238
238
 
239
239
  eclipse/include/grid/*
240
240
  eclipse/include/regions/*
@@ -270,7 +270,7 @@ class Ecldiff2Roff(ForwardModelStepPlugin):
270
270
  examples="""
271
271
  .. code-block:: console
272
272
 
273
- FORWARD_MODEL ECLDIFF2ROFF(<ECLROOT>=<ECLBASE>, <PROP>=SGAS, \
273
+ FORWARD_MODEL ECLDIFF2ROFF(<ECLROOT>=<ECLBASE>, <PROP>=SGAS, \\
274
274
  <DIFFDATES>=diff_dates.txt <OUTPUT>=share/results/grids/eclgrid)
275
275
 
276
276
  where ``ECLBASE`` is already defined in your ERT config, pointing to the Eclipse
@@ -357,7 +357,7 @@ given below will produce the files::
357
357
  examples="""
358
358
  .. code-block:: console
359
359
 
360
- FORWARD_MODEL ECLINIT2ROFF(<ECLROOT>=<ECLBASE>, \
360
+ FORWARD_MODEL ECLINIT2ROFF(<ECLROOT>=<ECLBASE>, \\
361
361
  <OUTPUT>=share/results/grids/eclgrid, <PROP>=PORO:PERMX)
362
362
 
363
363
  where ``ECLBASE`` is already defined in your ERT config, pointing to the Eclipse
@@ -411,7 +411,7 @@ if the file ``dates.txt`` contains only the line::
411
411
  examples="""
412
412
  .. code-block:: console
413
413
 
414
- FORWARD_MODEL ECLRST2ROFF(<ECLROOT>=<ECLBASE>, \
414
+ FORWARD_MODEL ECLRST2ROFF(<ECLROOT>=<ECLBASE>, \\
415
415
  <OUTPUT>=share/results/grids/eclgrid, <PROP>=SGAS:SWAT, <DATES>=dates.txt)
416
416
 
417
417
  where ``ECLBASE`` is already defined in your ERT config, pointing to the Eclipse
@@ -460,6 +460,7 @@ extension). If the extension is missing or not recognized, it defaults to
460
460
 
461
461
  FORWARD_MODEL ROFF2ECLGRID(<INPUT>=share/results/grids/reek.roff, \
462
462
  <OUTPUT>=share/results/grids/reek.EGRID, <OUTFORMAT>=egrid)
463
+
463
464
  """,
464
465
  )
465
466
 
@@ -487,9 +488,9 @@ class GravSubsMaps(ForwardModelStepPlugin):
487
488
  examples="""
488
489
  .. code-block:: console
489
490
 
490
- FORWARD_MODEL GRAV_SUBS_MAPS(<UNRST_FILE>=<ECLBASE>.UNRST, \
491
+ FORWARD_MODEL GRAV_SUBS_MAPS(<UNRST_FILE>=<ECLBASE>.UNRST, \\
491
492
  <GRAVMAPS_CONFIG>=grav_subs_maps.yml)
492
- FORWARD_MODEL GRAV_SUBS_MAPS(<UNRST_FILE>=<ECLBASE>.UNRST, \
493
+ FORWARD_MODEL GRAV_SUBS_MAPS(<UNRST_FILE>=<ECLBASE>.UNRST, \\
493
494
  <GRAVMAPS_CONFIG>=grav_subs_maps.yml, <OUTPUT_DIR>=share/results/maps)
494
495
 
495
496
 
@@ -534,15 +535,15 @@ class GravSubsPoints(ForwardModelStepPlugin):
534
535
  examples="""
535
536
  .. code-block:: console
536
537
 
537
- FORWARD_MODEL GRAV_SUBS_POINTS(<UNRST_FILE=<ECLBASE>.UNRST, \
538
+ FORWARD_MODEL GRAV_SUBS_POINTS(<UNRST_FILE=<ECLBASE>.UNRST, \\
538
539
  <GRAVPOINTS_CONFIG>=grav_subs_points.yml)
539
- FORWARD_MODEL GRAV_SUBS_POINTS(<UNRST_FILE=<ECLBASE>.UNRST, \
540
- <GRAVPOINTS_CONFIG>=<CONFIG_PATH>/../input/config/grav_subs_points.yml, \
540
+ FORWARD_MODEL GRAV_SUBS_POINTS(<UNRST_FILE=<ECLBASE>.UNRST, \\
541
+ <GRAVPOINTS_CONFIG>=<CONFIG_PATH>/../input/config/grav_subs_points.yml, \\
541
542
  <OUTPUT_DIR>=share/results/points)
542
543
 
543
- FORWARD_MODEL GRAV_SUBS_POINTS(<UNRST_FILE=<ECLBASE>.UNRST, \
544
+ FORWARD_MODEL GRAV_SUBS_POINTS(<UNRST_FILE=<ECLBASE>.UNRST, \\
544
545
  <GRAVPOINTS_CONFIG>=grav_subs_points.yml, <EXTENSION_GENDATA>="_10.txt")
545
- FORWARD_MODEL GRAV_SUBS_POINTS(<UNRST_FILE=<ECLBASE>.UNRST, \
546
+ FORWARD_MODEL GRAV_SUBS_POINTS(<UNRST_FILE=<ECLBASE>.UNRST, \\
546
547
  <GRAVPOINTS_CONFIG>=grav_subs_points.yml, <PREFIX_GENDATA>="fieldA_")
547
548
 
548
549
  where ``ECLBASE`` is already defined in your ERT config, pointing to the flowsimulator
@@ -584,7 +585,7 @@ class InterpRelperm(ForwardModelStepPlugin):
584
585
  examples="""
585
586
  .. code-block:: console
586
587
 
587
- FORWARD_MODEL INTERP_RELPERM(<INTERP_CONFIG>=interp_relperm.yml, \
588
+ FORWARD_MODEL INTERP_RELPERM(<INTERP_CONFIG>=interp_relperm.yml, \\
588
589
  <ROOT_PATH>=<CONFIG_PATH>)
589
590
 
590
591
  """,
@@ -655,9 +656,9 @@ class MergeUnrstFiles(ForwardModelStepPlugin):
655
656
  .. code-block:: console
656
657
 
657
658
  DEFINE <RESTART_DIR> iter-3
658
- FORWARD_MODEL MERGE_UNRST_FILES(<UNRST1>=..<RESTART_DIR>/<ECLBASE>.UNRST, \
659
+ FORWARD_MODEL MERGE_UNRST_FILES(<UNRST1>=..<RESTART_DIR>/<ECLBASE>.UNRST, \\
659
660
  <UNRST2>=<ECLBASE>.UNRST, <OUTPUT>=eclipse/model/ECLIPSE_MERGED.UNRST)
660
- FORWARD_MODEL MERGE_UNRST_FILES(<UNRST1>=..<RESTART_DIR>/<ECLBASE>.UNRST, \
661
+ FORWARD_MODEL MERGE_UNRST_FILES(<UNRST1>=..<RESTART_DIR>/<ECLBASE>.UNRST, \\
661
662
  <UNRST2>=<ECLBASE>.UNRST, <OUTPUT>=MERGED.UNRST, <PRIORITY>=pred)
662
663
 
663
664
  """,
@@ -727,7 +728,7 @@ FORWARD_MODEL.
727
728
 
728
729
  .. code-block:: console
729
730
 
730
- FORWARD_MODEL PARAMS2CSV(<PARAMETERFILES>=parameters.txt, <OUTPUT>=parameters.csv,\
731
+ FORWARD_MODEL PARAMS2CSV(<PARAMETERFILES>=parameters.txt, <OUTPUT>=parameters.csv,\\
731
732
  <FILENAMECOLUMN>=source_file)
732
733
 
733
734
  """,
@@ -771,8 +772,8 @@ class Prtvol2Csv(ForwardModelStepPlugin):
771
772
  examples="""
772
773
  .. code-block:: console
773
774
 
774
- FORWARD_MODEL PRTVOL2CSV(<DATAFILE>=<ECLBASE>, <REGIONS>=regions.yml, \
775
- <FIPNAME>=FIPNUM, <DATE>=first, <DIR>=., \
775
+ FORWARD_MODEL PRTVOL2CSV(<DATAFILE>=<ECLBASE>, <REGIONS>=regions.yml, \\
776
+ <FIPNAME>=FIPNUM, <DATE>=first, <DIR>=., \\
776
777
  <OUTPUTFILENAME>=simulator_volume_fipnum.csv)
777
778
 
778
779
  where ``ECLBASE`` is already defined in your ERT config, pointing to the Eclipse
@@ -821,6 +822,7 @@ class Sunsch(ForwardModelStepPlugin):
821
822
  .. code-block:: console
822
823
 
823
824
  FORWARD_MODEL SUNSCH(<config>=sunsch_config.yml)
825
+
824
826
  """,
825
827
  )
826
828
 
@@ -867,21 +869,21 @@ Example for cases without HM:
867
869
 
868
870
  or
869
871
 
870
- FORWARD_MODEL WELLTEST_DPDS(<ECLBASE>, <WELLNAME>=OP_1, <PHASE>=GAS, <BUILDUP_NR>=1,
871
- <OUTPUTDIRECTORY>=dst, <OUTFILESSUFFIX>=OP_1)
872
+ FORWARD_MODEL WELLTEST_DPDS(<ECLBASE>, <WELLNAME>=OP_1, <PHASE>=GAS, \\
873
+ <BUILDUP_NR>=1, <OUTPUTDIRECTORY>=dst, <OUTFILESSUFFIX>=OP_1)
872
874
 
873
875
  Example for cases with HM:
874
876
  --------------------------
875
877
  ::
876
878
 
877
- FORWARD_MODEL WELLTEST_DPDS(<ECLBASE>, <WELLNAME>=OP_1, <PHASE>=GAS, <BUILDUP_NR>=2,
878
- <OUTPUTDIRECTORY>=dst, <OUTFILESSUFFIX>=OP_1_1,
879
+ FORWARD_MODEL WELLTEST_DPDS(<ECLBASE>, <WELLNAME>=OP_1, <PHASE>=GAS, \\
880
+ <BUILDUP_NR>=2, <OUTPUTDIRECTORY>=dst, <OUTFILESSUFFIX>=OP_1_1, \\
879
881
  <GENOBS_RESULTFILE>=OP_1_dpdt_bu2_saphir.txt )
880
882
 
881
883
  Then set-up of GEN_DATA can be
882
884
  ::
883
885
 
884
- GEN_DATA DPDT_SIM INPUT_FORMAT:ASCII REPORT_STEPS:1
886
+ GEN_DATA DPDT_SIM INPUT_FORMAT:ASCII REPORT_STEPS:1 \\
885
887
  RESULT_FILE:dpdspt_lag2_genobs_OP_1_%d_2
886
888
 
887
889
  result_file corresponds to dpdspt_lag2_genobs_<WELLNAME>_%d_<BUILDUP_NR>
@@ -41,6 +41,7 @@ EXAMPLES = """
41
41
  .. code-block:: console
42
42
 
43
43
  FORWARD_MODEL SUNSCH(<config>=sunsch_config.yml)
44
+
44
45
  """
45
46
 
46
47
 
@@ -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.0'
22
- __version_tuple__ = version_tuple = (1, 16, 0)
21
+ __version__ = version = '1.16.2'
22
+ __version_tuple__ = version_tuple = (1, 16, 2)
23
23
 
24
- __commit_id__ = commit_id = 'g284c2566f'
24
+ __commit_id__ = commit_id = 'g0ffc507dc'
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: subscript
3
- Version: 1.16.0
3
+ Version: 1.16.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
@@ -0,0 +1,8 @@
1
+ {
2
+ "tag": "1.16.2",
3
+ "distance": 0,
4
+ "node": "g0ffc507dcdf1b3a78fd4b1b2e35605466a061f9b",
5
+ "dirty": false,
6
+ "branch": "HEAD",
7
+ "node_date": "2026-10-08"
8
+ }
@@ -2,6 +2,7 @@
2
2
  other formats, and test the ERT hook"""
3
3
 
4
4
  import io
5
+ import logging
5
6
  import subprocess
6
7
  from pathlib import Path
7
8
 
@@ -9,7 +10,7 @@ import pandas as pd
9
10
  import pytest
10
11
  import yaml
11
12
 
12
- from subscript.fmuobs.fmuobs import autoparse_file, main
13
+ from subscript.fmuobs.fmuobs import autoparse_file, fmuobs, main
13
14
  from subscript.fmuobs.parsers import ertobs2df, obsdict2df, resinsight_df2df
14
15
  from subscript.fmuobs.writers import df2ertobs, df2obsdict, df2resinsight_df
15
16
 
@@ -302,8 +303,7 @@ def test_commandline(tmp_path, verbose, mocker, caplog, monkeypatch):
302
303
  """Test the executable versus on the ERT doc observation data
303
304
  and compare to precomputed CSV and YML.
304
305
 
305
- When code changes, updates to the CSV and YML might
306
- be necessary.
306
+ When code changes, updates to the CSV and YML might be necessary.
307
307
  """
308
308
  monkeypatch.chdir(tmp_path)
309
309
  mocker.patch(
@@ -312,7 +312,6 @@ def test_commandline(tmp_path, verbose, mocker, caplog, monkeypatch):
312
312
  filter(
313
313
  None,
314
314
  [
315
- # [
316
315
  "fmuobs",
317
316
  "--includedir",
318
317
  str(TESTDATA_DIR),
@@ -385,8 +384,16 @@ def test_commandline(tmp_path, verbose, mocker, caplog, monkeypatch):
385
384
  )
386
385
 
387
386
 
387
+ def _has_log(output: str, level: str, logger_name: str, text: str) -> bool:
388
+ """True if some ERT log line has this logger, level and message text"""
389
+ return any(
390
+ f" - {logger_name} - " in line and f" - {level} - " in line and text in line
391
+ for line in output.splitlines()
392
+ )
393
+
394
+
388
395
  @pytest.mark.integration
389
- @pytest.mark.parametrize("verbose", ["", '"--verbose"', '"--debug"'])
396
+ @pytest.mark.parametrize("verbose", ["", "--verbose", "--debug"])
390
397
  def test_ert_workflow_hook(verbose, tmp_path, monkeypatch):
391
398
  """Mock an ERT config with FMUOBS as a workflow and run it"""
392
399
  obs_file = TESTDATA_DIR / "ert-doc.obs"
@@ -394,14 +401,13 @@ def test_ert_workflow_hook(verbose, tmp_path, monkeypatch):
394
401
 
395
402
  Path("FOO.DATA").write_text("--Empty", encoding="utf8")
396
403
 
404
+ # ERT treats "--" as a comment, so options must be quoted in the workflow
405
+ quoted_verbose = f'"{verbose}"' if verbose else ""
406
+
397
407
  Path("wf_fmuobs").write_text(
398
- "FMUOBS "
399
- + verbose
400
- + " "
401
- + str(obs_file)
402
- + ' "--yaml" ert-obs.yml "--resinsight" ri-obs.csv "--includedir" '
403
- + str(TESTDATA_DIR)
404
- + "\n",
408
+ f"FMUOBS {quoted_verbose} {obs_file} "
409
+ '"--yaml" ert-obs.yml "--resinsight" ri-obs.csv '
410
+ f'"--includedir" {TESTDATA_DIR}\n',
405
411
  encoding="utf8",
406
412
  )
407
413
 
@@ -424,18 +430,43 @@ def test_ert_workflow_hook(verbose, tmp_path, monkeypatch):
424
430
 
425
431
  # Verify that we can control whether INFO messages from fmuobs through ERT
426
432
  # is emitted.
427
- log_file = next(Path("logs").glob("ert-log*txt"))
428
- ert_output = log_file.read_text(encoding="utf-8")
433
+ logs = list(Path("logs").glob("ert-log*txt"))
434
+ assert logs, "No ERT log file found"
435
+ ert_output = logs[0].read_text(encoding="utf-8")
436
+
437
+ parsers = "subscript.fmuobs.parsers"
438
+ # Positive control: the log file must contain fmuobs messages at WARNING
439
+ # level, which are emitted in every mode. Otherwise the absence checks
440
+ # below could pass on an empty or wrong file.
441
+ assert _has_log(ert_output, "WARNING", "subscript.fmuobs.writers", "missing DATE")
429
442
 
430
- # This is slightly tricky, as ERT has its own logging handler which is able
431
- # to pick up the log messages, but whose level cannot be controlled by
432
- # the fmuobs.py file. Thus, we test on the exact subscript logger format:
433
443
  if verbose == "--verbose":
434
- assert "INFO:subscript.fmuobs.parsers:Injecting include file" in ert_output
444
+ assert _has_log(ert_output, "INFO", parsers, "Injecting include file")
445
+ assert not _has_log(ert_output, "DEBUG", parsers, "Parsing observation")
435
446
  elif verbose == "--debug":
436
- assert (
437
- "DEBUG:subscript.fmuobs.parsers:"
438
- "Parsing observation SUMMARY_OBSERVATION SEP_TEST_2005" in ert_output
447
+ assert _has_log(ert_output, "INFO", parsers, "Injecting include file")
448
+ assert _has_log(
449
+ ert_output,
450
+ "DEBUG",
451
+ parsers,
452
+ "Parsing observation SUMMARY_OBSERVATION SEP_TEST_2005",
439
453
  )
440
454
  else:
441
- assert "INFO:subscript.fmuobs.parsers:Injecting include file" not in ert_output
455
+ assert not _has_log(ert_output, "INFO", parsers, "Injecting include file")
456
+ assert not _has_log(ert_output, "DEBUG", parsers, "Parsing observation")
457
+
458
+
459
+ def test_stdout_guard_does_not_change_log_levels(tmp_path, monkeypatch):
460
+ """A rejected verbose+stdout call must not alter logger levels"""
461
+ monkeypatch.chdir(tmp_path)
462
+ logger = logging.getLogger("subscript.fmuobs")
463
+ logger.setLevel(logging.WARNING)
464
+
465
+ with pytest.raises(SystemExit):
466
+ fmuobs(
467
+ str(TESTDATA_DIR / "ert-doc.obs"),
468
+ csv="-",
469
+ verbose=True,
470
+ )
471
+
472
+ assert logger.level == logging.WARNING
@@ -521,7 +521,15 @@ def test_block_df2obsdict(obs_df, expected_dict):
521
521
  pd.DataFrame([{"DATE": datetime.date(2020, 1, 1)}, {"DATE": np.nan}]),
522
522
  pd.DataFrame([{"DATE": "2020-01-01"}, {"DATE": np.nan}]),
523
523
  ),
524
+ # Explicitly cover every string marker in na_strings -> np.nan
525
+ (pd.DataFrame([{"DATE": "NaT"}]), pd.DataFrame([{"DATE": np.nan}])),
526
+ (pd.DataFrame([{"DATE": "NaN"}]), pd.DataFrame([{"DATE": np.nan}])),
524
527
  (pd.DataFrame([{"DATE": "nan"}]), pd.DataFrame([{"DATE": np.nan}])),
528
+ # Ensure valid dates are untouched while markers become np.nan
529
+ (
530
+ pd.DataFrame([{"DATE": "2020-01-01"}, {"DATE": "NaN"}]),
531
+ pd.DataFrame([{"DATE": "2020-01-01"}, {"DATE": np.nan}]),
532
+ ),
525
533
  ],
526
534
  )
527
535
  def test_convert_dframe_date_to_str(dframe, expected_dframe):
@@ -1,4 +1,4 @@
1
1
  [diffend] Oversized file quarantined before diffing.
2
- name: subscript-1.16.0/tests/testdata_gravity/HIST.UNRST
2
+ name: subscript-1.16.2/tests/testdata_gravity/HIST.UNRST
3
3
  size: 53714112 bytes
4
4
  sha256: 7c2f7bfbf989a3cf2a820d52bf61eb31813ec2b6bd57cd25fc7dec4aa0ea5ac0
@@ -1,8 +0,0 @@
1
- {
2
- "tag": "1.16.0",
3
- "distance": 0,
4
- "node": "g284c2566f22720eaf307f9092dddebd2e8a52737",
5
- "dirty": false,
6
- "branch": "HEAD",
7
- "node_date": "2026-08-12"
8
- }
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes