From bd03e412cdce8a619b67ee61e813a7deaf03c0fd Mon Sep 17 00:00:00 2001
From: JPRichings <j.richings@epcc.ed.ac.uk>
Date: Fri, 25 Apr 2025 14:30:08 +0100
Subject: [PATCH 1/6] update openfoam fetch test

---
 tests/apps/openfoam/Fetch_OpenFoam.py | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 tests/apps/openfoam/Fetch_OpenFoam.py

diff --git a/tests/apps/openfoam/Fetch_OpenFoam.py b/tests/apps/openfoam/Fetch_OpenFoam.py
new file mode 100644
index 0000000..97eae4a
--- /dev/null
+++ b/tests/apps/openfoam/Fetch_OpenFoam.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+
+"""Reframe test for OpenFoam"""
+
+# Based on original work from:
+#   Copyright 2016-2022 Swiss National Supercomputing Centre (CSCS/ETH Zurich)
+#   ReFrame Project Developers. See the top-level LICENSE file for details.
+#   SPDX-License-Identifier: BSD-3-Clause
+
+import os
+import reframe as rfm
+import reframe.utility.sanity as sn
+import reframe.utility.udeps as udeps
+
+
+@rfm.simple_test
+class fetch_OpenFoam(rfm.RunOnlyRegressionTest):
+    """Downlaod OpenFoam"""
+    version = variable(str, value="v2212")
+    executable = 'wget'
+    executable_opts = [
+        f"https://sourceforge.net/projects/openfoam/files/{version}/OpenFOAM-{version}.tgz",
+        f"https://sourceforge.net/projects/openfoam/files/{version}/ThirdParty-{version}.tgz"
+    ]
+    local = True
+    valid_systems = ['archer2:login']
+    valid_prog_environs = ['PrgEnv-gnu']
+
+    tags = {"fetch"}
+
+    @sanity_function
+    def validate_download(self):
+        return (sn.path_isfile(f"ThirdParty-{self.version}.tgz") and sn.path_isfile(f"OpenFOAM-{self.version}.tgz"))

From ea5fa82cceb5c2549f26438785cc9b15f78d5a06 Mon Sep 17 00:00:00 2001
From: JPRichings <j.richings@epcc.ed.ac.uk>
Date: Fri, 22 Aug 2025 22:17:28 +0100
Subject: [PATCH 2/6] openfoam test complete

---
 tests/apps/openfoam/Compile_OpenFoam.py       | 113 ++++++++++
 .../{Fetch_OpenFoam.py => FetchOpenFoam.py}   |   4 +-
 tests/apps/openfoam/Test_OpenFoam.py          | 201 ++++++++++++++++++
 tests/apps/openfoam/Test_module_OpenFoam.py   | 160 ++++++++++++++
 tests/apps/openfoam/src/prefs.sh              |  17 ++
 5 files changed, 493 insertions(+), 2 deletions(-)
 create mode 100644 tests/apps/openfoam/Compile_OpenFoam.py
 rename tests/apps/openfoam/{Fetch_OpenFoam.py => FetchOpenFoam.py} (91%)
 create mode 100644 tests/apps/openfoam/Test_OpenFoam.py
 create mode 100644 tests/apps/openfoam/Test_module_OpenFoam.py
 create mode 100644 tests/apps/openfoam/src/prefs.sh

