Merge pull request #559 from gdsfactory/better_syntax

better syntax

Author: joamatab

gplugins/fdtdz/get_ports_fdtdz.py

@@ -224,8 +224,8 @@ def plot_mode(
         omega=omega,
         port=c.ports["o1"],
         epsilon=epsilon,
-        xmin=c.dxmin,
-        ymin=c.dymin,
+        xmin=c.xmin,
+        ymin=c.ymin,
         nm_per_pixel=nm_per_pixel,
         port_extent_xy=1,
     )
@@ -234,8 +234,8 @@ def plot_mode(
         port=c.ports["o1"],
         epsilon_port=epsilon_port,
         excitation=excitation,
-        xmin=c.dxmin,
-        ymin=c.dymin,
+        xmin=c.xmin,
+        ymin=c.ymin,
         zmin=zmin,
         nm_per_pixel=1000,
         figsize=(11, 4),

gplugins/fdtdz/get_sparameters_fdtdz.py

@@ -93,8 +93,8 @@ def get_sparameters_fdtdz(
     """
     # Checks from gmeep
     component_ref = component.ref()
-    component_ref.dx = 0
-    component_ref.dy = 0
+    component_ref.x = 0
+    component_ref.y = 0
 
     optical_port_names = list(component_ref.get_ports_dict(port_type="optical").keys())
 
@@ -129,8 +129,8 @@ def get_sparameters_fdtdz(
             omega=omega,
             port=component.ports[portname],
             epsilon=epsilon,
-            xmin=component_extended.dxmin,
-            ymin=component_extended.dymin,
+            xmin=component_extended.xmin,
+            ymin=component_extended.ymin,
             nm_per_pixel=nm_per_pixel,
             port_extent_xy=port_margin,
         )

gplugins/femwell/mode_solver.py

@@ -68,8 +68,8 @@ def compute_cross_section_modes(
     """
     # Get meshable component from cross-section
     c = gf.components.straight(length=10, cross_section=cross_section)
-    dx = c.dxsize
-    dy = c.dysize
+    dx = c.xsize
+    dy = c.ysize
 
     xsection_bounds = [
         [dx / 2, dy - wafer_padding],

gplugins/gfviz/netlist.py

@@ -167,10 +167,10 @@ def get_ports(child, parent=None):
     else:
         ports = ports1
 
-    x0 = c.dxmin
-    x1 = c.dxmax
-    y0 = c.dymin
-    y1 = c.dymax
+    x0 = c.xmin
+    x1 = c.xmax
+    y0 = c.ymin
+    y1 = c.ymax
     x0, x1 = min(x0, x1), max(x0, x1)
     y0, y1 = min(y0, y1), max(y0, y1)
 
@@ -271,7 +271,7 @@ def _line_dists(points, start, end):
 
 
 def sort_ports(ports) -> list[gf.Port]:
-    return natsorted(ports, key=lambda port: port.dx)
+    return natsorted(ports, key=lambda port: port.x)
 
 
 def wrap_component_in_netlist(name):

gplugins/gmeep/get_port_eigenmode.py

@@ -19,10 +19,10 @@ def get_domain_measurements(sim, output_plane, frequency, resolution=0):
     # Get domain measurements
     sim_center, sim_size = get_2D_dimensions(sim, output_plane)
 
-    xmin = sim_center.dx- sim_size.dx/ 2
-    xmax = sim_center.dx+ sim_size.dx/ 2
-    ymin = sim_center.dy- sim_size.dy/ 2
-    ymax = sim_center.dy+ sim_size.dy/ 2
+    xmin = sim_center.x- sim_size.x/ 2
+    xmax = sim_center.x+ sim_size.x/ 2
+    ymin = sim_center.y- sim_size.y/ 2
+    ymax = sim_center.y+ sim_size.y/ 2
     zmin = sim_center.z - sim_size.z / 2
     zmax = sim_center.z + sim_size.z / 2
 
@@ -31,12 +31,12 @@ def get_domain_measurements(sim, output_plane, frequency, resolution=0):
     Ny = int((ymax - ymin) * grid_resolution + 1)
     Nz = int((zmax - zmin) * grid_resolution + 1)
 
-    if sim_size.dx== 0:
+    if sim_size.x== 0:
         # Plot y on x axis, z on y axis (YZ plane)
         xtics = np.array([sim_center.x])
         ytics = np.linspace(ymin, ymax, Ny)
         ztics = np.linspace(zmin, zmax, Nz)
-    elif sim_size.dy== 0:
+    elif sim_size.y== 0:
         # Plot x on x axis, z on y axis (XZ plane)
         xtics = np.linspace(xmin, xmax, Nx)
         ytics = np.array([sim_center.y])
@@ -117,10 +117,10 @@ def get_port_2Dx_eigenmode(
     # The output of this function is slightly different then MPB (there is no mode_solver object)
     # Format like the Mode objects in gdsfactory/simulation/modes to reuse modes' functions
     if not choose_yz:
-        ny = int(size.dy * sim.resolution)
+        ny = int(size.y * sim.resolution)
         nz = int(size.z * sim.resolution)
         y = np.linspace(
-            center.dy - size.dy / 2, center.dy + size.dy / 2, ny
+            center.y - size.y / 2, center.y + size.y / 2, ny
         )  # eigenmode solver and sim res are technically different
         z = np.linspace(center.z - size.z / 2, center.z + size.z / 2, nz)
     yy, zz = np.meshgrid(y, z, indexing="ij")

gplugins/gmeep/get_simulation.py

@@ -144,8 +144,8 @@ def get_simulation(
 
     dummy_component = gf.Component()
     component_ref = dummy_component << component
-    component_ref.dx = 0
-    component_ref.dy = 0
+    component_ref.x = 0
+    component_ref.y = 0
 
     wavelength = (wavelength_start + wavelength_stop) / 2
 
@@ -195,8 +195,8 @@ def get_simulation(
     cell_thickness = tpml + zmargin_bot + t_core + zmargin_top + tpml if is_3d else 0
 
     cell_size = mp.Vector3(
-        component.dxsize + 2 * tpml,
-        component.dysize + 2 * tpml,
+        component.xsize + 2 * tpml,
+        component.ysize + 2 * tpml,
         cell_thickness,
     )
 

gplugins/gmeep/get_simulation_grating_farfield.py

@@ -172,7 +172,7 @@ def get_simulation_grating_farfield(
         0.5 * sz - pml_thickness + y_offset - 1,
     )
     fiber_port_size = mp.Vector3(3 * fiber_core_diameter, 0, 0)
-    # fiber_port_direction = mp.Vector3(y=-1).drotate(mp.Vector3(z=1), -1 * fiber_angle)
+    # fiber_port_direction = mp.Vector3(y=-1).rotate(mp.Vector3(z=1), -1 * fiber_angle)
 
     waveguide_port_center = mp.Vector3(-sxy / 4)
     waveguide_port_size = mp.Vector3(0, 2 * clad_thickness - 0.2)
@@ -193,8 +193,8 @@ def get_simulation_grating_farfield(
                 x=grating_start + fiber_xposition - fiber_offset_from_angle
             ),
             size=mp.Vector3(fiber_clad, hfiber_geom),
-            e1=mp.Vector3(x=1).drotate(mp.Vector3(z=1), -1 * fiber_angle),
-            e2=mp.Vector3(y=1).drotate(mp.Vector3(z=1), -1 * fiber_angle),
+            e1=mp.Vector3(x=1).rotate(mp.Vector3(z=1), -1 * fiber_angle),
+            e2=mp.Vector3(y=1).rotate(mp.Vector3(z=1), -1 * fiber_angle),
         )
     ]
 
@@ -205,8 +205,8 @@ def get_simulation_grating_farfield(
                 x=grating_start + fiber_xposition - fiber_offset_from_angle
             ),
             size=mp.Vector3(fiber_core_diameter, hfiber_geom),
-            e1=mp.Vector3(x=1).drotate(mp.Vector3(z=1), -1 * fiber_angle),
-            e2=mp.Vector3(y=1).drotate(mp.Vector3(z=1), -1 * fiber_angle),
+            e1=mp.Vector3(x=1).rotate(mp.Vector3(z=1), -1 * fiber_angle),
+            e2=mp.Vector3(y=1).rotate(mp.Vector3(z=1), -1 * fiber_angle),
         )
     )
 
@@ -415,8 +415,8 @@ def get_port_1D_eigenmode(
         frequency=fsrc,
     )
     ys_waveguide = np.linspace(
-        center_waveguide.dy - size_waveguide.dy / 2,
-        center_waveguide.dy + size_waveguide.dy / 2,
+        center_waveguide.y - size_waveguide.y / 2,
+        center_waveguide.y + size_waveguide.y / 2,
         int(sim.resolution * size_waveguide.y),
     )
     x_waveguide = center_waveguide.x
@@ -426,14 +426,14 @@ def get_port_1D_eigenmode(
         direction=mp.NO_DIRECTION,
         where=mp.Volume(center=center_fiber, size=size_fiber),
         band_num=band_num,
-        kpoint=mp.Vector3(0, fsrc * 1.45, 0).drotate(
+        kpoint=mp.Vector3(0, fsrc * 1.45, 0).rotate(
             mp.Vector3(z=1), -1 * np.radians(fiber_angle_deg)
         ),  # Hardcoded index for now, pull from simulation eventually
         frequency=fsrc,
     )
     xs_fiber = np.linspace(
-        center_fiber.dx - size_fiber.dx / 2,
-        center_fiber.dx + size_fiber.dx / 2,
+        center_fiber.x - size_fiber.x / 2,
+        center_fiber.x + size_fiber.x / 2,
         int(sim.resolution * size_fiber.x),
     )
     y_fiber = center_fiber.y

gplugins/gmeep/get_simulation_grating_fiber.py

@@ -501,8 +501,8 @@ def get_port_1D_eigenmode(
         frequency=fsrc,
     )
     ys_waveguide = np.linspace(
-        center_waveguide.dy - size_waveguide.dy / 2,
-        center_waveguide.dy + size_waveguide.dy / 2,
+        center_waveguide.y - size_waveguide.y / 2,
+        center_waveguide.y + size_waveguide.y / 2,
         int(sim.resolution * size_waveguide.y),
     )
     x_waveguide = center_waveguide.x
@@ -518,8 +518,8 @@ def get_port_1D_eigenmode(
         frequency=fsrc,
     )
     xs_fiber = np.linspace(
-        center_fiber.dx - size_fiber.dx / 2,
-        center_fiber.dx + size_fiber.dx / 2,
+        center_fiber.x - size_fiber.x / 2,
+        center_fiber.x + size_fiber.x / 2,
         int(sim.resolution * size_fiber.x),
     )
     y_fiber = center_fiber.y

gplugins/gmeep/meep_adjoint_optimization.py

@@ -151,8 +151,8 @@ def get_meep_adjoint_optimizer(
         Vector3(*cell_size)
         if cell_size
         else Vector3(
-            c.dxsize + 2 * sim.boundary_layers[0].thickness,
-            c.dysize + 2 * sim.boundary_layers[0].thickness,
+            c.xsize + 2 * sim.boundary_layers[0].thickness,
+            c.ysize + 2 * sim.boundary_layers[0].thickness,
             cell_thickness,
         )
     )
@@ -262,10 +262,10 @@ def get_component_from_sim(
     """
     grid_resolution = upscale_factor * sim.resolution
     sim_center, sim_size = get_2D_dimensions(sim, output_plane=None)
-    xmin = sim_center.dx - sim_size.dx / 2
-    xmax = sim_center.dx + sim_size.dx / 2
-    ymin = sim_center.dy - sim_size.dy / 2
-    ymax = sim_center.dy + sim_size.dy / 2
+    xmin = sim_center.x - sim_size.x / 2
+    xmax = sim_center.x + sim_size.x / 2
+    ymin = sim_center.y - sim_size.y / 2
+    ymax = sim_center.y + sim_size.y / 2
     Nx = int((xmax - xmin) * grid_resolution + 1)
     Ny = int((ymax - ymin) * grid_resolution + 1)
     xtics = np.linspace(xmin, xmax, Nx)

gplugins/klayout/drc/check_exclusion.py

@@ -70,8 +70,8 @@ def check_exclusion(
     c = gf.Component()
     r1 = c << gf.components.rectangle(size=(w, w), layer=(1, 0))
     r2 = c << gf.components.rectangle(size=(w, w), layer=(2, 0))
-    r1.dxmax = 0
-    r2.dxmin = space
+    r1.xmax = 0
+    r2.xmin = space
     gdspath = c
     gf.show(gdspath)
     print(check_exclusion(c))