no post-layout folder
diff --git a/caravel_user_project_analog b/caravel_user_project_analog
new file mode 160000
index 0000000..cc08105
--- /dev/null
+++ b/caravel_user_project_analog
@@ -0,0 +1 @@
+Subproject commit cc08105187ec004beeec23d4cd6965548a9eb16b
diff --git a/mag/detector.ext b/mag/detector.ext
new file mode 100644
index 0000000..9cae05e
--- /dev/null
+++ b/mag/detector.ext
@@ -0,0 +1,30 @@
+timestamp 1654529013
+version 8.3
+tech sky130A
+style ngspice()
+scale 1000 1 500000
+resistclasses 2200000 3050000 1700000 3050000 120000 197000 114000 191000 120000 197000 114000 191000 48200 319800 2000000 48200 48200 12200 125 125 47 47 29 5
+parameters sky130_fd_pr__nfet_01v8 l=l w=w
+parameters sky130_fd_pr__res_xhigh_po l=l w=w
+parameters sky130_fd_pr__res_xhigh_po_5p73 l=l
+parameters sky130_fd_pr__res_xhigh_po_2p85 l=l
+parameters sky130_fd_pr__res_xhigh_po_1p41 l=l
+parameters sky130_fd_pr__res_xhigh_po_0p69 l=l
+parameters sky130_fd_pr__res_xhigh_po_0p35 l=l
+parameters sky130_fd_pr__cap_mim_m3_2 w=w l=l
+port "din" 1 -19580 2548 -18152 6054 m5
+port "do" 3 8126 -84 8378 246 m5
+port "db" 2 8330 -780 8516 -516 m4
+port "GND" 4 8116 4748 8370 4972 m4
+node "din" 0 -nan -19580 2548 m5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49970000 29988 0 0
+node "do" 131 -nan 8126 -84 m5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 264276 3676 168544 1652 168544 1652 168544 1652 168544 1652 3055488 12304 0 0
+node "a_2690_398#" 100000 0 2690 398 xres 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 245000 7140 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+node "db" 2491 5914.46 8330 -780 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100716 4632 0 0 43896 844 43896 844 43896 844 43896 844 631740 16872 0 0 0 0
+node "nd" 3710 -nan 2170 1280 ndif 0 0 0 0 0 0 0 0 136800 3752 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 298908 9348 50600 1140 50600 1140 50600 1140 401175828 80364 0 0 0 0
+substrate "GND" 0 0 8116 4748 m4 0 0 0 0 0 0 0 0 136800 3752 136800 3752 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 219012 4608 12312 444 12312 444 765996 15828 24411720 20708 0 0 0 0
+cap "din" "nd" -nan
+cap "db" "nd" 477.109
+device csubckt sky130_fd_pr__cap_mim_m3_2 3710 -150 3711 -149 w=4400 l=4400 "None" "do" 4436 0 "GND" 1000 0
+device csubckt sky130_fd_pr__cap_mim_m3_2 -17002 -4028 -17001 -4027 w=17400 l=17400 "None" "din" 12196 0 "nd" 1000 0
+device rsubckt sky130_fd_pr__res_xhigh_po 2690 398 2691 399 l=3500 w=70 "GND" "a_2690_398#" 0 0 "do" 70 0 "nd" 70 0
+device msubckt sky130_fd_pr__nfet_01v8 2246 1280 2247 1281 l=30 w=1800 "GND" "db" 60 0 "nd" 1800 0 "GND" 1800 0
diff --git a/mag/detector.mag b/mag/detector.mag
new file mode 100644
index 0000000..2e45c96
--- /dev/null
+++ b/mag/detector.mag
@@ -0,0 +1,404 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1654529013
+<< nmos >>
+rect 2246 1280 2276 3080
+<< ndiff >>
+rect 2170 2963 2246 3080
+rect 2170 2911 2180 2963
+rect 2214 2911 2246 2963
+rect 2170 2763 2246 2911
+rect 2170 2711 2180 2763
+rect 2214 2711 2246 2763
+rect 2170 2563 2246 2711
+rect 2170 2511 2180 2563
+rect 2214 2511 2246 2563
+rect 2170 2363 2246 2511
+rect 2170 2311 2180 2363
+rect 2214 2311 2246 2363
+rect 2170 2163 2246 2311
+rect 2170 2111 2180 2163
+rect 2214 2111 2246 2163
+rect 2170 1963 2246 2111
+rect 2170 1911 2180 1963
+rect 2214 1911 2246 1963
+rect 2170 1763 2246 1911
+rect 2170 1711 2180 1763
+rect 2214 1711 2246 1763
+rect 2170 1563 2246 1711
+rect 2170 1511 2180 1563
+rect 2214 1511 2246 1563
+rect 2170 1362 2246 1511
+rect 2170 1310 2180 1362
+rect 2214 1310 2246 1362
+rect 2170 1280 2246 1310
+rect 2276 2962 2352 3080
+rect 2276 2910 2310 2962
+rect 2344 2910 2352 2962
+rect 2276 2762 2352 2910
+rect 2276 2710 2310 2762
+rect 2344 2710 2352 2762
+rect 2276 2562 2352 2710
+rect 2276 2510 2310 2562
+rect 2344 2510 2352 2562
+rect 2276 2362 2352 2510
+rect 2276 2310 2310 2362
+rect 2344 2310 2352 2362
+rect 2276 2162 2352 2310
+rect 2276 2110 2310 2162
+rect 2344 2110 2352 2162
+rect 2276 1962 2352 2110
+rect 2276 1910 2310 1962
+rect 2344 1910 2352 1962
+rect 2276 1762 2352 1910
+rect 2276 1710 2310 1762
+rect 2344 1710 2352 1762
+rect 2276 1562 2352 1710
+rect 2276 1510 2310 1562
+rect 2344 1510 2352 1562
+rect 2276 1362 2352 1510
+rect 2276 1310 2310 1362
+rect 2344 1310 2352 1362
+rect 2276 1280 2352 1310
+<< ndiffc >>
+rect 2180 2911 2214 2963
+rect 2180 2711 2214 2763
+rect 2180 2511 2214 2563
+rect 2180 2311 2214 2363
+rect 2180 2111 2214 2163
+rect 2180 1911 2214 1963
+rect 2180 1711 2214 1763
+rect 2180 1511 2214 1563
+rect 2180 1310 2214 1362
+rect 2310 2910 2344 2962
+rect 2310 2710 2344 2762
+rect 2310 2510 2344 2562
+rect 2310 2310 2344 2362
+rect 2310 2110 2344 2162
+rect 2310 1910 2344 1962
+rect 2310 1710 2344 1762
+rect 2310 1510 2344 1562
+rect 2310 1310 2344 1362
+<< psubdiff >>
+rect 2352 3042 2428 3080
+rect 2352 2990 2364 3042
+rect 2398 2990 2428 3042
+rect 2352 2842 2428 2990
+rect 2352 2790 2364 2842
+rect 2398 2790 2428 2842
+rect 2352 2642 2428 2790
+rect 2352 2590 2364 2642
+rect 2398 2590 2428 2642
+rect 2352 2442 2428 2590
+rect 2352 2390 2364 2442
+rect 2398 2390 2428 2442
+rect 2352 2242 2428 2390
+rect 2352 2190 2364 2242
+rect 2398 2190 2428 2242
+rect 2352 2042 2428 2190
+rect 2352 1990 2364 2042
+rect 2398 1990 2428 2042
+rect 2352 1842 2428 1990
+rect 2352 1790 2364 1842
+rect 2398 1790 2428 1842
+rect 2352 1642 2428 1790
+rect 2352 1590 2364 1642
+rect 2398 1590 2428 1642
+rect 2352 1442 2428 1590
+rect 2352 1390 2364 1442
+rect 2398 1390 2428 1442
+rect 2352 1280 2428 1390
+<< psubdiffcont >>
+rect 2364 2990 2398 3042
+rect 2364 2790 2398 2842
+rect 2364 2590 2398 2642
+rect 2364 2390 2398 2442
+rect 2364 2190 2398 2242
+rect 2364 1990 2398 2042
+rect 2364 1790 2398 1842
+rect 2364 1590 2398 1642
+rect 2364 1390 2398 1442
+<< poly >>
+rect 2246 3080 2276 3130
+rect 2246 1236 2276 1280
+rect 2246 1200 2432 1236
+rect 2246 1034 2278 1200
+rect 2398 1034 2432 1200
+rect 2246 1000 2432 1034
+<< polycont >>
+rect 2278 1034 2398 1200
+<< xpolycontact >>
+rect 2690 3898 2760 4426
+rect 2690 -130 2760 398
+<< xpolyres >>
+rect 2690 398 2760 3898
+<< locali >>
+rect 2170 4116 2690 4166
+rect 2170 3060 2218 4116
+rect 2300 3410 2414 3418
+rect 2300 3316 2314 3410
+rect 2400 3316 2414 3410
+rect 2300 3310 2414 3316
+rect 2332 3060 2380 3310
+rect 2170 2963 2220 3060
+rect 2170 2911 2180 2963
+rect 2214 2911 2220 2963
+rect 2170 2763 2220 2911
+rect 2170 2711 2180 2763
+rect 2214 2711 2220 2763
+rect 2170 2563 2220 2711
+rect 2170 2511 2180 2563
+rect 2214 2511 2220 2563
+rect 2170 2370 2220 2511
+rect 2040 2363 2220 2370
+rect 2040 2330 2180 2363
+rect 2040 2240 2060 2330
+rect 2130 2311 2180 2330
+rect 2214 2311 2220 2363
+rect 2130 2240 2220 2311
+rect 2040 2163 2220 2240
+rect 2040 2111 2180 2163
+rect 2214 2111 2220 2163
+rect 2040 2030 2220 2111
+rect 2040 1940 2060 2030
+rect 2130 1963 2220 2030
+rect 2130 1940 2180 1963
+rect 2040 1911 2180 1940
+rect 2214 1911 2220 1963
+rect 2040 1910 2220 1911
+rect 2170 1763 2220 1910
+rect 2170 1711 2180 1763
+rect 2214 1711 2220 1763
+rect 2170 1563 2220 1711
+rect 2170 1511 2180 1563
+rect 2214 1511 2220 1563
+rect 2170 1362 2220 1511
+rect 2170 1310 2180 1362
+rect 2214 1310 2220 1362
+rect 2170 1290 2220 1310
+rect 2300 3042 2410 3060
+rect 2300 2990 2364 3042
+rect 2398 2990 2410 3042
+rect 2300 2962 2410 2990
+rect 2300 2910 2310 2962
+rect 2344 2910 2410 2962
+rect 2300 2842 2410 2910
+rect 2300 2790 2364 2842
+rect 2398 2790 2410 2842
+rect 2300 2762 2410 2790
+rect 2300 2710 2310 2762
+rect 2344 2710 2410 2762
+rect 2300 2642 2410 2710
+rect 2300 2590 2364 2642
+rect 2398 2590 2410 2642
+rect 2300 2562 2410 2590
+rect 2300 2510 2310 2562
+rect 2344 2510 2410 2562
+rect 2300 2442 2410 2510
+rect 2300 2390 2364 2442
+rect 2398 2390 2410 2442
+rect 2300 2362 2410 2390
+rect 2300 2310 2310 2362
+rect 2344 2310 2410 2362
+rect 2300 2242 2410 2310
+rect 2300 2190 2364 2242
+rect 2398 2190 2410 2242
+rect 2300 2162 2410 2190
+rect 2300 2110 2310 2162
+rect 2344 2110 2410 2162
+rect 2300 2042 2410 2110
+rect 2300 1990 2364 2042
+rect 2398 1990 2410 2042
+rect 2300 1962 2410 1990
+rect 2300 1910 2310 1962
+rect 2344 1910 2410 1962
+rect 2300 1842 2410 1910
+rect 2300 1790 2364 1842
+rect 2398 1790 2410 1842
+rect 2300 1762 2410 1790
+rect 2300 1710 2310 1762
+rect 2344 1710 2410 1762
+rect 2300 1642 2410 1710
+rect 2300 1590 2364 1642
+rect 2398 1590 2410 1642
+rect 2300 1562 2410 1590
+rect 2300 1510 2310 1562
+rect 2344 1510 2410 1562
+rect 2300 1442 2410 1510
+rect 2300 1390 2364 1442
+rect 2398 1390 2410 1442
+rect 2300 1362 2410 1390
+rect 2300 1310 2310 1362
+rect 2344 1310 2410 1362
+rect 2300 1290 2410 1310
+rect 2246 1200 2432 1236
+rect 2246 1034 2278 1200
+rect 2398 1034 2432 1200
+rect 2246 1000 2432 1034
+rect 2842 276 3210 358
+rect 2842 232 2914 276
+rect 2760 -34 2914 232
+rect 2842 -46 2914 -34
+rect 3150 -46 3210 276
+rect 2842 -100 3210 -46
+<< viali >>
+rect 2314 3316 2400 3410
+rect 2060 2240 2130 2330
+rect 2060 1940 2130 2030
+rect 2278 1034 2398 1200
+rect 2914 -46 3150 276
+<< metal1 >>
+rect 2300 3410 2414 3418
+rect 2300 3316 2314 3410
+rect 2400 3316 2414 3410
+rect 2300 3310 2414 3316
+rect 2040 2330 2150 2370
+rect 2040 2240 2060 2330
+rect 2130 2240 2150 2330
+rect 2040 2030 2150 2240
+rect 2040 1940 2060 2030
+rect 2130 1940 2150 2030
+rect 2040 1910 2150 1940
+rect 2246 1200 2432 1236
+rect 2246 1034 2278 1200
+rect 2398 1034 2432 1200
+rect 2246 1000 2432 1034
+rect 2842 276 3210 358
+rect 2842 -46 2914 276
+rect 3150 -46 3210 276
+rect 2842 -100 3210 -46
+<< via1 >>
+rect 2314 3316 2400 3410
+rect 2060 2240 2130 2330
+rect 2060 1940 2130 2030
+rect 2278 1034 2398 1200
+rect 2914 -46 3150 276
+<< metal2 >>
+rect 2300 3410 2414 3418
+rect 2300 3316 2314 3410
+rect 2400 3316 2414 3410
+rect 2300 3310 2414 3316
+rect 2040 2330 2150 2370
+rect 2040 2240 2060 2330
+rect 2130 2240 2150 2330
+rect 2040 2030 2150 2240
+rect 2040 1940 2060 2030
+rect 2130 1940 2150 2030
+rect 2040 1910 2150 1940
+rect 2246 1200 2432 1236
+rect 2246 1034 2278 1200
+rect 2398 1034 2432 1200
+rect 2246 1000 2432 1034
+rect 2842 276 3210 358
+rect 2842 -46 2914 276
+rect 3150 -46 3210 276
+rect 2842 -100 3210 -46
+<< via2 >>
+rect 2314 3316 2400 3410
+rect 2060 2240 2130 2330
+rect 2060 1940 2130 2030
+rect 2278 1034 2398 1200
+rect 2914 -46 3150 276
+<< metal3 >>
+rect 8100 4966 8400 5002
+rect 8100 4900 8132 4966
+rect 2332 4800 8132 4900
+rect 2332 3418 2394 4800
+rect 8100 4748 8132 4800
+rect 8368 4748 8400 4966
+rect 8100 4698 8400 4748
+rect 2300 3410 2414 3418
+rect 2300 3316 2314 3410
+rect 2400 3316 2414 3410
+rect 2300 3310 2414 3316
+rect 2040 2330 2150 2370
+rect 2040 2240 2060 2330
+rect 2130 2240 2150 2330
+rect 2040 2030 2150 2240
+rect 2040 1940 2060 2030
+rect 2130 1940 2150 2030
+rect 2040 1910 2150 1940
+rect 2246 1200 2432 1236
+rect 2246 1034 2278 1200
+rect 2398 1034 2432 1200
+rect 2246 1000 2432 1034
+rect 2842 276 3210 358
+rect 2842 -46 2914 276
+rect 3150 -46 3210 276
+rect 2842 -100 3210 -46
+<< via3 >>
+rect 8132 4748 8368 4966
+rect 2060 2240 2130 2330
+rect 2060 1940 2130 2030
+rect 2278 1034 2398 1200
+rect 2914 -46 3150 276
+<< metal4 >>
+rect -18058 2370 2024 14998
+rect 8100 4966 8400 5002
+rect 8100 4748 8132 4966
+rect 8368 4748 8400 4966
+rect 8100 4500 8400 4748
+rect -18058 2330 2150 2370
+rect -18058 2240 2060 2330
+rect 2130 2240 2150 2330
+rect -18058 2030 2150 2240
+rect -18058 1940 2060 2030
+rect 2130 1940 2150 2030
+rect -18058 1910 2150 1940
+rect -18058 -4976 2024 1910
+rect 2246 1200 2432 1236
+rect 2246 1034 2278 1200
+rect 2398 1034 2432 1200
+rect 2246 1000 2432 1034
+rect 2300 -602 2372 1000
+rect 2842 276 3210 358
+rect 2842 -46 2914 276
+rect 3150 -46 3210 276
+rect 2842 -100 3210 -46
+rect 3446 -360 8438 4500
+rect 8328 -602 8518 -514
+rect 2300 -672 8518 -602
+rect 8328 -780 8518 -672
+<< via4 >>
+rect 2914 -46 3150 276
+<< mimcap2 >>
+rect -17002 6054 398 13372
+rect -17002 2980 -15008 6054
+rect -11984 2980 398 6054
+rect -17002 -4028 398 2980
+rect 3710 308 8110 4250
+rect 3710 -60 3800 308
+rect 5650 -60 8110 308
+rect 3710 -150 8110 -60
+<< mimcap2contact >>
+rect -15008 2980 -11984 6054
+rect 3800 -60 5650 308
+<< metal5 >>
+rect -20000 6054 -10006 6998
+rect -20000 2980 -15008 6054
+rect -11984 2980 -10006 6054
+rect -20000 1998 -10006 2980
+rect 5722 400 8440 402
+rect 3268 358 8440 400
+rect 2842 308 8440 358
+rect 2842 276 3800 308
+rect 2842 -46 2914 276
+rect 3150 -46 3800 276
+rect 2842 -60 3800 -46
+rect 5650 -60 8440 308
+rect 2842 -100 8440 -60
+rect 3268 -152 8440 -100
+<< labels >>
+flabel metal5 -19580 2548 -18152 6054 0 FreeSans 4800 0 0 0 din
+port 1 nsew
+flabel locali 2300 2408 2338 2482 0 FreeSans 160 0 0 0 nbs
+flabel metal5 2930 -50 3158 280 0 FreeSans 320 0 0 0 rc
+flabel metal5 8126 -84 8378 246 0 FreeSans 1600 0 0 0 do
+port 3 nsew
+flabel metal4 8330 -780 8516 -516 0 FreeSans 480 0 0 0 db
+port 2 nsew
+flabel locali 2046 2096 2162 2194 0 FreeSans 160 0 0 0 nd
+flabel metal4 8116 4748 8370 4972 0 FreeSans 480 0 0 0 GND
+port 4 nsew
+<< end >>
diff --git a/mag/detector.nodes b/mag/detector.nodes
new file mode 100644
index 0000000..9431efa
--- /dev/null
+++ b/mag/detector.nodes
@@ -0,0 +1,6 @@
+din -19579 2548 m5
+do 8126 -83 m5
+db 8330 -779 m4
+GND 8116 4748 m4
+a_2690_398# 2690 398 xres
+nd 2170 1280 ndif
diff --git a/mag/detector.res.ext b/mag/detector.res.ext
new file mode 100644
index 0000000..c61b214
--- /dev/null
+++ b/mag/detector.res.ext
@@ -0,0 +1,51 @@
+scale 1000 1 500000
+rnode "db.t0" 0 274.123 2261 2180 0
+rnode "db" 0 5635.88 8330 -780 0
+resist "db" "db.t0" 1552.66
+rnode "GND.n0" 0 0 2381 2416 0
+rnode "GND.n1" 0 0 2381 2416 0
+rnode "GND.t1" 0 0 2276 2180 0
+rnode "GND.n2" 0 0 2381 2616 0
+rnode "GND.n3" 0 0 2381 2616 0
+rnode "GND.n4" 0 0 2327 2536 0
+rnode "GND.n5" 0 0 2381 2816 0
+rnode "GND.n6" 0 0 2381 2816 0
+rnode "GND.n7" 0 0 2327 2736 0
+rnode "GND.t0" 0 0 5910 2050 0
+rnode "GND" 0 0 8116 4748 0
+rnode "GND.n8" 0 0 2381 3016 0
+rnode "GND.n9" 0 0 2327 2936 0
+rnode "GND.n10" 0 0 2327 2936 0
+rnode "GND.n11" 0 0 2327 2336 0
+rnode "nbs" 0 0 2300 2408 0
+resist "GND.n11" "GND.n10" 0.00802672
+resist "GND.n3" "GND.n2" 0.019
+resist "GND.n1" "GND.n0" 0.019
+resist "GND.n10" "GND.n4" 0.019
+resist "GND.n10" "GND.n7" 0.019
+resist "GND.n6" "GND.n5" 0.019
+resist "GND.n10" "GND.n9" 0.019
+resist "GND" "GND.t0" 0.061
+resist "nbs" "GND.n1" 0.887
+resist "GND.n10" "GND.t1" 3.4
+resist "nbs" "GND.n11" 7.99696
+resist "GND.n4" "GND.n3" 8.872
+resist "GND.n7" "GND.n6" 8.872
+resist "GND.n9" "GND.n8" 8.872
+resist "GND.n8" "GND" 77.897
+rnode "do.t0" 0 0 2725 134 0
+rnode "do" 0 0 8126 -84 0
+rnode "do.t1" 0 0 4725 124 0
+rnode "do.n0" 0 0 3032 115 0
+rnode "rc" 0 0 2930 -50 0
+resist "rc" "do.n0" 0.006
+resist "do.n0" "do.t1" 0.09
+resist "do.t1" "do" 0.177
+resist "do.n0" "do.t0" 9.629
+rnode "din.t0" 0 nan -13496 4517 0
+rnode "din" 0 nan -19580 2548 0
+resist "din" "din.t0" 0.035
+device msubckt sky130_fd_pr__nfet_01v8 2246 1280 2247 1281 "GND" "db.t0" 60 0 "nd" 1800 0 "GND.t1" 1800 0
+device rsubckt sky130_fd_pr__res_xhigh_po 2690 398 2691 399 "GND" "a_2690_398#" 140 0 "do.t0" 3500 0 "nd" 3500 0
+device csubckt sky130_fd_pr__cap_mim_m3_2 3710 -150 3711 -149 "None" "do.t1" 19072 0 "GND.t0" -6708 0
+device csubckt sky130_fd_pr__cap_mim_m3_2 -17002 -4028 -17001 -4027 "None" "din.t0" 81896 0 "nd" -25492 0
diff --git a/mag/detector.sim b/mag/detector.sim
new file mode 100644
index 0000000..c4ffdf4
--- /dev/null
+++ b/mag/detector.sim
@@ -0,0 +1,12 @@
+| units: 500000 tech: sky130A format: MIT
+x din nd l=17400 w=17400 x=-17001 y=-4027 sky130_fd_pr__cap_mim_m3_2
+x do GND l=4400 w=4400 x=3710 y=-149 sky130_fd_pr__cap_mim_m3_2
+x a_2690_398# do nd GND l=3500 w=70 x=2690 y=398 sky130_fd_pr__res_xhigh_po
+x db nd GND GND l=30 w=1800 x=2246 y=1280 sky130_fd_pr__nfet_01v8
+C nd din nan
+R do 131
+C db GND 5.91
+R db 2491
+R GND 7783
+R a_2690_398# 100000
+R nd 3710
diff --git a/mag/detector.spice b/mag/detector.spice
new file mode 100644
index 0000000..ddd87cd
--- /dev/null
+++ b/mag/detector.spice
@@ -0,0 +1,32 @@
+* NGSPICE file created from detector.ext - technology: sky130A
+
+.subckt detector din db do GND
+X0 din.t0 nd sky130_fd_pr__cap_mim_m3_2 l=8.7e+07u w=8.7e+07u
+X1 do.t1 GND.t0 sky130_fd_pr__cap_mim_m3_2 l=2.2e+07u w=2.2e+07u
+X2 do.t0 nd GND sky130_fd_pr__res_xhigh_po w=350000u l=1.75e+07u
+X3 GND.t1 db.t0 nd GND sky130_fd_pr__nfet_01v8 w=9e+06u l=150000u
+R0 din din.t0 0.035
+R1 do.n0 do.t0 9.629
+R2 do.t1 do 0.177
+R3 do.n0 do.t1 0.09
+R4 rc do.n0 0.006
+R5 GND.n8 GND 77.897
+R6 GND.n9 GND.n8 8.872
+R7 GND.n7 GND.n6 8.872
+R8 GND.n4 GND.n3 8.872
+R9 nbs GND.n11 7.997
+R10 GND.n10 GND.t1 3.4
+R11 nbs GND.n1 0.887
+R12 GND GND.t0 0.061
+R13 GND.n10 GND.n9 0.019
+R14 GND.n6 GND.n5 0.019
+R15 GND.n10 GND.n7 0.019
+R16 GND.n10 GND.n4 0.019
+R17 GND.n1 GND.n0 0.019
+R18 GND.n3 GND.n2 0.019
+R19 GND.n11 GND.n10 0.008
+R20 db db.t0 1552.66
+C0 db nd 0.48fF
+*C1 din nd nanfF
+.ends
+
diff --git a/mag/ota.ext b/mag/ota.ext
new file mode 100644
index 0000000..c1df621
--- /dev/null
+++ b/mag/ota.ext
@@ -0,0 +1,51 @@
+timestamp 1654536627
+version 8.3
+tech sky130A
+style ngspice()
+scale 1000 1 500000
+resistclasses 2200000 3050000 1700000 3050000 120000 197000 114000 191000 120000 197000 114000 191000 48200 319800 2000000 48200 48200 12200 125 125 47 47 29 5
+parameters sky130_fd_pr__nfet_01v8 l=l w=w
+parameters sky130_fd_pr__pfet_01v8 l=l w=w
+port "vout" 3 9574 1644 9670 1716 m4
+port "Inn" 2 6692 1528 6792 1602 m4
+port "Inp" 1 6692 1698 6788 1770 m4
+port "Ib" 6 6694 4526 6796 4610 m4
+port "VDD" 4 7968 4736 8256 4940 m3
+port "VSS" 5 7934 358 8242 556 m3
+node "vout" 867 -nan 9574 1644 m4 0 0 0 0 0 0 0 0 16000 520 28000 760 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 32424 1232 154144 5484 12000 440 12000 440 12000 440 0 0 0 0
+node "a_8070_1014#" 1158 2668.43 8070 1014 ndif 0 0 0 0 0 0 0 0 16000 520 34000 880 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 430840 2852 0 0 85360 2432 0 0 0 0 0 0 0 0 0 0 0 0
+node "a_6890_1010#" 1190 -nan 6890 1010 ndif 0 0 0 0 0 0 0 0 16000 520 34000 880 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 430840 2852 0 0 64936 2268 43600 1648 0 0 0 0 0 0 0 0 0 0
+node "Inn" 370 1927.29 6692 1528 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 190840 1892 0 0 91680 2936 12000 440 12000 440 12000 440 12000 440 0 0 0 0
+node "Inp" 238 1525.92 6692 1698 m4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 190840 1892 0 0 53080 1644 12000 440 12000 440 12000 440 12000 440 0 0 0 0
+node "a_6890_750#" 1244 -nan 6890 750 ndif 0 0 0 0 0 0 0 0 16000 520 28000 760 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 160200 2120 0 0 67032 2508 192040 7132 0 0 0 0 0 0 0 0 0 0
+node "a_7570_1796#" 3150 273.9 7570 1796 pdif 0 0 0 0 0 0 0 0 0 0 134000 3080 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 31376 996 0 0 0 0 0 0 0 0 0 0 0 0
+node "Ib" 2415 3332.43 6694 4526 m4 0 0 0 0 0 0 0 0 0 0 100000 2200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1807400 6300 0 0 94012 3124 12000 440 12000 440 12000 440 12000 440 0 0 0 0
+node "VDD" 10153 28812.7 7968 4736 m3 0 0 0 0 6952344 10580 0 0 100000 2200 256000 5920 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 884236 13624 604284 5888 604284 5888 604284 5888 0 0 0 0 0 0
+substrate "VSS" 0 0 7934 358 m3 0 0 0 0 0 0 0 0 64000 2080 16000 520 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 688892 8336 594268 5888 600600 5900 600600 5900 0 0 0 0 0 0
+cap "a_8070_1014#" "VDD" 8.8985
+cap "a_8070_1014#" "vout" -nan
+cap "Inn" "a_8070_1014#" 20.0202
+cap "Inp" "a_6890_1010#" -nan
+cap "a_6890_750#" "VDD" 88.5586
+cap "a_6890_750#" "vout" 897.1
+cap "a_6890_1010#" "VDD" 2.457
+cap "Inp" "VDD" 9.657
+cap "Inn" "a_6890_1010#" -nan
+cap "Inp" "Inn" 745.113
+cap "Ib" "VDD" 300.725
+cap "a_6890_750#" "a_8070_1014#" -nan
+cap "Inn" "Ib" 109.524
+cap "vout" "VDD" 20.5325
+cap "a_6890_1010#" "a_8070_1014#" 11.3789
+cap "a_7570_1796#" "VDD" 11.9103
+cap "a_6890_750#" "a_6890_1010#" -nan
+device msubckt sky130_fd_pr__nfet_01v8 8170 754 8171 755 l=800 w=160 "VSS" "a_8070_1014#" 1600 0 "vout" 160 0 "VSS" 160 0
+device msubckt sky130_fd_pr__nfet_01v8 6990 750 6991 751 l=800 w=160 "VSS" "a_6890_1010#" 1600 0 "a_6890_750#" 160 0 "VSS" 160 0
+device msubckt sky130_fd_pr__nfet_01v8 8170 1014 8171 1015 l=800 w=160 "VSS" "a_8070_1014#" 1600 0 "a_8070_1014#" 160 0 "VSS" 160 0
+device msubckt sky130_fd_pr__nfet_01v8 6990 1010 6991 1011 l=800 w=160 "VSS" "a_6890_1010#" 1600 0 "a_6890_1010#" 160 0 "VSS" 160 0
+device msubckt sky130_fd_pr__pfet_01v8 9026 1786 9027 1787 l=200 w=280 "VDD" "a_6890_750#" 400 0 "vout" 280 0 "VDD" 280 0
+device msubckt sky130_fd_pr__pfet_01v8 7670 1796 7671 1797 l=400 w=340 "VDD" "Inn" 800 0 "a_7570_1796#" 340 0 "a_8070_1014#" 340 0
+device msubckt sky130_fd_pr__pfet_01v8 7170 1796 7171 1797 l=400 w=340 "VDD" "Inp" 800 0 "a_6890_1010#" 340 0 "a_7570_1796#" 340 0
+device msubckt sky130_fd_pr__pfet_01v8 9026 2166 9027 2167 l=200 w=280 "VDD" "a_6890_750#" 400 0 "a_6890_750#" 280 0 "VDD" 280 0
+device msubckt sky130_fd_pr__pfet_01v8 7670 2310 7671 2311 l=800 w=1000 "VDD" "Ib" 1600 0 "a_7570_1796#" 1000 0 "VDD" 1000 0
+device msubckt sky130_fd_pr__pfet_01v8 7670 3450 7671 3451 l=800 w=1000 "VDD" "Ib" 1600 0 "Ib" 1000 0 "VDD" 1000 0
diff --git a/mag/ota.mag b/mag/ota.mag
new file mode 100644
index 0000000..6e59e93
--- /dev/null
+++ b/mag/ota.mag
@@ -0,0 +1,570 @@
+magic
+tech sky130A
+timestamp 1654536627
+<< nwell >>
+rect 3509 833 4727 2260
+<< nmos >>
+rect 3495 505 3895 585
+rect 4085 507 4485 587
+rect 3495 375 3895 455
+rect 4085 377 4485 457
+<< pmos >>
+rect 3835 1725 4235 2225
+rect 3835 1155 4235 1655
+rect 4513 1083 4613 1223
+rect 3585 898 3785 1068
+rect 3835 898 4035 1068
+rect 4513 893 4613 1033
+<< ndiff >>
+rect 3445 573 3495 585
+rect 3445 553 3457 573
+rect 3477 553 3495 573
+rect 3445 505 3495 553
+rect 3895 561 3945 585
+rect 3895 540 3910 561
+rect 3931 540 3945 561
+rect 3895 505 3945 540
+rect 4035 571 4085 587
+rect 4035 550 4051 571
+rect 4072 550 4085 571
+rect 4035 507 4085 550
+rect 4485 561 4535 587
+rect 4485 540 4498 561
+rect 4519 540 4535 561
+rect 4485 507 4535 540
+rect 3445 421 3495 455
+rect 3445 400 3460 421
+rect 3481 400 3495 421
+rect 3445 375 3495 400
+rect 3895 421 3945 455
+rect 3895 400 3910 421
+rect 3931 400 3945 421
+rect 3895 375 3945 400
+rect 4035 421 4085 457
+rect 4035 400 4050 421
+rect 4071 400 4085 421
+rect 4035 377 4085 400
+rect 4485 431 4535 457
+rect 4485 410 4500 431
+rect 4521 410 4535 431
+rect 4485 377 4535 410
+<< pdiff >>
+rect 3785 2198 3835 2225
+rect 3785 2177 3800 2198
+rect 3821 2177 3835 2198
+rect 3785 1725 3835 2177
+rect 4235 2203 4285 2225
+rect 4235 2182 4248 2203
+rect 4269 2182 4285 2203
+rect 4235 2050 4285 2182
+rect 4235 2000 4257 2050
+rect 4278 2000 4285 2050
+rect 4235 1766 4285 2000
+rect 4235 1745 4249 1766
+rect 4270 1745 4285 1766
+rect 4235 1725 4285 1745
+rect 3785 1206 3835 1655
+rect 3785 1185 3800 1206
+rect 3821 1185 3835 1206
+rect 3785 1155 3835 1185
+rect 4235 1641 4285 1655
+rect 4235 1620 4249 1641
+rect 4270 1620 4285 1641
+rect 4235 1155 4285 1620
+rect 4463 1143 4513 1223
+rect 4463 1122 4476 1143
+rect 4497 1122 4513 1143
+rect 4463 1083 4513 1122
+rect 4613 1214 4663 1223
+rect 4613 1193 4627 1214
+rect 4648 1193 4663 1214
+rect 4613 1110 4663 1193
+rect 4613 1089 4626 1110
+rect 4647 1089 4663 1110
+rect 4613 1083 4663 1089
+rect 3535 951 3585 1068
+rect 3535 930 3549 951
+rect 3570 930 3585 951
+rect 3535 898 3585 930
+rect 3785 1061 3835 1068
+rect 3785 1040 3799 1061
+rect 3820 1040 3835 1061
+rect 3785 898 3835 1040
+rect 4035 941 4085 1068
+rect 4035 920 4049 941
+rect 4070 920 4085 941
+rect 4035 898 4085 920
+rect 4463 926 4513 1033
+rect 4463 905 4477 926
+rect 4498 905 4513 926
+rect 4463 893 4513 905
+rect 4613 1023 4663 1033
+rect 4613 1002 4625 1023
+rect 4646 1002 4663 1023
+rect 4613 893 4663 1002
+<< ndiffc >>
+rect 3457 553 3477 573
+rect 3910 540 3931 561
+rect 4051 550 4072 571
+rect 4498 540 4519 561
+rect 3460 400 3481 421
+rect 3910 400 3931 421
+rect 4050 400 4071 421
+rect 4500 410 4521 431
+<< pdiffc >>
+rect 3800 2177 3821 2198
+rect 4248 2182 4269 2203
+rect 4257 2000 4278 2050
+rect 4249 1745 4270 1766
+rect 3800 1185 3821 1206
+rect 4249 1620 4270 1641
+rect 4476 1122 4497 1143
+rect 4627 1193 4648 1214
+rect 4626 1089 4647 1110
+rect 3549 930 3570 951
+rect 3799 1040 3820 1061
+rect 4049 920 4070 941
+rect 4477 905 4498 926
+rect 4625 1002 4646 1023
+<< psubdiff >>
+rect 4535 561 4585 587
+rect 4535 539 4544 561
+rect 4567 539 4585 561
+rect 4535 507 4585 539
+<< nsubdiff >>
+rect 4285 2050 4335 2225
+rect 4285 2000 4295 2050
+rect 4316 2000 4335 2050
+rect 4285 1725 4335 2000
+<< psubdiffcont >>
+rect 4544 539 4567 561
+<< nsubdiffcont >>
+rect 4295 2000 4316 2050
+<< poly >>
+rect 3870 2295 3940 2310
+rect 3870 2265 3890 2295
+rect 3920 2265 3940 2295
+rect 3870 2255 3940 2265
+rect 3835 2225 4235 2255
+rect 3835 1655 4235 1725
+rect 4524 1292 4565 1298
+rect 4524 1271 4533 1292
+rect 4554 1271 4565 1292
+rect 4524 1248 4565 1271
+rect 4513 1223 4613 1248
+rect 3835 1135 4235 1155
+rect 3585 1068 3785 1093
+rect 3835 1068 4035 1093
+rect 4513 1033 4613 1083
+rect 3585 873 3785 898
+rect 3835 873 4035 898
+rect 3600 865 3670 873
+rect 3600 835 3620 865
+rect 3650 835 3670 865
+rect 3600 820 3670 835
+rect 3850 865 3920 873
+rect 4513 868 4613 893
+rect 3850 835 3870 865
+rect 3900 835 3920 865
+rect 3850 820 3920 835
+rect 3606 654 3676 668
+rect 3606 624 3626 654
+rect 3656 624 3676 654
+rect 3606 615 3676 624
+rect 4120 650 4190 670
+rect 4120 620 4140 650
+rect 4170 620 4190 650
+rect 4120 617 4190 620
+rect 3495 585 3895 615
+rect 4085 587 4485 617
+rect 3495 455 3895 505
+rect 4085 457 4485 507
+rect 3495 355 3895 375
+rect 4085 357 4485 377
+<< polycont >>
+rect 3890 2265 3920 2295
+rect 4533 1271 4554 1292
+rect 3620 835 3650 865
+rect 3870 835 3900 865
+rect 3626 624 3656 654
+rect 4140 620 4170 650
+<< locali >>
+rect 3399 2458 4760 2477
+rect 3399 2379 3537 2458
+rect 3659 2379 3837 2458
+rect 3959 2379 4137 2458
+rect 4259 2379 4437 2458
+rect 4559 2379 4760 2458
+rect 3399 2366 4760 2379
+rect 3342 2303 3402 2310
+rect 3342 2267 3348 2303
+rect 3396 2297 3402 2303
+rect 3870 2297 3940 2310
+rect 3396 2295 3940 2297
+rect 3396 2270 3890 2295
+rect 3396 2267 3402 2270
+rect 3342 2260 3402 2267
+rect 3792 2198 3829 2270
+rect 3870 2265 3890 2270
+rect 3920 2265 3940 2295
+rect 3870 2251 3940 2265
+rect 3792 2177 3800 2198
+rect 3821 2177 3829 2198
+rect 3792 2169 3829 2177
+rect 4240 2203 4277 2366
+rect 4240 2182 4248 2203
+rect 4269 2182 4277 2203
+rect 4240 2174 4277 2182
+rect 4250 2050 4320 2080
+rect 4250 2000 4257 2050
+rect 4278 2000 4295 2050
+rect 4316 2000 4320 2050
+rect 4250 1950 4320 2000
+rect 4243 1766 4276 1780
+rect 4243 1745 4249 1766
+rect 4270 1745 4276 1766
+rect 4243 1641 4276 1745
+rect 4243 1620 4249 1641
+rect 4270 1620 4276 1641
+rect 4243 1610 4276 1620
+rect 4410 1292 4565 1298
+rect 4410 1271 4533 1292
+rect 4554 1271 4565 1292
+rect 3791 1206 3828 1227
+rect 3791 1185 3800 1206
+rect 3821 1185 3828 1206
+rect 3791 1061 3828 1185
+rect 4343 1147 4393 1153
+rect 4410 1147 4437 1271
+rect 4619 1214 4656 2366
+rect 4619 1193 4627 1214
+rect 4648 1193 4656 1214
+rect 4619 1184 4656 1193
+rect 4468 1147 4505 1152
+rect 4343 1120 4354 1147
+rect 4381 1143 4505 1147
+rect 4381 1122 4476 1143
+rect 4497 1122 4505 1143
+rect 4381 1120 4505 1122
+rect 4343 1113 4393 1120
+rect 4468 1112 4505 1120
+rect 3791 1040 3799 1061
+rect 3820 1040 3828 1061
+rect 3791 1015 3828 1040
+rect 4618 1110 4655 1113
+rect 4618 1089 4626 1110
+rect 4647 1089 4655 1110
+rect 4618 1023 4655 1089
+rect 4618 1002 4625 1023
+rect 4646 1002 4655 1023
+rect 4618 993 4655 1002
+rect 3540 954 3580 960
+rect 3540 927 3546 954
+rect 3573 927 3580 954
+rect 3540 920 3580 927
+rect 4042 941 4079 960
+rect 4042 920 4049 941
+rect 4070 920 4079 941
+rect 3340 885 3400 892
+rect 3340 849 3346 885
+rect 3394 881 3400 885
+rect 3394 865 3670 881
+rect 3394 851 3620 865
+rect 3394 849 3400 851
+rect 3340 842 3400 849
+rect 3600 835 3620 851
+rect 3650 835 3670 865
+rect 3600 820 3670 835
+rect 3850 865 3920 880
+rect 3850 835 3870 865
+rect 3900 835 3920 865
+rect 3850 820 3920 835
+rect 3341 801 3401 808
+rect 3341 765 3347 801
+rect 3395 795 3401 801
+rect 3870 795 3900 820
+rect 3395 765 3900 795
+rect 3341 758 3401 765
+rect 3446 736 3489 748
+rect 3446 709 3453 736
+rect 3480 709 3489 736
+rect 3446 700 3489 709
+rect 3453 654 3480 700
+rect 3606 654 3676 668
+rect 3453 624 3626 654
+rect 3656 624 3676 654
+rect 3453 573 3480 624
+rect 3606 608 3676 624
+rect 4042 650 4079 920
+rect 4470 926 4505 935
+rect 4470 905 4477 926
+rect 4498 905 4505 926
+rect 4470 895 4505 905
+rect 4474 860 4501 895
+rect 4463 854 4513 860
+rect 4463 827 4474 854
+rect 4501 827 4513 854
+rect 4463 820 4513 827
+rect 4120 650 4190 670
+rect 4042 620 4140 650
+rect 4170 620 4190 650
+rect 3453 553 3457 573
+rect 3477 553 3480 573
+rect 4042 571 4079 620
+rect 4120 610 4190 620
+rect 3453 530 3480 553
+rect 3902 561 3939 570
+rect 3902 540 3910 561
+rect 3931 540 3939 561
+rect 3396 424 3489 430
+rect 3396 397 3407 424
+rect 3434 421 3489 424
+rect 3434 400 3460 421
+rect 3481 400 3489 421
+rect 3434 397 3489 400
+rect 3396 390 3489 397
+rect 3902 421 3939 540
+rect 4042 550 4051 571
+rect 4072 550 4079 571
+rect 4042 530 4079 550
+rect 4492 561 4573 570
+rect 4492 540 4498 561
+rect 4519 540 4544 561
+rect 4492 539 4544 540
+rect 4567 539 4573 561
+rect 4492 510 4573 539
+rect 4492 431 4529 510
+rect 3902 400 3910 421
+rect 3931 400 3939 421
+rect 3902 286 3939 400
+rect 3985 424 4080 430
+rect 3985 397 3996 424
+rect 4023 421 4080 424
+rect 4023 400 4050 421
+rect 4071 400 4080 421
+rect 4023 397 4080 400
+rect 3985 391 4080 397
+rect 4492 410 4500 431
+rect 4521 410 4529 431
+rect 3985 390 4041 391
+rect 4492 286 4529 410
+rect 3396 268 4759 286
+rect 3396 189 3537 268
+rect 3659 189 3837 268
+rect 3959 189 4137 268
+rect 4259 189 4437 268
+rect 4559 189 4759 268
+rect 3396 177 4759 189
+<< viali >>
+rect 3537 2379 3659 2458
+rect 3837 2379 3959 2458
+rect 4137 2379 4259 2458
+rect 4437 2379 4559 2458
+rect 3348 2267 3396 2303
+rect 4354 1120 4381 1147
+rect 3546 951 3573 954
+rect 3546 930 3549 951
+rect 3549 930 3570 951
+rect 3570 930 3573 951
+rect 3546 927 3573 930
+rect 3346 849 3394 885
+rect 3347 765 3395 801
+rect 3453 709 3480 736
+rect 4474 827 4501 854
+rect 3407 397 3434 424
+rect 3996 397 4023 424
+rect 3537 189 3659 268
+rect 3837 189 3959 268
+rect 4137 189 4259 268
+rect 4437 189 4559 268
+<< metal1 >>
+rect 3399 2458 4760 2477
+rect 3399 2379 3537 2458
+rect 3659 2379 3837 2458
+rect 3959 2379 4137 2458
+rect 4259 2379 4437 2458
+rect 4559 2379 4760 2458
+rect 3399 2366 4760 2379
+rect 3342 2303 3402 2310
+rect 3342 2267 3348 2303
+rect 3396 2267 3402 2303
+rect 3342 2260 3402 2267
+rect 4343 1147 4393 1153
+rect 4343 1120 4354 1147
+rect 4381 1120 4393 1147
+rect 4343 1113 4393 1120
+rect 3540 954 3580 960
+rect 3540 927 3546 954
+rect 3573 927 3580 954
+rect 3540 920 3580 927
+rect 3340 885 3400 892
+rect 3340 849 3346 885
+rect 3394 849 3400 885
+rect 3340 842 3400 849
+rect 3341 801 3401 808
+rect 3341 765 3347 801
+rect 3395 765 3401 801
+rect 3341 758 3401 765
+rect 3446 736 3489 748
+rect 3546 736 3573 920
+rect 4354 776 4381 1113
+rect 4463 855 4513 860
+rect 4783 858 4843 865
+rect 4783 855 4788 858
+rect 4463 854 4788 855
+rect 4463 827 4474 854
+rect 4501 827 4788 854
+rect 4463 825 4788 827
+rect 4463 820 4513 825
+rect 4783 822 4788 825
+rect 4836 822 4843 858
+rect 3446 709 3453 736
+rect 3480 709 3573 736
+rect 3941 749 4381 776
+rect 3446 700 3489 709
+rect 3941 493 3968 749
+rect 4474 720 4501 820
+rect 4783 815 4843 822
+rect 3407 466 3968 493
+rect 3996 693 4501 720
+rect 3407 430 3434 466
+rect 3996 430 4023 693
+rect 3396 424 3446 430
+rect 3396 397 3407 424
+rect 3434 397 3446 424
+rect 3396 390 3446 397
+rect 3985 424 4035 430
+rect 3985 397 3996 424
+rect 4023 397 4035 424
+rect 3985 390 4035 397
+rect 3396 268 4759 286
+rect 3396 189 3537 268
+rect 3659 189 3837 268
+rect 3959 189 4137 268
+rect 4259 189 4437 268
+rect 4559 189 4759 268
+rect 3396 177 4759 189
+<< via1 >>
+rect 3537 2379 3659 2458
+rect 3837 2379 3959 2458
+rect 4137 2379 4259 2458
+rect 4437 2379 4559 2458
+rect 3348 2267 3396 2303
+rect 3346 849 3394 885
+rect 3347 765 3395 801
+rect 4788 822 4836 858
+rect 3537 189 3659 268
+rect 3837 189 3959 268
+rect 4137 189 4259 268
+rect 4437 189 4559 268
+<< metal2 >>
+rect 3399 2458 4760 2477
+rect 3399 2379 3537 2458
+rect 3659 2379 3837 2458
+rect 3959 2379 4137 2458
+rect 4259 2379 4437 2458
+rect 4559 2379 4760 2458
+rect 3399 2366 4760 2379
+rect 3342 2303 3402 2310
+rect 3342 2267 3348 2303
+rect 3396 2267 3402 2303
+rect 3342 2260 3402 2267
+rect 3340 885 3400 892
+rect 3340 849 3346 885
+rect 3394 849 3400 885
+rect 3340 842 3400 849
+rect 4783 858 4843 865
+rect 4783 822 4788 858
+rect 4836 822 4843 858
+rect 4783 815 4843 822
+rect 3341 801 3401 808
+rect 3341 765 3347 801
+rect 3395 765 3401 801
+rect 3341 758 3401 765
+rect 3395 268 4760 286
+rect 3395 189 3537 268
+rect 3659 189 3837 268
+rect 3959 189 4137 268
+rect 4259 189 4437 268
+rect 4559 189 4760 268
+rect 3395 176 4760 189
+<< via2 >>
+rect 3537 2379 3659 2458
+rect 3837 2379 3959 2458
+rect 4137 2379 4259 2458
+rect 4437 2379 4559 2458
+rect 3348 2267 3396 2303
+rect 3346 849 3394 885
+rect 4788 822 4836 858
+rect 3347 765 3395 801
+rect 3537 189 3659 268
+rect 3837 189 3959 268
+rect 4137 189 4259 268
+rect 4437 189 4559 268
+<< metal3 >>
+rect 3399 2458 4760 2477
+rect 3399 2379 3537 2458
+rect 3659 2379 3837 2458
+rect 3959 2379 4137 2458
+rect 4259 2379 4437 2458
+rect 4559 2379 4760 2458
+rect 3399 2366 4760 2379
+rect 3342 2303 3402 2310
+rect 3342 2267 3348 2303
+rect 3396 2267 3402 2303
+rect 3342 2260 3402 2267
+rect 3340 885 3400 892
+rect 3340 849 3346 885
+rect 3394 849 3400 885
+rect 3340 842 3400 849
+rect 4783 858 4843 865
+rect 4783 822 4788 858
+rect 4836 822 4843 858
+rect 4783 815 4843 822
+rect 3341 801 3401 808
+rect 3341 765 3347 801
+rect 3395 765 3401 801
+rect 3341 758 3401 765
+rect 3395 268 4760 286
+rect 3395 189 3537 268
+rect 3659 189 3837 268
+rect 3959 189 4137 268
+rect 4259 189 4437 268
+rect 4559 189 4760 268
+rect 3395 176 4760 189
+<< via3 >>
+rect 3348 2267 3396 2303
+rect 3346 849 3394 885
+rect 4788 822 4836 858
+rect 3347 765 3395 801
+<< metal4 >>
+rect 3342 2303 3402 2310
+rect 3342 2267 3348 2303
+rect 3396 2267 3402 2303
+rect 3342 2260 3402 2267
+rect 3340 885 3400 892
+rect 3340 849 3346 885
+rect 3394 849 3400 885
+rect 3340 842 3400 849
+rect 4783 858 4843 865
+rect 4783 822 4788 858
+rect 4836 822 4843 858
+rect 4783 815 4843 822
+rect 3341 801 3401 808
+rect 3341 765 3347 801
+rect 3395 765 3401 801
+rect 3341 758 3401 765
+<< labels >>
+flabel metal3 3967 179 4121 278 0 FreeSans 240 0 0 0 VSS
+port 5 nsew
+flabel metal3 3984 2368 4128 2470 0 FreeSans 240 0 0 0 VDD
+port 4 nsew
+flabel metal4 3346 764 3396 801 0 FreeSans 240 0 0 0 Inn
+port 2 nsew
+flabel metal4 3346 849 3394 885 0 FreeSans 240 0 0 0 Inp
+port 1 nsew
+flabel metal4 3347 2263 3398 2305 0 FreeSans 240 0 0 0 Ib
+port 6 nsew
+flabel metal4 4787 822 4835 858 0 FreeSans 160 0 0 0 vout
+port 3 nsew
+<< end >>
diff --git a/netgen/detector.spice b/netgen/detector.spice
new file mode 100644
index 0000000..0a18a3e
--- /dev/null
+++ b/netgen/detector.spice
@@ -0,0 +1,9 @@
+* NGSPICE file created from detector.ext - technology: sky130A
+
+.subckt detector din db do GND
+X0 din nd sky130_fd_pr__cap_mim_m3_2 l=8.7e+07u w=8.7e+07u
+X1 do GND sky130_fd_pr__cap_mim_m3_2 l=2.2e+07u w=2.2e+07u
+X2 do nd GND sky130_fd_pr__res_xhigh_po w=350000u l=1.75e+07u
+X3 GND db nd GND sky130_fd_pr__nfet_01v8 w=9e+06u l=150000u
+.ends
+
diff --git a/netgen/ota.spice b/netgen/ota.spice
new file mode 100644
index 0000000..6646251
--- /dev/null
+++ b/netgen/ota.spice
@@ -0,0 +1,15 @@
+* NGSPICE file created from ota.ext - technology: sky130A
+
+.subckt ota Inp Inn vout Ib VDD VSS
+X0 VSS a_6890_1010# a_6890_750# VSS sky130_fd_pr__nfet_01v8 w=800000u l=4e+06u
+X1 a_7570_1796# Inp a_6890_1010# VDD sky130_fd_pr__pfet_01v8 w=1.7e+06u l=2e+06u
+X2 VSS a_8070_1014# a_8070_1014# VSS sky130_fd_pr__nfet_01v8 w=800000u l=4e+06u
+X3 VSS a_6890_1010# a_6890_1010# VSS sky130_fd_pr__nfet_01v8 w=800000u l=4e+06u
+X4 VDD a_6890_750# vout VDD sky130_fd_pr__pfet_01v8 w=1.4e+06u l=1e+06u
+X5 VDD Ib a_7570_1796# VDD sky130_fd_pr__pfet_01v8 w=5e+06u l=4e+06u
+X6 VSS a_8070_1014# vout VSS sky130_fd_pr__nfet_01v8 w=800000u l=4e+06u
+X7 VDD a_6890_750# a_6890_750# VDD sky130_fd_pr__pfet_01v8 w=1.4e+06u l=1e+06u
+X8 a_8070_1014# Inn a_7570_1796# VDD sky130_fd_pr__pfet_01v8 w=1.7e+06u l=2e+06u
+X9 VDD Ib Ib VDD sky130_fd_pr__pfet_01v8 w=5e+06u l=4e+06u
+.ends
+
diff --git a/xschem/detectorPassivo.sch b/xschem/detectorPassivo.sch
new file mode 100644
index 0000000..613284e
--- /dev/null
+++ b/xschem/detectorPassivo.sch
@@ -0,0 +1,57 @@
+v {xschem version=3.0.0 file_version=1.2 }
+G {}
+K {}
+V {}
+S {}
+E {}
+T {Resistencia de 250K considerando um resistor de largura fixa de 0,35um;
+O capacitor do filtro passa baixas possui um valor de 4pF;
+Logo, a frequencia de corte é 150KHz.
+O filtro capacitivo na entrada possui uma capacitancia de 590fF.
+E para uma frequencia abaixo de 150K, possui uma impedancia na ordem de M ohm.} -50 -210 0 0 0.2 0.2 {}
+N 130 90 130 110 { lab=gnd}
+N 130 110 130 140 { lab=gnd}
+N 130 60 220 60 { lab=gnd}
+N 220 60 220 120 { lab=gnd}
+N 130 120 220 120 { lab=gnd}
+N 130 -10 130 30 { lab=#net1}
+N 350 110 350 140 { lab=gnd}
+N 350 -10 350 50 { lab=do}
+N 350 -10 410 -10 { lab=do}
+N 50 60 90 60 { lab=dB}
+N 130 140 350 140 { lab=gnd}
+N 240 140 240 160 { lab=gnd}
+N 130 -10 200 -10 { lab=#net1}
+N 260 -10 350 -10 { lab=do}
+N 230 10 230 80 { lab=gnd}
+N 220 80 230 80 { lab=gnd}
+N -50 -10 -10 -10 {
+lab=din}
+N 50 -10 130 -10 {
+lab=#net1}
+C {/home/wisla/sky130_skel/xschem_sky130/sky130_fd_pr/nfet_01v8.sym} 110 60 0 0 {name=M1
+L=0.15
+W=9
+nf=1
+mult=1
+ad="'int((nf+1)/2) * W/nf * 0.29'"
+pd="'2*int((nf+1)/2) * (W/nf + 0.29)'"
+as="'int((nf+2)/2) * W/nf * 0.29'"
+ps="'2*int((nf+2)/2) * (W/nf + 0.29)'"
+nrd="'0.29 / W'" nrs="'0.29 / W'"
+sa=0 sb=0 sd=0
+model=nfet_01v8
+spiceprefix=X
+}
+C {/edatools/opentools/xschem/xschem_library/devices/ipin.sym} -50 -10 0 0 {name=p1 lab=din}
+C {/edatools/opentools/xschem/xschem_library/devices/ipin.sym} 60 60 0 0 {name=p3 lab=dB}
+C {/edatools/opentools/xschem/xschem_library/devices/opin.sym} 410 -10 0 0 {name=p2 lab=do}
+C {/edatools/opentools/xschem/xschem_library/devices/iopin.sym} 240 150 1 0 {name=p4 lab=gnd}
+C {/home/wisla/sky130_skel/xschem_sky130/sky130_fd_pr/cap_mim_m3_2.sym} 350 80 0 0 {name=C3 model=cap_mim_m3_2 W=22 L=22 MF=1 spiceprefix=X}
+C {/home/wisla/sky130_skel/xschem_sky130/sky130_fd_pr/res_xhigh_po.sym} 230 -10 3 0 {name=R2
+W=0.35
+L=17.5
+model=res_xhigh_po
+spiceprefix=X
+mult=1}
+C {/home/wisla/sky130_skel/xschem_sky130/sky130_fd_pr/cap_mim_m3_2.sym} 20 -10 3 0 {name=C1 model=cap_mim_m3_2 W=87 L=87 MF=1 spiceprefix=X}
diff --git a/xschem/detectorPassivo.sym b/xschem/detectorPassivo.sym
new file mode 100644
index 0000000..32c0d8f
--- /dev/null
+++ b/xschem/detectorPassivo.sym
@@ -0,0 +1,32 @@
+v {xschem version=3.0.0 file_version=1.2 }
+G {}
+K {type=subcircuit
+format="@name @pinlist @symname"
+template="name=X1"}
+V {}
+S {}
+E {}
+L 4 130 20 130 40 {}
+L 4 130 40 150 30 {}
+L 4 130 20 150 30 {}
+L 4 150 20 150 40 {}
+L 4 150 30 160 30 {}
+L 4 120 30 130 30 {}
+L 4 90 20 110 20 {}
+L 4 90 40 110 40 {}
+L 4 140 50 140 60 {}
+L 4 170 30 180 30 {}
+B 5 87.5 17.5 92.5 22.5 {name=din
+dir=in}
+B 5 87.5 37.5 92.5 42.5 {name=dB
+dir=in}
+B 5 137.5 57.5 142.5 62.5 {name=ground
+dir=inout}
+B 5 177.5 27.5 182.5 32.5 {name=do
+dir=out}
+P 4 5 110 10 170 10 170 50 110 50 110 10 {}
+T {@name} 110 -5 0 0 0.2 0.2 {}
+T {vin} 95 10 0 0 0.1 0.1 {}
+T {vbias} 90 30 0 0 0.1 0.1 {}
+T {vout} 172.5 20 0 0 0.1 0.1 {}
+T {gnd} 145 55 0 0 0.1 0.1 {}
diff --git a/xschem/sky130_fd_pr.patch b/xschem/sky130_fd_pr.patch
new file mode 100644
index 0000000..84bc6d2
--- /dev/null
+++ b/xschem/sky130_fd_pr.patch
@@ -0,0 +1,902 @@
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ff.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ff.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ff.pm3.spice 2020-11-08 01:33:06.385642949 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ff.pm3.spice 2020-12-08 04:28:01.986577051 +0100
+@@ -27,8 +27,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8__model.0 nmos
+ * Model Flag Parameters
+ + lmin = 2.0e-05 lmax = 0.0001 wmin = 7.0e-06 wmax = 0.0001
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__fs.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__fs.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__fs.pm3.spice 2020-11-08 01:33:06.397642948 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__fs.pm3.spice 2020-12-08 04:28:02.106577048 +0100
+@@ -27,8 +27,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8__model.0 nmos
+ * Model Flag Parameters
+ + lmin = 2.0e-05 lmax = 0.0001 wmin = 7.0e-06 wmax = 0.0001
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__leak.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__leak.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__leak.pm3.spice 2020-11-08 01:33:06.405642948 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__leak.pm3.spice 2020-12-08 04:28:02.122577048 +0100
+@@ -27,8 +27,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8__model.0 nmos
+ * Model Flag Parameters
+ + lmin = 2.0e-05 lmax = 0.0001 wmin = 7.0e-06 wmax = 0.0001
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8.pm3.spice 2020-11-08 01:33:06.373642950 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8.pm3.spice 2020-12-08 04:28:02.126577047 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 1.45e-07 lmax = 1.55e-07 wmin = 1.255e-06 wmax = 1.265e-6
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__sf.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__sf.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__sf.pm3.spice 2020-11-08 01:33:06.413642948 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__sf.pm3.spice 2020-12-08 04:28:02.142577047 +0100
+@@ -27,8 +27,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8__model.0 nmos
+ * Model Flag Parameters
+ + lmin = 2.0e-05 lmax = 0.0001 wmin = 7.0e-06 wmax = 0.0001
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ss.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ss.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ss.pm3.spice 2020-11-08 01:33:06.417642948 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__ss.pm3.spice 2020-12-08 04:28:02.158577047 +0100
+@@ -27,8 +27,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8__model.0 nmos
+ * Model Flag Parameters
+ + lmin = 2.0e-05 lmax = 0.0001 wmin = 7.0e-06 wmax = 0.0001
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__tt_leak.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__tt_leak.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__tt_leak.pm3.spice 2020-11-08 01:33:06.425642947 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__tt_leak.pm3.spice 2020-12-08 04:28:02.298577044 +0100
+@@ -27,8 +27,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8__model.0 nmos
+ * Model Flag Parameters
+ + lmin = 2.0e-05 lmax = 0.0001 wmin = 7.0e-06 wmax = 0.0001
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__tt.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__tt.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__tt.pm3.spice 2020-11-08 01:33:06.421642947 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8/sky130_fd_pr__nfet_01v8__tt.pm3.spice 2020-12-15 13:33:10.243355060 +0100
+@@ -27,8 +27,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8 d g s b sky130_fd_pr__nfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8__model.0 nmos
+ * Model Flag Parameters
+ + lmin = 2.0e-05 lmax = 0.0001 wmin = 7.0e-06 wmax = 0.0001
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__ff.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__ff.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__ff.pm3.spice 2020-11-08 01:33:06.445642946 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__ff.pm3.spice 2020-12-08 04:28:01.710577057 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8_lvt__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 8e-06 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__fs.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__fs.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__fs.pm3.spice 2020-11-08 01:33:06.453642946 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__fs.pm3.spice 2020-12-08 04:28:01.722577057 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8_lvt__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 8e-06 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__leak.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__leak.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__leak.pm3.spice 2020-11-08 01:33:06.457642946 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__leak.pm3.spice 2020-12-08 04:28:01.730577056 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8_lvt__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 8e-06 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt.pm3.spice 2020-11-08 01:33:06.441642947 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt.pm3.spice 2020-12-08 04:28:01.734577056 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8_lvt__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 9.95e-07 lmax = 1.005e-06 wmin = 9.95e-07 wmax = 1.005e-6
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__sf.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__sf.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__sf.pm3.spice 2020-11-08 01:33:06.461642946 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__sf.pm3.spice 2020-12-08 04:28:01.742577056 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8_lvt__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 8e-06 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__ss.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__ss.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__ss.pm3.spice 2020-11-08 01:33:06.465642946 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__ss.pm3.spice 2020-12-08 04:28:01.750577056 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8_lvt__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 8e-06 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__tt_leak.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__tt_leak.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__tt_leak.pm3.spice 2020-11-08 01:33:06.469642945 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__tt_leak.pm3.spice 2020-12-08 04:28:01.966577051 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8_lvt__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 8e-06 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__tt.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__tt.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__tt.pm3.spice 2020-11-08 01:33:06.465642946 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_01v8_lvt/sky130_fd_pr__nfet_01v8_lvt__tt.pm3.spice 2020-12-08 04:28:01.970577051 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_01v8_lvt d g s b sky130_fd_pr__nfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_01v8_lvt__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 8e-06 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/nfet_03v3_nvt/sky130_fd_pr__nfet_03v3_nvt.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_03v3_nvt/sky130_fd_pr__nfet_03v3_nvt.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_03v3_nvt/sky130_fd_pr__nfet_03v3_nvt.pm3.spice 2020-11-08 01:33:06.485642945 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_03v3_nvt/sky130_fd_pr__nfet_03v3_nvt.pm3.spice 2020-12-08 04:28:02.478577040 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_03v3_nvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_03v3_nvt d g s b sky130_fd_pr__nfet_03v3_nvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_03v3_nvt d g s b sky130_fd_pr__nfet_03v3_nvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_03v3_nvt__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 4.95e-07 lmax = 5.05e-07 wmin = 9.995e-06 wmax = 1.0005e-5
+diff -Naur sky130_fd_pr/latest/cells/nfet_05v0_nvt/sky130_fd_pr__nfet_05v0_nvt.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_05v0_nvt/sky130_fd_pr__nfet_05v0_nvt.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_05v0_nvt/sky130_fd_pr__nfet_05v0_nvt.pm3.spice 2020-11-08 01:33:06.501642944 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_05v0_nvt/sky130_fd_pr__nfet_05v0_nvt.pm3.spice 2020-12-08 04:28:02.482577039 +0100
+@@ -32,8 +32,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_05v0_nvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_05v0_nvt d g s b sky130_fd_pr__nfet_05v0_nvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_05v0_nvt d g s b sky130_fd_pr__nfet_05v0_nvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_05v0_nvt__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 1.995e-06 lmax = 2.005e-06 wmin = 9.995e-06 wmax = 1.0005e-5
+diff -Naur sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__ff.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__ff.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__ff.pm3.spice 2020-11-08 01:33:06.621642939 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__ff.pm3.spice 2020-12-08 04:28:02.498577039 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_g5v0d10v5__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 2.0e-05 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__fs.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__fs.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__fs.pm3.spice 2020-11-08 01:33:06.625642939 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__fs.pm3.spice 2020-12-08 04:28:02.510577039 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_g5v0d10v5__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 2.0e-05 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__leak.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__leak.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__leak.pm3.spice 2020-11-08 01:33:06.625642939 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__leak.pm3.spice 2020-12-08 04:28:02.518577039 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_g5v0d10v5__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 2.0e-05 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5.pm3.spice 2020-11-08 01:33:06.617642939 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5.pm3.spice 2020-12-08 04:28:02.522577039 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_g5v0d10v5__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 4.95e-07 lmax = 5.05e-07 wmin = 9.995e-06 wmax = 1.0005e-5
+diff -Naur sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__sf.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__sf.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__sf.pm3.spice 2020-11-08 01:33:06.629642939 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__sf.pm3.spice 2020-12-08 04:28:02.558577038 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_g5v0d10v5__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 2.0e-05 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__ss.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__ss.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__ss.pm3.spice 2020-11-08 01:33:06.629642939 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__ss.pm3.spice 2020-12-08 04:28:02.570577037 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_g5v0d10v5__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 2.0e-05 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__tt_leak.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__tt_leak.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__tt_leak.pm3.spice 2020-11-08 01:33:06.637642938 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__tt_leak.pm3.spice 2020-12-08 04:28:02.594577037 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_g5v0d10v5__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 2.0e-05 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__tt.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__tt.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__tt.pm3.spice 2020-11-08 01:33:06.633642938 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d10v5/sky130_fd_pr__nfet_g5v0d10v5__tt.pm3.spice 2020-12-08 04:28:02.758577033 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__nfet_g5v0d10v5 d g s b sky130_fd_pr__nfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_g5v0d10v5__model.0 nmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 2.0e-05 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/nfet_g5v0d16v0/sky130_fd_pr__nfet_g5v0d16v0.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d16v0/sky130_fd_pr__nfet_g5v0d16v0.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_g5v0d16v0/sky130_fd_pr__nfet_g5v0d16v0.pm3.spice 2020-11-08 01:33:06.653642938 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d16v0/sky130_fd_pr__nfet_g5v0d16v0.pm3.spice 2020-12-08 04:42:22.654557626 +0100
+@@ -35,8 +35,8 @@
+ * }
+ .subckt sky130_fd_pr__nfet_g5v0d16v0__base d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1 delvto = 0.0
+-msky130_fd_pr__nfet_g5v0d16v0__base d g s b sky130_fd_pr__nfet_g5v0d16v0__model_base l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 delvto = 0.0
++msky130_fd_pr__nfet_g5v0d16v0__base d g s b sky130_fd_pr__nfet_g5v0d16v0__model_base l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__nfet_g5v0d16v0__model_base.0 nmos
+ * Model Flag Parameters
+ + lmin = 6.95e-007 lmax = 7.05e-007 wmin = 1.9995e-005 wmax = 2.00005e-5
+diff -Naur sky130_fd_pr/latest/cells/nfet_g5v0d16v0/sky130_fd_pr__nfet_g5v0d16v0__subcircuit.pm3.spice sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d16v0/sky130_fd_pr__nfet_g5v0d16v0__subcircuit.pm3.spice
+--- sky130_fd_pr/latest/cells/nfet_g5v0d16v0/sky130_fd_pr__nfet_g5v0d16v0__subcircuit.pm3.spice 2020-11-08 01:33:06.653642938 +0100
++++ sky130_fd_pr_ngspice/latest/cells/nfet_g5v0d16v0/sky130_fd_pr__nfet_g5v0d16v0__subcircuit.pm3.spice 2020-12-08 04:40:53.082559648 +0100
+@@ -13,11 +13,11 @@
+ * limitations under the License.
+
+ * SKY130 Spice File.
+-.subckt sky130_fd_pr__nfet_g5v0d16v0 d g s b w=5.0 l=0.7 ad=0 as=0 pd=0 ps=0 nrd=0 nrs=0 delvto=0 mf=1 m=1 sa=0.28 sb=2.41 sd=0 mult=1
++.subckt sky130_fd_pr__nfet_g5v0d16v0 d g s b w=5.0 l=0.7 nf=1 ad=0 as=0 pd=0 ps=0 nrd=0 nrs=0 delvto=0 m=1 sa=0.28 sb=2.41 sd=0 mult=1
+ .param sky130_fd_pr__nfet_g5v0d16v0__rdiff=5.906500e+003 sky130_fd_pr__nfet_g5v0d16v0__rdiff_tc1=1.483000e-003 sky130_fd_pr__nfet_g5v0d16v0__rdiff_tc2=7.824000e-006
+ *.param sb_cadfixedvalue_nvhv=2.41
+ .param sb_cadfixedvalue_nvhv=1.585
+-xmain1 d1 g s b sky130_fd_pr__nfet_g5v0d16v0__base w=w l=l ad=0 as=as pd=0 ps=ps nrd=nrd nrs=nrs delvto=delvto m=m mult=mult sa=sa sb=sb_cadfixedvalue_nvhv
++xmain1 d1 g s b sky130_fd_pr__nfet_g5v0d16v0__base w=w l=l nf=nf ad=0 as=as pd=0 ps=ps nrd=nrd nrs=nrs delvto=delvto mult=mult sa=sa sb=sb_cadfixedvalue_nvhv m=m
+ rldd_nvhv d d1 R='(1/w)*sky130_fd_pr__nfet_g5v0d16v0__rdiff*sky130_fd_pr__nfet_g5v0d16v0__rdiff_mult' tc1 = 'sky130_fd_pr__nfet_g5v0d16v0__rdiff_tc1' tc2 = 'sky130_fd_pr__nfet_g5v0d16v0__rdiff_tc2'
+ dnw1 b d sky130_fd_pr__model__parasitic__diode_ps2nw area='ad/2' pj='pd/2'
+ dnw2 b d1 sky130_fd_pr__model__parasitic__diode_ps2nw area='ad/2' pj='pd/2'
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__ff.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__ff.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__ff.pm3.spice 2020-11-08 01:33:06.745642934 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__ff.pm3.spice 2020-12-08 04:28:03.346577020 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__fs.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__fs.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__fs.pm3.spice 2020-11-08 01:33:06.749642933 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__fs.pm3.spice 2020-12-08 04:28:03.354577020 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__leak.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__leak.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__leak.pm3.spice 2020-11-08 01:33:06.749642933 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__leak.pm3.spice 2020-12-08 04:28:03.366577019 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8.pm3.spice 2020-11-08 01:33:06.741642934 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8.pm3.spice 2020-12-08 04:28:03.370577019 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 1.45e-07 lmax = 1.55e-07 wmin = 1.255e-06 wmax = 1.265e-6
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__sf.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__sf.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__sf.pm3.spice 2020-11-08 01:33:06.753642933 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__sf.pm3.spice 2020-12-08 04:28:03.542577016 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__ss.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__ss.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__ss.pm3.spice 2020-11-08 01:33:06.757642933 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__ss.pm3.spice 2020-12-08 04:28:03.550577015 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__tt_leak.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__tt_leak.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__tt_leak.pm3.spice 2020-11-08 01:33:06.761642933 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__tt_leak.pm3.spice 2020-12-08 04:28:03.654577013 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__tt.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__tt.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__tt.pm3.spice 2020-11-08 01:33:06.757642933 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8/sky130_fd_pr__pfet_01v8__tt.pm3.spice 2020-12-08 04:28:03.666577013 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8 d g s b sky130_fd_pr__pfet_01v8__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ff.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ff.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ff.pm3.spice 2020-11-08 01:33:06.785642932 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ff.pm3.spice 2020-12-08 04:28:02.786577033 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_hvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_hvt__model.0 pmos
+ * Model Flag Parameters
+ + lmin = 2.0e-05 lmax = 0.0001 wmin = 7.0e-06 wmax = 0.0001
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__fs.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__fs.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__fs.pm3.spice 2020-11-08 01:33:06.793642932 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__fs.pm3.spice 2020-12-08 04:28:02.810577032 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_hvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_hvt__model.0 pmos
+ * Model Flag Parameters
+ + lmin = 2.0e-05 lmax = 0.0001 wmin = 7.0e-06 wmax = 0.0001
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__leak.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__leak.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__leak.pm3.spice 2020-11-08 01:33:06.797642931 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__leak.pm3.spice 2020-12-08 04:28:02.830577032 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_hvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_hvt__model.0 pmos
+ * Model Flag Parameters
+ + lmin = 2.0e-05 lmax = 0.0001 wmin = 7.0e-06 wmax = 0.0001
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt.pm3.spice 2020-11-08 01:33:06.785642932 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt.pm3.spice 2020-12-08 04:28:02.834577031 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_hvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_hvt__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 1.45e-07 lmax = 1.55e-07 wmin = 1.255e-06 wmax = 1.265e-6
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__sf.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__sf.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__sf.pm3.spice 2020-11-08 01:33:06.801642931 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__sf.pm3.spice 2020-12-08 04:28:02.850577031 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_hvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_hvt__model.0 pmos
+ * Model Flag Parameters
+ + lmin = 2.0e-05 lmax = 0.0001 wmin = 7.0e-06 wmax = 0.0001
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ss.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ss.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ss.pm3.spice 2020-11-08 01:33:06.805642931 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__ss.pm3.spice 2020-12-08 04:28:03.118577025 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_hvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_hvt__model.0 pmos
+ * Model Flag Parameters
+ + lmin = 2.0e-05 lmax = 0.0001 wmin = 7.0e-06 wmax = 0.0001
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__tt_leak.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__tt_leak.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__tt_leak.pm3.spice 2020-11-08 01:33:06.817642930 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__tt_leak.pm3.spice 2020-12-08 04:28:03.134577025 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_hvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_hvt__model.0 pmos
+ * Model Flag Parameters
+ + lmin = 2.0e-05 lmax = 0.0001 wmin = 7.0e-06 wmax = 0.0001
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__tt.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__tt.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__tt.pm3.spice 2020-11-08 01:33:06.809642931 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_hvt/sky130_fd_pr__pfet_01v8_hvt__tt.pm3.spice 2020-12-15 13:33:26.931354344 +0100
+@@ -29,8 +29,9 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_hvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_hvt d g s b sky130_fd_pr__pfet_01v8_hvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
++
+ .model sky130_fd_pr__pfet_01v8_hvt__model.0 pmos
+ * Model Flag Parameters
+ + lmin = 2.0e-05 lmax = 0.0001 wmin = 7.0e-06 wmax = 0.0001
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__ff.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__ff.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__ff.pm3.spice 2020-11-08 01:33:06.833642930 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__ff.pm3.spice 2020-12-08 04:28:03.154577024 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_lvt__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__fs.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__fs.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__fs.pm3.spice 2020-11-08 01:33:06.833642930 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__fs.pm3.spice 2020-12-08 04:28:03.158577024 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_lvt__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__leak.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__leak.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__leak.pm3.spice 2020-11-08 01:33:06.833642930 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__leak.pm3.spice 2020-12-08 04:28:03.310577021 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_lvt__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt.pm3.spice 2020-11-08 01:33:06.829642930 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt.pm3.spice 2020-12-08 04:28:03.310577021 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_lvt__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 9.95e-07 lmax = 1.005e-06 wmin = 9.95e-07 wmax = 1.005e-6
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__sf.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__sf.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__sf.pm3.spice 2020-11-08 01:33:06.837642930 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__sf.pm3.spice 2020-12-08 04:28:03.314577021 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_lvt__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__ss.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__ss.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__ss.pm3.spice 2020-11-08 01:33:06.837642930 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__ss.pm3.spice 2020-12-08 04:28:03.318577021 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_lvt__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__tt_leak.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__tt_leak.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__tt_leak.pm3.spice 2020-11-08 01:33:06.841642929 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__tt_leak.pm3.spice 2020-12-08 04:28:03.326577020 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_lvt__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__tt.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__tt.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__tt.pm3.spice 2020-11-08 01:33:06.841642929 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_lvt/sky130_fd_pr__pfet_01v8_lvt__tt.pm3.spice 2020-12-08 04:28:03.338577020 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_lvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_lvt d g s b sky130_fd_pr__pfet_01v8_lvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_lvt__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 7e-06 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_01v8_mvt/sky130_fd_pr__pfet_01v8_mvt.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_01v8_mvt/sky130_fd_pr__pfet_01v8_mvt.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_01v8_mvt/sky130_fd_pr__pfet_01v8_mvt.pm3.spice 2020-11-08 01:33:06.857642929 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_01v8_mvt/sky130_fd_pr__pfet_01v8_mvt.pm3.spice 2020-12-08 04:28:03.338577020 +0100
+@@ -31,8 +31,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_01v8_mvt d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_01v8_mvt d g s b sky130_fd_pr__pfet_01v8_mvt__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_01v8_mvt d g s b sky130_fd_pr__pfet_01v8_mvt__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_01v8_mvt__model.0 pmos
+ * Model Flag Parameters
+ + lmin = 1.45e-007 lmax = 1.55e-007 wmin = 1.675e-006 wmax = 1.685e-6
+diff -Naur sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__ff.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__ff.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__ff.pm3.spice 2020-11-08 01:33:06.897642927 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__ff.pm3.spice 2020-12-08 04:28:03.678577012 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_g5v0d10v5__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 2.0e-05 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__fs.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__fs.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__fs.pm3.spice 2020-11-08 01:33:06.897642927 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__fs.pm3.spice 2020-12-08 04:28:03.738577011 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_g5v0d10v5__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 2.0e-05 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__leak.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__leak.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__leak.pm3.spice 2020-11-08 01:33:06.901642927 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__leak.pm3.spice 2020-12-08 04:28:03.750577011 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_g5v0d10v5__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 2.0e-05 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5.pm3.spice 2020-11-08 01:33:06.893642927 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5.pm3.spice 2020-12-08 04:28:03.754577011 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_g5v0d10v5__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 4.95e-07 lmax = 5.05e-07 wmin = 9.995e-06 wmax = 1.0005e-5
+diff -Naur sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__sf.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__sf.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__sf.pm3.spice 2020-11-08 01:33:06.901642927 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__sf.pm3.spice 2020-12-08 04:28:03.954577006 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_g5v0d10v5__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 2.0e-05 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__ss.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__ss.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__ss.pm3.spice 2020-11-08 01:33:06.905642927 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__ss.pm3.spice 2020-12-08 04:28:03.962577006 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_g5v0d10v5__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 2.0e-05 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__tt_leak.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__tt_leak.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__tt_leak.pm3.spice 2020-11-08 01:33:06.909642927 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__tt_leak.pm3.spice 2020-12-08 04:28:03.978577006 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_g5v0d10v5__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 2.0e-05 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__tt.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__tt.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__tt.pm3.spice 2020-11-08 01:33:06.905642927 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d10v5/sky130_fd_pr__pfet_g5v0d10v5__tt.pm3.spice 2020-12-08 04:28:03.986577005 +0100
+@@ -29,8 +29,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_g5v0d10v5 d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1.0
+-msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1
++msky130_fd_pr__pfet_g5v0d10v5 d g s b sky130_fd_pr__pfet_g5v0d10v5__model l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_g5v0d10v5__model.0 pmos
+ * DC IV MOS Parameters
+ + lmin = 2.0e-05 lmax = 1.0e-04 wmin = 2.0e-05 wmax = 1.0e-4
+diff -Naur sky130_fd_pr/latest/cells/pfet_g5v0d16v0/sky130_fd_pr__pfet_g5v0d16v0.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d16v0/sky130_fd_pr__pfet_g5v0d16v0.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_g5v0d16v0/sky130_fd_pr__pfet_g5v0d16v0.pm3.spice 2020-11-08 01:33:06.921642926 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d16v0/sky130_fd_pr__pfet_g5v0d16v0.pm3.spice 2020-12-08 04:51:45.270544928 +0100
+@@ -35,8 +35,8 @@
+ * }
+ .subckt sky130_fd_pr__pfet_g5v0d16v0__base d g s b
+ +
+-.param l = 1 w = 1 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 nf = 1 delvto = 0.0
+-msky130_fd_pr__pfet_g5v0d16v0__base d g s b sky130_fd_pr__pfet_g5v0d16v0__model_base l = {l} w = {w} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd} nf = {nf}
++.param l = 1 w = 1 nf = 1.0 ad = 0 as = 0 pd = 0 ps = 0 nrd = 0 nrs = 0 sa = 0 sb = 0 sd = 0 mult = 1 delvto = 0.0
++msky130_fd_pr__pfet_g5v0d16v0__base d g s b sky130_fd_pr__pfet_g5v0d16v0__model_base l = {l} w = {w} nf = {nf} ad = {ad} as = {as} pd = {pd} ps = {ps} nrd = {nrd} nrs = {nrs} sa = {sa} sb = {sb} sd = {sd}
+ .model sky130_fd_pr__pfet_g5v0d16v0__model_base.0 pmos
+ * Model Flag Parameters
+ + lmin = 0.655e-06 lmax = 0.665e-06 wmin = 4.990000e-006 wmax = 5.010000e-5
+diff -Naur sky130_fd_pr/latest/cells/pfet_g5v0d16v0/sky130_fd_pr__pfet_g5v0d16v0__subcircuit.pm3.spice sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d16v0/sky130_fd_pr__pfet_g5v0d16v0__subcircuit.pm3.spice
+--- sky130_fd_pr/latest/cells/pfet_g5v0d16v0/sky130_fd_pr__pfet_g5v0d16v0__subcircuit.pm3.spice 2020-11-08 01:33:06.921642926 +0100
++++ sky130_fd_pr_ngspice/latest/cells/pfet_g5v0d16v0/sky130_fd_pr__pfet_g5v0d16v0__subcircuit.pm3.spice 2020-12-17 04:20:00.185221141 +0100
+@@ -13,13 +13,13 @@
+ * limitations under the License.
+
+ * SKY130 Spice File.
+-.subckt sky130_fd_pr__pfet_g5v0d16v0 d g s b w=5.0 l=0.66 ad=0 as=0 pd=0 ps=0.0 m=1 mf=1 nrd=0 nrs=0 sa=0.28 sb=1.19 sd=0 mult=1
++.subckt sky130_fd_pr__pfet_g5v0d16v0 d g s b w=5.0 l=0.66 nf=1 ad=0 as=0 pd=0 ps=0.0 m=1 nrd=0 nrs=0 sa=0.28 sb=1.19 sd=0 mult=1
+ .param rdiff='8.900000e+003*sky130_fd_pr__pfet_g5v0d16v0__rdiff_mult'
+ .param rdiff_tc1=2.500000e-003
+ .param rdiff_tc2=2.200000e-006
+ .param sb_cadfixedvalue_pvhv=1.19
+ * sd intentionally left out for sky130_fd_pr__pfet_g5v0d16v0 devices because poly-poly spacing not uniform in DE FET
+-xmain1 d1 g s b sky130_fd_pr__pfet_g5v0d16v0__base w=w l=l ad=0 as=as pd=0 ps=ps nrd=nrd nrs=nrs m=m mult=mult sa=sa sb=sb_cadfixedvalue_pvhv
++xmain1 d1 g s b sky130_fd_pr__pfet_g5v0d16v0__base w=w l=l nf=nf ad=0 as=as pd=0 ps=ps nrd=nrd nrs=nrs m=m mult=mult sa=sa sb=sb_cadfixedvalue_pvhv
+ rldd d d1 '(1/w)*rdiff' tc1 = 'rdiff_tc1' tc2 = 'rdiff_tc2'
+ dnw1 d b sky130_fd_pr__pfet_g5v0d16v0__parasitic__diode_pw2dn area='ad/2' pj='pd/2'
+ dnw2 d1 b sky130_fd_pr__pfet_g5v0d16v0__parasitic__diode_pw2dn area='ad/2' pj='pd/2'
+diff -Naur sky130_fd_pr/latest/models/r+c.mrp1monte.spice sky130_fd_pr_ngspice/latest/models/r+c.mrp1monte.spice
+--- sky130_fd_pr/latest/models/r+c.mrp1monte.spice 2020-11-08 01:33:32.389641833 +0100
++++ sky130_fd_pr_ngspice/latest/models/r+c.mrp1monte.spice 2020-12-20 02:30:18.289349469 +0100
+@@ -30,6 +30,6 @@
+ .param w = 1 l = 0 mult = 1 r = 0 tc1 = {tc1rsgpu*sky130_fd_pr__res_generic_po__tc1_slope} tc2 = {tc2rsgpu*sky130_fd_pr__res_generic_po__tc2_slope}
+ + rp1_mm = {rp1*sky130_fd_pr__res_generic_po__slope/sqrt(2.0*l*w*mult+rp1/100000.0)}
+ + r_tot = {(rp1+rp1_mm)*l/(w-1e6*(-tol_poly-poly_dw))+r}
+-sky130_fd_pr__res_generic_po r0 r1 sky130_fd_pr__res_generic_po__monte r = {r_tot} tc1r = {tc1} tc2r = {tc2}
++rsky130_fd_pr__res_generic_po r0 r1 sky130_fd_pr__res_generic_po__monte r = {r_tot} tc1 = {tc1} tc2 = {tc2}
+ .model sky130_fd_pr__res_generic_po__monte r tref = 30.0
+ .ends sky130_fd_pr__res_generic_po
diff --git a/xschem/tb_detectorASK.spice b/xschem/tb_detectorASK.spice
new file mode 100644
index 0000000..4e89503
--- /dev/null
+++ b/xschem/tb_detectorASK.spice
@@ -0,0 +1,55 @@
+** sch_path: /home/wisla/sky130_skel/Myschematics/Receptor/EnvelopeDetector/tb_detectorASK.sch
+**.subckt tb_detectorASK
+X1 ask vb GND out detectorPassivo
+V1 vb GND 0.9
+X2 ask GND askMod
+**** begin user architecture code
+
+
+.tran 1e-10 100u
+.control
+ run
+ plot out
+.endc
+
+
+
+.lib /edatools/pdks/skywater-pdk/libraries/sky130_fd_pr_ngspice/latest/models/sky130.lib.spice tt
+
+**** end user architecture code
+**.ends
+
+* expanding symbol: /home/wisla/sky130_skel/Myschematics/detectorPassivo.sym # of pins=4
+** sym_path: /home/wisla/sky130_skel/Myschematics/detectorPassivo.sym
+** sch_path: /home/wisla/sky130_skel/Myschematics/detectorPassivo.sch
+.subckt detectorPassivo din dB ground do
+*.ipin din
+*.ipin dB
+*.opin do
+*.iopin gnd
+XM1 net1 dB gnd gnd sky130_fd_pr__nfet_01v8 L=0.15 W=9 nf=1 ad='int((nf+1)/2) * W/nf * 0.29' as='int((nf+2)/2) * W/nf * 0.29'
++ pd='2*int((nf+1)/2) * (W/nf + 0.29)' ps='2*int((nf+2)/2) * (W/nf + 0.29)' nrd='0.29 / W' nrs='0.29 / W'
++ sa=0 sb=0 sd=0 mult=1 m=1
+XC3 do gnd sky130_fd_pr__cap_mim_m3_2 W=22 L=22 VM=1 m=1
+XR2 do net1 gnd sky130_fd_pr__res_xhigh_po W=0.35 L=17.5 mult=1 m=1
+XC1 din net1 sky130_fd_pr__cap_mim_m3_2 W=87 L=87 VM=1 m=1
+.ends
+
+
+* expanding symbol: /home/wisla/sky130_skel/Myschematics/Receptor/EnvelopeDetector/askMod.sym #
+*+ of pins=2
+** sym_path: /home/wisla/sky130_skel/Myschematics/Receptor/EnvelopeDetector/askMod.sym
+** sch_path: /home/wisla/sky130_skel/Myschematics/Receptor/EnvelopeDetector/askMod.sch
+.subckt askMod ask ground
+*.opin ask
+*.iopin gnd
+XM2 carrier DS ask gnd sky130_fd_pr__nfet_01v8 L=0.15 W=1 nf=1 ad='int((nf+1)/2) * W/nf * 0.29' as='int((nf+2)/2) * W/nf * 0.29'
++ pd='2*int((nf+1)/2) * (W/nf + 0.29)' ps='2*int((nf+2)/2) * (W/nf + 0.29)' nrd='0.29 / W' nrs='0.29 / W'
++ sa=0 sb=0 sd=0 mult=1 m=1
+R1 ask gnd 10 m=1
+V3 DS gnd PULSE(0 1.8 100n 100n 100n 32u 64u)
+V1 carrier gnd sin(0 500m 2e9)
+.ends
+
+.GLOBAL GND
+.end
