Skip to content

Commit

Permalink
Use only one fm shell script list
Browse files Browse the repository at this point in the history
  • Loading branch information
yngve-sk committed Oct 15, 2024
1 parent 59d80e7 commit 14e9d81
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 18 deletions.
8 changes: 6 additions & 2 deletions src/everest/bin/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import colorama
from colorama import Fore

from ert.resources.shell_scripts import all_shell_script_fm_steps
from ert.simulator.batch_simulator_context import Status
from everest.config import EverestConfig
from everest.detached import (
Expand All @@ -20,7 +21,6 @@
start_monitor,
)
from everest.export import export
from everest.jobs import shell_commands
from everest.simulator import JOB_FAILURE, JOB_RUNNING, JOB_SUCCESS
from everest.strings import EVEREST

Expand Down Expand Up @@ -269,7 +269,11 @@ def _get_jobs_status(progress):
def _filter_jobs(self, progress):
if not self._show_all_jobs:
progress = [
[job for job in progress_list if job["name"] not in shell_commands]
[
job
for job in progress_list
if job["name"] not in all_shell_script_fm_steps
]
for progress_list in progress
]
return progress
Expand Down
14 changes: 0 additions & 14 deletions src/everest/jobs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,3 @@ def fetch_script(script_name):


_inject_scripts()

# Note: Must be kept in sync with shell scripts on ERT-side
# (which is also not expected to change frequently/drastically)
shell_commands = (
"careful_copy_file",
"copy_directory",
"copy_file",
"delete_directory",
"delete_file",
"make_directory",
"make_symlink",
"move_file",
"symlink",
)
4 changes: 2 additions & 2 deletions src/everest/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from ropt.plan import OptimizationPlanRunner
from seba_sqlite import SqliteStorage

import everest
from ert.resources.shell_scripts import all_shell_script_fm_steps
from everest.config import EverestConfig
from everest.optimizer.everest2ropt import everest2ropt
from everest.plugins.site_config_env import PluginSiteConfigEnv
Expand Down Expand Up @@ -217,7 +217,7 @@ def extract(path_str, key):
for fms in progress_queue.steps:
if (
not self._display_all_jobs
and fms.name in everest.jobs.shell_commands
and fms.name in all_shell_script_fm_steps
):
continue
realization = extract(fms.std_out_file, "geo_realization")
Expand Down

0 comments on commit 14e9d81

Please sign in to comment.