Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ def SurfaceEdgeRefinement_to_edges(obj: SurfaceEdgeRefinement):


# pylint: disable=invalid-name
def SurfaceRefinement_to_faces(obj: SurfaceRefinement, global_max_edge_length):
def SurfaceRefinement_to_faces(
obj: SurfaceRefinement, global_max_edge_length, global_curvature_resolution_angle
):
"""
Translate SurfaceRefinement to faces.
"""
Expand All @@ -74,6 +76,11 @@ def SurfaceRefinement_to_faces(obj: SurfaceRefinement, global_max_edge_length):
if obj.max_edge_length is not None
else global_max_edge_length.value.item()
),
"curvatureResolutionAngle": (
obj.curvature_resolution_angle.to("degree").value.item()
if obj.curvature_resolution_angle is not None
else global_curvature_resolution_angle.to("degree").value.item()
),
}


Expand Down Expand Up @@ -532,6 +539,7 @@ def legacy_mesher_json(input_params: SimulationParams):
SurfaceRefinement,
translation_func=SurfaceRefinement_to_faces,
translation_func_global_max_edge_length=input_params.meshing.defaults.surface_max_edge_length,
translation_func_global_curvature_resolution_angle=input_params.meshing.defaults.curvature_resolution_angle,
use_sub_item_as_key=True,
)

Expand Down
30 changes: 20 additions & 10 deletions tests/simulation/translator/ref/surface_meshing/airplane.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,44 @@
{
"faces": {
"body01_face001": {
"maxEdgeLength": 1.5
"maxEdgeLength": 1.5,
"curvatureResolutionAngle": 15.0
},
"body01_face002": {
"maxEdgeLength": 1.5
"maxEdgeLength": 1.5,
"curvatureResolutionAngle": 15.0
},
"body01_face003": {
"maxEdgeLength": 1.5
"maxEdgeLength": 1.5,
"curvatureResolutionAngle": 15.0
},
"body01_face004": {
"maxEdgeLength": 1.5
"maxEdgeLength": 1.5,
"curvatureResolutionAngle": 15.0
},
"body01_face005": {
"maxEdgeLength": 0.7000000000000001
"maxEdgeLength": 0.7000000000000001,
"curvatureResolutionAngle": 15.0
},
"body01_face006": {
"maxEdgeLength": 0.7000000000000001
"maxEdgeLength": 0.7000000000000001,
"curvatureResolutionAngle": 15.0
},
"body01_face007": {
"maxEdgeLength": 0.7000000000000001
"maxEdgeLength": 0.7000000000000001,
"curvatureResolutionAngle": 15.0
},
"body01_face008": {
"maxEdgeLength": 0.5
"maxEdgeLength": 0.5,
"curvatureResolutionAngle": 15.0
},
"body01_face009": {
"maxEdgeLength": 0.5
"maxEdgeLength": 0.5,
"curvatureResolutionAngle": 15.0
},
"body01_face010": {
"maxEdgeLength": 0.5
"maxEdgeLength": 0.5,
"curvatureResolutionAngle": 15.0
}
},
"curvatureResolutionAngle": 15.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
},
"faces": {
"body01_face001": {
"maxEdgeLength": 0.14
"maxEdgeLength": 0.14,
"curvatureResolutionAngle": 10
}
},
"boundaries": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
},
"faces": {
"body01_face001": {
"maxEdgeLength": 0.14
"maxEdgeLength": 0.14,
"curvatureResolutionAngle": 10
}
},
"boundaries": {
Expand Down
9 changes: 6 additions & 3 deletions tests/simulation/translator/ref/surface_meshing/rotor.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,16 @@
},
"faces": {
"body01_face001": {
"maxEdgeLength": 10
"maxEdgeLength": 10,
"curvatureResolutionAngle": 15
},
"body01_face002": {
"maxEdgeLength": 10
"maxEdgeLength": 10,
"curvatureResolutionAngle": 15
},
"body01_face003": {
"maxEdgeLength": 0.1
"maxEdgeLength": 0.1,
"curvatureResolutionAngle": 15
}
},
"boundaries": {
Expand Down
Loading