Commit 3118cda6 authored by Antoine Berchet's avatar Antoine Berchet
Browse files

Changing names for article figures

parent 00825fdb
......@@ -18,14 +18,14 @@ from pycif.utils.path import init_dir
@pytest.mark.article
@pytest.mark.parametrize(
"settings", [
{"mode": "4dvar", "minimizer": "M1QN3"},
pytest.param({"mode": "4dvar", "minimizer": "M1QN3", "montecarlo": 10},
# {"mode": "4dvar", "minimizer": "M1QN3"},
# pytest.param({"mode": "4dvar", "minimizer": "M1QN3", "montecarlo": 10},
# marks=pytest.mark.uncertainties),
# {"mode": "4dvar", "minimizer": "congrad"},
# {"mode": "ensrf"},
pytest.param({"mode": "ensrf", "nsample": 250},
marks=pytest.mark.uncertainties),
{"mode": "4dvar", "minimizer": "congrad"},
{"mode": "ensrf"},
pytest.param({"mode": "ensrf", "nsimmax": 250},
marks=pytest.mark.uncertainties),
{"mode": "analytical"}
# {"mode": "analytical"}
]
)
def test_integration_inversion(dummy_config_inversion, settings, pytestconfig):
......@@ -40,7 +40,7 @@ def test_integration_inversion(dummy_config_inversion, settings, pytestconfig):
config["model"]["reload_H"] = "{}/../H_matrix.pickle".format(tmpdir)
# Changing mode
nsimmax = settings.get("nsimmax", 10)
nsimmax = 10
if config["datavect"]["components"]["fluxes"]\
["parameters"]["CH4"]["hresol"] == "hpixels":
nsimmax = 25
......@@ -82,7 +82,7 @@ def test_integration_inversion(dummy_config_inversion, settings, pytestconfig):
posterior_dir = os.path.join(tmpdir, "obsvect_posterior")
elif settings["mode"] == "ensrf":
nsimmax *= 2
nsimmax = 2 * settings.get("nsample", nsimmax)
mode = {"plugin": {"name": "EnSRF", "version": "std"},
"nsample": nsimmax}
prior_dir = os.path.join(tmpdir, "obsvect_prior")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment