Address PR feedback and add warning when wave port path/boundary are not perpendicular

Author: simlapointe

examples/SingleTransmon/SingleTransmon.jl

@@ -92,7 +92,7 @@ function single_transmon(;
         bridge=BRIDGE_STYLE
     )
     ## Readout path
-    readout_length = 2700μm
+    readout_length = wave_ports ? 4mm : 2700μm
     p_readout = Path(
         Point(0μm, 0μm);
         α0=π / 2,
@@ -134,7 +134,7 @@ function single_transmon(;
 
     #### Prepare solid model
     # Specify the extent of the simulation domain.
-    substrate_x = wave_ports ? readout_length : 4mm # wave port domain boundary needs to touch the readout line
+    substrate_x = 4mm # wave port domain boundary needs to touch the readout line
     substrate_y = 3.7mm
 
     center_xyz = DeviceLayout.center(floorplan)
@@ -149,7 +149,7 @@ function single_transmon(;
     render!(floorplan.coordinate_system, chip, LayerVocabulary.CHIP_AREA)
 
     # Add wave ports
-    wave_ports && add_wave_ports!(floorplan, [floorplan.graph.node_dict[:p_ro]], sim_area, 0.6mm, LayerVocabulary.WAVE_PORT)
+    wave_ports && add_wave_ports!(floorplan, [p_readout_node], sim_area, 0.6mm, LayerVocabulary.WAVE_PORT)
 
     check!(floorplan)
 
@@ -287,7 +287,7 @@ function configfile(sm::SolidModel; palace_build=nothing, solver_order=2, amr=0,
         ),
         "Solver" => Dict(
             "Order" => solver_order,
-            "Eigenmode" => Dict("N" => 2, "Tol" => 1.0e-6, "Target" => 3, "Save" => 2),
+            "Eigenmode" => Dict("N" => 2, "Tol" => 1.0e-6, "Target" => 2.5, "Save" => 2),
             "Linear" => Dict("Type" => "Default", "Tol" => 1.0e-7, "MaxIts" => 500)
         )
     )

src/polygons.jl

@@ -1523,6 +1523,10 @@ abstract type D1{T} <: GeometryEntity{T} end
 
 ab(p0, p1) = Point(gety(p1) - gety(p0), getx(p0) - getx(p1))
 
+to_polygons(::D1{T}) where {T} = Polygon{T}[]
+
+transform(d1::T, f::Transformation) where {T <: D1} = T(f(d1.p0), f(d1.p1))
+
 """
     LineSegment{T} <: D1{T}
 

src/schematics/ExamplePDK/utils.jl

@@ -148,6 +148,7 @@ function add_wave_ports!(
     wave_port_width::T,
     wave_port_layer::SemanticMeta
 ) where {T}
+    angle_tol = 1e-1
     for node in nodes
         # Check component type
         node_component = component(node)
@@ -173,6 +174,19 @@ function add_wave_ports!(
                !(Paths.curvature(path.nodes[node_idx].seg, t) ≈ Point(0 / nm, 0 / nm))
                 @warn "Placing a wave port in curved segment of node $(node.id) can lead to erroneous results."
             end
+            # Warn if the path intersection is not perpendicular to the domain boundary
+            path_direction = Paths.direction(trans(path).nodes[node_idx].seg, t) % 360°
+            if (
+                dir == :x &&
+                !isapprox_angle(90°, path_direction; atol=angle_tol) &&
+                !isapprox_angle(270°, path_direction; atol=angle_tol)
+            ) || (
+                dir == :y &&
+                !isapprox_angle(0°, path_direction; atol=angle_tol) &&
+                !isapprox_angle(180°, path_direction; atol=angle_tol)
+            )
+                @warn "Placing a wave port in segment of node $(node.id) which is not perpendicular to the domain boundary can lead to erroneous results."
+            end
             if dir == :x
                 line = LineSegment(
                     Point(loc.x - wave_port_width / 2, loc.y),

src/schematics/solidmodels.jl

@@ -99,8 +99,8 @@ function intersection_ops(t::SolidModelTarget, sch::Schematic)
     wave_ports = []
     for m in element_metadata(sch.coordinate_system)
         if iswaveportlayer(t, layer(m))
-            levelstr = layer(m) in levelwise_layers(t) ? "_L$(level(m))" : ""
-            push!(wave_ports, string(layer(m)) * levelstr * "_$(layerindex(m))")
+            layer_name = _map_meta_fn(t)(m)
+            !isnothing(layer_name) && push!(wave_ports, layer_name)
         end
     end
     isempty(bv) && return []
@@ -160,10 +160,10 @@ function layer_extrusions_dz(target, sch)
         dim = iswaveportlayer(target, ly) ? 1 : 2
         sgn = issublayer(target, ly) ? -1 : 1
         if isempty(size(t))
-            if iswaveportlayer(target, ly)
+            if ly in indexed_layers(target)
                 for m in element_metadata(sch.coordinate_system)
                     if layer(m) == ly
-                        t_dict[string(ly) * "_$(layerindex(m))"] = (sgn * t, dim)
+                        t_dict[_map_meta_fn(target)(m)] = (sgn * t, dim)
                     end
                 end
             else
@@ -172,11 +172,10 @@ function layer_extrusions_dz(target, sch)
         else
             for (lev, t_level) in pairs(t)
                 sgn = isodd(lev) ? sgn : -sgn
-                if iswaveportlayer(target, ly)
+                if ly in indexed_layers(target)
                     for m in element_metadata(sch.coordinate_system)
                         if layer(m) == ly && level(m) == lev
-                            t_dict[string(ly) * "_L$lev" * "_$(layerindex(m))"] =
-                                (sgn * t_level, dim)
+                            t_dict[_map_meta_fn(target)(m)] = (sgn * t_level, dim)
                         end
                     end
                 else

test/test_schematicdriven.jl

@@ -1203,6 +1203,9 @@
         @test_logs (
             :warn,
             "Placing a wave port in curved segment of node path5 can lead to erroneous results."
+        ) (
+            :warn,
+            "Placing a wave port in segment of node path5 which is not perpendicular to the domain boundary can lead to erroneous results."
         ) add_wave_ports!(
             floorplan,
             [floorplan.graph.nodes[5]],