Merge with feature/autochop

Author: FranzBangar

classy_blocks.code-workspace

@@ -12,7 +12,10 @@
             "Pylance",
             "scipy"
         ],
-        "editor.autoClosingBrackets": "never"
+        "editor.autoClosingBrackets": "never",
+        "isort.importStrategy": "fromEnvironment",
+        "editor.defaultFormatter": null,
+        "ruff.organizeImports": false
     },
     "extensions": {
         "recommendations": [

examples/advanced/edge_grading.py

@@ -1,3 +1,5 @@
+# NOT FINISHED!
+# TODO: add operation.grade_edge() and show its usage in this example
 import os
 
 import classy_blocks as cb

examples/advanced/autograding_highre.py renamed to examples/advanced/smooth_grader.py

@@ -1,14 +1,23 @@
+# A terrible blocking of a rectangle for displaying SmoothGrader capabilities
+
 import os
 
+import numpy as np
+
 import classy_blocks as cb
-from classy_blocks.grading.autograding.grader import HighReGrader
 
 mesh = cb.Mesh()
 
 base = cb.Grid([0, 0, 0], [3, 2, 0], 3, 2)
 
 shape = cb.ExtrudedShape(base, 1)
+
+# turn one block around to test grader's skillz
+shape.grid[1][0].rotate(np.pi, [0, 0, 1])
+
 mesh.add(shape)
+
+# move some points to get a mesh with uneven blocks
 mesh.assemble()
 finder = cb.GeometricFinder(mesh)
 
@@ -19,11 +28,8 @@
     vertex.translate([0, 0.8, 0])
 
 mesh.set_default_patch("walls", "wall")
-
-# TODO: Hack! mesh.assemble() won't work here but wires et. al. must be updated
 mesh.block_list.update()
-
-grader = HighReGrader(mesh, 0.05)
+grader = cb.SmoothGrader(mesh, 0.05)
 grader.grade()
 
 mesh.write(os.path.join("..", "case", "system", "blockMeshDict"), debug_path="debug.vtk")

examples/chaining/labyrinth.py

@@ -2,7 +2,6 @@
 from typing import List
 
 import classy_blocks as cb
-from classy_blocks.grading.autograding.grader import FixedCountGrader
 from classy_blocks.util import functions as f
 
 mesh = cb.Mesh()
@@ -34,7 +33,7 @@
 
 mesh.set_default_patch("walls", "wall")
 
-grader = FixedCountGrader(mesh, 5)
+grader = cb.FixedCountGrader(mesh, 5)
 grader.grade()
 
 mesh.write(os.path.join("..", "case", "system", "blockMeshDict"), debug_path="debug.vtk")

examples/chaining/tank.py

@@ -1,7 +1,6 @@
 import os
 
 import classy_blocks as cb
-from classy_blocks.grading.autograding.grader import SimpleGrader
 
 # a cylindrical tank with round end caps
 diameter = 0.5
@@ -25,7 +24,7 @@
 mesh.add(start_cap)
 mesh.add(end_cap)
 
-grader = SimpleGrader(mesh, 0.05)
+grader = cb.SimpleGrader(mesh, 0.05)
 grader.grade()
 
 mesh.write(os.path.join("..", "case", "system", "blockMeshDict"), debug_path="debug.vtk")

examples/optimization/duct.py

@@ -28,12 +28,10 @@
 
 optimizer.optimize(tolerance=0.01)
 
-# Quick'n'dirty chopping, don't do this at home
-for operation in shape.operations:
-    for axis in range(3):
-        operation.chop(axis, count=10)
-
 mesh.add(shape)
 
+grader = cb.SmoothGrader(mesh, 0.08)
+grader.grade()
+
 mesh.set_default_patch("walls", "wall")
 mesh.write(os.path.join("..", "case", "system", "blockMeshDict"), debug_path="debug.vtk")

examples/shape/custom.py

@@ -69,5 +69,8 @@ def add_edges(self) -> None:
 mesh.add(shape)
 mesh.assemble()
 
+grader = cb.SmoothGrader(mesh, 0.03)
+grader.grade(take="max")
+
 mesh.set_default_patch("walls", "wall")
 mesh.write(os.path.join("..", "case", "system", "blockMeshDict"), debug_path="debug.vtk")

examples/shape/cylinder.py

@@ -2,7 +2,6 @@
 
 import classy_blocks as cb
 from classy_blocks.construct.flat.sketches.disk import DiskBase
-from classy_blocks.grading.autograding.grader import HighReGrader
 
 DiskBase.core_ratio = 0.4  # Default is 0.8
 
@@ -23,21 +22,19 @@
 # remove them with this method:
 cylinder.remove_inner_edges(start=False, end=True)
 
-bl_thickness = 0.05
-core_size = 0.2
+bl_thickness = 1e-3
+core_size = 0.1
 
 # manual grading
 # cylinder.chop_axial(count=30)
 # cylinder.chop_radial(start_size=core_size, end_size=bl_thickness)
 # cylinder.chop_tangential(start_size=core_size)
 
 mesh.add(cylinder)
-
-mesh.assemble()
-mesh.block_list.update()
+mesh.modify_patch("walls", "wall")
 
 # automatic grading
-grader = HighReGrader(mesh, 0.1)
+grader = cb.SmoothGrader(mesh, 0.1)
 grader.grade()
 
 mesh.write(os.path.join("..", "case", "system", "blockMeshDict"), debug_path="debug.vtk")

examples/shape/quarter_cylinder.py

@@ -2,7 +2,6 @@
 
 import classy_blocks as cb
 from classy_blocks.construct.flat.sketches.disk import QuarterDisk
-from classy_blocks.grading.autograding.grader import HighReGrader
 from classy_blocks.util import functions as f
 
 mesh = cb.Mesh()
@@ -21,7 +20,7 @@
 
 mesh.assemble()
 
-grader = HighReGrader(mesh, 0.05)
+grader = cb.SmoothGrader(mesh, 0.05)
 grader.grade()
 
 mesh.set_default_patch("walls", "wall")

src/classy_blocks/__init__.py

@@ -32,6 +32,9 @@
 from .construct.shapes.shell import Shell
 from .construct.shapes.sphere import Hemisphere
 from .construct.stack import ExtrudedStack, RevolvedStack, TransformedStack
+from .grading.autograding.fixed.grader import FixedCountGrader
+from .grading.autograding.simple.grader import SimpleGrader
+from .grading.autograding.smooth.grader import SmoothGrader
 from .mesh import Mesh
 from .modify.find.geometric import GeometricFinder
 from .modify.find.shape import RoundSolidFinder
@@ -123,4 +126,7 @@
     "ViewpointReorienter",
     "Wedge",
     "WrappedDisk",
+    "FixedCountGrader",
+    "SimpleGrader",
+    "SmoothGrader",
 ]