subscript 1.11.0__tar.gz → 1.13.0__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 (420) hide show
  1. {subscript-1.11.0 → subscript-1.13.0}/.github/workflows/codecov.yml +8 -2
  2. {subscript-1.11.0 → subscript-1.13.0}/.github/workflows/publish.yml +2 -2
  3. {subscript-1.11.0 → subscript-1.13.0}/.github/workflows/subscript.yml +8 -2
  4. {subscript-1.11.0 → subscript-1.13.0}/PKG-INFO +9 -8
  5. {subscript-1.11.0 → subscript-1.13.0}/README.md +1 -1
  6. {subscript-1.11.0 → subscript-1.13.0}/pyproject.toml +6 -6
  7. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/casegen_upcars/casegen_upcars.py +0 -23
  8. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/check_swatinit/check_swatinit.py +3 -13
  9. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/csv2ofmvol/csv2ofmvol.py +0 -2
  10. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/csv_merge/csv_merge.py +17 -11
  11. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/csv_stack/csv_stack.py +12 -14
  12. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/eclcompress/eclcompress.py +0 -26
  13. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/ecldiff2roff/ecldiff2roff.py +0 -11
  14. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/field_statistics/field_statistics.py +15 -6
  15. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/fmu_copy_revision/fmu_copy_revision.py +13 -3
  16. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/fmuobs/fmuobs.py +1 -2
  17. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/grav_subs_maps/grav_subs_maps.py +0 -17
  18. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/grav_subs_points/grav_subs_points.py +2 -31
  19. subscript-1.13.0/src/subscript/hook_implementations/forward_model_steps.py +863 -0
  20. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/interp_relperm/interp_relperm.py +0 -9
  21. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/merge_unrst_files/merge_unrst_files.py +0 -9
  22. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/params2csv/params2csv.py +1 -21
  23. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/prtvol2csv/prtvol2csv.py +0 -26
  24. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/ri_wellmod/ri_wellmod.py +0 -48
  25. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/version.py +9 -4
  26. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/welltest_dpds/welltest_dpds.py +0 -34
  27. {subscript-1.11.0 → subscript-1.13.0}/src/subscript.egg-info/PKG-INFO +9 -8
  28. {subscript-1.11.0 → subscript-1.13.0}/src/subscript.egg-info/SOURCES.txt +2 -24
  29. {subscript-1.11.0 → subscript-1.13.0}/src/subscript.egg-info/entry_points.txt +1 -1
  30. {subscript-1.11.0 → subscript-1.13.0}/src/subscript.egg-info/requires.txt +3 -5
  31. {subscript-1.11.0 → subscript-1.13.0}/tests/test_casegen_upcars.py +26 -0
  32. {subscript-1.11.0 → subscript-1.13.0}/tests/test_convert_grid_format.py +24 -0
  33. {subscript-1.11.0 → subscript-1.13.0}/tests/test_csv2ofmvol.py +1 -10
  34. {subscript-1.11.0 → subscript-1.13.0}/tests/test_csv_merge.py +1 -9
  35. {subscript-1.11.0 → subscript-1.13.0}/tests/test_csv_stack.py +4 -13
  36. {subscript-1.11.0 → subscript-1.13.0}/tests/test_docs.py +0 -1
  37. {subscript-1.11.0 → subscript-1.13.0}/tests/test_eclcompress.py +40 -0
  38. {subscript-1.11.0 → subscript-1.13.0}/tests/test_ecldiff2roff.py +21 -0
  39. subscript-1.13.0/tests/test_eclinit2roff.py +50 -0
  40. {subscript-1.11.0 → subscript-1.13.0}/tests/test_fmu_copy_revision.py +10 -0
  41. subscript-1.13.0/tests/test_hook_implementations.py +76 -0
  42. {subscript-1.11.0 → subscript-1.13.0}/tests/test_interp_relperm.py +19 -0
  43. {subscript-1.11.0 → subscript-1.13.0}/tests/test_merge_rft_ertobs.py +1 -8
  44. {subscript-1.11.0 → subscript-1.13.0}/tests/test_merge_unrst_files.py +19 -0
  45. {subscript-1.11.0 → subscript-1.13.0}/tests/test_ofmvol2csv.py +1 -9
  46. {subscript-1.11.0 → subscript-1.13.0}/tests/test_params2csv.py +6 -15
  47. {subscript-1.11.0 → subscript-1.13.0}/tests/test_ri_wellmod.py +1 -9
  48. {subscript-1.11.0 → subscript-1.13.0}/tests/test_welltest_dpds.py +25 -0
  49. subscript-1.11.0/src/subscript/config_jobs/CASEGEN_UPCARS +0 -10
  50. subscript-1.11.0/src/subscript/config_jobs/CHECK_SWATINIT +0 -8
  51. subscript-1.11.0/src/subscript/config_jobs/CSV2OFMVOL +0 -9
  52. subscript-1.11.0/src/subscript/config_jobs/CSV_STACK +0 -12
  53. subscript-1.11.0/src/subscript/config_jobs/ECLCOMPRESS +0 -9
  54. subscript-1.11.0/src/subscript/config_jobs/ECLDIFF2ROFF +0 -8
  55. subscript-1.11.0/src/subscript/config_jobs/ECLGRID2ROFF +0 -6
  56. subscript-1.11.0/src/subscript/config_jobs/ECLINIT2ROFF +0 -10
  57. subscript-1.11.0/src/subscript/config_jobs/ECLRST2ROFF +0 -11
  58. subscript-1.11.0/src/subscript/config_jobs/GRAV_SUBS_MAPS +0 -9
  59. subscript-1.11.0/src/subscript/config_jobs/GRAV_SUBS_POINTS +0 -13
  60. subscript-1.11.0/src/subscript/config_jobs/INTERP_RELPERM +0 -9
  61. subscript-1.11.0/src/subscript/config_jobs/MERGE_RFT_ERTOBS +0 -11
  62. subscript-1.11.0/src/subscript/config_jobs/MERGE_UNRST_FILES +0 -11
  63. subscript-1.11.0/src/subscript/config_jobs/OFMVOL2CSV +0 -9
  64. subscript-1.11.0/src/subscript/config_jobs/PARAMS2CSV +0 -6
  65. subscript-1.11.0/src/subscript/config_jobs/PRTVOL2CSV +0 -18
  66. subscript-1.11.0/src/subscript/config_jobs/RI_WELLMOD +0 -39
  67. subscript-1.11.0/src/subscript/config_jobs/SUNSCH +0 -6
  68. subscript-1.11.0/src/subscript/config_jobs/WELLTEST_DPDS +0 -12
  69. subscript-1.11.0/src/subscript/eclgrid2roff/eclgrid2roff.py +0 -19
  70. subscript-1.11.0/src/subscript/eclinit2roff/eclinit2roff.py +0 -23
  71. subscript-1.11.0/src/subscript/eclrst2roff/eclrst2roff.py +0 -27
  72. subscript-1.11.0/src/subscript/hook_implementations/jobs.py +0 -79
  73. subscript-1.11.0/tests/test_hook_implementations.py +0 -108
  74. {subscript-1.11.0 → subscript-1.13.0}/.gitignore +0 -0
  75. {subscript-1.11.0 → subscript-1.13.0}/.pylintrc +0 -0
  76. {subscript-1.11.0 → subscript-1.13.0}/LICENSE +0 -0
  77. {subscript-1.11.0 → subscript-1.13.0}/SECURITY.md +0 -0
  78. {subscript-1.11.0 → subscript-1.13.0}/ci/testkomodo.sh +0 -0
  79. {subscript-1.11.0 → subscript-1.13.0}/docs/Makefile +0 -0
  80. {subscript-1.11.0 → subscript-1.13.0}/docs/_static/equinor-logo.png +0 -0
  81. {subscript-1.11.0 → subscript-1.13.0}/docs/_static/equinor-logo2.jpg +0 -0
  82. {subscript-1.11.0 → subscript-1.13.0}/docs/_static/equinor-logo2.png +0 -0
  83. {subscript-1.11.0 → subscript-1.13.0}/docs/_static/equinor_logo.jpg +0 -0
  84. {subscript-1.11.0 → subscript-1.13.0}/docs/_static/equinor_logo_only.jpg +0 -0
  85. {subscript-1.11.0 → subscript-1.13.0}/docs/_templates/layout.html +0 -0
  86. {subscript-1.11.0 → subscript-1.13.0}/docs/conf.py +0 -0
  87. {subscript-1.11.0 → subscript-1.13.0}/docs/contributing.rst +0 -0
  88. {subscript-1.11.0 → subscript-1.13.0}/docs/history.rst +0 -0
  89. {subscript-1.11.0 → subscript-1.13.0}/docs/index.rst +0 -0
  90. {subscript-1.11.0 → subscript-1.13.0}/docs/make.bat +0 -0
  91. {subscript-1.11.0 → subscript-1.13.0}/docs/overview.rst +0 -0
  92. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/bjobsusers.rst +0 -0
  93. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/casegen_upcars.rst +0 -0
  94. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/check_swatinit.rst +0 -0
  95. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/convert_grid_format.rst +0 -0
  96. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/csv2ofmvol.rst +0 -0
  97. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/csv_merge.rst +0 -0
  98. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/csv_stack.rst +0 -0
  99. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/eclcompress.rst +0 -0
  100. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/ecldiff2roff.rst +0 -0
  101. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/field_statistics.rst +0 -0
  102. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/fmu_copy_revision.rst +0 -0
  103. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/fmuobs.rst +0 -0
  104. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/grav_subs_maps.rst +0 -0
  105. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/grav_subs_points.rst +0 -0
  106. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/images/Pack_sim_overview.png +0 -0
  107. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/images/Summaryplot-ensemble.png +0 -0
  108. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/images/Summaryplot-ert.png +0 -0
  109. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/images/Summaryplot-normalizeexample.png +0 -0
  110. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/images/Workflow_sector2fluxnum.png +0 -0
  111. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/images/casegen_upcars_geometry.png +0 -0
  112. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/images/check_swatinit_scatter.png +0 -0
  113. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/images/check_swatinit_volplot.png +0 -0
  114. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/images/ecl-swat-initialization.png +0 -0
  115. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/images/make_check_swatinit_images.sh +0 -0
  116. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/images/resinsight_wells_project_example.png +0 -0
  117. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/interp_relperm.rst +0 -0
  118. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/merge_rft_ertobs.rst +0 -0
  119. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/merge_unrst_files.rst +0 -0
  120. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/ofmvol2csv.rst +0 -0
  121. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/pack_sim.rst +0 -0
  122. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/params2csv.rst +0 -0
  123. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/presentvalue.rst +0 -0
  124. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/prtvol2csv.csv +0 -0
  125. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/prtvol2csv.rst +0 -0
  126. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/restartthinner.rst +0 -0
  127. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/ri_wellmod.rst +0 -0
  128. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/rmsecl_volumetrics.rst +0 -0
  129. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/sector2fluxnum.rst +0 -0
  130. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/summaryplot.rst +0 -0
  131. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/sunsch.rst +0 -0
  132. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/sw_model_utilities.rst +0 -0
  133. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/vfp2csv.rst +0 -0
  134. {subscript-1.11.0 → subscript-1.13.0}/docs/scripts/welltest_dpds.rst +0 -0
  135. {subscript-1.11.0 → subscript-1.13.0}/docs/usage.rst +0 -0
  136. {subscript-1.11.0 → subscript-1.13.0}/setup.cfg +0 -0
  137. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/__init__.py +0 -0
  138. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/bjobsusers/__init__.py +0 -0
  139. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/bjobsusers/bjobsusers.py +0 -0
  140. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/casegen_upcars/__init__.py +0 -0
  141. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/casegen_upcars/model.py +0 -0
  142. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/casegen_upcars/udf.py +0 -0
  143. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/casegen_upcars/udf_arg_parser.py +0 -0
  144. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/check_swatinit/__init__.py +0 -0
  145. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/check_swatinit/constants.py +0 -0
  146. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/check_swatinit/pillarmodel.py +0 -0
  147. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/check_swatinit/plotter.py +0 -0
  148. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/convert_grid_format/__init__.py +0 -0
  149. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/convert_grid_format/convert_grid_format.py +0 -0
  150. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/csv2ofmvol/__init__.py +0 -0
  151. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/csv_merge/__init__.py +0 -0
  152. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/csv_stack/__init__.py +0 -0
  153. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/eclcompress/__init__.py +0 -0
  154. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/eclcompress/allowlist.py +0 -0
  155. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/ecldiff2roff/__init__.py +0 -0
  156. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/field_statistics/__init__.py +0 -0
  157. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/fmu_copy_revision/__init__.py +0 -0
  158. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/fmuobs/__init__.py +0 -0
  159. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/fmuobs/parsers.py +0 -0
  160. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/fmuobs/util.py +0 -0
  161. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/fmuobs/writers.py +0 -0
  162. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/grav_subs_maps/__init__.py +0 -0
  163. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/grav_subs_points/__init__.py +0 -0
  164. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/hook_implementations/__init__.py +0 -0
  165. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/interp_relperm/__init__.py +0 -0
  166. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/legacy/duf +0 -0
  167. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/legacy/eclmanual +0 -0
  168. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/legacy/ertwatch +0 -0
  169. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/legacy/list_rms_usage +0 -0
  170. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/legacy/nosim +0 -0
  171. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/legacy/runeclipse +0 -0
  172. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/merge_rft_ertobs/__init__.py +0 -0
  173. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/merge_rft_ertobs/merge_rft_ertobs.py +0 -0
  174. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/merge_unrst_files/__init__.py +0 -0
  175. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/ofmvol2csv/__init__.py +0 -0
  176. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/ofmvol2csv/ofmvol2csv.py +0 -0
  177. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/pack_sim/__init__.py +0 -0
  178. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/pack_sim/pack_sim.py +0 -0
  179. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/params2csv/__init__.py +0 -0
  180. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/presentvalue/__init__.py +0 -0
  181. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/presentvalue/presentvalue.py +0 -0
  182. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/prtvol2csv/__init__.py +0 -0
  183. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/restartthinner/__init__.py +0 -0
  184. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/restartthinner/restartthinner.py +0 -0
  185. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/ri_wellmod/__init__.py +0 -0
  186. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/rmsecl_volumetrics/__init__.py +0 -0
  187. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/rmsecl_volumetrics/rmsecl_volumetrics.py +0 -0
  188. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/sector2fluxnum/__init__.py +0 -0
  189. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/sector2fluxnum/completions.py +0 -0
  190. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/sector2fluxnum/datafile_obj.py +0 -0
  191. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/sector2fluxnum/flux_obj.py +0 -0
  192. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/sector2fluxnum/flux_util.py +0 -0
  193. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/sector2fluxnum/fluxfile_obj.py +0 -0
  194. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/sector2fluxnum/sector2fluxnum.py +0 -0
  195. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/summaryplot/__init__.py +0 -0
  196. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/summaryplot/summaryplot.py +0 -0
  197. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/sunsch/__init__.py +0 -0
  198. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/sunsch/sunsch.py +0 -0
  199. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/sunsch/time_vector.py +0 -0
  200. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/sw_model_utilities/__init__.py +0 -0
  201. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/sw_model_utilities/sw_model_utilities.py +0 -0
  202. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/vfp2csv/__init__.py +0 -0
  203. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/vfp2csv/vfp2csv.py +0 -0
  204. {subscript-1.11.0 → subscript-1.13.0}/src/subscript/welltest_dpds/__init__.py +0 -0
  205. {subscript-1.11.0 → subscript-1.13.0}/src/subscript.egg-info/dependency_links.txt +0 -0
  206. {subscript-1.11.0 → subscript-1.13.0}/src/subscript.egg-info/top_level.txt +0 -0
  207. {subscript-1.11.0 → subscript-1.13.0}/tests/__init__.py +0 -0
  208. {subscript-1.11.0 → subscript-1.13.0}/tests/conftest.py +0 -0
  209. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/edit/drogon.trans +0 -0
  210. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/grid/drogon.faults +0 -0
  211. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/grid/drogon.grid +0 -0
  212. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/grid/drogon.multnum +0 -0
  213. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/grid/drogon.multregt +0 -0
  214. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/grid/drogon.perm +0 -0
  215. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/grid/drogon.poro +0 -0
  216. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/props/drogon.pvt +0 -0
  217. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/props/drogon.sattab +0 -0
  218. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/props/drogon.swatinit +0 -0
  219. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/regions/drogon.eqlnum +0 -0
  220. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/regions/drogon.fipnum +0 -0
  221. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/regions/drogon.fipzon +0 -0
  222. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/regions/drogon.pvtnum +0 -0
  223. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/regions/drogon.satnum +0 -0
  224. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/runspec/drogon.dimens +0 -0
  225. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/runspec/drogon.eqldims +0 -0
  226. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/runspec/drogon.gridopts +0 -0
  227. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/runspec/drogon.regdims +0 -0
  228. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/runspec/drogon.tabdims +0 -0
  229. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/schedule/55_33-1.sch +0 -0
  230. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/schedule/55_33-1.wells +0 -0
  231. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/schedule/drogon_hist.sch +0 -0
  232. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/schedule/vfp/A-1.inc +0 -0
  233. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/schedule/vfp/A-2.inc +0 -0
  234. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/schedule/vfp/A-3.inc +0 -0
  235. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/schedule/vfp/A-4.inc +0 -0
  236. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/solution/drogon.equil +0 -0
  237. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/solution/drogon.rxvd +0 -0
  238. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/solution/drogon.thpres +0 -0
  239. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/include/summary/drogon.summary +0 -0
  240. {subscript-1.11.0 → subscript-1.13.0}/tests/data/drogon/eclipse/model/DROGON-0.DATA +0 -0
  241. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/grid/reek.faults +0 -0
  242. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/grid/reek.grid +0 -0
  243. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/grid/reek.multflt +0 -0
  244. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/grid/reek.multz +0 -0
  245. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/grid/reek.perm +0 -0
  246. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/grid/reek.poro +0 -0
  247. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/props/let-sgof.txt +0 -0
  248. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/props/let-swof.txt +0 -0
  249. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/props/reek.endpoints +0 -0
  250. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/props/reek.pvt +0 -0
  251. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/props/reek.swatinit +0 -0
  252. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/props/sgof.txt +0 -0
  253. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/props/swof.inc +0 -0
  254. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/props/swof.txt +0 -0
  255. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/regions/reek.eqlnum +0 -0
  256. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/regions/reek.fipnum +0 -0
  257. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/schedule/reek_history.sch +0 -0
  258. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/solution/reek.equil +0 -0
  259. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/include/summary/reek.smry +0 -0
  260. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/model/2_R001_REEK-0.DATA +0 -0
  261. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/model/2_R001_REEK-0.ECLEND +0 -0
  262. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/model/2_R001_REEK-0.EGRID +0 -0
  263. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/model/2_R001_REEK-0.INIT +0 -0
  264. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/model/2_R001_REEK-0.LOG +0 -0
  265. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/model/2_R001_REEK-0.PRT +0 -0
  266. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/model/2_R001_REEK-0.RFT +0 -0
  267. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/model/2_R001_REEK-0.SMSPEC +0 -0
  268. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/model/2_R001_REEK-0.UNRST +0 -0
  269. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/model/2_R001_REEK-0.UNSMRY +0 -0
  270. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/eclipse/model/parameters.txt +0 -0
  271. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/parameters.txt +0 -0
  272. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/rms/README +0 -0
  273. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/rms/reek.rms10.1.3/.master +0 -0
  274. {subscript-1.11.0 → subscript-1.13.0}/tests/data/reek/rms/reek.rms11.1.0/.master +0 -0
  275. {subscript-1.11.0 → subscript-1.13.0}/tests/data/vfp/GasProd.VFP +0 -0
  276. {subscript-1.11.0 → subscript-1.13.0}/tests/data/vfp/pd2.VFP +0 -0
  277. {subscript-1.11.0 → subscript-1.13.0}/tests/data/welltest/eclipse/model/DROGON_DST_PLT-0.SMSPEC +0 -0
  278. {subscript-1.11.0 → subscript-1.13.0}/tests/data/welltest/eclipse/model/DROGON_DST_PLT-0.UNSMRY +0 -0
  279. {subscript-1.11.0 → subscript-1.13.0}/tests/test_bjobsusers.py +0 -0
  280. {subscript-1.11.0 → subscript-1.13.0}/tests/test_check_swatinit.py +0 -0
  281. {subscript-1.11.0 → subscript-1.13.0}/tests/test_check_swatinit_simulators.py +0 -0
  282. {subscript-1.11.0 → subscript-1.13.0}/tests/test_field_statistics.py +0 -0
  283. {subscript-1.11.0 → subscript-1.13.0}/tests/test_fmuobs.py +0 -0
  284. {subscript-1.11.0 → subscript-1.13.0}/tests/test_fmuobs_parsers.py +0 -0
  285. {subscript-1.11.0 → subscript-1.13.0}/tests/test_fmuobs_writers.py +0 -0
  286. {subscript-1.11.0 → subscript-1.13.0}/tests/test_grav_subs_maps.py +0 -0
  287. {subscript-1.11.0 → subscript-1.13.0}/tests/test_grav_subs_points.py +0 -0
  288. {subscript-1.11.0 → subscript-1.13.0}/tests/test_pack_sim.py +0 -0
  289. {subscript-1.11.0 → subscript-1.13.0}/tests/test_presentvalue.py +0 -0
  290. {subscript-1.11.0 → subscript-1.13.0}/tests/test_prtvol2csv.py +0 -0
  291. {subscript-1.11.0 → subscript-1.13.0}/tests/test_restartthinner.py +0 -0
  292. {subscript-1.11.0 → subscript-1.13.0}/tests/test_rmsecl_volumetrics.py +0 -0
  293. {subscript-1.11.0 → subscript-1.13.0}/tests/test_sector2fluxnum.py +0 -0
  294. {subscript-1.11.0 → subscript-1.13.0}/tests/test_subscriptlogger.py +0 -0
  295. {subscript-1.11.0 → subscript-1.13.0}/tests/test_summaryplot.py +0 -0
  296. {subscript-1.11.0 → subscript-1.13.0}/tests/test_sunsch.py +0 -0
  297. {subscript-1.11.0 → subscript-1.13.0}/tests/test_sw_model_utilities.py +0 -0
  298. {subscript-1.11.0 → subscript-1.13.0}/tests/test_vfp2csv.py +0 -0
  299. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_casegen_upcars/demo_large_scale.yaml +0 -0
  300. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_casegen_upcars/demo_small_scale.yaml +0 -0
  301. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_casegen_upcars/dump_value.tmpl +0 -0
  302. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_casegen_upcars/upcars_eclipse_ref_lg.tmpl +0 -0
  303. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_casegen_upcars/upcars_eclipse_ref_ss.tmpl +0 -0
  304. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_eclcompress/permxyz.grdecl +0 -0
  305. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/config_example.yml +0 -0
  306. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/ERTBOX.roff +0 -0
  307. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/Geogrid.roff +0 -0
  308. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/files.txt +0 -0
  309. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P1_0.roff +0 -0
  310. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P1_3.roff +0 -0
  311. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P2_0.roff +0 -0
  312. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_A_P2_3.roff +0 -0
  313. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_B_P1_0.roff +0 -0
  314. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_B_P1_3.roff +0 -0
  315. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_C_P2_0.roff +0 -0
  316. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/mean_C_P2_3.roff +0 -0
  317. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_A_0.roff +0 -0
  318. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_A_3.roff +0 -0
  319. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_B_0.roff +0 -0
  320. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_B_3.roff +0 -0
  321. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_C_0.roff +0 -0
  322. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/nactive_C_3.roff +0 -0
  323. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F1_0.roff +0 -0
  324. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F1_3.roff +0 -0
  325. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F2_0.roff +0 -0
  326. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F2_3.roff +0 -0
  327. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F3_0.roff +0 -0
  328. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_A_F3_3.roff +0 -0
  329. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F1_0.roff +0 -0
  330. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F1_3.roff +0 -0
  331. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F2_0.roff +0 -0
  332. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F2_3.roff +0 -0
  333. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F3_0.roff +0 -0
  334. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_B_F3_3.roff +0 -0
  335. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F1_0.roff +0 -0
  336. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F1_3.roff +0 -0
  337. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F2_0.roff +0 -0
  338. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F2_3.roff +0 -0
  339. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F3_0.roff +0 -0
  340. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/prob_C_F3_3.roff +0 -0
  341. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P1_0.roff +0 -0
  342. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P1_3.roff +0 -0
  343. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P2_0.roff +0 -0
  344. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_A_P2_3.roff +0 -0
  345. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_B_P1_0.roff +0 -0
  346. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_B_P1_3.roff +0 -0
  347. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_C_P2_0.roff +0 -0
  348. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ensemble/share/grid_statistics/referencedata/stdev_C_P2_3.roff +0 -0
  349. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/ert/model/0readme +0 -0
  350. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/fmuconfig/output/global_variables.yml +0 -0
  351. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_field_statistics/rms/output/aps/ERTBOX.EGRID +0 -0
  352. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_fmuobs/drogon_wbhp_rft_wct_gor_tracer_4d.obs +0 -0
  353. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_fmuobs/ert-doc.csv +0 -0
  354. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_fmuobs/ert-doc.obs +0 -0
  355. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_fmuobs/ert-doc.yml +0 -0
  356. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_fmuobs/fmu-ensemble-obs.yml +0 -0
  357. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_fmuobs/hist_obs_wells.txt +0 -0
  358. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_fmuobs/ri-obs.csv +0 -0
  359. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_gravity/HIST.EGRID +0 -0
  360. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_gravity/HIST.INIT +0 -0
  361. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_gravity/HIST.UNRST +0 -0
  362. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_gravity/global_variables.yml +0 -0
  363. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_gravity/grav_subs_maps.yml +0 -0
  364. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_gravity/grav_subs_points.yml +0 -0
  365. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_gravity/seabed.gri +0 -0
  366. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_gravity/station_coordinates.csv +0 -0
  367. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_interp_relperm/cfg.yml +0 -0
  368. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_interp_relperm/sgof_base.inc +0 -0
  369. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_interp_relperm/sgof_opt.inc +0 -0
  370. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_interp_relperm/sgof_pes.inc +0 -0
  371. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_interp_relperm/swof_base.inc +0 -0
  372. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_interp_relperm/swof_opt.inc +0 -0
  373. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_interp_relperm/swof_pes.inc +0 -0
  374. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_merge_rft_ertobs/drogon/gendata_rft.csv +0 -0
  375. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A2.obs +0 -0
  376. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A2.txt +0 -0
  377. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A3.obs +0 -0
  378. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A3.txt +0 -0
  379. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A4.txt +0 -0
  380. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A4_1.obs +0 -0
  381. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A5.obs +0 -0
  382. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A5.txt +0 -0
  383. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A6.obs +0 -0
  384. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_merge_rft_ertobs/drogon/rft/R_A6.txt +0 -0
  385. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_merge_rft_ertobs/drogon/rft/well_date_rft.txt +0 -0
  386. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_merge_unrst_files/HIST.UNRST +0 -0
  387. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_merge_unrst_files/PRED.UNRST +0 -0
  388. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_ofmvol2csv/fileA.vol +0 -0
  389. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_ofmvol2csv/fileB.vol +0 -0
  390. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_ofmvol2csv/fileC.vol +0 -0
  391. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_ofmvol2csv/ofm_example.vol +0 -0
  392. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_prtvol2csv/0readme.txt +0 -0
  393. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_prtvol2csv/DROGON_FIPNUM.PRT +0 -0
  394. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_prtvol2csv/DROGON_FIPZON.PRT +0 -0
  395. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_prtvol2csv/DROGON_INACTIVE_FIPNUM.PRT +0 -0
  396. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_ri_wellmod/drogon_include/grid/drogon.grid.grdecl +0 -0
  397. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_ri_wellmod/drogon_include/grid/drogon.ntg.grdecl +0 -0
  398. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_ri_wellmod/drogon_include/grid/drogon.perm.grdecl +0 -0
  399. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_ri_wellmod/drogon_trajectories/rft_wells.dat +0 -0
  400. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_ri_wellmod/drogon_trajectories/wells.dat +0 -0
  401. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_ri_wellmod/drogon_wells_noicd.rsp +0 -0
  402. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_ri_wellmod/reek_trajectories/reek_wells.dat +0 -0
  403. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_ri_wellmod/ri_reek_wells.rsp +0 -0
  404. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sector2fluxnum/DUMPFLUX_TEST.DATA +0 -0
  405. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sector2fluxnum/DUMPFLUX_TEST.EGRID +0 -0
  406. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sector2fluxnum/DUMPFLUX_TEST.FLUX +0 -0
  407. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sector2fluxnum/OUT_COARSE.FLUX +0 -0
  408. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sector2fluxnum/TEST.DATA +0 -0
  409. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sector2fluxnum/TEST.EGRID +0 -0
  410. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sector2fluxnum/TEST.INIT +0 -0
  411. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sector2fluxnum/TEST.UNRST +0 -0
  412. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sunsch/config.yml +0 -0
  413. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sunsch/emptyinit.sch +0 -0
  414. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sunsch/foo1.sch +0 -0
  415. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sunsch/footemplate.sch +0 -0
  416. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sunsch/initwithdates.sch +0 -0
  417. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sunsch/merge2.sch +0 -0
  418. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sunsch/mergeme.sch +0 -0
  419. {subscript-1.11.0 → subscript-1.13.0}/tests/testdata_sunsch/options3.sch +0 -0
  420. {subscript-1.11.0 → subscript-1.13.0}/tests/utils.py +0 -0
