From f76595460fe4ea6f5472e352eea5b2c7b82c0977 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Tue, 21 Aug 2018 16:39:15 +0200 Subject: [PATCH 1/2] White space --- python/python/CMakeLists.txt | 2 +- python/python/ert_gui/simulation/models/ensemble_experiment.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/python/CMakeLists.txt b/python/python/CMakeLists.txt index 4d92486c4fc..cac82fd1730 100644 --- a/python/python/CMakeLists.txt +++ b/python/python/CMakeLists.txt @@ -1,7 +1,7 @@ configure_file(test_env.py.in ${PROJECT_BINARY_DIR}/${PYTHON_INSTALL_PREFIX}/test_env.py ) add_subdirectory( bin ) -if (GUI) +if (GUI) add_subdirectory( ert_gui ) endif() diff --git a/python/python/ert_gui/simulation/models/ensemble_experiment.py b/python/python/ert_gui/simulation/models/ensemble_experiment.py index 8c8a7ad8228..212147327cf 100644 --- a/python/python/ert_gui/simulation/models/ensemble_experiment.py +++ b/python/python/ert_gui/simulation/models/ensemble_experiment.py @@ -33,7 +33,7 @@ def assertHaveSufficientRealizations(self, num_successful_realizations, active_r raise ErtRunError("Simulation failed! All realizations failed!") elif (num_successful_realizations < active_realizations): raise ErtRunError("Too many simulations have failed! .\n\n" - "Check ERT log file '%s' or simulation folder for details." % ResLog.getFilename()) + "Check ERT log file '%s' or simulation folder for details." % ResLog.getFilename()) def runSimulations(self, arguments ): self.runSimulations__( arguments , "Running ensemble experiment...") From 2aa9dfb93c8151fb737b67b529e406bac0a1dd91 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Tue, 21 Aug 2018 16:40:54 +0200 Subject: [PATCH 2/2] Add missing import --- python/python/ert_gui/simulation/models/ensemble_experiment.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/python/ert_gui/simulation/models/ensemble_experiment.py b/python/python/ert_gui/simulation/models/ensemble_experiment.py index 212147327cf..d98e1ce9187 100644 --- a/python/python/ert_gui/simulation/models/ensemble_experiment.py +++ b/python/python/ert_gui/simulation/models/ensemble_experiment.py @@ -1,5 +1,6 @@ from res.enkf.enums import HookRuntime from res.enkf import ErtRunContext +from res.util import ResLog from ert_gui.simulation.models import BaseRunModel, ErtRunError class EnsembleExperiment(BaseRunModel):