diff --git a/tests/apps/openfoam/Compile_OpenFoam.py b/tests/apps/openfoam/Compile_OpenFoam.py
new file mode 100644
index 0000000..662b67d
--- /dev/null
+++ b/tests/apps/openfoam/Compile_OpenFoam.py
@@ -0,0 +1,113 @@
+#!/usr/bin/env python3
+
+"""Reframe test for OpenFoam"""
+
+# Based on original work from:
+#   Copyright 2016-2022 Swiss National Supercomputing Centre (CSCS/ETH Zurich)
+#   ReFrame Project Developers. See the top-level LICENSE file for details.
+#   SPDX-License-Identifier: BSD-3-Clause
+
+import os
+import reframe as rfm
+import reframe.utility.sanity as sn
+
+class FetchOpenFoam(rfm.RunOnlyRegressionTest):
+    """Downlaod OpenFoam"""
+    version = variable(str, value="v2412")
+    executable = 'wget'
+    executable_opts = [
+        f"https://sourceforge.net/projects/openfoam/files/{version}/OpenFOAM-{version}.tgz",
+        f"https://sourceforge.net/projects/openfoam/files/{version}/ThirdParty-{version}.tgz"
+    ]
+    local = True
+    valid_systems = ['archer2:login']
+    valid_prog_environs = ['PrgEnv-gnu']
+
+    tags = {"fetch"}
+
+    @sanity_function
+    def validate_download(self):
+        return (sn.path_isfile(f"ThirdParty-{self.version}.tgz") and sn.path_isfile(f"OpenFOAM-{self.version}.tgz"))
+
+@rfm.simple_test
+class CompileOpenFoam(rfm.CompileOnlyRegressionTest):
+    """Test compilation of OpenFoam"""
+
+    build_system = "Make"
+    fetch_openfoam = fixture(FetchOpenFoam, scope="environment")
+
+    valid_systems = ["archer2:compute"]
+    valid_prog_environs = ["PrgEnv-gnu"]
+
+    tags = {"compile"}
+
+    modules = ["gcc/11.2.0",
+               "mkl",
+               "cray-fftw"]
+
+    build_prefix = ""
+
+    env_vars = {"FOAM_VERBOSE": "1",
+                "FFTW_ARCH_PATH": "${FFTW_DIR}"}
+
+    num_nodes = 1
+    num_tasks_per_node = 1
+    num_cpus_per_task = 1
+    num_tasks = num_nodes * num_tasks_per_node * num_cpus_per_task
+    time_limit = "4h"
+    
+#    build_system.options = ["-v", "-n"]
+
+
+    @run_before("compile")
+    def prepare_build(self):
+        """Prepare environment for build"""
+        version = "v2412"
+        label1 = "OpenFOAM"
+        name1 = f"{label1}-{version}"
+        archive1 = f"{label1}-{version}.tgz"
+        label2 = "ThirdParty"
+        name2 = f"{label2}-{version}"
+        archive2 = f"{label2}-{version}.tgz"
+
+        self.build_prefix = f"{name1}"
+
+        config_file_fftw = f"{name1}/etc/config.sh/FFTW"
+        config_file_paraview = f"{name1}/etc/config.sh/paraview"
+
+        fullpath1 = os.path.join(self.fetch_openfoam.stagedir, archive1)
+        fullpath2 = os.path.join(self.fetch_openfoam.stagedir, archive2)
+
+        self.prebuild_cmds = [
+            f"cp {fullpath1} {self.stagedir}",
+            f"cp {fullpath2} {self.stagedir}",
+            f"tar xzf {archive1}",
+            f"tar xzf {archive2}",
+            f"export FOAM_SRC={self.build_prefix}",
+            f"export FOAM_THIRDPARTY={name2}",
+            f"cp prefs.sh {name1}/etc/prefs.sh",
+            f"sed -i 's/^fftw_version.*/fftw_version=fftw-system/' {config_file_fftw}",
+            f"sed -i 's/^export FFTW_ARCH_PATH.*//' {config_file_fftw}",
+            f"sed -i 's/^ParaView_VERSION.*/ParaView_VERSION=none/' {config_file_paraview}",
+            f"cd {self.build_prefix}",
+            "pwd",
+            "ls",
+            "module list",
+            "source ./etc/bashrc",
+            "echo $WM_PROJECT_DIR",
+            "ls $WM_PROJECT_DIR",
+            "./Allwmake -j 16",
+            "./Allwmake -j 1",
+        ]
+
+        self.build_system.options = ["-v", "-n"]
+
+        self.postbuild_cmds = [
+
+
+    @sanity_function
+    def validate_compile(self):
+        """Validate compilation by checking existance of binary"""
+        return sn.assert_eq(0, 0)
+        
+
diff --git a/tests/apps/openfoam/Fetch_OpenFoam.py b/tests/apps/openfoam/FetchOpenFoam.py
similarity index 91%
rename from tests/apps/openfoam/Fetch_OpenFoam.py
rename to tests/apps/openfoam/FetchOpenFoam.py
index 97eae4a..5c482bd 100644
--- a/tests/apps/openfoam/Fetch_OpenFoam.py
+++ b/tests/apps/openfoam/FetchOpenFoam.py
@@ -14,9 +14,9 @@
 
 
 @rfm.simple_test
-class fetch_OpenFoam(rfm.RunOnlyRegressionTest):
+class FetchOpenFoam(rfm.RunOnlyRegressionTest):
     """Downlaod OpenFoam"""
-    version = variable(str, value="v2212")
+    version = variable(str, value="v2412")
     executable = 'wget'
     executable_opts = [
         f"https://sourceforge.net/projects/openfoam/files/{version}/OpenFOAM-{version}.tgz",
diff --git a/tests/apps/openfoam/Test_OpenFoam.py b/tests/apps/openfoam/Test_OpenFoam.py
new file mode 100644
index 0000000..e4a3ef2
--- /dev/null
+++ b/tests/apps/openfoam/Test_OpenFoam.py
@@ -0,0 +1,201 @@
+#!/usr/bin/env python3
+
+"""Reframe test for OpenFoam"""
+
+# Based on original work from:
+#   Copyright 2016-2022 Swiss National Supercomputing Centre (CSCS/ETH Zurich)
+#   ReFrame Project Developers. See the top-level LICENSE file for details.
+#   SPDX-License-Identifier: BSD-3-Clause
+
+import os
+import reframe as rfm
+import reframe.utility.sanity as sn
+
+class FetchOpenFoam(rfm.RunOnlyRegressionTest):
+    """Downlaod OpenFoam"""
+    version = variable(str, value="v2412")
+    executable = 'wget'
+    executable_opts = [
+        f"https://sourceforge.net/projects/openfoam/files/{version}/OpenFOAM-{version}.tgz",
+        f"https://sourceforge.net/projects/openfoam/files/{version}/ThirdParty-{version}.tgz"
+    ]
+    local = True
+    valid_systems = ['archer2:login']
+    valid_prog_environs = ['PrgEnv-gnu']
+
+    tags = {"fetch"}
+
+    @sanity_function
+    def validate_download(self):
+        return (sn.path_isfile(f"ThirdParty-{self.version}.tgz") and sn.path_isfile(f"OpenFOAM-{self.version}.tgz"))
+
+
+class CompileOpenFoam(rfm.CompileOnlyRegressionTest):
+    """Test compilation of OpenFoam"""
+
+    build_system = "Make"
+    fetch_openfoam = fixture(FetchOpenFoam, scope="environment")
+
+    valid_systems = ["archer2:compute"]
+    valid_prog_environs = ["PrgEnv-gnu"]
+
+    tags = {"compile"}
+
+    modules = ["gcc/11.2.0",
+               "mkl",
+               "cray-fftw"]
+
+    build_prefix = ""
+
+    env_vars = {"FOAM_VERBOSE": "1",
+                "FFTW_ARCH_PATH": "${FFTW_DIR}"}
+
+    num_nodes = 1
+    num_tasks_per_node = 1
+    num_cpus_per_task = 1
+    num_tasks = num_nodes * num_tasks_per_node * num_cpus_per_task
+    time_limit = "4h"
+
+
+    @run_before("compile")
+    def prepare_build(self):
+        """Prepare environment for build"""
+        version = "v2412"
+        label1 = "OpenFOAM"
+        name1 = f"{label1}-{version}"
+        archive1 = f"{label1}-{version}.tgz"
+        label2 = "ThirdParty"
+        name2 = f"{label2}-{version}"
+        archive2 = f"{label2}-{version}.tgz"
+
+        self.build_prefix = f"{name1}"
+
+        config_file_fftw = f"{name1}/etc/config.sh/FFTW"
+        config_file_paraview = f"{name1}/etc/config.sh/paraview"
+
+        fullpath1 = os.path.join(self.fetch_openfoam.stagedir, archive1)
+        fullpath2 = os.path.join(self.fetch_openfoam.stagedir, archive2)
+
+        self.prebuild_cmds = [
+            f"cp {fullpath1} {self.stagedir}",
+            f"cp {fullpath2} {self.stagedir}",
+            f"tar xzf {archive1}",
+            f"tar xzf {archive2}",
+            f"export FOAM_SRC={self.build_prefix}",
+            f"export FOAM_THIRDPARTY={name2}",
+            f"cp prefs.sh {name1}/etc/prefs.sh",
+            f"sed -i 's/^fftw_version.*/fftw_version=fftw-system/' {config_file_fftw}",
+            f"sed -i 's/^export FFTW_ARCH_PATH.*//' {config_file_fftw}",
+            f"sed -i 's/^ParaView_VERSION.*/ParaView_VERSION=none/' {config_file_paraview}",
+            f"cd {self.build_prefix}",
+            "pwd",
+            "ls",
+            "module list",
+            "source ./etc/bashrc",
+            "echo $WM_PROJECT_DIR",
+            "ls $WM_PROJECT_DIR",
+            "./Allwmake -j 16",
+            "./Allwmake -j 1",
+        ]
+
+        self.build_system.options = ["-v", "-n"]
+
+    @sanity_function
+    def validate_compile(self):
+        """Validate compilation by checking existance of binary"""
+        return sn.assert_eq(0, 0)
+        
+@rfm.simple_test
+class TestOpenFoam(rfm.RunOnlyRegressionTest):
+    """OpenFoam Test"""
+
+    # Select system to use
+    valid_systems = ["archer2:compute"]
+    
+    # Set Programming Environment
+    valid_prog_environs = ["PrgEnv-gnu"]
+
+    # Description of test
+    descr = "OpenFoam damnBreak"
+
+    tags = {"performance", "applications"}
+
+    compile_openfoam = fixture(CompileOpenFoam, scope="environment")
+
+    modules = ["gcc/11.2.0",
+               "mkl",
+               "cray-fftw"]
+
+    version = "v2412"
+
+    # slurm parameters
+    num_nodes = 4
+    num_tasks_per_node = 1
+    num_cpus_per_task = 128
+    num_tasks = num_nodes * num_tasks_per_node
+    time_limit = "10m"
+
+    # different cpu frequencies
+    freq = parameter(["2250000", "2000000"])
+
+    # Output files to be retained
+    keep_files = ["rfm_job.out"]
+
+    # Identify the executable
+    executable = "interFoam"
+
+    # Command line options for executable
+    executable_opts = ["-parallel"]
+
+    reference_performance = {
+        "2000000": (4, -0.2, 0.2, "seconds"),
+        "2250000": (3, -0.2, 0.2, "seconds"),
+    }
+
+    @run_after("init")
+    def setup_params(self):
+        """sets up extra parameters"""
+        self.descr += self.freq
+        if self.current_system.name in ["archer2"]:
+            self.env_vars = {
+                "OMP_NUM_THREADS": str(self.num_cpus_per_task),
+                "OMP_PLACES": "cores",
+                "SLURM_CPU_FREQ_REQ": self.freq,
+            }
+
+
+    @run_before("run")
+    def prepare_run(self):
+        """set up job execution"""
+
+
+        foam_install_dir = os.path.join(self.compile_openfoam.stagedir, self.compile_openfoam.build_prefix)
+
+        print("foam_install_dir: ", foam_install_dir)
+
+        self.prerun_cmds = [ f"export FOAM_INSTALL_DIR={foam_install_dir}",
+                            "source ${FOAM_INSTALL_DIR}/etc/bashrc",
+                            "cp -r ${FOAM_INSTALL_DIR}/tutorials/multiphase/interFoam/laminar/damBreak/damBreak .",
+                            "cd damBreak",
+                            "blockMesh",
+                            "cp -r 0.orig/ 0/",
+                            "cp 0/alpha.water 0/alpha.water.orig",
+                            "setFields",
+                            "decomposePar"]
+
+
+    @sanity_function
+    def assert_finished(self):
+        """Sanity check that simulation finished successfully"""
+        return sn.assert_found("End", self.keep_files[0])
+
+    @performance_function("seconds", perf_key="performance")
+    def extract_perf(self):
+        """Extract performance value to compare with reference value"""
+        return sn.extractsingle(
+            r"ExecutionTime\s+=\s+(?P<time>\d+.?\d*\s+)s\s+ClockTime\s+=\s+\d*\s+s\n\nEnd",
+            self.keep_files[0],
+            "time",
+            float,
+        )
+
diff --git a/tests/apps/openfoam/Test_module_OpenFoam.py b/tests/apps/openfoam/Test_module_OpenFoam.py
new file mode 100644
index 0000000..f8f4fb6
--- /dev/null
+++ b/tests/apps/openfoam/Test_module_OpenFoam.py
@@ -0,0 +1,160 @@
+#!/usr/bin/env python3
+
+"""ReFrame test for cp2k"""
+
+import reframe as rfm
+import reframe.utility.sanity as sn
+
+
+class OpenFoamBaseCheck(rfm.RunOnlyRegressionTest):
+    """ReFrame OpenFoam test base class"""
+
+    # Which modules to load in test
+    modules = ["openfoam/org/v10.20230119"]
+    # Identify the executable
+    executable = "interFoam"
+    # Additional Slurm parameters. Requires adding to config file first.
+    extra_resources = {"qos": {"qos": "standard"}}
+    # Output files to be retained
+    keep_files = ["rfm_job.out"]
+
+    maintainers = ["j.richings@epcc.ed.ac.uk"]
+    use_multithreading = False
+    tags = {"applications", "performance"}
+
+    # Reference value to validate run with
+
+    reference = {
+        "archer2:compute": {"performance": (6, -0.05, 0.05, "seconds")},
+    }
+
+    @sanity_function
+    def assert_finished(self):
+        """Sanity check that simulation finished successfully"""
+        return sn.assert_found("End", self.keep_files[0])
+
+    @performance_function("seconds", perf_key="performance")
+    def extract_perf(self):
+        """Extract performance value to compare with reference value"""
+        return sn.extractsingle(
+            r"ExecutionTime\s+=\s+(?P<time>\d+.?\d*\s+)s\s+ClockTime\s+=\s+\d*\s+s\n\nEnd",
+            self.keep_files[0],
+            "time",
+            float,
+        )
+
+
+@rfm.simple_test
+class OpenFoamDamnBreak(OpenFoamBaseCheck):
+    """OpenFoam Damn break test"""
+
+    # Select system to use
+    valid_systems = ["archer2:compute"]
+    # Set Programming Environment
+    valid_prog_environs = ["PrgEnv-gnu"]
+    # Description of test
+    descr = "OpenFoam damnBreak"
+    # Command line options for executable
+    executable_opts = ("").split()
+    # different cpu frequencies
+    freq = parameter(["2250000", "2000000"])
+    # slurm parameters
+    num_tasks = 1
+    num_tasks_per_node = 1
+    num_cpus_per_task = 128
+    time_limit = "10m"
+
+    reference_performance = {
+        "2000000": (6, -0.1, 0.1, "seconds"),
+        "2250000": (3.6, -0.1, 0.1, "seconds"),
+    }
+
+    @run_after("init")
+    def setup_params(self):
+        """sets up extra parameters"""
+        self.descr += self.freq
+        if self.current_system.name in ["archer2"]:
+            self.env_vars = {
+                "OMP_NUM_THREADS": str(self.num_cpus_per_task),
+                "OMP_PLACES": "cores",
+                "SLURM_CPU_FREQ_REQ": self.freq,
+            }
+
+
+    @run_before("run")
+    def setup_testcase(self):
+        """set up test case """
+        self.prerun_cmds = ["source ${FOAM_INSTALL_DIR}/etc/bashrc",
+                            "cp -r ${FOAM_INSTALL_DIR}/tutorials/multiphase/interFoam/laminar/damBreak/damBreak .",
+                            "cd damBreak",
+                            "blockMesh",
+                            "cp 0/alpha.water.orig 0/alpha.water",
+                            "setFields"]
+        
+
+    @run_before("performance")
+    def set_reference(self):
+        """Changes reference values"""
+        if self.current_system.name in ["archer2"]:
+            # https://reframe-hpc.readthedocs.io/en/stable/utility_functions_reference.html#reframe.utility.ScopedDict
+            self.reference["archer2:compute:performance"] = self.reference_performance[self.freq]
+
+@rfm.simple_test
+class OpenFoamDamnBreakParallel(OpenFoamBaseCheck):
+    """OpenFoam Damn break test"""
+
+    # Select system to use
+    valid_systems = ["archer2:compute"]
+    # Set Programming Environment
+    valid_prog_environs = ["PrgEnv-gnu"]
+    # Description of test
+    descr = "OpenFoam damnBreak"
+    # Command line options for executable
+    executable_opts = ("-parallel").split()
+    # different cpu frequencies
+    freq = parameter(["2250000", "2000000"])
+    # slurm parameters
+    num_tasks = 4
+    num_tasks_per_node = 1
+    num_cpus_per_task = 128
+    time_limit = "10m"
+
+    reference_performance = {
+        "2000000": (5, -0.5, 0.5, "seconds"),
+        "2250000": (5, -0.5, 0.5, "seconds"),
+    }
+
+    @run_after("init")
+    def setup_params(self):
+        """sets up extra parameters"""
+        self.descr += self.freq
+        if self.current_system.name in ["archer2"]:
+            self.env_vars = {
+                "OMP_NUM_THREADS": str(self.num_cpus_per_task),
+                "OMP_PLACES": "cores",
+                "SLURM_CPU_FREQ_REQ": self.freq,
+            }
+
+
+    @run_before("run")
+    def setup_testcase(self):
+        """set up test case """
+        self.prerun_cmds = ["source ${FOAM_INSTALL_DIR}/etc/bashrc",
+                            "cp -r ${FOAM_INSTALL_DIR}/tutorials/multiphase/interFoam/laminar/damBreak/damBreak .",
+                            "cd damBreak",
+                            "blockMesh",
+                            "cp 0/alpha.water.orig 0/alpha.water",
+                            "setFields",
+                            "decomposePar"]
+
+    @sanity_function
+    def assert_finished_parallel(self):
+        """Sanity check that simulation finished successfully"""
+        return sn.assert_found("Finalising parallel run", self.keep_files[0])
+
+    @run_before("performance")
+    def set_reference(self):
+        """Changes reference values"""
+        if self.current_system.name in ["archer2"]:
+            # https://reframe-hpc.readthedocs.io/en/stable/utility_functions_reference.html#reframe.utility.ScopedDict
+            self.reference["archer2:compute:performance"] = self.reference_performance[self.freq]
diff --git a/tests/apps/openfoam/src/prefs.sh b/tests/apps/openfoam/src/prefs.sh
new file mode 100644
index 0000000..cbaef01
--- /dev/null
+++ b/tests/apps/openfoam/src/prefs.sh
@@ -0,0 +1,17 @@
+
+export WM_MPLIB=CRAY-MPICH
+export WM_COMPILER=Cray
+
+export WM_COMPILER_LIB_ARCH=64
+export WM_CC='cc'
+export WM_CXX='CC'
+export WM_CFLAGS='-fPIC'
+export WM_CXXFLAGS='-fPIC'
+export WM_LDFLAGS=''
+
+# MPI
+# Because ${WM_PROJECT_DIR}/etc/config.sh/mpi is sourced after  this file
+# we need to induce the system to set the appropriate variables:
+
+export MPICH_DIR=${CRAY_MPICH_BASEDIR}
+export MPI_ARCH_PATH=${MPICH_DIR}

From d2d1f20947cbe71752c18adb49e8d74efc01a678 Mon Sep 17 00:00:00 2001
From: JPRichings <j.richings@epcc.ed.ac.uk>
Date: Tue, 26 Aug 2025 14:57:26 +0100
Subject: [PATCH 3/6] pass python black formatting

---
 tests/apps/openfoam/Compile_OpenFoam.py     | 28 ++++-------
 tests/apps/openfoam/FetchOpenFoam.py        | 11 +++--
 tests/apps/openfoam/Test_OpenFoam.py        | 53 ++++++++++-----------
 tests/apps/openfoam/Test_module_OpenFoam.py | 38 ++++++++-------
 4 files changed, 60 insertions(+), 70 deletions(-)

diff --git a/tests/apps/openfoam/Compile_OpenFoam.py b/tests/apps/openfoam/Compile_OpenFoam.py
index 662b67d..2a0a468 100644
--- a/tests/apps/openfoam/Compile_OpenFoam.py
+++ b/tests/apps/openfoam/Compile_OpenFoam.py
@@ -11,23 +11,26 @@
 import reframe as rfm
 import reframe.utility.sanity as sn
 
+
 class FetchOpenFoam(rfm.RunOnlyRegressionTest):
     """Downlaod OpenFoam"""
+
     version = variable(str, value="v2412")
-    executable = 'wget'
+    executable = "wget"
     executable_opts = [
         f"https://sourceforge.net/projects/openfoam/files/{version}/OpenFOAM-{version}.tgz",
-        f"https://sourceforge.net/projects/openfoam/files/{version}/ThirdParty-{version}.tgz"
+        f"https://sourceforge.net/projects/openfoam/files/{version}/ThirdParty-{version}.tgz",
     ]
     local = True
-    valid_systems = ['archer2:login']
-    valid_prog_environs = ['PrgEnv-gnu']
+    valid_systems = ["archer2:login"]
+    valid_prog_environs = ["PrgEnv-gnu"]
 
     tags = {"fetch"}
 
     @sanity_function
     def validate_download(self):
-        return (sn.path_isfile(f"ThirdParty-{self.version}.tgz") and sn.path_isfile(f"OpenFOAM-{self.version}.tgz"))
+        return sn.path_isfile(f"ThirdParty-{self.version}.tgz") and sn.path_isfile(f"OpenFOAM-{self.version}.tgz")
+
 
 @rfm.simple_test
 class CompileOpenFoam(rfm.CompileOnlyRegressionTest):
@@ -41,23 +44,17 @@ class CompileOpenFoam(rfm.CompileOnlyRegressionTest):
 
     tags = {"compile"}
 
-    modules = ["gcc/11.2.0",
-               "mkl",
-               "cray-fftw"]
+    modules = ["gcc/11.2.0", "mkl", "cray-fftw"]
 
     build_prefix = ""
 
-    env_vars = {"FOAM_VERBOSE": "1",
-                "FFTW_ARCH_PATH": "${FFTW_DIR}"}
+    env_vars = {"FOAM_VERBOSE": "1", "FFTW_ARCH_PATH": "${FFTW_DIR}"}
 
     num_nodes = 1
     num_tasks_per_node = 1
     num_cpus_per_task = 1
     num_tasks = num_nodes * num_tasks_per_node * num_cpus_per_task
     time_limit = "4h"
-    
-#    build_system.options = ["-v", "-n"]
-
 
     @run_before("compile")
     def prepare_build(self):
@@ -102,12 +99,7 @@ def prepare_build(self):
 
         self.build_system.options = ["-v", "-n"]
 
-        self.postbuild_cmds = [
-
-
     @sanity_function
     def validate_compile(self):
         """Validate compilation by checking existance of binary"""
         return sn.assert_eq(0, 0)
-        
-
diff --git a/tests/apps/openfoam/FetchOpenFoam.py b/tests/apps/openfoam/FetchOpenFoam.py
index 5c482bd..16bf255 100644
--- a/tests/apps/openfoam/FetchOpenFoam.py
+++ b/tests/apps/openfoam/FetchOpenFoam.py
@@ -16,18 +16,19 @@
 @rfm.simple_test
 class FetchOpenFoam(rfm.RunOnlyRegressionTest):
     """Downlaod OpenFoam"""
+
     version = variable(str, value="v2412")
-    executable = 'wget'
+    executable = "wget"
     executable_opts = [
         f"https://sourceforge.net/projects/openfoam/files/{version}/OpenFOAM-{version}.tgz",
-        f"https://sourceforge.net/projects/openfoam/files/{version}/ThirdParty-{version}.tgz"
+        f"https://sourceforge.net/projects/openfoam/files/{version}/ThirdParty-{version}.tgz",
     ]
     local = True
-    valid_systems = ['archer2:login']
-    valid_prog_environs = ['PrgEnv-gnu']
+    valid_systems = ["archer2:login"]
+    valid_prog_environs = ["PrgEnv-gnu"]
 
     tags = {"fetch"}
 
     @sanity_function
     def validate_download(self):
-        return (sn.path_isfile(f"ThirdParty-{self.version}.tgz") and sn.path_isfile(f"OpenFOAM-{self.version}.tgz"))
+        return sn.path_isfile(f"ThirdParty-{self.version}.tgz") and sn.path_isfile(f"OpenFOAM-{self.version}.tgz")
diff --git a/tests/apps/openfoam/Test_OpenFoam.py b/tests/apps/openfoam/Test_OpenFoam.py
index e4a3ef2..6759ebd 100644
--- a/tests/apps/openfoam/Test_OpenFoam.py
+++ b/tests/apps/openfoam/Test_OpenFoam.py
@@ -11,23 +11,25 @@
 import reframe as rfm
 import reframe.utility.sanity as sn
 
+
 class FetchOpenFoam(rfm.RunOnlyRegressionTest):
     """Downlaod OpenFoam"""
+
     version = variable(str, value="v2412")
-    executable = 'wget'
+    executable = "wget"
     executable_opts = [
         f"https://sourceforge.net/projects/openfoam/files/{version}/OpenFOAM-{version}.tgz",
-        f"https://sourceforge.net/projects/openfoam/files/{version}/ThirdParty-{version}.tgz"
+        f"https://sourceforge.net/projects/openfoam/files/{version}/ThirdParty-{version}.tgz",
     ]
     local = True
-    valid_systems = ['archer2:login']
-    valid_prog_environs = ['PrgEnv-gnu']
+    valid_systems = ["archer2:login"]
+    valid_prog_environs = ["PrgEnv-gnu"]
 
     tags = {"fetch"}
 
     @sanity_function
     def validate_download(self):
-        return (sn.path_isfile(f"ThirdParty-{self.version}.tgz") and sn.path_isfile(f"OpenFOAM-{self.version}.tgz"))
+        return sn.path_isfile(f"ThirdParty-{self.version}.tgz") and sn.path_isfile(f"OpenFOAM-{self.version}.tgz")
 
 
 class CompileOpenFoam(rfm.CompileOnlyRegressionTest):
@@ -41,14 +43,11 @@ class CompileOpenFoam(rfm.CompileOnlyRegressionTest):
 
     tags = {"compile"}
 
-    modules = ["gcc/11.2.0",
-               "mkl",
-               "cray-fftw"]
+    modules = ["gcc/11.2.0", "mkl", "cray-fftw"]
 
     build_prefix = ""
 
-    env_vars = {"FOAM_VERBOSE": "1",
-                "FFTW_ARCH_PATH": "${FFTW_DIR}"}
+    env_vars = {"FOAM_VERBOSE": "1", "FFTW_ARCH_PATH": "${FFTW_DIR}"}
 
     num_nodes = 1
     num_tasks_per_node = 1
@@ -56,7 +55,6 @@ class CompileOpenFoam(rfm.CompileOnlyRegressionTest):
     num_tasks = num_nodes * num_tasks_per_node * num_cpus_per_task
     time_limit = "4h"
 
-
     @run_before("compile")
     def prepare_build(self):
         """Prepare environment for build"""
@@ -104,14 +102,15 @@ def prepare_build(self):
     def validate_compile(self):
         """Validate compilation by checking existance of binary"""
         return sn.assert_eq(0, 0)
-        
+
+
 @rfm.simple_test
 class TestOpenFoam(rfm.RunOnlyRegressionTest):
     """OpenFoam Test"""
 
     # Select system to use
     valid_systems = ["archer2:compute"]
-    
+
     # Set Programming Environment
     valid_prog_environs = ["PrgEnv-gnu"]
 
@@ -122,9 +121,7 @@ class TestOpenFoam(rfm.RunOnlyRegressionTest):
 
     compile_openfoam = fixture(CompileOpenFoam, scope="environment")
 
-    modules = ["gcc/11.2.0",
-               "mkl",
-               "cray-fftw"]
+    modules = ["gcc/11.2.0", "mkl", "cray-fftw"]
 
     version = "v2412"
 
@@ -163,26 +160,25 @@ def setup_params(self):
                 "SLURM_CPU_FREQ_REQ": self.freq,
             }
 
-
     @run_before("run")
     def prepare_run(self):
         """set up job execution"""
 
-
         foam_install_dir = os.path.join(self.compile_openfoam.stagedir, self.compile_openfoam.build_prefix)
 
         print("foam_install_dir: ", foam_install_dir)
 
-        self.prerun_cmds = [ f"export FOAM_INSTALL_DIR={foam_install_dir}",
-                            "source ${FOAM_INSTALL_DIR}/etc/bashrc",
-                            "cp -r ${FOAM_INSTALL_DIR}/tutorials/multiphase/interFoam/laminar/damBreak/damBreak .",
-                            "cd damBreak",
-                            "blockMesh",
-                            "cp -r 0.orig/ 0/",
-                            "cp 0/alpha.water 0/alpha.water.orig",
-                            "setFields",
-                            "decomposePar"]
-
+        self.prerun_cmds = [
+            f"export FOAM_INSTALL_DIR={foam_install_dir}",
+            "source ${FOAM_INSTALL_DIR}/etc/bashrc",
+            "cp -r ${FOAM_INSTALL_DIR}/tutorials/multiphase/interFoam/laminar/damBreak/damBreak .",
+            "cd damBreak",
+            "blockMesh",
+            "cp -r 0.orig/ 0/",
+            "cp 0/alpha.water 0/alpha.water.orig",
+            "setFields",
+            "decomposePar",
+        ]
 
     @sanity_function
     def assert_finished(self):
@@ -198,4 +194,3 @@ def extract_perf(self):
             "time",
             float,
         )
-
diff --git a/tests/apps/openfoam/Test_module_OpenFoam.py b/tests/apps/openfoam/Test_module_OpenFoam.py
index f8f4fb6..05c8dc0 100644
--- a/tests/apps/openfoam/Test_module_OpenFoam.py
+++ b/tests/apps/openfoam/Test_module_OpenFoam.py
@@ -80,17 +80,17 @@ def setup_params(self):
                 "SLURM_CPU_FREQ_REQ": self.freq,
             }
 
