Changed the extracted output from magic for diodes from "D" components to "X" subcircuits. This makes them compatible with the combined models. However, it will require a change to the original model files to add subcircuits to allow the old models to behave the same as the continuous models.
diff --git a/VERSION b/VERSION index 93ad932..215b77b 100644 --- a/VERSION +++ b/VERSION
@@ -1 +1 @@ -1.0.470 +1.0.471
diff --git a/sky130/magic/sky130.tech b/sky130/magic/sky130.tech index 5fd5a94..a6b28f6 100644 --- a/sky130/magic/sky130.tech +++ b/sky130/magic/sky130.tech
@@ -6589,15 +6589,15 @@ device resistor sky130_fd_pr__res_generic_po mrp1 *poly # NOTE: SkyWater diode models have bizarre units requiring bizarre scaling - device pdiode sky130_fd_pr__diode_pd2nw_05v5 *pdiode nwell a=area*1E12 p=pj*1E6 - device pdiode sky130_fd_pr__diode_pd2nw_05v5_lvt *pdiodelvt nwell a=area*1E12 p=pj*1E6 - device pdiode sky130_fd_pr__diode_pd2nw_05v5_hvt *pdiodehvt nwell a=area*1E12 p=pj*1E6 - device pdiode sky130_fd_pr__diode_pd2nw_11v0 *mvpdiode nwell a=area*1E12 p=pj*1E6 + device subcircuit sky130_fd_pr__diode_pd2nw_05v5 *pdiode nwell a=area*1E12 p=perim*1E6 + device subcircuit sky130_fd_pr__diode_pd2nw_05v5_lvt *pdiodelvt nwell a=area*1E12 p=perim*1E6 + device subcircuit sky130_fd_pr__diode_pd2nw_05v5_hvt *pdiodehvt nwell a=area*1E12 p=perim*1E6 + device subcircuit sky130_fd_pr__diode_pd2nw_11v0 *mvpdiode nwell a=area*1E12 p=perim*1E6 - device ndiode sky130_fd_pr__diode_pw2nd_05v5 *ndiode pwell,space/w a=area*1E12 p=pj*1E6 - device ndiode sky130_fd_pr__diode_pw2nd_05v5_lvt *ndiodelvt pwell,space/w a=area*1E12 p=pj*1E6 - device ndiode sky130_fd_pr__diode_pw2nd_05v5_nvt *nndiode pwell,space/w a=area*1E12 p=pj*1E6 - device ndiode sky130_fd_pr__diode_pw2nd_11v0 *mvndiode pwell,space/w a=area*1E12 p=pj*1E6 + device msubcircuit sky130_fd_pr__diode_pw2nd_05v5 *ndiode pwell,space/w a=area*1E12 p=perim*1E6 + device msubcircuit sky130_fd_pr__diode_pw2nd_05v5_lvt *ndiodelvt pwell,space/w a=area*1E12 p=perim*1E6 + device msubcircuit sky130_fd_pr__diode_pw2nd_05v5_nvt *nndiode pwell,space/w a=area*1E12 p=perim*1E6 + device msubcircuit sky130_fd_pr__diode_pw2nd_11v0 *mvndiode pwell,space/w a=area*1E12 p=perim*1E6 #ifdef RERAM device csubcircuit sky130_fd_pr_reram__reram_cell reram m1 a=area_ox