Skip to content

Commit a5de8ab

Browse files
committed
mesh output type chose removed
1 parent e861710 commit a5de8ab

File tree

3 files changed

+10
-27
lines changed

3 files changed

+10
-27
lines changed

ceasiompy/CPACS2GMSH/__specs__.py

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
GMSH_MESH_SIZE_FACTOR_FUSELAGE_XPATH,
2222
GMSH_MESH_SIZE_FACTOR_WINGS_XPATH,
2323
GMSH_MESH_TYPE_XPATH,
24-
GMSH_MESH_FORMAT_XPATH,
2524
GMSH_NUMBER_LAYER_XPATH,
2625
GMSH_H_FIRST_LAYER_XPATH,
2726
GMSH_MAX_THICKNESS_LAYER_XPATH,
@@ -184,8 +183,8 @@
184183
cpacs_inout.add_input(
185184
var_name="max_layer_thickness",
186185
var_type=float,
187-
default_value=10,
188-
unit="[cm]",
186+
default_value=100,
187+
unit="[mm]",
189188
descr="The maximum allowed absolute thickness of the prismatic layer.",
190189
xpath=GMSH_MAX_THICKNESS_LAYER_XPATH,
191190
gui=True,
@@ -241,18 +240,6 @@
241240
gui_group="RANS options",
242241
)
243242

244-
cpacs_inout.add_input(
245-
var_name="type_output_penta",
246-
var_type=list,
247-
default_value=["su2", "cgns", "sml"],
248-
unit="1",
249-
descr="Choice between the file type generated by pentagrow",
250-
xpath=GMSH_MESH_FORMAT_XPATH,
251-
gui=True,
252-
gui_name="Choice the output file type",
253-
gui_group="RANS options",
254-
)
255-
256243
cpacs_inout.add_input(
257244
var_name="export_propellers",
258245
var_type=bool,
@@ -274,7 +261,7 @@
274261
xpath=GMSH_N_POWER_FACTOR_XPATH,
275262
gui=True,
276263
gui_name="n power factor",
277-
gui_group="Advanced mesh parameters",
264+
gui_group="Advanced Euler mesh parameters",
278265
)
279266

280267
cpacs_inout.add_input(
@@ -286,7 +273,7 @@
286273
xpath=GMSH_N_POWER_FIELD_XPATH,
287274
gui=True,
288275
gui_name="n power field",
289-
gui_group="Advanced mesh parameters",
276+
gui_group="Advanced Euler mesh parameters",
290277
)
291278

292279
cpacs_inout.add_input(
@@ -298,7 +285,7 @@
298285
xpath=GMSH_REFINE_FACTOR_XPATH,
299286
gui=True,
300287
gui_name="LE/TE refinement factor",
301-
gui_group="Advanced mesh parameters",
288+
gui_group="Advanced Euler mesh parameters",
302289
)
303290
cpacs_inout.add_input(
304291
var_name="refine_truncated",
@@ -309,7 +296,7 @@
309296
xpath=GMSH_REFINE_TRUNCATED_XPATH,
310297
gui=True,
311298
gui_name="Refine truncated TE",
312-
gui_group="Advanced mesh parameters",
299+
gui_group="Advanced Euler mesh parameters",
313300
)
314301

315302
cpacs_inout.add_input(
@@ -322,7 +309,7 @@
322309
xpath=GMSH_AUTO_REFINE_XPATH,
323310
gui=True,
324311
gui_name="Auto refine",
325-
gui_group="Advanced mesh parameters",
312+
gui_group="Advanced Euler mesh parameters",
326313
)
327314

328315
cpacs_inout.add_input(

ceasiompy/CPACS2GMSH/cpacs2gmsh.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
GMSH_GROWTH_RATIO_XPATH,
6161
GMSH_MIN_MAX_MESH_SIZE_XPATH,
6262
GMSH_FEATURE_ANGLE_XPATH,
63-
GMSH_MESH_FORMAT_XPATH,
6463
)
6564
from cpacspy.cpacsfunctions import create_branch, get_value_or_default
6665
from cpacspy.cpacspy import CPACS
@@ -118,7 +117,6 @@ def cpacs2gmsh(cpacs_path, cpacs_out_path):
118117
growth_ratio = get_value_or_default(cpacs.tixi, GMSH_GROWTH_RATIO_XPATH, 1.2)
119118
min_max_mesh_factor = get_value_or_default(cpacs.tixi, GMSH_MIN_MAX_MESH_SIZE_XPATH, 5)
120119
feature_angle = get_value_or_default(cpacs.tixi, GMSH_FEATURE_ANGLE_XPATH, 40)
121-
type_output_penta = get_value_or_default(cpacs.tixi, GMSH_MESH_FORMAT_XPATH, "su2")
122120

123121
# Run mesh generation
124122
if type_mesh == "Euler":
@@ -156,7 +154,7 @@ def cpacs2gmsh(cpacs_path, cpacs_out_path):
156154
brep_dir,
157155
results_dir,
158156
open_gmsh=open_gmsh,
159-
min_max_mesh_factor=min_max_mesh_factor
157+
min_max_mesh_factor=min_max_mesh_factor,
160158
)
161159

162160
if gmesh_path.exists():
@@ -171,7 +169,6 @@ def cpacs2gmsh(cpacs_path, cpacs_out_path):
171169
growth_factor=growth_factor,
172170
growth_ratio=growth_ratio,
173171
feature_angle=feature_angle,
174-
type_output_penta=type_output_penta
175172
)
176173
if mesh_path.exists():
177174
create_branch(cpacs.tixi, SU2MESH_XPATH)

ceasiompy/CPACS2GMSH/func/RANS_mesh_generator.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ def pentagrow_3d_mesh(
261261
growth_factor,
262262
growth_ratio,
263263
feature_angle,
264-
type_output_penta,
265264
) -> None:
266265
# create the config file for pentagrow
267266
config_penta_path = Path(result_dir, "config.cfg")
@@ -271,10 +270,10 @@ def pentagrow_3d_mesh(
271270
FeatureAngle = feature_angle
272271
InitialHeight = h_first_layer * (10**-5)
273272
MaxGrowthRatio = growth_ratio
274-
MaxLayerThickness = max_layer_thickness
273+
MaxLayerThickness = max_layer_thickness / 10
275274
FarfieldRadius = fuselage_maxlen * farfield_factor * 100
276275
FarfieldCenter = "0.0 0.0 0.0"
277-
OutputFormat = type_output_penta
276+
OutputFormat = "su2"
278277
HolePosition = "0.0 0.0 0.0"
279278
TetgenOptions = "-pq1.3VY"
280279
TetGrowthFactor = growth_factor

0 commit comments

Comments
 (0)