-
     @run_before("run")
     def setup_testcase(self):
-        """set up test case """
-        self.prerun_cmds = ["source ${FOAM_INSTALL_DIR}/etc/bashrc",
-                            "cp -r ${FOAM_INSTALL_DIR}/tutorials/multiphase/interFoam/laminar/damBreak/damBreak .",
-                            "cd damBreak",
-                            "blockMesh",
-                            "cp 0/alpha.water.orig 0/alpha.water",
-                            "setFields"]
-        
+        """set up test case"""
+        self.prerun_cmds = [
+            "source ${FOAM_INSTALL_DIR}/etc/bashrc",
+            "cp -r ${FOAM_INSTALL_DIR}/tutorials/multiphase/interFoam/laminar/damBreak/damBreak .",
+            "cd damBreak",
+            "blockMesh",
+            "cp 0/alpha.water.orig 0/alpha.water",
+            "setFields",
+        ]
 
     @run_before("performance")
     def set_reference(self):
@@ -99,6 +99,7 @@ def set_reference(self):
             # https://reframe-hpc.readthedocs.io/en/stable/utility_functions_reference.html#reframe.utility.ScopedDict
             self.reference["archer2:compute:performance"] = self.reference_performance[self.freq]
 
+
 @rfm.simple_test
 class OpenFoamDamnBreakParallel(OpenFoamBaseCheck):
     """OpenFoam Damn break test"""
