diff --git a/ceasiompy/CPACS2GMSH/README.md b/ceasiompy/CPACS2GMSH/README.md index 2311a666e..c9aeeaed5 100644 --- a/ceasiompy/CPACS2GMSH/README.md +++ b/ceasiompy/CPACS2GMSH/README.md @@ -87,8 +87,8 @@ The maximum allowed absolute thickness of the prismatic layer. Growth factor between edge lengths of coincident tetrahedra *`Feature angle: 80 grad` Whenever the dihedral angle of two triangle is smaller than this limit, the resulting edge is understood to represent an actual geometrical feature. Larger angles are treated as resulting from approximation of curved surfaces by linear triangles -*`Max and min mesh size: 5 ` - Minimum and maximum mesh size factor compare to the aircraft largest dimension +*`Surface mesh size: 5 ` + Surface mesh size factor compared to the aircraft largest dimension, omogeneus everywhere Advanced mesh parameters : diff --git a/ceasiompy/CPACS2GMSH/__specs__.py b/ceasiompy/CPACS2GMSH/__specs__.py index 0c046e236..c9b6235e9 100644 --- a/ceasiompy/CPACS2GMSH/__specs__.py +++ b/ceasiompy/CPACS2GMSH/__specs__.py @@ -26,7 +26,7 @@ GMSH_MAX_THICKNESS_LAYER_XPATH, GMSH_GROWTH_FACTOR_XPATH, GMSH_GROWTH_RATIO_XPATH, - GMSH_MIN_MAX_MESH_SIZE_XPATH, + GMSH_SURFACE_MESH_SIZE_XPATH, GMSH_FEATURE_ANGLE_XPATH, ) from ceasiompy.utils.moduleinterfaces import CPACSInOut @@ -229,14 +229,14 @@ ) cpacs_inout.add_input( - var_name="size_mesh_factor", + var_name="surface_mesh_factor", var_type=float, default_value=5, unit="[10^-3]", - descr="Mesh size factor compared to aircraft largest dimension (omogeneus everywhere)", - xpath=GMSH_MIN_MAX_MESH_SIZE_XPATH, + descr="Surface mesh size factor compared to aircraft largest dimension (omogeneus everywhere)", + xpath=GMSH_SURFACE_MESH_SIZE_XPATH, gui=True, - gui_name="Mesh size", + gui_name="Surface mesh size", gui_group="RANS options", ) diff --git a/ceasiompy/CPACS2GMSH/cpacs2gmsh.py b/ceasiompy/CPACS2GMSH/cpacs2gmsh.py index b7da8ffa3..92bf67828 100644 --- a/ceasiompy/CPACS2GMSH/cpacs2gmsh.py +++ b/ceasiompy/CPACS2GMSH/cpacs2gmsh.py @@ -58,7 +58,7 @@ GMSH_MAX_THICKNESS_LAYER_XPATH, GMSH_GROWTH_FACTOR_XPATH, GMSH_GROWTH_RATIO_XPATH, - GMSH_MIN_MAX_MESH_SIZE_XPATH, + GMSH_SURFACE_MESH_SIZE_XPATH, GMSH_FEATURE_ANGLE_XPATH, ) from cpacspy.cpacsfunctions import create_branch, get_value_or_default @@ -115,7 +115,7 @@ def cpacs2gmsh(cpacs_path, cpacs_out_path): max_layer_thickness = get_value_or_default(cpacs.tixi, GMSH_MAX_THICKNESS_LAYER_XPATH, 10) growth_factor = get_value_or_default(cpacs.tixi, GMSH_GROWTH_FACTOR_XPATH, 1.4) growth_ratio = get_value_or_default(cpacs.tixi, GMSH_GROWTH_RATIO_XPATH, 1.2) - min_max_mesh_factor = get_value_or_default(cpacs.tixi, GMSH_MIN_MAX_MESH_SIZE_XPATH, 5) + min_max_mesh_factor = get_value_or_default(cpacs.tixi, GMSH_SURFACE_MESH_SIZE_XPATH, 5) feature_angle = get_value_or_default(cpacs.tixi, GMSH_FEATURE_ANGLE_XPATH, 40) # Run mesh generation diff --git a/ceasiompy/utils/commonxpath.py b/ceasiompy/utils/commonxpath.py index 906e4703f..42dec376b 100644 --- a/ceasiompy/utils/commonxpath.py +++ b/ceasiompy/utils/commonxpath.py @@ -119,7 +119,7 @@ GMSH_MAX_THICKNESS_LAYER_XPATH = GMSH_XPATH + "/max_thickness_layer" GMSH_GROWTH_FACTOR_XPATH = GMSH_XPATH + "/growth_factor" GMSH_GROWTH_RATIO_XPATH = GMSH_XPATH + "/growth_ratio" -GMSH_MIN_MAX_MESH_SIZE_XPATH = GMSH_XPATH + "min_max_mesh_factor" +GMSH_SURFACE_MESH_SIZE_XPATH = GMSH_XPATH + "min_max_mesh_factor" GMSH_FEATURE_ANGLE_XPATH = GMSH_XPATH + "/feature_angle" # SU2