diff --git a/test_implementation.py b/test_implementation.py index be53239cd..27f80eb53 100644 --- a/test_implementation.py +++ b/test_implementation.py @@ -84,11 +84,7 @@ def half(x): my_model.subdomains = [bottom_domain, top_domain, top_surface, bottom_surface] # we should be able to automate this -my_model.interfaces = [ - F.Interface( - my_model.mesh.mesh, my_model.facet_meshtags, 5, (bottom_domain, top_domain) - ) -] +my_model.interfaces = [F.Interface(5, (bottom_domain, top_domain))] my_model.surface_to_volume = {top_surface: top_domain, bottom_surface: bottom_domain} H = F.Species("H", mobile=True) @@ -123,8 +119,8 @@ def half(x): ] my_model.boundary_conditions = [ - F.DirichletBC(top_surface, value=0.05, species=H), - F.DirichletBC(bottom_surface, value=0.2, species=H), + F.FixedConcentrationBC(top_surface, value=0.05, species=H), + F.FixedConcentrationBC(bottom_surface, value=0.2, species=H), ] diff --git a/test_implementation_2.py b/test_implementation_2.py index 41f49fed7..e26c8e89a 100644 --- a/test_implementation_2.py +++ b/test_implementation_2.py @@ -84,11 +84,7 @@ def half(x): my_model.subdomains = [bottom_domain, top_domain, top_surface, bottom_surface] # we should be able to automate this -my_model.interfaces = [ - F.Interface( - my_model.mesh.mesh, my_model.facet_meshtags, 5, (bottom_domain, top_domain) - ) -] +my_model.interfaces = [F.Interface(5, (bottom_domain, top_domain))] my_model.surface_to_volume = {top_surface: top_domain, bottom_surface: bottom_domain} H = F.Species("H", mobile=True) diff --git a/test_implementation_3.py b/test_implementation_3.py index 19750a89c..bd5e7f80b 100644 --- a/test_implementation_3.py +++ b/test_implementation_3.py @@ -44,12 +44,8 @@ # the ids here are arbitrary in 1D, you can put anything as long as it's not the same as the surfaces my_model.interfaces = [ - F.Interface( - my_model.mesh.mesh, my_model.facet_meshtags, 6, (left_domain, middle_domain) - ), - F.Interface( - my_model.mesh.mesh, my_model.facet_meshtags, 7, (middle_domain, right_domain) - ), + F.Interface(6, (left_domain, middle_domain)), + F.Interface(7, (middle_domain, right_domain)), ] my_model.subdomains = [ left_domain, diff --git a/test_implementation_transient.py b/test_implementation_transient.py index 328fdd876..342ba6b50 100644 --- a/test_implementation_transient.py +++ b/test_implementation_transient.py @@ -38,12 +38,8 @@ # the ids here are arbitrary in 1D, you can put anything as long as it's not the same as the surfaces # TODO remove mesh and meshtags from these arguments my_model.interfaces = [ - F.Interface( - my_model.mesh.mesh, my_model.facet_meshtags, 6, (left_domain, middle_domain) - ), - F.Interface( - my_model.mesh.mesh, my_model.facet_meshtags, 7, (middle_domain, right_domain) - ), + F.Interface(6, (left_domain, middle_domain)), + F.Interface(7, (middle_domain, right_domain)), ] my_model.subdomains = [