Skip to content

Commit

Permalink
Create run_context on model factory tests
Browse files Browse the repository at this point in the history
Get default iter_num when not existing in arguments
  • Loading branch information
ManInFez authored and sondreso committed Feb 25, 2020
1 parent 91f2920 commit 2589d9e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ert_shared/models/ensemble_experiment.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def create_context(self, arguments):
runpath_fmt = model_config.getRunpathFormat( )
jobname_fmt = model_config.getJobnameFormat( )
subst_list = self.ert().getDataKW( )
itr = arguments["iter_num"]
itr = arguments.get("iter_num", 0)
mask = arguments["active_realizations"]

run_context = ErtRunContext.ensemble_experiment(result_fs,
Expand Down
6 changes: 5 additions & 1 deletion tests/cli/test_model_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ def test_setup_single_test_run(self):
self.assertTrue(isinstance(model, SingleTestRun))
self.assertEqual(1, len(argument.keys()))
self.assertTrue("active_realizations" in argument)
model.create_context(argument)

def test_setup_ensemble_experiment(self):
config_file = self.createTestPath('local/poly_example/poly.ert')
Expand All @@ -113,6 +114,7 @@ def test_setup_ensemble_experiment(self):
self.assertTrue(isinstance(model, EnsembleExperiment))
self.assertEqual(1, len(argument.keys()))
self.assertTrue("active_realizations" in argument)
model.create_context(argument)

def test_setup_ensemble_smoother(self):
config_file = self.createTestPath('local/poly_example/poly.ert')
Expand All @@ -128,14 +130,15 @@ def test_setup_ensemble_smoother(self):
self.assertTrue("active_realizations" in argument)
self.assertTrue("target_case" in argument)
self.assertTrue("analysis_module" in argument)
model.create_context(argument)

def test_setup_multiple_data_assimilation(self):
config_file = self.createTestPath('local/poly_example/poly.ert')
with ErtTestContext('test_single_test_run', config_file) as work_area:
ert = work_area.getErt()
notifier = ErtCliNotifier(ert, config_file)
ERT.adapt(notifier)
args = Namespace(realizations="0-4,7,8", weights="6,4,2", target_case="test_case")
args = Namespace(realizations="0-4,7,8", weights="6,4,2", target_case="test_case_%d")

model, argument = model_factory._setup_multiple_data_assimilation(args)
self.assertTrue(isinstance(model, MultipleDataAssimilation))
Expand All @@ -144,6 +147,7 @@ def test_setup_multiple_data_assimilation(self):
self.assertTrue("target_case" in argument)
self.assertTrue("analysis_module" in argument)
self.assertTrue("weights" in argument)
model.create_context(argument, 0)

def test_analysis_module_name_iterable(self):

Expand Down

0 comments on commit 2589d9e

Please sign in to comment.