From 3ab5f15c339c974a4e8d2490fa7e7aaaf746b8d9 Mon Sep 17 00:00:00 2001 From: Mengmeng Zhang Date: Mon, 22 Jan 2024 15:21:03 +0100 Subject: [PATCH] modified: ../edgerun.py changed result folder from EdgeRun to MEdge modified: edgeconfig.py added some log output for preprocessor and running_solver --- ceasiompy/EdgeRun/edgerun.py | 2 +- ceasiompy/EdgeRun/func/edgeconfig.py | 3 ++- ceasiompy/EdgeRun/tests/test_edgerun_submit.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ceasiompy/EdgeRun/edgerun.py b/ceasiompy/EdgeRun/edgerun.py index 91d9273b9..66075c987 100644 --- a/ceasiompy/EdgeRun/edgerun.py +++ b/ceasiompy/EdgeRun/edgerun.py @@ -125,7 +125,7 @@ def main(cpacs_path, cpacs_out_path): nb_proc = get_value_or_default(tixi, EDGE_NB_CPU_XPATH, get_reasonable_nb_cpu()) - results_dir = get_results_directory("EdgeRun") + results_dir = get_results_directory("MEdge") # Temporary CPACS to be stored after "generate_edge_cfd_ainp" cpacs_tmp_cfg = Path(cpacs_out_path.parent, "ConfigTMP.xml") diff --git a/ceasiompy/EdgeRun/func/edgeconfig.py b/ceasiompy/EdgeRun/func/edgeconfig.py index 9f264d03a..3d292d9a1 100644 --- a/ceasiompy/EdgeRun/func/edgeconfig.py +++ b/ceasiompy/EdgeRun/func/edgeconfig.py @@ -308,13 +308,14 @@ def edge_cfd(cpacs_path, cpacs_out_path, wkdir): if not bedg_files_exist: # edge_scripts_instance.submit_preprocessor_script(case_dir_path) + log.info("Running Edge preprocessor for Case..." + case_dir_name ) edge_scripts_instance.run_preprocessor(case_dir_path) print("bedg files are generated") # else: # print('bedg files exist, not generated') # edge_scripts_instance.submit_solver_script(case_dir_path,NPART) - + log.info("Running Edge solver for Case..." + case_dir_name ) edge_scripts_instance.run_edgesolver(case_dir_path, NPART) # postprocess for results diff --git a/ceasiompy/EdgeRun/tests/test_edgerun_submit.py b/ceasiompy/EdgeRun/tests/test_edgerun_submit.py index 382a0a776..0b871e1d2 100644 --- a/ceasiompy/EdgeRun/tests/test_edgerun_submit.py +++ b/ceasiompy/EdgeRun/tests/test_edgerun_submit.py @@ -41,7 +41,7 @@ # cpacs_in_path = Path(MODULE_DIR / "ToolInput" / "ToolInput.xml") cpacs_in_path = Path('/home/mengmeng/Documents/CEASIOMpy23/CEASIOMpy/WKDIR/CPACS_selected_from_GUI.xml') cpacs_out_path = MODULE_DIR / "ToolOutput.xml" -wkdir = MODULE_DIR / "Results/Edge" +wkdir = MODULE_DIR / "Results" if not os.path.exists(wkdir):