From 1e01bae927498e73845efef363d996bf2553dde6 Mon Sep 17 00:00:00 2001
From: GBenedett <giacomo.benedetti@cfse.ch>
Date: Tue, 16 Jan 2024 13:00:05 +0100
Subject: [PATCH] if euler removed

---
 ceasiompy/CPACS2GMSH/__specs__.py          | 13 ---------
 ceasiompy/CPACS2GMSH/cpacs2gmsh.py         |  3 --
 ceasiompy/CPACS2GMSH/func/generategmesh.py | 32 ++++++++--------------
 ceasiompy/EdgeRun/__specs__.py             |  2 +-
 ceasiompy/utils/commonxpath.py             |  1 -
 5 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/ceasiompy/CPACS2GMSH/__specs__.py b/ceasiompy/CPACS2GMSH/__specs__.py
index 9edbd0349..cdefcd57c 100644
--- a/ceasiompy/CPACS2GMSH/__specs__.py
+++ b/ceasiompy/CPACS2GMSH/__specs__.py
@@ -16,7 +16,6 @@
     GMSH_OPEN_GUI_XPATH,
     GMSH_REFINE_TRUNCATED_XPATH,
     GMSH_REFINE_FACTOR_XPATH,
-    GMSH_EULER_XPATH,
     GMSH_SYMMETRY_XPATH,
     SU2MESH_XPATH,
     GMSH_MESH_SIZE_FACTOR_FUSELAGE_XPATH,
@@ -64,18 +63,6 @@
     gui_group="General options",
 )
 
-cpacs_inout.add_input(
-    var_name="euler",
-    var_type=bool,
-    default_value=True,
-    unit="1",
-    descr="Create a farfield",
-    xpath=GMSH_EULER_XPATH,
-    gui=True,
-    gui_name="Domain for euler calculation",
-    gui_group="Domain",
-)
-
 cpacs_inout.add_input(
     var_name="symmetry",
     var_type=bool,
diff --git a/ceasiompy/CPACS2GMSH/cpacs2gmsh.py b/ceasiompy/CPACS2GMSH/cpacs2gmsh.py
index 7a2a80e01..648a849da 100644
--- a/ceasiompy/CPACS2GMSH/cpacs2gmsh.py
+++ b/ceasiompy/CPACS2GMSH/cpacs2gmsh.py
@@ -44,7 +44,6 @@
     GMSH_OPEN_GUI_XPATH,
     GMSH_REFINE_FACTOR_XPATH,
     GMSH_REFINE_TRUNCATED_XPATH,
-    GMSH_EULER_XPATH,
     GMSH_SYMMETRY_XPATH,
     SU2MESH_XPATH,
 )
@@ -79,7 +78,6 @@ def cpacs2gmsh(cpacs_path, cpacs_out_path):
     # Retrieve value from the GUI Setting
     open_gmsh = get_value_or_default(cpacs.tixi, GMSH_OPEN_GUI_XPATH, False)
     farfield_factor = get_value_or_default(cpacs.tixi, GMSH_FARFIELD_FACTOR_XPATH, 6)
-    euler = get_value_or_default(cpacs.tixi, GMSH_EULER_XPATH, True)
     symmetry = get_value_or_default(cpacs.tixi, GMSH_SYMMETRY_XPATH, False)
     farfield_size_factor = get_value_or_default(cpacs.tixi, GMSH_MESH_SIZE_FARFIELD_XPATH, 17)
     n_power_factor = get_value_or_default(cpacs.tixi, GMSH_N_POWER_FACTOR_XPATH, 2)
@@ -107,7 +105,6 @@ def cpacs2gmsh(cpacs_path, cpacs_out_path):
         results_dir,
         open_gmsh=open_gmsh,
         farfield_factor=farfield_factor,
-        euler=euler,
         symmetry=symmetry,
         farfield_size_factor=farfield_size_factor,
         n_power_factor=n_power_factor,