@@ -135,17 +136,18 @@ def setup_params(self):
                 "SLURM_CPU_FREQ_REQ": self.freq,
             }
 
-
     @run_before("run")
     def setup_testcase(self):
-        """set up test case """
-        self.prerun_cmds = ["source ${FOAM_INSTALL_DIR}/etc/bashrc",
-                            "cp -r ${FOAM_INSTALL_DIR}/tutorials/multiphase/interFoam/laminar/damBreak/damBreak .",
-                            "cd damBreak",
-                            "blockMesh",
-                            "cp 0/alpha.water.orig 0/alpha.water",
-                            "setFields",
-                            "decomposePar"]
+        """set up test case"""
+        self.prerun_cmds = [
+            "source ${FOAM_INSTALL_DIR}/etc/bashrc",
+            "cp -r ${FOAM_INSTALL_DIR}/tutorials/multiphase/interFoam/laminar/damBreak/damBreak .",
+            "cd damBreak",
+            "blockMesh",
+            "cp 0/alpha.water.orig 0/alpha.water",
+            "setFields",
+            "decomposePar",
+        ]
 
     @sanity_function
     def assert_finished_parallel(self):

From fbcf47c90918291f694fc1ce65278ed4e384b486 Mon Sep 17 00:00:00 2001
From: JPRichings <j.richings@epcc.ed.ac.uk>
Date: Tue, 26 Aug 2025 15:12:45 +0100
Subject: [PATCH 4/6] pass flake8 formatting

