Added "swap_axes" argument to mode_solver.py. Updated unit tests for test_geometry.py and test_mode_solver.py

Author: jewettaijfc

tests/test_components/test_geometry.py

@@ -85,14 +85,14 @@
 _, AX = plt.subplots()
 
 
-@pytest.mark.parametrize("component", GEO_TYPES)
-def test_plot(component):
-    _ = component.plot(z=0, ax=AX)
+@pytest.mark.parametrize("component, swap_axes", zip(GEO_TYPES, [True, False]))
+def test_plot(component, swap_axes):
+    _ = component.plot(z=0, ax=AX, swap_axes=swap_axes)
     plt.close()
 
-
-def test_plot_with_units():
-    _ = BOX.plot(z=0, ax=AX, plot_length_units="nm")
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_plot_with_units(swap_axes):
+    _ = BOX.plot(z=0, ax=AX, plot_length_units="nm", swap_axes=swap_axes)
     plt.close()
 
 
@@ -204,11 +204,11 @@ def test_array_to_vertices():
     assert np.all(np.array(vertices) == np.array(vertices2))
 
 
-@pytest.mark.parametrize("component", GEO_TYPES)
-def test_intersections_plane(component):
-    assert len(component.intersections_plane(z=0.2)) > 0
-    assert len(component.intersections_plane(x=0.2)) > 0
-    assert len(component.intersections_plane(x=10000)) == 0
+@pytest.mark.parametrize("component, swap_axes", zip(GEO_TYPES, [True, False]))
+def test_intersections_plane(component, swap_axes):
+    assert len(component.intersections_plane(z=0.2, swap_axes=swap_axes)) > 0
+    assert len(component.intersections_plane(x=0.2, swap_axes=swap_axes)) > 0
+    assert len(component.intersections_plane(x=10000, swap_axes=swap_axes)) == 0
 
 
 def test_intersections_plane_inf():
@@ -778,38 +778,39 @@ def test_pop_axis():
         assert Ly == _Ly
 
 
-def test_pop_axis_and_swap():
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_pop_axis_and_swap(swap_axes):
     b = td.Box(size=(1, 1, 1))
-    for swap_axes in (False, True):
-        for axis in range(3):
-            coords = (1, 2, 3)
-            Lz, (Lx, Ly) = b.pop_axis_and_swap(coords, axis=axis, swap_axes=swap_axes)
-            _coords = b.unpop_axis_and_swap(Lz, (Lx, Ly), axis=axis, swap_axes=swap_axes)
-            assert all(c == _c for (c, _c) in zip(coords, _coords))
-            _Lz, (_Lx, _Ly) = b.pop_axis_and_swap(_coords, axis=axis, swap_axes=swap_axes)
-            assert Lz == _Lz
-            assert Lx == _Lx
-            assert Ly == _Ly
-
-
-def test_2b_box_intersections():
+    for axis in range(3):
+        coords = (1, 2, 3)
+        Lz, (Lx, Ly) = b.pop_axis_and_swap(coords, axis=axis, swap_axes=swap_axes)
+        _coords = b.unpop_axis_and_swap(Lz, (Lx, Ly), axis=axis, swap_axes=swap_axes)
+        assert all(c == _c for (c, _c) in zip(coords, _coords))
+        _Lz, (_Lx, _Ly) = b.pop_axis_and_swap(_coords, axis=axis, swap_axes=swap_axes)
+        assert Lz == _Lz
+        assert Lx == _Lx
+        assert Ly == _Ly
+
+
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_2b_box_intersections(swap_axes):
     plane = td.Box(size=(1, 4, 0))
     box1 = td.Box(size=(1, 1, 1))
     box2 = td.Box(size=(1, 1, 1), center=(3, 0, 0))
 
-    result = plane.intersections_with(box1)
+    result = plane.intersections_with(box1, swap_axes=swap_axes)
     assert len(result) == 1
     assert result[0].geom_type == "Polygon"
-    assert len(plane.intersections_with(box2)) == 0
+    assert len(plane.intersections_with(box2, swap_axes=swap_axes)) == 0
 
     with pytest.raises(ValidationError):
-        _ = box1.intersections_with(box2)
+        _ = box1.intersections_with(box2, swap_axes=swap_axes)
 
-    assert len(box1.intersections_2dbox(plane)) == 1
-    assert len(box2.intersections_2dbox(plane)) == 0
+    assert len(box1.intersections_2dbox(plane, swap_axes=swap_axes)) == 1
+    assert len(box2.intersections_2dbox(plane, swap_axes=swap_axes)) == 0
 
     with pytest.raises(ValidationError):
-        _ = box2.intersections_2dbox(box1)
+        _ = box2.intersections_2dbox(box1, swap_axes=swap_axes)
 
 
 def test_polyslab_merge():

tests/test_components/test_simulation.py

@@ -708,22 +708,25 @@ def test_wvl_mat_min_error():
         SIM.wvl_mat_min()
 
 