@@ -13,15 +13,21 @@ jobs:
13
13
  os: [ubuntu-latest]
14
14
  env:
15
15
  OS: ${{ matrix.os }}
16
- PYTHON: '3.8'
16
+ PYTHON: '3.12'
17
17
 
18
18
  steps:
19
+
20
+ - name: Install Ubuntu dependencies
21
+ run: |
22
+ sudo apt-get update
23
+ sudo apt-get install libegl1
24
+
19
25
  - uses: actions/checkout@v4
20
26
 
21
27
  - name: Setup Python
22
28
  uses: actions/setup-python@v5
23
29
  with:
24
- python-version: 3.8
30
+ python-version: 3.12
25
31
 
26
32
  - name: Install OPM-flow and ResInsight (for testing)
27
33
  run: |
@@ -20,10 +20,10 @@ jobs:
20
20
  with:
21
21
  fetch-depth: 0
22
22
 
23
- - name: Set up Python 3.8
23
+ - name: Set up Python 3.12
24
24
  uses: actions/setup-python@v5
25
25
  with:
26
- python-version: 3.8
26
+ python-version: 3.12
27
27
 
28
28
  - name: Install build dependencies
29
29
  run: |
@@ -22,9 +22,15 @@ jobs:
22
22
  runs-on: ubuntu-latest