---
 tests/apps/openfoam/FetchOpenFoam.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/apps/openfoam/FetchOpenFoam.py b/tests/apps/openfoam/FetchOpenFoam.py
index 16bf255..f165338 100644
--- a/tests/apps/openfoam/FetchOpenFoam.py
+++ b/tests/apps/openfoam/FetchOpenFoam.py
@@ -7,10 +7,8 @@
 #   ReFrame Project Developers. See the top-level LICENSE file for details.
 #   SPDX-License-Identifier: BSD-3-Clause
 
-import os
 import reframe as rfm
 import reframe.utility.sanity as sn
-import reframe.utility.udeps as udeps
 
 
 @rfm.simple_test

From 7cb9f5c769f90e8595cb84d5dd15ba2f356b1d0e Mon Sep 17 00:00:00 2001
From: JPRichings <j.richings@epcc.ed.ac.uk>
Date: Tue, 26 Aug 2025 15:25:18 +0100
Subject: [PATCH 5/6] pylint formatting

---
 tests/apps/openfoam/Compile_OpenFoam.py     |  7 ++++---
 tests/apps/openfoam/FetchOpenFoam.py        |  3 ++-
 tests/apps/openfoam/Test_OpenFoam.py        | 11 ++++++-----
 tests/apps/openfoam/Test_module_OpenFoam.py |  6 +++---
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/tests/apps/openfoam/Compile_OpenFoam.py b/tests/apps/openfoam/Compile_OpenFoam.py
index 2a0a468..26d7e72 100644
--- a/tests/apps/openfoam/Compile_OpenFoam.py
+++ b/tests/apps/openfoam/Compile_OpenFoam.py
@@ -12,7 +12,7 @@
 import reframe.utility.sanity as sn
 
 
