Add medge as output mesh

ceasiompy/CPACS2GMSH/cpacs2gmsh.py

@@ -46,6 +46,7 @@
     GMSH_REFINE_TRUNCATED_XPATH,
     GMSH_SYMMETRY_XPATH,
     SU2MESH_XPATH,
+    EDGE_MESH_XPATH,
 )
 from cpacspy.cpacsfunctions import create_branch, get_value_or_default
 from cpacspy.cpacspy import CPACS
@@ -98,7 +99,7 @@ def cpacs2gmsh(cpacs_path, cpacs_out_path):
 
     # Run mesh generation
     export_brep(cpacs, brep_dir, (intake_percent, exhaust_percent))
-    mesh_path, _ = generate_gmsh(
+    su2mesh_path, _, cgnsmesh_path = generate_gmsh(
         cpacs,
         cpacs_path,
         brep_dir,
@@ -119,11 +120,16 @@ def cpacs2gmsh(cpacs_path, cpacs_out_path):
         testing_gmsh=False,
     )
 
-    if mesh_path.exists():
+    if su2mesh_path.exists():
         create_branch(cpacs.tixi, SU2MESH_XPATH)
-        cpacs.tixi.updateTextElement(SU2MESH_XPATH, str(mesh_path))
+        cpacs.tixi.updateTextElement(SU2MESH_XPATH, str(su2mesh_path))
         log.info("SU2 Mesh has been correctly generated.")
 
+    if cgnsmesh_path.exists():
+        create_branch(cpacs.tixi, EDGE_MESH_XPATH)
+        cpacs.tixi.updateTextElement(EDGE_MESH_XPATH, str(cgnsmesh_path))
+        log.info("EDGE Mesh has been correctly generated.")
+
     # Save CPACS
     cpacs.save_cpacs(cpacs_out_path, overwrite=True)
 

ceasiompy/CPACS2GMSH/func/generategmesh.py

@@ -694,7 +694,6 @@ def generate_gmsh(
     domain_length = farfield_factor * max(model_dimensions)
     farfield = gmsh.model.occ.addSphere(*model_center, domain_length)
     gmsh.model.occ.synchronize()
-
     ext_domain = [(3, farfield)]
 
     if symmetry:
@@ -714,7 +713,6 @@ def generate_gmsh(
 
     _, children_dimtag = gmsh.model.occ.fragment(ext_domain, parts_parent_dimtag)
     gmsh.model.occ.synchronize()
-
     log.info("Fragment operation finished")
 
     # fragment produce fragments_dimtag and children_dimtag
@@ -1111,7 +1109,11 @@ def generate_gmsh(
     if not testing_gmsh:
         gmsh.clear()
         gmsh.finalize()
-    return su2mesh_path, aircraft_parts
+    return (
+        su2mesh_path,
+        aircraft_parts,
+        cgnsmesh_path,
+    )
 
 
 # =================================================================================================

ceasiompy/CPACS2GMSH/func/mesh_sizing.py

@@ -3,7 +3,7 @@
 
 Developed by CFS ENGINEERING, 1015 Lausanne, Switzerland
 
-This script contains different functions to classify and manipulate wing elements
+This script contains different functions to classify and manipulate wing and fuselage elements
 
 Python version: >=3.8
 
@@ -35,6 +35,8 @@
 
 
 def fuselage_size(cpacs_path):
+    """Function to get the measure of the fuselage and to obtain a good mesh size"""
+
     tixi = open_tixi(cpacs_path)
     if tixi.checkElement(FUSELAGES_XPATH):
         fus_cnt = tixi.getNamedChildrenCount(FUSELAGES_XPATH, "fuselage")
@@ -178,6 +180,8 @@ def fuselage_size(cpacs_path):
 
         # Get overall minimum radius (semi-minor axis for ellipse)
         min_radius = min(min_radius, height, width)
+        if min_radius == 0:
+            min_radius = 0.0001
 
     mean_circ = sum(circ_list) / len(circ_list)
 
@@ -186,12 +190,14 @@ def fuselage_size(cpacs_path):
     fuselage_minlen = min(0.1 * fuselage_maxlen, min_radius / 2)
 
     log.info(f"Fuselage maxlen={fuselage_maxlen:.3f} m")
-    log.info(f"Fuselage minlen={fuselage_minlen:.3f} m")
+    log.info(f"Fuselage minlen={fuselage_minlen:.4f} m")
 
     return fuselage_maxlen, fuselage_minlen
 
 
 def wings_size(cpacs_path):
+    """Function to get the measure of the wing and to obtain a good mesh size"""
+
     tixi = open_tixi(cpacs_path)
     if tixi.checkElement(WINGS_XPATH):
         wing_cnt = tixi.getNamedChildrenCount(WINGS_XPATH, "wing")
@@ -283,6 +289,6 @@ def wings_size(cpacs_path):
     wing_minlen = 0.08 * wing_maxlen
 
     log.info(f"Wing maxlen={wing_maxlen:.3f} m")
-    log.info(f"Wing minlen={wing_minlen:.3f} m")
+    log.info(f"Wing minlen={wing_minlen:.4f} m")
 
     return wing_maxlen, wing_minlen

ceasiompy/CPACS2GMSH/tests/test_generatemesh.py

@@ -213,7 +213,7 @@ def test_assignation():
 
     export_brep(cpacs, TEST_OUT_PATH)
 
-    _, aircraft_parts = generate_gmsh(
+    _, aircraft_parts, _ = generate_gmsh(
         cpacs=cpacs,
         cpacs_path=CPACS_IN_PATH,
         brep_dir=TEST_OUT_PATH,

ceasiompy/CPACS2GMSH/tests/test_wingclassification.py

@@ -231,7 +231,7 @@ def test_classify_wing():
 
     export_brep(cpacs, TEST_OUT_PATH)
 
-    _, aircraft_parts = generate_gmsh(
+    _, aircraft_parts, _ = generate_gmsh(
         cpacs=cpacs,
         cpacs_path=CPACS_IN_PATH,
         brep_dir=TEST_OUT_PATH,

ceasiompy/EdgeRun/README.md

@@ -0,0 +1,40 @@
+
+<img align="right" height="70" src="../../documents/logos/CEASIOMpy_banner_main.png">
+
+# ModuleTemplate
+
+**Categories:** Template module, Example, Illustration
+
+**State**: :heavy_check_mark:
+
+This is a template module. Its purpose is to illustrate how other modules of CEASIOMpy should be structured, set up and documented.
+
+<p align="center">
+<img height="160" src="files/Spirit_of_St._Louis.jpg">
+</p>
+
+Example picture. Image in the public domain, from [Wikimedia Commons](https://commons.wikimedia.org/wiki/File:Spirit_of_St._Louis.jpg)
+
+## Inputs
+
+ModuleTemplate needs no inputs.
+
+## Analyses
+
+ModuleTemplate computes nothing.
+
+## Outputs
+
+ModuleTemplate outputs nothing.
+
+## Installation or requirements
+
+ModuleTemplate is a native CEASIOMpy module, hence it is available and installed by default.
+
+## Limitations
+
+ModuleTemplate is limited in every aspect.
+
+## More information
+
+* <https://en.wikipedia.org/wiki/Spirit_of_St._Louis>

ceasiompy/EdgeRun/ToolInput/.keep

@@ -0,0 +1 @@
+

ceasiompy/EdgeRun/__specs__.py

@@ -0,0 +1,222 @@
+from pathlib import Path
+
+from ceasiompy.utils.commonxpath import (
+    AEROPERFORMANCE_XPATH,
+    GEOM_XPATH,
+    RANGE_XPATH,
+    REF_XPATH,
+    EDGE_AEROMAP_UID_XPATH,
+    EDGE_CFL_NB_XPATH,
+    EDGE_FIXED_CL_XPATH,
+    EDGE_MAX_ITER_XPATH,
+    EDGE_MG_LEVEL_XPATH,
+    EDGE_NB_CPU_XPATH,
+    EDGE_MESH_XPATH,
+    EDGE_SOLVER_XPATH,
+    EDGE_ABOC_XPATH,
+)
+from ceasiompy.utils.moduleinterfaces import CPACSInOut
+
+# ===== Module Status =====
+# True if the module is active
+# False if the module is disabled (not working or not ready)
+module_status = True
+
+# ===== Results directory path =====
+
+RESULTS_DIR = Path("Results", "EdgeRun")
+
+# ===== CPACS inputs and outputs =====
+
+cpacs_inout = CPACSInOut()
+
+# ----- Input -----
+
+cpacs_inout.add_input(
+    var_name="aeromap_uid",
+    var_type=list,
+    default_value=None,
+    unit=None,
+    descr="Name of the aero map to calculate",
+    xpath=EDGE_AEROMAP_UID_XPATH,
+    gui=True,
+    gui_name="__AEROMAP_SELECTION",
+    gui_group="Aeromap settings",
+)
+
+cpacs_inout.add_input(
+    var_name="ref_len",
+    var_type=float,
+    default_value=None,
+    unit="m",
+    descr="Reference length of the aircraft",
+    xpath=REF_XPATH + "/length",
+    gui=False,
+    gui_name=None,
+    gui_group=None,
+)
+
+cpacs_inout.add_input(
+    var_name="ref_area",
+    var_type=float,
+    default_value=None,
+    unit="m^2",
+    descr="Reference area of the aircraft",
+    xpath=REF_XPATH + "/area",
+    gui=False,
+    gui_name=None,
+    gui_group=None,
+)
+
+for direction in ["x", "y", "z"]:
+    cpacs_inout.add_input(
+        var_name=f"ref_ori_moment_{direction}",
+        var_type=float,
+        default_value=0.0,
+        unit="m",
+        descr=f"Fuselage scaling on {direction} axis",
+        xpath=REF_XPATH + f"/point/{direction}",
+        gui=False,
+        gui_name=None,
+        gui_group=None,
+    )
+
+cpacs_inout.add_input(
+    var_name="cruise_mach",
+    var_type=float,
+    default_value=0.78,
+    unit="1",
+    descr="Aircraft cruise Mach number",
+    xpath=RANGE_XPATH + "/cruiseMach",
+    gui=False,
+    gui_name="Cruise Mach",
+    gui_group="If fixed CL",
+)
+
+cpacs_inout.add_input(
+    var_name="cruise_alt",
+    var_type=float,
+    default_value=120000.0,
+    unit="m",
+    descr="Aircraft cruise altitude",
+    xpath=RANGE_XPATH + "/cruiseAltitude",
+    gui=False,
+    gui_name="Cruise Altitude",
+    gui_group="If fixed CL",
+)
+
+cpacs_inout.add_input(
+    var_name="fixed_cl",
+    var_type=str,
+    default_value="NO",
+    unit="-",
+    descr="FIXED_CL_MODE parameter for SU2",
+    xpath=EDGE_FIXED_CL_XPATH,
+    gui=False,
+    gui_name=None,
+    gui_group=None,
+)
+
+cpacs_inout.add_input(
+    var_name="nb_proc",
+    var_type=int,
+    default_value=64,
+    unit="1",
+    descr="Number of proc to use to run EDGE",
+    xpath=EDGE_NB_CPU_XPATH,
+    gui=True,
+    gui_name="Nb of processor",
+    gui_group="CPU",
+)
+
+cpacs_inout.add_input(
+    var_name="max_iter",
+    var_type=int,
+    default_value=200,
+    unit="1",
+    descr="Maximum number of iterations performed by EDGE",
+    xpath=EDGE_MAX_ITER_XPATH,
+    gui=True,
+    gui_name="Maximum iterations",
+    gui_group="EDGE Parameters",
+)
+
+cpacs_inout.add_input(
+    var_name="cfl_nb",
+    var_type=float,
+    default_value=1.0,
+    unit="1",
+    descr="CFL Number, Courant–Friedrichs–Lewy condition",
+    xpath=EDGE_CFL_NB_XPATH,
+    gui=False,
+    gui_name="CFL Number",
+    gui_group="EDGE Parameters",
+)
+
+cpacs_inout.add_input(
+    var_name="mg_level",
+    var_type=int,
+    default_value=1,
+    unit="1",
+    descr="Multi-grid level (0 = no multigrid)",
+    xpath=EDGE_MG_LEVEL_XPATH,
+    gui=True,
+    gui_name="Multigrid Level",
+    gui_group="EDGE Parameters",
+)
+
+cpacs_inout.add_input(
+    var_name="calculation_type",
+    var_type=list,
+    default_value=["Euler", "RANS"],
+    unit="1",
+    descr="Chose if perform a RANS or an Euler calculation",
+    xpath=EDGE_SOLVER_XPATH,
+    gui=True,
+    gui_name="Solver for calculation",
+    gui_group="EDGE parameters",
+)
+
+cpacs_inout.add_input(
+    var_name="EDGE_mesh_path",
+    var_type="pathtype",
+    default_value="-",
+    unit="1",
+    descr="Absolute path of the EDGE mesh",
+    xpath=EDGE_MESH_XPATH,
+    gui=True,
+    gui_name="EDGE Mesh",
+    gui_group="Inputs",
+)
+
+cpacs_inout.add_input(
+    var_name="EDGE_ABOC_path",
+    var_type="pathtype",
+    default_value="-",
+    unit="1",
+    descr="Absolute path of the EDGE Boundary Condition file",
+    xpath=EDGE_ABOC_XPATH,
+    gui=True,
+    gui_name="EDGE ABOC",
+    gui_group="Inputs",
+)
+
+# ----- Output -----
+
+cpacs_inout.add_output(
+    var_name="wetted_area",
+    var_type=float,
+    default_value=None,
+    unit="m^2",
+    descr="Aircraft wetted area calculated by EDGE",
+    xpath=GEOM_XPATH + "/analyses/wettedArea",
+)
+
+cpacs_inout.add_output(
+    var_name="aeromap_EDGE",  # name to change...
+    # var_type=CPACS_aeroMap, # no type pour output, would it be useful?
+    default_value=None,
+    unit="-",
+    descr="aeroMap with aero coefficients calculated by EDGE",
+    xpath=AEROPERFORMANCE_XPATH + "/aeroMap/aeroPerformanceMap",
+)