-def test_plot_structure():
-    _ = SIM_FULL.structures[0].plot(x=0)
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_plot_structure(swap_axes):
+    _ = SIM_FULL.structures[0].plot(x=0, swap_axes=swap_axes)
     plt.close()
 
 
-def test_plot_eps():
-    _ = SIM_FULL.plot_eps(x=0)
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_plot_eps(swap_axes):
+    _ = SIM_FULL.plot_eps(x=0, swap_axes=swap_axes)
     plt.close()
 
 
-def test_plot_eps_bounds():
-    _ = SIM_FULL.plot_eps(x=0, hlim=[-0.45, 0.45])
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_plot_eps_bounds(swap_axes):
+    _ = SIM_FULL.plot_eps(x=0, hlim=[-0.45, 0.45], swap_axes=swap_axes)
     plt.close()
-    _ = SIM_FULL.plot_eps(x=0, vlim=[-0.45, 0.45])
+    _ = SIM_FULL.plot_eps(x=0, vlim=[-0.45, 0.45], swap_axes=swap_axes)
     plt.close()
-    _ = SIM_FULL.plot_eps(x=0, hlim=[-0.45, 0.45], vlim=[-0.45, 0.45])
+    _ = SIM_FULL.plot_eps(x=0, hlim=[-0.45, 0.45], vlim=[-0.45, 0.45], swap_axes=swap_axes)
     plt.close()
 
 
@@ -949,22 +952,23 @@ def test_plot_3d():
     plt.close()
 
 
-def test_structure_alpha():
-    _ = SIM_FULL.plot_structures_eps(x=0, alpha=None)
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_structure_alpha(swap_axes):
+    _ = SIM_FULL.plot_structures_eps(x=0, alpha=None, swap_axes=swap_axes)
     plt.close()
-    _ = SIM_FULL.plot_structures_eps(x=0, alpha=-1)
+    _ = SIM_FULL.plot_structures_eps(x=0, alpha=-1, swap_axes=swap_axes)
     plt.close()
-    _ = SIM_FULL.plot_structures_eps(x=0, alpha=1)
+    _ = SIM_FULL.plot_structures_eps(x=0, alpha=1, swap_axes=swap_axes)
     plt.close()
-    _ = SIM_FULL.plot_structures_eps(x=0, alpha=0.5)
+    _ = SIM_FULL.plot_structures_eps(x=0, alpha=0.5, swap_axes=swap_axes)
     plt.close()
-    _ = SIM_FULL.plot_structures_eps(x=0, alpha=0.5, cbar=True)
+    _ = SIM_FULL.plot_structures_eps(x=0, alpha=0.5, cbar=True, swap_axes=swap_axes)
     plt.close()
     new_structs = [
         td.Structure(geometry=s.geometry, medium=SIM_FULL.medium) for s in SIM_FULL.structures
     ]
     S2 = SIM_FULL.copy(update={"structures": new_structs})
-    _ = S2.plot_structures_eps(x=0, alpha=0.5)
+    _ = S2.plot_structures_eps(x=0, alpha=0.5, swap_axes=swap_axes)
     plt.close()
 
 

tests/test_plugins/test_mode_solver.py

@@ -1067,7 +1067,8 @@ def test_mode_solver_relative():
     _ = ms._data_on_yee_grid_relative(basis=basis)
 
 
-def test_mode_solver_plot():
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_mode_solver_plot(swap_axes):
     """Test mode plane plotting functions"""
 
     simulation = td.Simulation(
@@ -1094,13 +1095,13 @@ def test_mode_solver_plot():
         colocate=False,
     )
     _, ax = plt.subplots(2, 2, figsize=(12, 8), tight_layout=True)
-    ms.plot(ax=ax[0, 0])
-    ms.plot_eps(freq=200e14, alpha=0.7, ax=ax[0, 1])
-    ms.plot_structures_eps(freq=200e14, alpha=0.8, cbar=True, reverse=False, ax=ax[1, 0])
-    ms.plot_grid(linewidth=0.3, ax=ax[1, 0])
-    ms.plot(ax=ax[1, 1])
-    ms.plot_pml(ax=ax[1, 1])
-    ms.plot_grid(linewidth=0.3, ax=ax[1, 1])
+    ms.plot(ax=ax[0, 0], swap_axes=swap_axes)
+    ms.plot_eps(freq=200e14, alpha=0.7, ax=ax[0, 1], swap_axes=swap_axes)
+    ms.plot_structures_eps(freq=200e14, alpha=0.8, cbar=True, reverse=False, ax=ax[1, 0], swap_axes=swap_axes)
+    ms.plot_grid(linewidth=0.3, ax=ax[1, 0], swap_axes=swap_axes)
+    ms.plot(ax=ax[1, 1], swap_axes=swap_axes)
+    ms.plot_pml(ax=ax[1, 1], swap_axes=swap_axes)
+    ms.plot_grid(linewidth=0.3, ax=ax[1, 1], swap_axes=swap_axes)
     plt.close()