Clean up some nasty leftovers

Author: FranzBangar

examples/complex/airfoil/airfoil.py

@@ -38,7 +38,7 @@
 FILE_NAME = "naca2414.dat"
 ANGLE_OF_ATTACK = 20  # in degrees
 CHORD = 0.5  # desired chord (provided the one from points is 1)
-OPTIMIZE = False  # Set to False to skip optimization
+OPTIMIZE = True  # Set to False to skip optimization
 
 CELL_SIZE = 0.025
 BL_THICKNESS = 0.001  # thickness of boundary layer cells

src/classy_blocks/grading/chop.py

@@ -49,7 +49,6 @@ def get_possible_combinations() -> List["ChopRelation"]:
 class ChopData:
     """A collection of results from Chop.calculate()"""
 
-    # TODO: combine with Chop? (not the same thing, though?)
     length_ratio: float
     start_size: float
     c2c_expansion: float
@@ -122,24 +121,3 @@ def calculate(self, length: float) -> ChopData:
                     calculated.add(output)
 
         raise ValueError(f"Could not calculate count and grading for given parameters: {data}")
-
-    def copy(self, length: float) -> "Chop":
-        """Returns a new Chop with same count but different
-        total_expansion, keeping the 'preserve'd value constant;
-        'length' argument refers to the original length (not the copied-to)"""
-        this_def = dataclasses.asdict(self)
-        this_data = dataclasses.asdict(self.calculate(length))
-        preserve_value = this_data[self.preserve]
-
-        # create a copy of this Chop with equal count but
-        # set other parameters from current data so that
-        # the correct start/end size or c2c is maintained"""
-        new_args = this_data
-        new_args["count"] = this_data["count"]
-
-        for arg in ["total_expansion", "c2c_expansion", "start_size", "end_size"]:
-            new_args[arg] = None
-
-        new_args[this_def["preserve"]] = preserve_value
-
-        return Chop(**new_args)

src/classy_blocks/grading/grading.py

@@ -86,7 +86,7 @@ def get_specification(self, inverted: bool) -> List[GradingSpecType]:
         return [data.get_specification(inverted) for data in chops]
 
     @property
-    def specification(self) -> List[GradingSpecType]:  # TODO: type this
+    def specification(self) -> List[GradingSpecType]:
         # a list of [length_ratio, count, total_expansion] for each chop
         return self.get_specification(self.inverted)
 

src/classy_blocks/items/wires/axis.py

@@ -6,7 +6,7 @@
 from classy_blocks.items.vertex import Vertex
 from classy_blocks.items.wires.manager import WireManager
 from classy_blocks.items.wires.wire import Wire
-from classy_blocks.types import AxisType, ChopTakeType
+from classy_blocks.types import AxisType
 
 
 class Axis:
@@ -47,17 +47,6 @@ def is_aligned(self, other: "Axis") -> bool:
 
         raise RuntimeError("Axes are not neighbours")
 
-    def get_length(self, take: ChopTakeType) -> float:
-        lengths = [wire.length for wire in self.wires]
-
-        if take == "max":
-            return max(lengths)
-
-        if take == "min":
-            return min(lengths)
-
-        return sum(lengths) / len(lengths)
-
     def grade(self) -> None:
         if self.is_defined:
             return
@@ -67,37 +56,39 @@ def grade(self) -> None:
             self.wires.propagate_gradings()
             return
 
-        # TODO: improve
-        if len(self.chops) > 0:
-            # create Grading from chops, if there are any
-            wires_by_length = list(sorted(self.wires, key=lambda w: w.length))
-            grading = Grading(0)
-            for chop in self.chops:
-                grading.add_chop(chop)
+        if len(self.chops) == 0:
+            # nothing to work with
+            return
 
+        # create Grading from chops, if there are any
+        grading = Grading(0)
+        for chop in self.chops:
+            grading.add_chop(chop)
+
+        take = self.chops[0].take
+
+        if take == "avg":
+            # make a fake grading with an average length,
+            # calculate count from it, then copy it with the same
+            # count to all wires
+            avg_length = sum([w.length for w in self.wires]) / 4
+            grading.length = avg_length
+            for wire in self.wires:
+                wire.grading = grading.copy(wire.length, False)
+        else:
+            # take a specific wire
+            wires_by_length = list(sorted(self.wires, key=lambda w: w.length))
             if self.chops[0].take == "max":
                 # chop the longest wire, then propagate
                 wire = wires_by_length[-1]
-                wire.grading = grading
-                wire.update()
-                # copy grading to all wires in this axis
-                self.wires.propagate_gradings()
-            elif self.chops[0].take == "min":
-                # chop the shortest wire, then propagate
+            else:  # "min"
                 wire = wires_by_length[0]
-                wire.grading = grading
-                wire.update()
-                # copy grading to all wires in this axis
-                self.wires.propagate_gradings()
-            else:
-                # make a fake grading with an average length,
-                # calculate count from it, then copy it with the same
-                # count to all wires
-                avg_length = sum([w.length for w in self.wires]) / 4
-                grading.length = avg_length
-                for wire in self.wires:
-                    wire.grading = grading.copy(wire.length, False)
-                    wire.copy_to_coincidents()
+
+            wire.grading = grading
+            wire.update()
+
+        # copy grading to all wires in this axis
+        self.wires.propagate_gradings()
 
     @property
     def is_defined(self) -> bool:

src/classy_blocks/items/wires/manager.py

@@ -65,7 +65,7 @@ def propagate_gradings(self) -> None:
         if defined is None:
             raise UndefinedGradingsError("Can't propagate: no defined wires")
 
-        for wire in self.undefined:
+        for wire in self.wires:
             wire.grading = defined.grading.copy(wire.length, False)
             wire.copy_to_coincidents()