From 569f8b133e078e7f5cf75426a5494e50d0b9af83 Mon Sep 17 00:00:00 2001 From: Lukas Riedel Date: Tue, 6 Nov 2018 14:30:18 +0100 Subject: [PATCH] Correct adaptation of ODE evaluation script to new config parameters --- python/dorie/dorie/testtools/dorie_run/ode.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/python/dorie/dorie/testtools/dorie_run/ode.py b/python/dorie/dorie/testtools/dorie_run/ode.py index 3cf5c823..a0a90d7a 100644 --- a/python/dorie/dorie/testtools/dorie_run/ode.py +++ b/python/dorie/dorie/testtools/dorie_run/ode.py @@ -25,10 +25,11 @@ def evaluate(iniinfo,runtime): # get parameter data param_data = read_yml(iniinfo["richards.parameters.file"]) mapping_file = iniinfo["grid.mapping.file"] + mapping_dataset = iniinfo["grid.mapping.volume"] # homogeneous setting if mapping_file in ["None", "none", ""]: - medium_index = int(iniinfo["grid.globalIndex"]) + medium_index = int(mapping_dataset) param = get_parameter_data(medium_index, volumes=param_data["volumes"]) if param["type"] != "MvG": raise NotImplementedError("This testing function only supports " @@ -39,9 +40,7 @@ def evaluate(iniinfo,runtime): parfun = lambda y: param["parameters"] # 1D heterogeneity - else: - mapping_dataset = iniinfo["grid.mapping.volume"] mapping = read_h5_dataset(mapping_file, mapping_dataset) # check mapping shape -- GitLab