diff --git a/ceasiompy/CPACS2GMSH/func/generategmesh.py b/ceasiompy/CPACS2GMSH/func/generategmesh.py
index 1a809c0ab..49b0ecdae 100644
--- a/ceasiompy/CPACS2GMSH/func/generategmesh.py
+++ b/ceasiompy/CPACS2GMSH/func/generategmesh.py
@@ -567,7 +567,6 @@ def generate_gmsh(
     results_dir,
     open_gmsh=False,
     farfield_factor=6,
-    euler=False,
     symmetry=False,
     farfield_size_factor=10,
     n_power_factor=2,
@@ -693,12 +692,9 @@ def generate_gmsh(
     ]
 
     domain_length = farfield_factor * max(model_dimensions)
-
-    if euler:
-        farfield = gmsh.model.occ.addSphere(*model_center, domain_length)
-        gmsh.model.occ.synchronize()
-
-        ext_domain = [(3, farfield)]
+    farfield = gmsh.model.occ.addSphere(*model_center, domain_length)
+    gmsh.model.occ.synchronize()
+    ext_domain = [(3, farfield)]
 
     if symmetry:
         log.info("Preparing: symmetry operation")
@@ -715,14 +711,9 @@ def generate_gmsh(
 
     log.info("Start fragment operation between the aircraft and the farfield")
 
-    if euler:
-        _, children_dimtag = gmsh.model.occ.fragment(ext_domain, parts_parent_dimtag)
-        gmsh.model.occ.synchronize()
-
-        log.info("Fragment operation finished")
-
-    else:
-        _, child_dimtag = parts_parent_dimtag
+    _, 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
 
@@ -919,13 +910,12 @@ def generate_gmsh(
         symmetry_group = gmsh.model.addPhysicalGroup(2, symmetry_surfaces_tags)
         gmsh.model.setPhysicalName(2, symmetry_group, "symmetry")
 
-    if euler:
-        farfield = gmsh.model.addPhysicalGroup(2, farfield_surfaces_tags)
-        gmsh.model.setPhysicalName(2, farfield, "Farfield")
+    farfield = gmsh.model.addPhysicalGroup(2, farfield_surfaces_tags)
+    gmsh.model.setPhysicalName(2, farfield, "Farfield")
 
-        # Fluid domain
-        ps = gmsh.model.addPhysicalGroup(3, final_domain.volume_tag)
-        gmsh.model.setPhysicalName(3, ps, final_domain.uid)
+    # Fluid domain
+    ps = gmsh.model.addPhysicalGroup(3, final_domain.volume_tag)
+    gmsh.model.setPhysicalName(3, ps, final_domain.uid)
 
     gmsh.model.occ.synchronize()
     log.info("Markers for SU2 generated")
diff --git a/ceasiompy/EdgeRun/__specs__.py b/ceasiompy/EdgeRun/__specs__.py
index 4b701e752..9e62bdc26 100644
--- a/ceasiompy/EdgeRun/__specs__.py
+++ b/ceasiompy/EdgeRun/__specs__.py
@@ -38,7 +38,7 @@
 
 # ===== Results directory path =====
 
-RESULTS_DIR = Path("Results", "MEDGE")
+RESULTS_DIR = Path("Results", "EdgeRun")
 
 # ===== CPACS inputs and outputs =====
 
diff --git a/ceasiompy/utils/commonxpath.py b/ceasiompy/utils/commonxpath.py
index ff2334924..5a68497e2 100644
--- a/ceasiompy/utils/commonxpath.py
+++ b/ceasiompy/utils/commonxpath.py
@@ -94,7 +94,6 @@
 # GMSH
 GMSH_XPATH = MESH_XPATH + "/gmshOptions"
 GMSH_OPEN_GUI_XPATH = GMSH_XPATH + "/open_gui"
-GMSH_EULER_XPATH = GMSH_XPATH + "/euler"
 GMSH_SYMMETRY_XPATH = GMSH_XPATH + "/symmetry"
 GMSH_EXPORT_PROP_XPATH = GMSH_XPATH + "/exportPropellers"
 GMSH_FARFIELD_FACTOR_XPATH = GMSH_XPATH + "/farfield_factor"