Skip to content

Commit

Permalink
Merge pull request #374 from gdsfactory/update_gdsfactory725
Browse files Browse the repository at this point in the history
update gdsfactory
  • Loading branch information
joamatab authored Apr 30, 2024
2 parents 64575f5 + bceafef commit ebf16ae
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 38 deletions.
8 changes: 7 additions & 1 deletion docs/notebooks/11_sparameters.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,15 @@
"id": "d6c52ae2",
"metadata": {},
"source": [
"Meep is open source and does not require a license. However, both tidy3d and Lumerical require licenses to use.\n",
"\n",
"## Tidy3d\n",
"\n",
"You can read about the [tidy3d gdsfactory plugin](https://gdsfactory.github.io/gdsfactory/notebooks/plugins/tidy3d/00_tidy3d.html)"
"[tidy3D](https://docs.flexcompute.com/projects/tidy3d/en/latest/) is a fast GPU based FDTD tool developed by flexcompute.\n",
"\n",
"To run, you need to [create an account](https://simulation.cloud/) and add credits. The number of credits that each simulation takes depends on the simulation size and computation time.\n",
"\n",
"![cloud_model](https://i.imgur.com/5VTCPLR.png)"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ classifiers = [
"Operating System :: OS Independent"
]
dependencies = [
"gdsfactory==7.23.0",
"gplugins[tidy3d,sax,schematic]>=0.12,<0.13"
"gdsfactory==7.25.0",
"gplugins[tidy3d,sax,schematic]>=0.13,<0.14"
]
description = "ubcpdk pdk"
keywords = ["python"]
Expand Down
Binary file not shown.
Binary file modified tests/ref/cavity_dbr_cavity_2afc46e9.gds
Binary file not shown.
4 changes: 2 additions & 2 deletions tests/test_components/test_pdk_settings_taper_.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ settings:
cross_section: xs_sc
length: 10.0
port: null
port_order_name:
port_names:
- o1
- o2
port_order_types:
port_types:
- optical
- optical
width1: 0.5
Expand Down
5 changes: 3 additions & 2 deletions tests/test_netlists.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,14 @@ def test_netlists(
component_factory: component factory.
"""
c = component_factory[component_type]()
n = c.get_netlist()
allow_multiple = True
n = c.get_netlist(allow_multiple=allow_multiple)
if check:
data_regression.check(n)

yaml_str = OmegaConf.to_yaml(n, sort_keys=True)
c2 = gf.read.from_yaml(yaml_str, name=c.name)
n2 = c2.get_netlist()
n2 = c2.get_netlist(allow_multiple=allow_multiple)

d = jsondiff.diff(n, n2)
assert len(d) == 0, d
4 changes: 2 additions & 2 deletions tests/test_netlists/test_netlists_dbr_cavity_.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ placements:
dbr_1:
mirror: 0
rotation: 180
x: -10.079
x: -10.158
y: 2.35
dbr_2:
mirror: 0
rotation: 0
x: 10.179
x: 10.258
y: 2.35
ports:
o1: coupler_1,o1
Expand Down
12 changes: 6 additions & 6 deletions tests/test_netlists/test_netlists_ebeam_y_adiabatic_tapers_.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ instances:
cross_section: xs_sc
length: 10.0
port: null
port_order_name:
port_names:
- o1
- o2
port_order_types:
port_types:
- optical
- optical
width1: 0.5
Expand All @@ -38,10 +38,10 @@ instances:
cross_section: xs_sc
length: 10.0
port: null
port_order_name:
port_names:
- o1
- o2
port_order_types:
port_types:
- optical
- optical
width1: 0.5
Expand All @@ -57,10 +57,10 @@ instances:
cross_section: xs_sc
length: 10.0
port: null
port_order_name:
port_names:
- o1
- o2
port_order_types:
port_types:
- optical
- optical
width1: 0.5
Expand Down
2 changes: 1 addition & 1 deletion tests/test_netlists/test_netlists_mzi_heater_.yml
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ instances:
sxb:
component: straight
info:
length: 200
length: 200.0
route_info_length: 200.0
route_info_type: xs_sc
route_info_weight: 200.0
Expand Down
2 changes: 1 addition & 1 deletion tests/test_netlists/test_netlists_ring_with_crossing_.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ instances:
straight_2:
component: straight
info:
length: 4
length: 4.0
route_info_length: 4.0
route_info_type: xs_sc
route_info_weight: 4.0
Expand Down
34 changes: 15 additions & 19 deletions tests/test_netlists/test_netlists_straight_heater_metal_.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
connections: {}
connections:
taper_1,o1: via_stack_1,e3
taper_2,o1: via_stack_2,e1
instances:
component_sequence_1:
component: component_sequence
Expand Down Expand Up @@ -79,12 +81,12 @@ instances:
width_function: null
length: 5.0
port: null
port_order_name:
port_names:
- o1
- o2
port_order_types:
- optical
- optical
port_types:
- electrical
- electrical
width1: 10.0
width2: 4.0
with_two_ports: true
Expand Down Expand Up @@ -121,12 +123,12 @@ instances:
width_function: null
length: 5.0
port: null
port_order_name:
port_names:
- o1
- o2
port_order_types:
- optical
- optical
port_types:
- electrical
- electrical
width1: 10.0
width2: 4.0
with_two_ports: true
Expand Down Expand Up @@ -216,29 +218,23 @@ placements:
ports:
l_e1: via_stack_1,e1
l_e2: via_stack_1,e2
l_e3: via_stack_1,e3
l_e3: taper_1,o1
l_e4: via_stack_1,e4
o1: component_sequence_1,o1
o2: component_sequence_1,o2
r_e1: via_stack_2,e1
r_e1: taper_2,o1
r_e2: via_stack_2,e2
r_e3: via_stack_2,e3
r_e4: via_stack_2,e4
warnings:
optical:
electrical:
unconnected_ports:
- message: 4 unconnected optical ports!
- message: 2 unconnected electrical ports!
ports:
- taper_1,o1
- taper_1,o2
- taper_2,o1
- taper_2,o2
values:
- - -4.905
- 0.0
- - 0.095
- 0.0
- - 324.905
- 0.0
- - 319.905
- 0.0
4 changes: 2 additions & 2 deletions tests/test_netlists/test_netlists_terminator_short_.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ instances:
radius_min: 5
length: 10.0
port: null
port_order_name:
port_names:
- o1
- o2
port_order_types:
port_types:
- optical
- optical
width1: 0.5
Expand Down

0 comments on commit ebf16ae

Please sign in to comment.