Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathan-eq committed Sep 23, 2024
1 parent 04ff8e6 commit 5ca6ebf
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
7 changes: 2 additions & 5 deletions src/semeio/forward_models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
ForwardModelStepDocumentation,
ForwardModelStepJSON,
ForwardModelStepPlugin,
ForwardModelStepWarning,
)

from .scripts.design2params import description as design2params_description
Expand Down Expand Up @@ -57,13 +56,11 @@ def validate_pre_realization_run(
return fm_step_json

def validate_pre_experiment(self, fm_step_json: ForwardModelStepJSON) -> None:
errors = DesignKWScript.validate_configuration(fm_step_json.get("argList")[0])
should_fail_on_validation_error = (
fm_step_json.get("argList")[2].lower() == "true"
)
if errors and should_fail_on_validation_error:
error_message = f"DESIGN_KW configuration validation failed:\n{errors}"
ForwardModelStepWarning.warn(error_message)
if should_fail_on_validation_error:
DesignKWScript.validate_configuration(fm_step_json.get("argList")[0])

@staticmethod
def documentation() -> Optional[ForwardModelStepDocumentation]:
Expand Down
8 changes: 6 additions & 2 deletions src/semeio/forward_models/design_kw/design_kw.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import shlex
from typing import List

from ert.config.forward_model_step import ForwardModelStepWarning

_STATUS_FILE_NAME = "DESIGN_KW.OK"

_logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -186,7 +188,7 @@ def rm_genkw_prefix(paramsdict, ignoreprefixes="LOG10_"):

def validate_configuration(
template_file_name: str, parameters_file_name: str = "parameters.txt"
) -> List[str]:
) -> None:
try:
if not os.path.exists(template_file_name):
raise ValueError(
Expand Down Expand Up @@ -217,4 +219,6 @@ def validate_configuration(
except ValueError as e:
errors.append(str(e))

return errors
if errors:
error_message = f"DESIGN_KW configuration validation failed:\n{errors}"
ForwardModelStepWarning.warn(error_message)

0 comments on commit 5ca6ebf

Please sign in to comment.