fix writer and cleanup

Author: julianschmoll

calculix/main.py

@@ -26,9 +26,9 @@ def main(scenario_cfg, precice_cfg_path, cleanup=True):
         mesh_name=mesh_name,
         interface_name=interface_name,
     )
-    writer.convert_to_vtk(sim_out, "out/output.vtk")
+    writer.convert_to_vtk(sim_out, "out/solid.vtk")
     if cleanup:
-        simulation.cleanup(simulation_folder, remove_spooles=True)
+        simulation.cleanup(simulation_folder)
 
 
 # entry point for solid simulation with calculix and precice

calculix/simulation.py

@@ -33,6 +33,7 @@ def precice_env_setup(environment):
         if yaml_target.exists():
             yaml_target.unlink()
 
+
 def run(inp_file, precice_cfg, participant="Solid", ccx_cmd="ccx_preCICE",
         mesh_name="Solid-Nodes-Mesh", interface_name="Solid-Interface",
         read_data="DisplacementDelta", write_data="Force"):
@@ -53,21 +54,49 @@ def run(inp_file, precice_cfg, participant="Solid", ccx_cmd="ccx_preCICE",
     with precice_env_setup(environment):
         run_cmd = [
             ccx_cmd,
-            "-i", inp_stem_name,
+            "-i",
+            inp_stem_name,
             "-precice-participant", participant
         ]
         subprocess.run(run_cmd, check=True, cwd=work_dir)
 
     return work_dir / f"{inp_stem_name}.frd"
 
 
-def cleanup(sim_folder, remove_spooles=True):
-    """Method to clean up all calculix files except paraview output."""
+def cleanup(sim_folder, exclude=None):
+    """Method to clean up all calculix files except specifically excluded."""
     sim_folder = Path(sim_folder)
-    spooles_file = Path(__file__).resolve().parent / "spooles.out"
 
-    if remove_spooles and spooles_file.exists():
-        spooles_file.unlink()
+    patterns = [
+        "precice*",
+        "exchange*",
+        "m2n*",
+        "*.nam",
+        "*.sur",
+        "*.log",
+        "*.lock",
+        "spooles.out",
+        "*.cvg",
+        "*.dat",
+        "*.inp",
+        "*.sta",
+        "*.12d"
+    ]
+
+    if not exclude:
+        exclude = []
+
+    if isinstance(exclude, str):
+        exclude = [exclude]
+
+    if not isinstance(exclude, list):
+        raise TypeError("exclude must be a string or list")
 
-    if sim_folder.exists() and sim_folder.is_dir():
-        shutil.rmtree(sim_folder)
+    for pattern in patterns:
+        for p in sim_folder.glob(pattern):
+            if p.name in exclude:
+                continue
+            if p.is_dir():
+                shutil.rmtree(p, ignore_errors=True)
+            else:
+                p.unlink()

calculix/writer.py

@@ -14,15 +14,23 @@ def convert_to_vtk(file_to_convert, output_path):
 
     converter = Converter(str(file_to_convert), [cleaned_suffix])
     converter.run()
-    # The converter does not let us specify an output file
-    tmp_output_file = (file_to_convert.parent
-                       / f"{file_to_convert.stem}.{cleaned_suffix}")
 
+    # The converter does not let us specify an output filename or path
     output_path = Path(output_path)
+    converter_output = (file_to_convert.parent
+                       / f"{file_to_convert.stem}.{cleaned_suffix}")
+
+    if converter_output == output_path:
+        return output_path
 
     if not output_path.parent.exists():
         output_path.parent.mkdir(parents=True, exist_ok=True)
 
-    shutil.copy(tmp_output_file, output_path)
+    vtk_files = sorted(file_to_convert.parent.glob(f"{file_to_convert.stem}*.{cleaned_suffix}"))
 
+    for idx, vtk_file in enumerate(vtk_files):
+        shutil.copy(
+            vtk_file,
+            output_path.parent / f"{output_path.stem}_{idx:04d}.{cleaned_suffix}"
+        )
     return output_path