diff --git a/lbmpy_tests/test_serial_scenarios.py b/lbmpy_tests/test_serial_scenarios.py index 62452b034dcc766f7147ac8f293cad1206c8348c..3c8ea28302d419e8c800da1695622979bf86ad27 100644 --- a/lbmpy_tests/test_serial_scenarios.py +++ b/lbmpy_tests/test_serial_scenarios.py @@ -133,8 +133,9 @@ def compare_lid_driven_cavity(optimization=MappingProxyType({}), action='Testing name = name + "_incompressible" try: + import waLBerla.field from lbmpy_tests.walberla_scenario_setup import create_lid_driven_cavity as run_lid_driven_cavity_walberla - except Exception: + except ImportError: run_lid_driven_cavity_walberla = None return compare_scenario(run_ldc_lbmpy, run_lid_driven_cavity_walberla, optimization, action, name, plot, **kwargs) @@ -151,8 +152,9 @@ def compare_force_driven_channel(optimization=MappingProxyType({}), action='Test name = name + "_incompressible" try: + import waLBerla.field from lbmpy_tests.walberla_scenario_setup import create_lid_driven_cavity as run_force_driven_channel_walberla - except Exception: + except ImportError: run_force_driven_channel_walberla = None return compare_scenario(lbmpy_func, run_force_driven_channel_walberla, optimization, action, name, plot, **kwargs) diff --git a/lbmpy_tests/walberla_scenario_setup.py b/lbmpy_tests/walberla_scenario_setup.py index 80b31118daa82128978a88381d42bdca4b86dcdf..0770884f275c376e162f65d1ff5d8c2a29605948 100644 --- a/lbmpy_tests/walberla_scenario_setup.py +++ b/lbmpy_tests/walberla_scenario_setup.py @@ -1,5 +1,5 @@ import pytest -pytest.importorskip('waLBerla') +pytest.importorskip('waLBerla.field') import waLBerla.field as field from waLBerla import createUniformBlockGrid, createUniformBufferedScheme, makeSlice