23
23
  strategy:
24
24
  matrix:
25
- python-version: ["3.8", "3.9", "3.10", "3.11"]
25
+ python-version: ["3.9", "3.10", "3.11", "3.12"]
26
26
 
27
27
  steps:
28
+
29
+ - name: Install Ubuntu dependencies
30
+ run: |
31
+ sudo apt-get update
32
+ sudo apt-get install libegl1
33
+
28
34
  - name: Checkout commit locally
29
35
  uses: actions/checkout@v4
30
36
  with:
@@ -85,7 +91,7 @@ jobs:
85
91
  run: sphinx-build -b html docs build/docs/html
86
92
 
87
93
  - name: Update GitHub pages
88
- if: github.repository_owner == 'equinor' && github.ref == 'refs/heads/main' && matrix.python-version == '3.8'
94
+ if: github.repository_owner == 'equinor' && github.ref == 'refs/heads/main' && matrix.python-version == '3.12'
89
95
  run: |
90
96
  cp -R ./build/docs/html ../html
91
97
 
@@ -1,6 +1,6 @@
1
- Metadata-Version: 2.1
1
+ Metadata-Version: 2.4
2
2
  Name: subscript
3
- Version: 1.11.0
3
+ Version: 1.13.0
4
4
  Summary: Equinor's collection of subsurface reservoir modelling scripts
5
5
  Author-email: Equinor <rnyb@equinor.com>
6
6
  License: GNU GENERAL PUBLIC LICENSE
@@ -689,13 +689,13 @@ Classifier: Topic :: Scientific/Engineering :: Physics
689
689
  Classifier: Topic :: Software Development :: Libraries
690
690
  Classifier: Topic :: Utilities
691
691
  Classifier: Operating System :: POSIX :: Linux
692
- Classifier: Programming Language :: Python :: 3.8
693
692
  Classifier: Programming Language :: Python :: 3.9
694
693
  Classifier: Programming Language :: Python :: 3.10
695
694
  Classifier: Programming Language :: Python :: 3.11
695
+ Classifier: Programming Language :: Python :: 3.12
696
696
  Classifier: Natural Language :: English
697
697
  Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
698
- Requires-Python: >=3.8
698
+ Requires-Python: >=3.9
699
699
  Description-Content-Type: text/markdown
700
700
  License-File: LICENSE
701
701
  Requires-Dist: resdata
@@ -704,7 +704,7 @@ Requires-Dist: ert>=10.2.0b13
704
704
  Requires-Dist: fmu-tools
705
705
  Requires-Dist: grid3d_maps
706
706
  Requires-Dist: matplotlib
707
- Requires-Dist: numpy<2
707
+ Requires-Dist: numpy
708
708
  Requires-Dist: opm>=2023.04
