Merge branch 'wip/engine' into development

Author: FranzBangar

.gitignore

@@ -79,6 +79,7 @@ coverage.xml
 *.py,cover
 .hypothesis/
 .pytest_cache/
+tests/outputs
 
 # Translations
 *.mo

examples/advanced/merged.py

@@ -40,4 +40,4 @@
 mesh.merge_patches("cylinder_master", "cylinder_slave")
 mesh.set_default_patch("walls", "wall")
 
-mesh.write(os.path.join("..", "case", "system", "blockMeshDict"))
+mesh.write(os.path.join("..", "case", "system", "blockMeshDict"), debug_path="debug.vtk")

examples/advanced/smooth_grader.py

@@ -24,11 +24,11 @@
 move_points = [[0, 1, 1], [2, 1, 1], [3, 1, 1]]
 
 for point in move_points:
-    vertex = list(finder.find_in_sphere(point))[0]
+    vertex = next(iter(finder.find_in_sphere(point)))
     vertex.translate([0, 0.8, 0])
 
 mesh.set_default_patch("walls", "wall")
-mesh.block_list.update()
+
 grader = cb.SmoothGrader(mesh, 0.05)
 grader.grade()
 

examples/complex/cyclone/cyclone.py

@@ -152,5 +152,5 @@ def mirror_region(region: Region):
 
 mesh.set_default_patch("walls", "wall")
 mesh.add_geometry(geometry.surfaces)
-mesh.settings["scale"] = params.MESH_SCALE
+mesh.settings.scale = params.MESH_SCALE
 mesh.write(os.path.join("..", "..", "case", "system", "blockMeshDict"), debug_path="debug.vtk")

examples/operation/channel.py

@@ -44,5 +44,5 @@
 mesh.add(right_block)
 
 mesh.set_default_patch("walls", "wall")
-mesh.settings["scale"] = SCALE
+mesh.settings.scale = SCALE
 mesh.write(os.path.join("..", "case", "system", "blockMeshDict"))

examples/optimization/duct.py

@@ -7,8 +7,8 @@
 
 mesh = cb.Mesh()
 
-start_sketch = cb.SplineDisk([0, 0, 0], [2.5, 0, 0], [0, 1, 0], 0, 0)
-end_sketch = cb.SplineDisk([0, 0, 0], [1, 0, 0], [0, 2.5, 0], 0, 0).translate([0, 0, 1])
+start_sketch = cb.SplineDisk([0, 0, 0], [2, 0, 0], [0, 1, 0], 0, 0)
+end_sketch = cb.SplineDisk([0, 0, 0], [1, 0, 0], [0, 2, 0], 0, 0).translate([0, 0, 1])
 
 shape = cb.LoftedShape(start_sketch, end_sketch)
 

examples/shape/cylinder.py

@@ -4,9 +4,9 @@
 
 mesh = cb.Mesh()
 
-axis_point_1 = [0.0, 0.0, 0.0]
-axis_point_2 = [5.0, 5.0, 0.0]
-radius_point_1 = [0.0, 0.0, 2.0]
+axis_point_1 = [0, 0, 0]
+axis_point_2 = [0, 0, 1]
+radius_point_1 = [1, 0, 0]
 
 cylinder = cb.Cylinder(axis_point_1, axis_point_2, radius_point_1)
 

examples/shape/frustum.py

@@ -1,4 +1,5 @@
 import os
+
 import numpy as np
 
 import classy_blocks as cb
@@ -24,18 +25,16 @@
 cylinder = cb.Cylinder.chain(frustum, 6, start_face=True)
 
 pos = cylinder.sketch_1.positions
-pos[:9] += np.array([-0.3,0,0])
+pos[:9] += np.array([-0.3, 0, 0])
 cylinder.sketch_1.update(pos)
 cylinder.sketch_1.add_edges()
 
 pos = frustum.sketch_1.positions
-pos[:9] += np.array([-0.3,0,0])
+pos[:9] += np.array([-0.3, 0, 0])
 frustum.sketch_1.update(pos)
 frustum.sketch_1.add_edges()
 
 
-
-
 cylinder.set_end_patch("inlet")
 frustum.set_outer_patch("walls")
 cylinder.set_outer_patch("walls")
@@ -48,5 +47,5 @@
 
 mesh.add(cylinder)
 mesh.add(frustum)
+mesh.modify_patch("walls", "wall")
 mesh.write(os.path.join("..", "case", "system", "blockMeshDict"), debug_path="debug.vtk")
-

pyproject.toml

@@ -7,7 +7,7 @@ license = { file = "LICENSE" }
 keywords = ["classy_blocks", "OpenFOAM", "blockMesh"]
 authors = [{ name = "Nejc Jurkovic", email = "kandelabr@gmail.com" }]
 requires-python = ">=3.8"
-dependencies = ["numpy", "scipy", "nptyping"]
+dependencies = ["numpy", "scipy", "nptyping", "numba"]
 
 [project.urls]
 "Homepage" = "https://github.com/damogranlabs/classy_blocks"

src/classy_blocks/__init__.py

@@ -44,7 +44,7 @@
 from .optimize.clamps.free import FreeClamp
 from .optimize.clamps.surface import ParametricSurfaceClamp, PlaneClamp
 from .optimize.links import LinkBase, RotationLink, SymmetryLink, TranslationLink
-from .optimize.optimizer import MeshOptimizer, SketchOptimizer
+from .optimize.optimizer import MeshOptimizer, ShapeOptimizer, SketchOptimizer
 from .optimize.smoother import MeshSmoother, SketchSmoother
 
 __all__ = [
@@ -113,6 +113,7 @@
     "Scaling",
     "SemiCylinder",
     "Shape",
+    "ShapeOptimizer",
     "Shear",
     "Shell",
     "SimpleGrader",