little clean-up

Author: Sarbani-Roy

.github/workflows/run-dumux-benchmark.yml

@@ -11,7 +11,7 @@ env:
   CACHE_NUMBER: 1  # increase to reset cache manually
 
 jobs:
-  tests:
+  dumux-tests:
     runs-on: ubuntu-latest
 
     steps:
@@ -45,6 +45,6 @@ jobs:
       - name: Upload results
         uses: actions/upload-artifact@v4
         with:
-          name: convergence-results
+          name: results
           path: benchmarks/rotating-cylinders/dumux/results
           retention-days: 5

.github/workflows/run-openfoam-benchmark.yml

@@ -11,7 +11,7 @@ env:
   CACHE_NUMBER: 1  # increase to reset cache manually
 
 jobs:
-  openfoam:
+  openfoam-tests:
     runs-on: ubuntu-latest
 
     steps:
@@ -45,6 +45,6 @@ jobs:
       - name: Upload OpenFOAM results
         uses: actions/upload-artifact@v4
         with:
-          name: openfoam-results
+          name: results
           path: benchmarks/rotating-cylinders/openfoam/results
           retention-days: 5

benchmarks/rotating-cylinders/dumux/Snakefile

@@ -11,15 +11,13 @@ rule all:
     input:
         "solution_metrics.json",
         "test_rotatingcylinders.zip"
-        # "test_rotatingcylinders-00000.vtu"
 
 rule run_simulation:
     input:
         rc_parameters_file = "parameters.json"
     output:
         zip = "test_rotatingcylinders.zip",
         metrics = "solution_metrics.json"
-        # "test_rotatingcylinders-00000.vtu"
     resources:
         serial_run=1
     singularity:

benchmarks/rotating-cylinders/dumux/plot_results.py

@@ -37,15 +37,13 @@
 from __future__ import annotations
 
 import argparse
-import json
 import re
 import tempfile
 import zipfile
 from pathlib import Path
 
 import matplotlib.pyplot as plt
 import numpy as np
-import pandas as pd
 
 # ParaView
 from paraview import servermanager

benchmarks/rotating-cylinders/dumux/run_benchmark.py

@@ -1,5 +1,4 @@
 import json
-import shutil
 import subprocess
 import zipfile
 import os
@@ -36,15 +35,7 @@
         # Copy the selected parameter file to the output directory with a standardised name
         with open(output_dir / "parameters.json", "w") as outfile:
             json.dump(data, outfile, indent=2)
-
-        # Copy files from root_dir to output_dir, excluding non-matching parameter files.
-        for item in root_dir.iterdir():
-            if item.is_file():
-                if item.name.startswith("parameters_") and item.suffix == ".json":
-                    continue
-                # else:
-                #     shutil.copy(item, output_dir / item.name)   
-        
+    
         # Run the Snakemake workflow for the configuration
         subprocess.run([
             "snakemake",

benchmarks/rotating-cylinders/openfoam/compute_l2_error.py

@@ -20,7 +20,6 @@
 import re
 import sys
 import numpy as np
-import matplotlib.pyplot as plt
 from pathlib import Path
 
 
@@ -283,39 +282,6 @@ def process_config(case_dir: Path) -> dict | None:
     print(f"    Saved: {out_path.relative_to(case_dir.parent)}")
     return metrics
 
-
-# # ---------------------------------------------------------------------------
-# # Convergence plot
-# # ---------------------------------------------------------------------------
-
-# def plot_convergence(results: list, results_dir: Path):
-#     results.sort(key=lambda d: d["cells_radial"])
-
-#     confs    = [d["conf"] for d in results]
-#     p_errors = [d["l2_error_pressure_rel"] for d in results]
-#     v_errors = [d["l2_error_velocity_rel"]  for d in results]
-
-#     fig, ax = plt.subplots(figsize=(10, 6))
-#     ax.plot(confs, p_errors, marker="o", linewidth=1.5,
-#             label=r"Relative $L^2$ Error — Pressure")
-#     ax.plot(confs, v_errors, marker="s", linewidth=1.5,
-#             label=r"Relative $L^2$ Error — Velocity")
-
-#     ax.set_yscale("log")
-#     ax.set_xlabel("Configuration")
-#     ax.set_ylabel("Relative $L^2$ Error")
-#     ax.set_title("OpenFOAM Rotating Cylinders — Convergence Summary")
-#     ax.legend()
-#     ax.grid(True, which="both", linestyle="-", alpha=0.3)
-#     plt.xticks(rotation=45)
-#     plt.tight_layout()
-
-#     plot_path = results_dir / "solution_metrics_plot.png"
-#     fig.savefig(plot_path, dpi=150)
-#     plt.close(fig)
-#     print(f"\nConvergence plot saved to: {plot_path}")
-
-
 # ---------------------------------------------------------------------------
 # Entry point
 # ---------------------------------------------------------------------------

benchmarks/rotating-cylinders/openfoam/run_benchmark.py

@@ -3,8 +3,6 @@
 import zipfile
 import os
 from pathlib import Path
-import numpy as np
-import matplotlib.pyplot as plt
 
 root_dir = Path(__file__).resolve().parent
 zip_path = root_dir.parent / "rotating-cylinders.zip"
@@ -66,6 +64,7 @@
                 if item.is_file() and item.name not in {"solution_metrics.json", "parameters.json"} and item != output_zip_path:
                     zf.write(item, item.relative_to(output_dir))
                     item.unlink()
+        
         # Remove any empty subdirectories left after zipping
         for item in sorted(output_dir.rglob("*"), reverse=True):
             if item.is_dir():