709
709
  Requires-Dist: pandas
710
710
  Requires-Dist: pyscal
@@ -722,7 +722,7 @@ Requires-Dist: pytest; extra == "tests"
722
722
  Requires-Dist: pytest-cov; extra == "tests"
723
723
  Requires-Dist: pytest-mock; extra == "tests"
724
724
  Requires-Dist: pytest-xdist; extra == "tests"
725
- Requires-Dist: PyQt5-sip<12.16.0; python_version == "3.8" and extra == "tests"
725
+ Requires-Dist: PyQt5-sip; extra == "tests"
726
726
  Requires-Dist: rstcheck; extra == "tests"
727
727
  Requires-Dist: rstcheck-core; extra == "tests"
728
728
  Requires-Dist: ruff; extra == "tests"
@@ -731,18 +731,19 @@ Requires-Dist: types-PyYAML; extra == "tests"
731
731
  Requires-Dist: types-python-dateutil; extra == "tests"
732
732
  Provides-Extra: docs
733
733
  Requires-Dist: autoapi; extra == "docs"
734
- Requires-Dist: sphinx; extra == "docs"
734
+ Requires-Dist: sphinx<8.2.0; extra == "docs"
735
735
  Requires-Dist: sphinx-argparse; extra == "docs"
736
736
  Requires-Dist: sphinx-autodoc-typehints<2.4; extra == "docs"
737
737
  Requires-Dist: sphinx-copybutton; extra == "docs"
738
738
  Requires-Dist: sphinx-togglebutton; extra == "docs"
739
739
  Requires-Dist: sphinx_rtd_theme; extra == "docs"
740
+ Dynamic: license-file
740
741
 
741
742
  # subscript
742
743
 