-class FetchOpenFoam(rfm.RunOnlyRegressionTest):
+class Fetch_Open_Foam(rfm.RunOnlyRegressionTest):
     """Downlaod OpenFoam"""
 
     version = variable(str, value="v2412")
@@ -29,15 +29,16 @@ class FetchOpenFoam(rfm.RunOnlyRegressionTest):
 
     @sanity_function
     def validate_download(self):
+        """Validate OpenFoam Downloaded"""
         return sn.path_isfile(f"ThirdParty-{self.version}.tgz") and sn.path_isfile(f"OpenFOAM-{self.version}.tgz")
 
 
 @rfm.simple_test
-class CompileOpenFoam(rfm.CompileOnlyRegressionTest):
+class Compile_Open_Foam(rfm.CompileOnlyRegressionTest):
     """Test compilation of OpenFoam"""
 
     build_system = "Make"
-    fetch_openfoam = fixture(FetchOpenFoam, scope="environment")
+    fetch_openfoam = fixture(Fetch_Open_Foam, scope="environment")
 
     valid_systems = ["archer2:compute"]
     valid_prog_environs = ["PrgEnv-gnu"]
diff --git a/tests/apps/openfoam/FetchOpenFoam.py b/tests/apps/openfoam/FetchOpenFoam.py
index f165338..34401c9 100644
--- a/tests/apps/openfoam/FetchOpenFoam.py
+++ b/tests/apps/openfoam/FetchOpenFoam.py
@@ -12,7 +12,7 @@
 
 
 @rfm.simple_test
