Merge pull request #138 from gdsfactory/fix_models

fix models and add tests for models

Author: joamatab

cspdk/si220/cband/models.py

@@ -23,7 +23,7 @@
 straight_strip = partial(
     sm.straight,
     length=10.0,
-    loss=0.0,
+    loss_dB_cm=3.0,
     wl0=1.55,
     neff=2.38,
     ng=4.30,
@@ -32,7 +32,7 @@
 straight_rib = partial(
     sm.straight,
     length=10.0,
-    loss=0.0,
+    loss_dB_cm=3.0,
     wl0=1.55,
     neff=2.38,
     ng=4.30,
@@ -43,7 +43,7 @@ def straight(
     *,
     wl: Float = 1.55,
     length: float = 10.0,
-    loss: float = 0.0,
+    loss_dB_cm: float = 3.0,
     cross_section: str = "strip",
 ) -> sax.SDict:
     """Straight waveguide model."""
@@ -56,7 +56,7 @@ def straight(
     return f(
         wl=wl,  # type: ignore
         length=length,
-        loss=loss,
+        loss_dB_cm=loss_dB_cm,
     )
 
 
@@ -76,15 +76,15 @@ def bend_s(
     *,
     wl: Float = 1.55,
     length: float = 10.0,
-    loss: float = 0.03,
+    loss_dB_cm=3.0,
     cross_section="strip",
 ) -> sax.SDict:
     """Bend S model."""
     # NOTE: it is assumed that `bend_s` exposes it's length in its info dictionary!
     return straight(
         wl=wl,
         length=length,
-        loss=loss,
+        loss_dB_cm=loss_dB_cm,
         cross_section=cross_section,
     )
 
@@ -93,20 +93,20 @@ def bend_euler(
     *,
     wl: Float = 1.55,
     length: float = 10.0,
-    loss: float = 0.03,
+    loss_dB_cm: float = 3,
     cross_section="strip",
 ) -> sax.SDict:
     """Euler bend model."""
     # NOTE: it is assumed that `bend_euler` exposes it's length in its info dictionary!
     return straight(
         wl=wl,
         length=length,
-        loss=loss,
+        loss_dB_cm=loss_dB_cm,
         cross_section=cross_section,
     )
 
 
-bend_euler = partial(bend_euler, cross_section="strip")
+bend_euler_strip = partial(bend_euler, cross_section="strip")
 bend_euler_rib = partial(bend_euler, cross_section="rib")
 
 
@@ -119,7 +119,7 @@ def taper(
     *,
     wl: Float = 1.55,
     length: float = 10.0,
-    loss: float = 0.0,
+    loss_dB_cm: float = 0.0,
     cross_section="strip",
 ) -> sax.SDict:
     """Taper model."""
@@ -128,20 +128,19 @@ def taper(
     return straight(
         wl=wl,
         length=length,
-        loss=loss,
+        loss_dB_cm=loss_dB_cm,
         cross_section=cross_section,
     )
 
 
 taper_rib = partial(taper, cross_section="rib", length=10.0)
-taper_ro = partial(taper, cross_section="xs_ro", length=10.0)
 
 
 def taper_strip_to_ridge(
     *,
     wl: Float = 1.55,
     length: float = 10.0,
-    loss: float = 0.0,
+    loss_dB_cm: float = 0.0,
     cross_section="strip",
 ) -> sax.SDict:
     """Taper strip to ridge model."""
@@ -150,7 +149,7 @@ def taper_strip_to_ridge(
     return straight(
         wl=wl,
         length=length,
-        loss=loss,
+        loss_dB_cm=loss_dB_cm,
         cross_section=cross_section,
     )
 
@@ -239,10 +238,10 @@ def coupler(
 # grating couplers Rectangular
 ##############################
 
-grating_coupler_rectangular = partial(
+grating_coupler_rectangular_strip = partial(
     sm.grating_coupler, loss=6, bandwidth=35 * nm, wl=1.55
 )
-grating_coupler_rectangular_rib = grating_coupler_rectangular
+grating_coupler_rectangular_rib = grating_coupler_rectangular_strip
 
 
 def grating_coupler_rectangular(
@@ -253,7 +252,7 @@ def grating_coupler_rectangular(
     # TODO: take more grating_coupler_rectangular arguments into account
     wl = jnp.asarray(wl)  # type: ignore
     fs = {
-        "strip": grating_coupler_rectangular,
+        "strip": grating_coupler_rectangular_strip,
         "rib": grating_coupler_rectangular_rib,
     }
     f = fs[cross_section]
@@ -264,7 +263,7 @@ def grating_coupler_rectangular(
 # grating couplers Elliptical
 ##############################
 
-grating_coupler_elliptical = partial(
+grating_coupler_elliptical_strip = partial(
     sm.grating_coupler, loss=6, bandwidth=35 * nm, wl=1.55
 )
 

tests/test_si220_cband.py

@@ -6,9 +6,11 @@
 
 import gdsfactory as gf
 import jsondiff
+import numpy as np
 import pytest
 from gdsfactory.difftest import difftest
 from pytest_regressions.data_regression import DataRegressionFixture
+from pytest_regressions.ndarrays_regression import NDArraysRegressionFixture
 
 from cspdk.si220.cband import PDK
 
@@ -130,6 +132,50 @@ def test_netlists(
         gf.kcl.dkcells[ci].delete()
 
 
+skip_test_models = {}
+
+
+models = PDK.models
+model_names = sorted(
+    [
+        name
+        for name in set(models.keys()) - set(skip_test_models)
+        if not name.startswith("_")
+    ]
+)
+
+
+@pytest.mark.parametrize("model_name", model_names)
+def test_models_with_wavelength_sweep(
+    model_name: str, ndarrays_regression: NDArraysRegressionFixture
+) -> None:
+    """Test models with different wavelengths to avoid regressions in frequency response."""
+    # Test at different wavelengths
+    wl = [1.53, 1.55, 1.57]
+    try:
+        model = models[model_name]
+        s_params = model(wl=wl)
+    except TypeError:
+        pytest.skip(f"{model_name} does not accept a wl argument")
+
+    # Convert s_params dictionary to arrays for regression testing
+    # s_params is a dict with tuple keys (port pairs) and JAX array values
+    arrays_to_check = {}
+    for key, value in sorted(s_params.items()):
+        # Convert tuple key to string for regression test compatibility
+        key_str = f"s_{key[0]}_{key[1]}"
+        # Convert JAX arrays to numpy and separate real/imag parts
+
+        value_np = np.array(value)
+        arrays_to_check[f"{key_str}_real"] = np.real(value_np)
+        arrays_to_check[f"{key_str}_imag"] = np.imag(value_np)
+
+    ndarrays_regression.check(
+        arrays_to_check,
+        default_tolerance={"atol": 1e-8, "rtol": 1e-8},
+    )
+
+
 if __name__ == "__main__":
     component_type = "coupler_symmetric"
     c = cells[component_type]()