Merge branch 'supply_routing' of https://github.com/VLSIDA/PrivateRAM into supply_routing

compiler/gdsMill/gdsMill/vlsiLayout.py

@@ -308,9 +308,6 @@ class VlsiLayout:
                 if layerNumber not in self.layerNumbersInUse:
                     self.layerNumbersInUse.append(layerNumber)
 
-    #   if debug: print("DEBUG: vlsilayout: Using %d layers")
-
-
         #add a reference to the new layout structure in this layout's root
         layoutToAddSref = GdsSref()
         layoutToAddSref.sName = StructureName
@@ -337,7 +334,6 @@ class VlsiLayout:
                 layoutToAddSref.transFlags = [1,0,0]
             if mirror == "y" or mirror == "MY": #NOTE: "MY" option will override specified rotate angle
                 layoutToAddSref.transFlags = [1,1,0]
-                #layoutToAddSref.transFlags = [1,0,0]
                 layoutToAddSref.rotateAngle = 180.0
             if mirror == "xy" or mirror == "XY": #NOTE: "XY" option will override specified rotate angle
                 layoutToAddSref.transFlags = [0,1,0]

compiler/router/router.py

@@ -221,7 +221,6 @@ class router:
         """
 
         shapes = self.layout.getAllShapesInStructureList(layer_num)
-
         for boundary in shapes:
             ll = vector(boundary[0],boundary[1])
             ur = vector(boundary[2],boundary[3])
@@ -229,7 +228,6 @@ class router:
             new_pin = pin_layout("blockage{}".format(len(self.blockages)),rect,layer_num)
             self.blockages.append(new_pin)
         
-        
         # for boundary in self.layout.structures[sref].boundaries:
         #     coord_trans = self.translate_coordinates(boundary.coordinates, mirr, angle, xyShift)
         #     shape_coords = self.min_max_coord(coord_trans)
@@ -481,6 +479,7 @@ class router:
                                 layer="text",
                                 offset=shape[0],
                                 zoom=0.05)
+
         for blockage in self.blockages:
             self.cell.add_rect(layer="boundary",
                                offset=blockage.ll(),