-class FetchOpenFoam(rfm.RunOnlyRegressionTest):
+class Fetch_Open_Foam(rfm.RunOnlyRegressionTest):
     """Downlaod OpenFoam"""
 
     version = variable(str, value="v2412")
@@ -29,4 +29,5 @@ class FetchOpenFoam(rfm.RunOnlyRegressionTest):
 
     @sanity_function
     def validate_download(self):
+        """Validate openFoam Downloaded"""
         return sn.path_isfile(f"ThirdParty-{self.version}.tgz") and sn.path_isfile(f"OpenFOAM-{self.version}.tgz")
diff --git a/tests/apps/openfoam/Test_OpenFoam.py b/tests/apps/openfoam/Test_OpenFoam.py
index 6759ebd..9e97d25 100644
--- a/tests/apps/openfoam/Test_OpenFoam.py
+++ b/tests/apps/openfoam/Test_OpenFoam.py
@@ -12,7 +12,7 @@
 import reframe.utility.sanity as sn
 
 
-class FetchOpenFoam(rfm.RunOnlyRegressionTest):
+class Fetch_Open_Foam(rfm.RunOnlyRegressionTest):
     """Downlaod OpenFoam"""
 
     version = variable(str, value="v2412")
@@ -29,14 +29,15 @@ class FetchOpenFoam(rfm.RunOnlyRegressionTest):
 
     @sanity_function
     def validate_download(self):
+        """Validate OenFoam Downloaded"""
         return sn.path_isfile(f"ThirdParty-{self.version}.tgz") and sn.path_isfile(f"OpenFOAM-{self.version}.tgz")
 
 
-class CompileOpenFoam(rfm.CompileOnlyRegressionTest):
+class Compile_Open_Foam(rfm.CompileOnlyRegressionTest):
     """Test compilation of OpenFoam"""
 
     build_system = "Make"
-    fetch_openfoam = fixture(FetchOpenFoam, scope="environment")
+    fetch_openfoam = fixture(Fetch_Open_Foam, scope="environment")
 
     valid_systems = ["archer2:compute"]
     valid_prog_environs = ["PrgEnv-gnu"]
@@ -105,7 +106,7 @@ def validate_compile(self):
 
 
 @rfm.simple_test
-class TestOpenFoam(rfm.RunOnlyRegressionTest):
+class Test_Open_Foam(rfm.RunOnlyRegressionTest):
     """OpenFoam Test"""
 
     # Select system to use
@@ -119,7 +120,7 @@ class TestOpenFoam(rfm.RunOnlyRegressionTest):
 
     tags = {"performance", "applications"}
 
-    compile_openfoam = fixture(CompileOpenFoam, scope="environment")
+    compile_openfoam = fixture(Compile_Open_Foam, scope="environment")
 
     modules = ["gcc/11.2.0", "mkl", "cray-fftw"]
 
diff --git a/tests/apps/openfoam/Test_module_OpenFoam.py b/tests/apps/openfoam/Test_module_OpenFoam.py
index 05c8dc0..1d85d01 100644
--- a/tests/apps/openfoam/Test_module_OpenFoam.py
+++ b/tests/apps/openfoam/Test_module_OpenFoam.py
@@ -6,7 +6,7 @@
 import reframe.utility.sanity as sn
 
 
-class OpenFoamBaseCheck(rfm.RunOnlyRegressionTest):
+class Open_Foam_Base_Check(rfm.RunOnlyRegressionTest):
     """ReFrame OpenFoam test base class"""
 
     # Which modules to load in test
@@ -45,7 +45,7 @@ def extract_perf(self):
 
 
 @rfm.simple_test
-class OpenFoamDamnBreak(OpenFoamBaseCheck):
+class Open_Foam_Damn_Break(Open_Foam_Base_Check):
     """OpenFoam Damn break test"""
 
     # Select system to use
@@ -101,7 +101,7 @@ def set_reference(self):
 
 
 @rfm.simple_test
-class OpenFoamDamnBreakParallel(OpenFoamBaseCheck):
+class Open_Foam_Damn_Break_Parallel(Open_Foam_Base_Check):
     """OpenFoam Damn break test"""
 
     # Select system to use

From 2ab1439121f5f958827d40cddbc9e6218f92ee3c Mon Sep 17 00:00:00 2001
From: JPRichings <j.richings@epcc.ed.ac.uk>
Date: Tue, 26 Aug 2025 15:45:35 +0100
Subject: [PATCH 6/6] pylint formatting

