Skip to content

Commit 2cc7049

Browse files
committed
Fix ecl not able to parce errors from MPI runs
1 parent 8872dec commit 2cc7049

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/ert/resources/forward_models/res/script/ecl_run.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ def failed_due_to_license_problems(self) -> bool:
4747
EclipseResult = namedtuple("EclipseResult", "errors bugs")
4848
body_sub_pattern = r"(\s^\s@.+$)*"
4949
date_sub_pattern = r"\s+AT TIME\s+(?P<Days>\d+\.\d+)\s+DAYS\s+\((?P<Date>(.+)):\s*$"
50-
error_pattern_e100 = rf"^\s@-- ERROR{date_sub_pattern}${body_sub_pattern}"
50+
error_pattern_e100 = (
51+
rf"^\s@-- ERROR\s(FROM PROCESSOR \d+)?{date_sub_pattern}${body_sub_pattern}"
52+
)
5153
error_pattern_e300 = rf"^\s@--Error${body_sub_pattern}"
5254
slave_started_pattern = (
5355
rf"^\s@--MESSAGE{date_sub_pattern}\s^\s@\s+STARTING SLAVE.+${body_sub_pattern}"

tests/ert/unit_tests/resources/test_ecl_run_new_config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -649,8 +649,8 @@ def test_slave_started_message_are_not_counted_as_errors():
649649
@ THIS IS A DUMMY ERROR MESSAGE"""
650650

651651
_DUMMY_ERROR_MESSAGE_MULTIPLE_CPUS_E100 = """\
652-
@-- ERROR FROM PROCESSOR 1 AT TIME 0.0 DAYS (21-DEC-2002):
653-
@ LICENSE FAILURE: ERROR NUMBER IS -4"""
652+
@-- ERROR FROM PROCESSOR 1 AT TIME 0.0 DAYS (21-DEC-2002):
653+
@ LICENSE FAILURE: ERROR NUMBER IS -4"""
654654

655655
_DUMMY_ERROR_MESSAGE_E300 = """\
656656
@--Error

0 commit comments

Comments
 (0)