Skip to content

Commit

Permalink
Merge pull request #123 from Statoil/import-fixup
Browse files Browse the repository at this point in the history
Import fixup
  • Loading branch information
joakim-hove authored Aug 21, 2018
2 parents 72ad33a + 2aa9dfb commit d31cb02
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion python/python/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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()

Expand Down
Original file line number Diff line number Diff line change
@@ -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):
Expand Down Expand Up @@ -33,7 +34,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...")
Expand Down

0 comments on commit d31cb02

Please sign in to comment.