Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update gdsfactory #116

Merged
merged 6 commits into from
Nov 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## [1.9.0](https://github.com/gdsfactory/ubc/pull/65)

- update to gdsfactory 6.0.1


## [1.8.0](https://github.com/gdsfactory/ubc/pull/65)

- update to gdsfactory 5.50.3
Expand Down
2 changes: 1 addition & 1 deletion docs/notebooks/11_sparameters.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.5"
"version": "3.9.7"
}
},
"nbformat": 4,
Expand Down
51 changes: 30 additions & 21 deletions docs/notebooks/13_sim_plugins.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
"metadata": {},
"outputs": [],
"source": [
"sim.plot.plot_sparameters(df, keys=['s21m'])"
"sim.plot.plot_sparameters(df, keys=['s21m'], with_simpler_input_keys=True)"
]
},
{
Expand Down Expand Up @@ -233,8 +233,8 @@
"metadata": {},
"outputs": [],
"source": [
"sim.plot.plot_sparameters(df2d, keys=['s21m'])\n",
"sim.plot.plot_sparameters(df, keys=['s21m'])"
"sim.plot.plot_sparameters(df2d, keys=['s21m'], with_simpler_input_keys=True)\n",
"sim.plot.plot_sparameters(df, keys=['s21m'], with_simpler_input_keys=True)"
]
},
{
Expand Down Expand Up @@ -297,7 +297,7 @@
"metadata": {},
"outputs": [],
"source": [
"gf.simulation.plot.plot_sparameters(df, keys=(\"s21m\",), logscale=False)"
"gf.simulation.plot.plot_sparameters(df, keys=(\"s21m\",), logscale=False, with_simpler_input_keys=True)"
]
},
{
Expand All @@ -306,7 +306,7 @@
"metadata": {},
"outputs": [],
"source": [
"gf.simulation.plot.plot_sparameters(df, keys=(\"s11m\",))"
"gf.simulation.plot.plot_sparameters(df, keys=(\"s11m\",), with_simpler_input_keys=True)"
]
},
{
Expand Down Expand Up @@ -382,7 +382,7 @@
"metadata": {},
"outputs": [],
"source": [
"gm.plot.plot_sparameters(df, keys=(\"s31m\",))"
"gm.plot.plot_sparameters(df, keys=(\"s31m\",), with_simpler_input_keys=True)"
]
},
{
Expand Down Expand Up @@ -452,7 +452,7 @@
"metadata": {},
"outputs": [],
"source": [
"df = pd.read_csv(filepath)"
"sp = np.load(filepath)"
]
},
{
Expand All @@ -461,7 +461,7 @@
"metadata": {},
"outputs": [],
"source": [
"gf.simulation.plot.plot_sparameters(df)"
"gf.simulation.plot.plot_sparameters(sp)"
]
},
{
Expand All @@ -470,7 +470,7 @@
"metadata": {},
"outputs": [],
"source": [
"gf.simulation.plot.plot_sparameters(df, keys=[\"s13m\", \"s14m\"])"
"gf.simulation.plot.plot_sparameters(sp, keys=[\"s13m\", \"s14m\"], with_simpler_input_keys=True)"
]
},
{
Expand Down Expand Up @@ -540,8 +540,8 @@
"metadata": {},
"outputs": [],
"source": [
"df = pd.read_csv(filepaths[0])\n",
"gf.simulation.plot.plot_sparameters(df)"
"sp = np.load(filepaths[0])\n",
"gf.simulation.plot.plot_sparameters(sp)"
]
},
{
Expand Down Expand Up @@ -593,7 +593,7 @@
"metadata": {},
"outputs": [],
"source": [
"df = pd.read_csv(filepaths[0])"
"sp = np.load(filepaths[0])"
]
},
{
Expand All @@ -602,7 +602,7 @@
"metadata": {},
"outputs": [],
"source": [
"gm.plot.plot_sparameters(df)"
"gm.plot.plot_sparameters(sp)"
]
},
{
Expand All @@ -611,7 +611,7 @@
"metadata": {},
"outputs": [],
"source": [
"gm.plot.plot_sparameters(df, keys=[\"s31m\", \"s41m\"])"
"gm.plot.plot_sparameters(sp, keys=[\"s31m\", \"s41m\"], with_simpler_input_keys=True)"
]
},
{
Expand All @@ -620,7 +620,7 @@
"metadata": {},
"outputs": [],
"source": [
"gm.plot.plot_sparameters(df, keys=[\"s31m\"])"
"gm.plot.plot_sparameters(sp, keys=[\"s31m\"], with_simpler_input_keys=True)"
]
},
{
Expand All @@ -629,7 +629,7 @@
"metadata": {},
"outputs": [],
"source": [
"gm.plot.plot_sparameters(df, keys=[\"s41m\"])"
"gm.plot.plot_sparameters(sp, keys=[\"s41m\"], with_simpler_input_keys=True)"
]
},
{
Expand Down Expand Up @@ -768,9 +768,18 @@
"metadata": {},
"outputs": [],
"source": [
"df = gm.write_sparameters_meep(y, run=True)\n",
"sp = gm.write_sparameters_meep(y, run=True)\n",
"#ebeam_y_1550 = gsax.read.sdict_from_csv(filepath=df)\n",
"ebeam_y_1550 = gsax.read.model_from_csv(filepath=df)"
"ebeam_y_1550 = gsax.read.model_from_npz(sp)"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"type(sp)"
]
},
{
Expand All @@ -779,7 +788,7 @@
"metadata": {},
"outputs": [],
"source": [
"netlist = mzi.get_netlist_dict()\n",
"netlist = mzi.get_netlist()\n",
"circuit, _ = sax.circuit(\n",
" netlist=netlist,\n",
" models={\n",
Expand Down Expand Up @@ -823,7 +832,7 @@
"metadata": {},
"outputs": [],
"source": [
"netlist = mzi.get_netlist_dict()\n",
"netlist = mzi.get_netlist()\n",
"circuit, _ = sax.circuit(\n",
" netlist=netlist,\n",
" models={\n",
Expand Down Expand Up @@ -875,7 +884,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.5"
"version": "3.9.7"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion docs/notebooks/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ sync:
jupytext --sync *.ipynb

convert:
jupytext *.ipynb --to *.py
jupytext *.ipynb --to *.py
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
lygadgets
flayout
gdsfactory[full]==5.50.3
gdsfactory[full,tidy3d]==6.0.3
modes==1.0.6
Binary file added sparameters/bend_euler_radius3_6ad1d010.npz
Binary file not shown.
86 changes: 86 additions & 0 deletions sparameters/bend_euler_radius3_6ad1d010.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
resolution: 30
port_symmetries:
o1@0,o1@0:
- o2@0,o2@0
o2@0,o1@0:
- o1@0,o2@0
wavelength_start: 1.5
wavelength_stop: 1.6
wavelength_points: 50
port_margin: 2
port_monitor_offset: -0.1
port_source_offset: -0.1
dispersive: false
ymargin_top: 0.0
ymargin_bot: 3.0
xmargin_left: 0
xmargin_right: 3.0
is_3d: false
layer_stack:
strip:
layer:
- 1
- 0
thickness: 0.22
zmin: 0.0
material: si
sidewall_angle: 0
info: {}
strip2:
layer:
- 31
- 0
thickness: 0.22
zmin: 0.0
material: si
sidewall_angle: 0
info: {}
component:
name: bend_euler_radius3
settings:
name: bend_euler_radius3
module: gdsfactory.components.bend_euler
function_name: bend_euler
info:
length: 4.991
dy: 3.0
radius_min: 2.118
radius: 3.0
width: 0.5
interconnect:
model: ebeam_wg_integral_1550
layout_model_property_pairs:
wg_length:
- length
- 1.0e-06
wg_width:
- width
- 1.0e-06
layout_model_port_pairs:
o1: port 1
o2: port 2
properties:
annotate: false
info_version: 2
full:
angle: 90.0
p: 0.5
with_arc_floorplan: true
npoints: 720
direction: ccw
with_bbox: true
cross_section: strip
radius: 3
changed:
radius: 3
default:
angle: 90.0
p: 0.5
with_arc_floorplan: true
npoints: 720
direction: ccw
with_bbox: true
cross_section: strip
child: null
compute_time_seconds: 133.15807580947876
compute_time_minutes: 2.2193012634913125
Binary file added sparameters/coupler_gap0p13_length8_e8c7ce5e.npz
Binary file not shown.
69 changes: 69 additions & 0 deletions sparameters/coupler_gap0p13_length8_e8c7ce5e.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
resolution: 30
port_symmetries: {}
wavelength_start: 1.5
wavelength_stop: 1.6
wavelength_points: 50
port_margin: 2
port_monitor_offset: -0.1
port_source_offset: -0.1
dispersive: false
ymargin_top: 3
ymargin_bot: 3
xmargin_left: 0
xmargin_right: 0
is_3d: false
layer_stack:
strip:
layer:
- 1
- 0
thickness: 0.22
zmin: 0.0
material: si
sidewall_angle: 0
info: {}
strip2:
layer:
- 31
- 0
thickness: 0.22
zmin: 0.0
material: si
sidewall_angle: 0
info: {}
component:
name: coupler_gap0p13_length8
settings:
name: coupler_gap0p13_length8
module: gdsfactory.components.coupler
function_name: coupler
info:
length: 10.33
min_bend_radius: 9.264
info_version: 2
full:
gap: 0.13
length: 8
coupler_symmetric:
function: coupler_symmetric
coupler_straight:
function: coupler_straight
dy: 5.0
dx: 10.0
cross_section: strip
changed:
gap: 0.13
length: 8
default:
gap: 0.236
length: 20.0
coupler_symmetric:
function: coupler_symmetric
coupler_straight:
function: coupler_straight
dy: 5.0
dx: 10.0
cross_section: strip
child: null
compute_time_seconds: 864.1240878105164
compute_time_minutes: 14.402068130175273
Binary file added sparameters/coupler_ring_4778e15a.npz
Binary file not shown.
Loading