---
 .../{Compile_OpenFoam.py => compile_openfoam.py}       |  6 +++---
 .../openfoam/{FetchOpenFoam.py => fetch_openfoam.py}   |  2 +-
 ...Test_module_OpenFoam.py => test_module_openfoam.py} |  6 +++---
 .../openfoam/{Test_OpenFoam.py => test_openfoam.py}    | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename tests/apps/openfoam/{Compile_OpenFoam.py => compile_openfoam.py} (94%)
 rename tests/apps/openfoam/{FetchOpenFoam.py => fetch_openfoam.py} (95%)
 rename tests/apps/openfoam/{Test_module_OpenFoam.py => test_module_openfoam.py} (96%)
 rename tests/apps/openfoam/{Test_OpenFoam.py => test_openfoam.py} (95%)

diff --git a/tests/apps/openfoam/Compile_OpenFoam.py b/tests/apps/openfoam/compile_openfoam.py
similarity index 94%
rename from tests/apps/openfoam/Compile_OpenFoam.py
rename to tests/apps/openfoam/compile_openfoam.py
index 26d7e72..e3e1ae7 100644
--- a/tests/apps/openfoam/Compile_OpenFoam.py
+++ b/tests/apps/openfoam/compile_openfoam.py
@@ -12,7 +12,7 @@
 import reframe.utility.sanity as sn
 
 
-class Fetch_Open_Foam(rfm.RunOnlyRegressionTest):
+class FetchOpenFoam(rfm.RunOnlyRegressionTest):
     """Downlaod OpenFoam"""
 
     version = variable(str, value="v2412")
@@ -34,11 +34,11 @@ def validate_download(self):
 
 
 @rfm.simple_test
-class Compile_Open_Foam(rfm.CompileOnlyRegressionTest):
+class CompileOpenFoam(rfm.CompileOnlyRegressionTest):
     """Test compilation of OpenFoam"""
 
     build_system = "Make"
-    fetch_openfoam = fixture(Fetch_Open_Foam, scope="environment")
+    fetch_openfoam = fixture(FetchOpenFoam, scope="environment")
 
     valid_systems = ["archer2:compute"]
     valid_prog_environs = ["PrgEnv-gnu"]
diff --git a/tests/apps/openfoam/FetchOpenFoam.py b/tests/apps/openfoam/fetch_openfoam.py
similarity index 95%
rename from tests/apps/openfoam/FetchOpenFoam.py
rename to tests/apps/openfoam/fetch_openfoam.py
index 34401c9..bbd4b79 100644
--- a/tests/apps/openfoam/FetchOpenFoam.py
+++ b/tests/apps/openfoam/fetch_openfoam.py
@@ -12,7 +12,7 @@
 
 
 @rfm.simple_test
-class Fetch_Open_Foam(rfm.RunOnlyRegressionTest):
+class FetchOpenFoam(rfm.RunOnlyRegressionTest):
     """Downlaod OpenFoam"""
 
     version = variable(str, value="v2412")
diff --git a/tests/apps/openfoam/Test_module_OpenFoam.py b/tests/apps/openfoam/test_module_openfoam.py
similarity index 96%
rename from tests/apps/openfoam/Test_module_OpenFoam.py
rename to tests/apps/openfoam/test_module_openfoam.py
index 1d85d01..05c8dc0 100644
--- a/tests/apps/openfoam/Test_module_OpenFoam.py
+++ b/tests/apps/openfoam/test_module_openfoam.py
@@ -6,7 +6,7 @@
 import reframe.utility.sanity as sn
 
 
-class Open_Foam_Base_Check(rfm.RunOnlyRegressionTest):
+class OpenFoamBaseCheck(rfm.RunOnlyRegressionTest):
     """ReFrame OpenFoam test base class"""
 
     # Which modules to load in test
@@ -45,7 +45,7 @@ def extract_perf(self):
 
 
 @rfm.simple_test
-class Open_Foam_Damn_Break(Open_Foam_Base_Check):
+class OpenFoamDamnBreak(OpenFoamBaseCheck):
     """OpenFoam Damn break test"""
 
     # Select system to use
@@ -101,7 +101,7 @@ def set_reference(self):
 
 
 @rfm.simple_test
-class Open_Foam_Damn_Break_Parallel(Open_Foam_Base_Check):
+class OpenFoamDamnBreakParallel(OpenFoamBaseCheck):
     """OpenFoam Damn break test"""
 
     # Select system to use
diff --git a/tests/apps/openfoam/Test_OpenFoam.py b/tests/apps/openfoam/test_openfoam.py
similarity index 95%
rename from tests/apps/openfoam/Test_OpenFoam.py
rename to tests/apps/openfoam/test_openfoam.py
index 9e97d25..59f2dfb 100644
--- a/tests/apps/openfoam/Test_OpenFoam.py
+++ b/tests/apps/openfoam/test_openfoam.py
@@ -12,7 +12,7 @@
 import reframe.utility.sanity as sn
 
 
-class Fetch_Open_Foam(rfm.RunOnlyRegressionTest):
+class FetchOpenFoam(rfm.RunOnlyRegressionTest):
     """Downlaod OpenFoam"""
 
     version = variable(str, value="v2412")
@@ -33,11 +33,11 @@ def validate_download(self):
         return sn.path_isfile(f"ThirdParty-{self.version}.tgz") and sn.path_isfile(f"OpenFOAM-{self.version}.tgz")
 
 
-class Compile_Open_Foam(rfm.CompileOnlyRegressionTest):
+class CompileOpenFoam(rfm.CompileOnlyRegressionTest):
     """Test compilation of OpenFoam"""
 
     build_system = "Make"
-    fetch_openfoam = fixture(Fetch_Open_Foam, scope="environment")
+    fetch_openfoam = fixture(FetchOpenFoam, scope="environment")
 
     valid_systems = ["archer2:compute"]
     valid_prog_environs = ["PrgEnv-gnu"]
@@ -106,7 +106,7 @@ def validate_compile(self):
 
 
 @rfm.simple_test
-class Test_Open_Foam(rfm.RunOnlyRegressionTest):
+class TestOpenFoam(rfm.RunOnlyRegressionTest):
     """OpenFoam Test"""
 
     # Select system to use
@@ -120,7 +120,7 @@ class Test_Open_Foam(rfm.RunOnlyRegressionTest):
 
     tags = {"performance", "applications"}
 
-    compile_openfoam = fixture(Compile_Open_Foam, scope="environment")
+    compile_openfoam = fixture(CompileOpenFoam, scope="environment")
 
     modules = ["gcc/11.2.0", "mkl", "cray-fftw"]