Merge branch 'medge_integration' of https://github.com/cfsengineering…

…/CEASIOMpy into medge_integration
cfsengineering · Jan 22, 2024 · a81c52a · a81c52a
2 parents 5e0900d + eb5adbe
commit a81c52a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/ceasiompy/EdgeRun/__specs__.py b/ceasiompy/EdgeRun/__specs__.py
@@ -1,6 +1,5 @@
 from pathlib import Path
 
-from ceasiompy.utils.ceasiompyutils import get_reasonable_nb_cpu
 from ceasiompy.utils.commonxpath import (
     AEROPERFORMANCE_XPATH,
     GEOM_XPATH,
@@ -120,7 +119,7 @@
 cpacs_inout.add_input(
     var_name="nb_proc",
     var_type=int,
-    default_value=get_reasonable_nb_cpu(),
+    default_value=64,
     unit="1",
     descr="Number of proc to use to run EDGE",
     xpath=EDGE_NB_CPU_XPATH,
@@ -156,8 +155,8 @@
 cpacs_inout.add_input(
     var_name="mg_level",
     var_type=int,
-    default_value=3,
-    unit="3",
+    default_value=1,
+    unit="1",
     descr="Multi-grid level (0 = no multigrid)",
     xpath=EDGE_MG_LEVEL_XPATH,
     gui=True,
@@ -168,7 +167,7 @@
 cpacs_inout.add_input(
     var_name="calculation_type",
     var_type=list,
-    default_value=["RANS", "Euler"],
+    default_value=["Euler", "RANS"],
     unit="1",
     descr="Chose if perform a RANS or an Euler calculation",
     xpath=EDGE_SOLVER,

diff --git a/ceasiompy/EdgeRun/edgerun.py b/ceasiompy/EdgeRun/edgerun.py
@@ -106,7 +106,7 @@ def run_edge_multi(wkdir, input_que_script_path, nb_proc=2):
             edge_scripts_instance.run_preprocessor(case_dir_path)
             print("bedg files are generated")
 
-        #edge_scripts_instance.submit_solver_script(nb_proc)
+        # edge_scripts_instance.submit_solver_script(nb_proc)
         edge_scripts_instance.run_solver(nb_proc)
 
         # postprocess for results
@@ -123,15 +123,14 @@ def main(cpacs_path, cpacs_out_path):
 
     tixi = open_tixi(cpacs_path)
     nb_proc = get_value_or_default(tixi, EDGE_NB_CPU_XPATH, get_reasonable_nb_cpu())
-
 
     results_dir = get_results_directory("EdgeRun")
 
     # Temporary CPACS to be stored after "generate_edge_cfd_ainp"
     cpacs_tmp_cfg = Path(cpacs_out_path.parent, "ConfigTMP.xml")
 
     edge_cfd(cpacs_path, cpacs_tmp_cfg, results_dir)
-    #run_edge_multi(results_dir, nb_proc)
+    # run_edge_multi(results_dir, nb_proc)
     # get_su2_results(cpacs_tmp_cfg, cpacs_out_path, results_dir)
 
     log.info("----- End of " + MODULE_NAME + " -----")