743
744
  [![subscript](https://github.com/equinor/subscript/actions/workflows/subscript.yml/badge.svg)](https://github.com/equinor/subscript/actions/workflows/subscript.yml)
744
745
  [![codecov](https://codecov.io/gh/equinor/subscript/branch/master/graph/badge.svg)](https://codecov.io/gh/equinor/subscript)
745
- ![Python Version](https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10%20|%203.11-blue.svg)
746
+ ![Python Version](https://img.shields.io/badge/python-3.9%20|%203.10%20|%203.11%20|%203.12-blue.svg)
746
747
  [![License: GPL v3](https://img.shields.io/github/license/equinor/subscript)](https://www.gnu.org/licenses/gpl-3.0)
747
748
  [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
748
749
 
@@ -2,7 +2,7 @@
2
2
 
3
3
  [![subscript](https://github.com/equinor/subscript/actions/workflows/subscript.yml/badge.svg)](https://github.com/equinor/subscript/actions/workflows/subscript.yml)
4
4
  [![codecov](https://codecov.io/gh/equinor/subscript/branch/master/graph/badge.svg)](https://codecov.io/gh/equinor/subscript)
5
- ![Python Version](https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10%20|%203.11-blue.svg)
5
+ ![Python Version](https://img.shields.io/badge/python-3.9%20|%203.10%20|%203.11%20|%203.12-blue.svg)
6
6
  [![License: GPL v3](https://img.shields.io/github/license/equinor/subscript)](https://www.gnu.org/licenses/gpl-3.0)
7
7
  [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
8
8
 
@@ -13,7 +13,7 @@ write_to = "src/subscript/version.py"
13
13
  name = "subscript"
14
14
  description = "Equinor's collection of subsurface reservoir modelling scripts"
15
15
  readme = "README.md"
16
- requires-python = ">=3.8"
16
+ requires-python = ">=3.9"
17
17
  license = { file = "LICENSE" }
18
18
  authors = [
19
19
  { name = "Equinor", email = "rnyb@equinor.com" },
@@ -27,10 +27,10 @@ classifiers = [
27
27
  "Topic :: Software Development :: Libraries",
28
28
  "Topic :: Utilities",
29
29
  "Operating System :: POSIX :: Linux",
30
- "Programming Language :: Python :: 3.8",
31
30
  "Programming Language :: Python :: 3.9",
32
31
  "Programming Language :: Python :: 3.10",
33
32
  "Programming Language :: Python :: 3.11",
33
+ "Programming Language :: Python :: 3.12",
34
34
  "Natural Language :: English",
35
35
  "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
36
36
  ]
@@ -42,7 +42,7 @@ dependencies = [
42
42
  "fmu-tools",
43
43
  "grid3d_maps",
44
44
  "matplotlib",
45
- "numpy<2",
45
+ "numpy",
46
46
  "opm>=2023.04",
47
47
  "pandas",
48
48
  "pyscal",
@@ -63,7 +63,7 @@ tests = [
63
63
  "pytest-cov",
64
64
  "pytest-mock",
65
65
  "pytest-xdist",
66
- "PyQt5-sip<12.16.0; python_version == '3.8'",
66
+ "PyQt5-sip",
67
67
  "rstcheck",
68
68
  "rstcheck-core",
69
69
  "ruff",
@@ -73,7 +73,7 @@ tests = [
73
73
  ]
74
74
  docs = [
75
75
  "autoapi",
76
- "sphinx",
76
+ "sphinx<8.2.0",
77
77
  "sphinx-argparse",
78
78
  "sphinx-autodoc-typehints<2.4",
79
79
  "sphinx-copybutton",
@@ -121,7 +121,7 @@ field_statistics = "subscript.field_statistics.field_statistics:main"
121
121
 
122
122
 
123
123
  [project.entry-points.ert]
124
- subscript_jobs = "subscript.hook_implementations.jobs"
124
+ subscript_fmsteps = "subscript.hook_implementations.forward_model_steps"
125
125
  CsvMerge = "subscript.csv_merge.csv_merge"
126
126
  CsvStack = "subscript.csv_stack.csv_stack"
127
127
  FmuObs = "subscript.fmuobs.fmuobs"
@@ -10,29 +10,6 @@ from subscript.casegen_upcars.model import Model
10
10
  from subscript.casegen_upcars.udf import TERMINALCOLORS, conversion, flatten, listify
11
11
  from subscript.casegen_upcars.udf_arg_parser import fill_parser
12
12
 
13
- DESCRIPTION = """casegen_upcars is script to create conceptual model
14
- based on sugar-cube representation of fracture.
15
-
16
- It has capability to:
17
-
18
- - simple geometric: tilting, hull and dome shape
19
- - Layers heterogeneity (streaks)
20
- - multple throws (vertical shifting in any part of the model)
21
- - vugs distribution: random, near fracture and near streak
22
- - etc. Check wiki for more details:
23
- https://wiki.equinor.com/wiki/index.php/UpCaRs_Upscaling_casegen"""
24
-
25
- CATEGORY = "modelling.reservoir"
26
-
27
- EXAMPLES = """
28
- .. code-block:: console
29
-
30
- DEFINE <CASEGEN_CONFIG_FILE> <RUNPATH>/model.yaml
31
- DEFINE <CASEGEN_ECLIPSE_TEMPLATE> <CONFIG_PATH>/../input/config/eclipse.tmpl
32
- FORWARD_MODEL CASEGEN_UPCARS(<CONFIG>=<CASEGEN_CONFIG_FILE>, <ECLIPSE_TEMPLATE>=<CASEGEN_ECLIPSE_TEMPLATE>, <ECLIPSE_OUTPUT>=<ECLIPSE_NAME>-<IENS>)
33
-
34
- """ # noqa
35
-
36
13
  logger = getLogger(__name__)
37
14
 
38
15
 
@@ -35,18 +35,6 @@ QC_FLAGS = [
35
35
  __WATER__,
36
36
  ]
37
37
 
38
- DESCRIPTION = "QC tool for SWATINIT vs SWAT in Eclipse runs"
39
-
40
- CATEGORY = "utility.eclipse"
41
-
42
- EXAMPLES = """
43
- .. code-block:: console
44
-
45
- FORWARD_MODEL CHECK_SWATINIT(<DATAFILE>=<ECLBASE>, <OUTPUT>=check_swatinit.csv)
46
-
47
- where ``ECLBASE`` is already defined in your ERT config.
48
- """
49
-
50
38
 
51
39
  def main() -> None:
52
40
  """Executed when called from the command line.
@@ -667,7 +655,9 @@ def augment_grid_frame_qc_vectors(grid_df: pd.DataFrame) -> pd.DataFrame:
667
655
 
668
656
  def get_parser() -> argparse.ArgumentParser:
669
657
  """Construct a command line argument parser"""
670
- parser = argparse.ArgumentParser(description=DESCRIPTION)
658
+ parser = argparse.ArgumentParser(
659
+ description="QC tool for SWATINIT vs SWAT in Eclipse runs"
660
+ )
671
661
  parser.add_argument(
672
662
  "DATAFILE",
673
663
  help=(
@@ -14,8 +14,6 @@ logger = subscriptlogger(__name__)
14
14
 
15
15
  DESCRIPTION = "Convert CSV files with production data to OFM vol-format"
16
16
 
17
- CATEGORY = "modelling.production"
18
-
19
17
  EPILOG = """The indented usage is to process CSV files outputted from the pyPDM
20
18
  library (possibly from the script 'export_production_data') and then
21
19
  convert this back to OFM (OilField Manager) "vol"-format, which gives
@@ -9,7 +9,6 @@ from typing import Dict, List, Optional
9
9
 
10
10
  import ert
11
11
  import pandas as pd
12
- from ert.config import ErtScript
13
12
 
14
13
  from subscript import __version__, getLogger
15
14
  from subscript.eclcompress.eclcompress import glob_patterns
@@ -45,6 +44,10 @@ runs::
45
44
  """ # noqa
46
45
 
47
46
 
47
+ class NoDataError(Exception):
48
+ pass
49
+
50
+
48
51
  class CustomFormatter(
49
52
  argparse.ArgumentDefaultsHelpFormatter, argparse.RawDescriptionHelpFormatter
50
53
  ):
@@ -56,7 +59,7 @@ class CustomFormatter(
56
59
  # pylint: disable=unnecessary-pass
57
60
 
58
61
 
59
- class CsvMerge(ErtScript):
62
+ class CsvMerge(ert.ErtScript):
60
63
  """A class with a run() function that can be registered as an ERT plugin"""
61
64
 
62
65
  # pylint: disable=too-few-public-methods
@@ -261,13 +264,16 @@ def main() -> None:
261
264
  if args.debug:
262
265
  logger.setLevel(logging.DEBUG)
263
266
 
264
- csv_merge_main(
265
- csvfiles=args.csvfiles,
266
- output=args.output,
267
- filecolumn=args.filecolumn,
268
- memoryconservative=args.memoryconservative,
269
- dropconstantcolumns=args.dropconstantcolumns,
270
- )
267
+ try:
268
+ csv_merge_main(
269
+ csvfiles=args.csvfiles,
270
+ output=args.output,
271
+ filecolumn=args.filecolumn,
272
+ memoryconservative=args.memoryconservative,
273
+ dropconstantcolumns=args.dropconstantcolumns,
274
+ )
275
+ except NoDataError:
276
+ sys.exit(1)
271
277
 
272
278
 
273
279
  def csv_merge_main(
@@ -304,8 +310,8 @@ def csv_merge_main(
304
310
  merged_df.drop(columnstodelete, inplace=True, axis=1)
305
311
 
306
312
  if merged_df.empty:
307
- logger.error("No data to output.")
308
- sys.exit(1)
313
+ logger.error("No data to output")
314
+ raise NoDataError
309
315
 
310
316
  logger.info("Final column list: %s", str(merged_df.columns))
311
317
 
@@ -10,7 +10,6 @@ from typing import Pattern
10
10
 
11
11
  import ert
12
12
  import pandas as pd
13
- from ert.config import ErtScript
14
13
 
15
14
  from subscript import __version__, getLogger
16
15
 
@@ -30,14 +29,6 @@ A-1, A-2, or A-3 as values.
30
29
  If importing the output CSV into Spotfire, you may then view and filter WOPT and
31
30
  friends by wellname, instead of selecting individual columns."""
32
31
 
33
- # The following string is used for the ERT forward model:
34
- EXAMPLE = """
35
- Put this in your ERT config::
36
-
37
- FORWARD_MODEL CSV_STACK(<CSVFILE>=stackme.csv, <OUTPUT>=stacked.csv, <OPTION>="--keepminimal")
38
-
39
- """ # noqa
40
-
41
32
  CATEGORY = "utility.transformation"
42
33
 
43
34
  # The following string is used for the ERT workflow documentation, note
@@ -82,6 +73,10 @@ STACK_LIBRARY = {
82
73
  }
83
74
 
84
75
 
76
+ class ArgumentError(Exception):
77
+ pass
78
+
79
+
85
80
  class CustomFormatter(
86
81
  argparse.ArgumentDefaultsHelpFormatter, argparse.RawDescriptionHelpFormatter
87
82
  ):
@@ -93,7 +88,7 @@ class CustomFormatter(
93
88
  # pylint: disable=unnecessary-pass
94
89
 
95
90
 
96
- class CsvStack(ErtScript):
91
+ class CsvStack(ert.ErtScript):
97
92
  """A class with a run() function that can be registered as an ERT plugin,
98
93
  to be used as an ERT workflow (wrapping the command line utility)"""
99
94
 
@@ -179,7 +174,10 @@ def main() -> None:
179
174
  """Function for command line invocation"""
180
175
  parser = get_parser()
181
176
  args = parser.parse_args()
182
- csv_stack_main(args, support_magics=True)
177
+ try:
178
+ csv_stack_main(args, support_magics=True)
179
+ except ArgumentError:
180
+ sys.exit(1)
183
181
 
184
182
 
185
183
  def csv_stack_main(args: argparse.Namespace, support_magics: bool = False) -> None:
@@ -197,7 +195,7 @@ def csv_stack_main(args: argparse.Namespace, support_magics: bool = False) -> No
197
195
  args.output == __MAGIC_STDOUT__ or args.csvfile == __MAGIC_STDIN__
198
196
  ):
199
197
  logger.error("Can't use stdin/stdout")
200
- sys.exit(1)
198
+ raise ArgumentError("Can't use stdin/stdout")
201
199
 
202
200
  if args.verbose:
203
201
  if args.output == __MAGIC_STDOUT__:
@@ -212,8 +210,8 @@ def csv_stack_main(args: argparse.Namespace, support_magics: bool = False) -> No
212
210
  dframe = pd.read_csv(args.csvfile)
213
211
 
214
212
  if args.split not in STACK_LIBRARY:
215
- logger.error("Don't know how to split on %s", str(args.split))
216
- sys.exit(1)
213
+ logger.error(f"Don't know how to split on {args.split}")
214
+ raise ArgumentError(f"Don't know how to split on {args.split}")
217
215
 
218
216
  stackargs = STACK_LIBRARY[args.split]
219
217
 
@@ -27,31 +27,6 @@ If called with ``<FILES>``, the argument provided must be a filepath to
27
27
  a text file containing a file list to compress.
28
28
  """
29
29
 
30
- EXAMPLES = """
31
- .. code-block:: console
32
-
33
- FORWARD_MODEL ECLCOMPRESS
34
-
35
- You can provide your own list of files to compress with the ``<FILES>``
36
- argument.
37
-
38
- .. code-block:: console
39
-
40
- FORWARD_MODEL ECLCOMPRESS(<FILES>=paths_to_compress.txt)
41
-
42
- where ``paths_to_compress.txt`` contains a list of files or filepaths to
43
- compress.
44
-
45
- .. code-block:: text
46
- :caption: paths_to_compress.txt
47
-
48
- eclipse/include/grid/*
49
- eclipse/include/regions/*
50
- eclipse/include/props/*
51
-
52
- Note that this list of file paths is the default list used when no file is
53
- provided.
54
- """
55
30
 
56
31
  DEFAULT_FILES_TO_COMPRESS = [
57
32
  "eclipse/include/grid/*",
@@ -62,7 +37,6 @@ DEFAULT_FILES_TO_COMPRESS = [
62
37
  EPILOG = """
63
38
  Default list of files to compress is """ + " ".join(DEFAULT_FILES_TO_COMPRESS)
64
39
 
65
- CATEGORY = "modelling.reservoir"
66
40
 
67
41
  # The string used here must match what is used as the DEFAULT
68
42
  # parameter in the ert joob config. It is not used elsewhere.
@@ -21,17 +21,6 @@ space-separated dates pr. line, dates either in YYYY-MM-DD format (ISO-8601) or
21
21
  YYYYMMDD. Empty lines and lines starting with "--" or "#" are ignored.
22
22
  """
23
23
 
24
- CATEGORY = "utility.eclipse"
25
-
26
- EXAMPLES = """
27
- .. code-block:: console
28
-
29
- FORWARD_MODEL ECLDIFF2ROFF(<ECLROOT>=<ECLBASE>, <PROP>=SGAS, <DIFFDATES>=diff_dates.txt <OUTPUT>=share/results/grids/eclgrid)
30
-
31
- where ``ECLBASE`` is already defined in your ERT config, pointing to the Eclipse
32
- basename relative to ``RUNPATH``.
33
- """ # noqa
34
-
35
24
 
36
25
  class CustomFormatter(
37
26
  argparse.ArgumentDefaultsHelpFormatter, argparse.RawDescriptionHelpFormatter
@@ -23,7 +23,6 @@ import fmu.config.utilities as utils
23
23
  import numpy as np
24
24
  import xtgeo
25
25
  import yaml
26
- from ert.config import ErtScript
27
26
 
28
27
  import subscript
29
28
 
@@ -320,18 +319,26 @@ GLOBAL_VARIABLES_FILE = "../../fmuconfig/output/global_variables.yml"
320
319
  ERTBOX_GRID_PATH = "../../rms/output/aps/ERTBOX.EGRID"
321
320
 
322
321
 
322
+ class ArgumentFileNotFound(Exception):
323
+ pass
324
+
325
+
323
326
  def main():
324
327
  """Invocated from the command line, parsing command line arguments"""
325
328
  parser = get_parser()
326
329
  args = parser.parse_args()
327
330
  logger.setLevel(logging.INFO)
328
- field_stat(args)
331
+ try:
332
+ field_stat(args)
333
+ except ArgumentFileNotFound:
334
+ sys.exit(1)
329
335
 
330
336
 
331
337
  def field_stat(args):
332
338
  # parse the config file for this script
333
339
  if not Path(args.configfile).exists():
334
- sys.exit("No such file:" + args.configfile)
340
+ logger.error(f"No such file: {args.configfile}")
341
+ raise ArgumentFileNotFound(f"No such file: {args.configfile}")
335
342
 
336
343
  config_file = args.configfile
337
344
  config_dict = read_field_stat_config(config_file)
@@ -339,12 +346,14 @@ def field_stat(args):
339
346
 
340
347
  # Path to FMU project models ert/model directory (ordinary CONFIG PATH in ERT)
341
348
  if not Path(args.ertconfigpath).exists():
342
- sys.exit("No such file:" + args.ertconfigpath)
349
+ logger.error(f"No such file: {args.ertconfigpath}")
350
+ raise ArgumentFileNotFound(f"No such file: {args.ertconfigpath}")
343
351
  ert_config_path = Path(args.ertconfigpath)
344
352
 
345
353
  # Path to ensemble on SCRATCH disk
346
354
  if not Path(args.ensemblepath).exists():
347
- sys.exit("No such file:" + args.ensemblepath)
355
+ logger.error(f"No such file: {args.ensemblepath}")
356
+ raise ArgumentFileNotFound(f"No such file: {args.ensemblepath}")
348
357
  ens_path = Path(args.ensemblepath)
349
358
  if not check_if_iterations_exist(ens_path, field_stat):
350
359
  # The ensemble realization does not exist for all specified iterations
@@ -1793,7 +1802,7 @@ if __name__ == "__main__":
1793
1802
  file.write("\n")
1794
1803
 
1795
1804
 
1796
- class FieldStatistics(ErtScript):
1805
+ class FieldStatistics(ert.ErtScript):
1797
1806
  """This class defines the ERT workflow hook.
1798
1807
 
1799
1808
  It is constructed to work identical to the command line except
@@ -280,7 +280,7 @@ def get_parser() -> argparse.ArgumentParser:
280
280
  "--profile",
281
281
  dest="profile",
282
282
  type=int,
283
- help="profile for copy profile to use, default is 4",
283
+ help=f"profile for copy profile to use, default is {DEFAULT_PROFILE}",
284
284
  )
285
285
  parser.add_argument(
286
286
  "--threads",
@@ -401,6 +401,15 @@ class CopyFMU:
401
401
  logger.info("Default target is %s", self.default_target.resolve())
402
402
 
403
403
  def construct_target(self, proposal):
404
+ def _clean_folder(folder):
405
+ """Remove all files and subdirectories inside the folder,
406
+ while keeping the folder itself intact, unlike shutil.rmtree."""
407
+ for item in Path(folder).iterdir():
408
+ if item.is_dir():
409
+ shutil.rmtree(item)
410
+ else:
411
+ item.unlink()
412
+
404
413
  """Final target as abs path string, and evaluate cleanup or merge."""
405
414
  target = Path(proposal)
406
415
  self.target = str(target.absolute())
@@ -413,7 +422,8 @@ class CopyFMU:
413
422
  print(f"Target is already present: <{self.target}>")
414
423
  if self.args.cleanup:
415
424
  print("Doing cleanup of current target...")
416
- shutil.rmtree(self.target)
425
+ _clean_folder(self.target)
426
+
417
427
  elif self.args.merge:
418
428
  print("Doing merge copy of current target...")
419
429
  else:
@@ -676,7 +686,7 @@ def main(args=None) -> None:
676
686
  runner.do_rsyncing()
677
687
  else:
678
688
  print("Command line mode!")
679
- runner.profile = int(runner.args.profile)
689
+ runner.profile = int(runner.args.profile or DEFAULT_PROFILE)
680
690
  runner.source = runner.args.source
681
691
  runner.batch = True
682
692
 
@@ -12,7 +12,6 @@ from typing import Optional, Tuple, Union
12
12
  import ert
13
13
  import pandas as pd
14
14
  import yaml
15
- from ert.config import ErtScript
16
15
 
17
16
  from subscript import __version__, getLogger
18
17
  from subscript.fmuobs.parsers import (
@@ -436,7 +435,7 @@ def dump_results(
436
435
  print(ertobs_str)
437
436
 
438
437
 
439
- class FmuObs(ErtScript):
438
+ class FmuObs(ert.ErtScript):
440
439
  """This class defines the ERT workflow hook.
441
440
 
442
441
  It is constructed to work identical to the command line except
@@ -54,23 +54,6 @@ EPILOGUE = """
54
54
 
55
55
  """
56
56
 
57
- CATEGORY = "modelling.reservoir"
58
-
59
- EXAMPLES = """
60
- .. code-block:: console
61
-
62
- FORWARD_MODEL GRAV_SUBS_MAPS(<UNRST_FILE>=<ECLBASE>.UNRST, <GRAVMAPS_CONFIG>=grav_subs_maps.yml)
63
- FORWARD_MODEL GRAV_SUBS_MAPS(<UNRST_FILE>=<ECLBASE>.UNRST, <GRAVMAPS_CONFIG>=grav_subs_maps.yml, <OUTPUT_DIR>=share/results/maps)
64
-
65
-
66
- where ``ECLBASE`` is already defined in your ERT config, pointing to the flowsimulator
67
- basename relative to ``RUNPATH``, grav_subs_maps.yml is a YAML file defining
68
- the inputs and modelling parameters and ``OUTPUT_DIR`` is the path to the output folder.
69
- If not specified OUTPUT_DIR will be defaulted to "./".
70
-
71
- The directory to export maps to must exist.
72
- """ # noqa
73
-
74
57
 
75
58
  class GravMapsInput(BaseModel):
76
59
  diffdates: List[Tuple[date, date]]
@@ -27,17 +27,14 @@ DUMMY_YOUNGS = 10
27
27
  PREFIX_POINTS = "all" # calculation is cumulative over all zones
28
28
  EXTENSION_POINTS = ".poi" # extension for points in roxar points format
29
29
 
30
- DESCRIPTION = """
31
- Modelling gravity change and subsidence based on flow simulation
30
+ DESCRIPTION = """Modelling gravity change and subsidence based on flow simulation
32
31
  output (EGRID, INIT and UNRST files) for a list of locations (
33
32
  bencmark stations) at seabed.
34
33
 
35
34
  The script reads flow simulation results and a yaml configuration file
36
35
  specifying input and calculation parameters.
37
36
  For configuration of the yaml config file, see:
38
- https://fmu-docs.equinor.com/docs/subscript/scripts/grav_subs_points.html
39
-
40
- """
37
+ https://fmu-docs.equinor.com/docs/subscript/scripts/grav_subs_points.html"""
41
38
 
42
39
  EPILOGUE = """
43
40
  .. code-block:: yaml
@@ -61,32 +58,6 @@ EPILOGUE = """
61
58
  """
62
59
 
63
60
 
64
- CATEGORY = "modelling.reservoir"
65
-
66
-
67
- EXAMPLES = """
68
- .. code-block:: console
69
-
70
- FORWARD_MODEL GRAV_SUBS_POINTS(<UNRST_FILE=<ECLBASE>.UNRST, <GRAVPOINTS_CONFIG>=grav_subs_points.yml)
71
- FORWARD_MODEL GRAV_SUBS_POINTS(<UNRST_FILE=<ECLBASE>.UNRST, <GRAVPOINTS_CONFIG>=<CONFIG_PATH>/../input/config/grav_subs_points.yml, <OUTPUT_DIR>=share/results/points)
72
-
73
- FORWARD_MODEL GRAV_SUBS_POINTS(<UNRST_FILE=<ECLBASE>.UNRST, <GRAVPOINTS_CONFIG>=grav_subs_points.yml, <EXTENSION_GENDATA>="_10.txt")
74
- FORWARD_MODEL GRAV_SUBS_POINTS(<UNRST_FILE=<ECLBASE>.UNRST, <GRAVPOINTS_CONFIG>=grav_subs_points.yml, <PREFIX_GENDATA>="fieldA_")
75
-
76
- where ``ECLBASE`` is already defined in your ERT config, pointing to the flowsimulator
77
- basename relative to ``RUNPATH``, grav_subs_points.yml is a YAML file defining
78
- the inputs and modelling parameters and ``OUTPUT_DIR`` is the path to the output folder.
79
- If not specified OUTPUT_DIR will be defaulted to "./".
80
- ``PREFIX_GENDATA`` and ``EXTENSION_GENDATA`` is the file prefix and extension used for
81
- the output files of type GEN_DATA. The prefix can be used to separate datasets for
82
- different structures/fields within the dataset and is defaulted to an empty string,
83
- i.e. no prefix. The extension could include the report step number by defining e.g. "_10.txt",
84
- but is defaulted without it a report step number, to only ".txt"
85
-
86
- The directory to export point files to must exist.
87
- """ # noqa
88
-
89
-
90
61
  class GravPointsInput(BaseModel):
91
62
  diffdates: List[Tuple[date, date]]
92
63