Support matching_mkl_version also for intel_x compilers

The macro matching_mkl_version should also be supported for the new _x Intel toolchains.

@loh Kindly ask you for a review, because of possible side effects. If merged, how whould that change be activated?

mpcdf_common.py

@@ -44,14 +44,14 @@ intel_parallel_studio = {
     "mpcdf_intel_oneapi_2022_1": {"compiler": "intel_21_5_0", "impi": "impi_2021_5", "mkl": "mkl_2022_0-module", },
     "mpcdf_intel_oneapi_2022_2": {"compiler": "intel_21_6_0", "compiler_x": "intel_22_1_0_x", "impi": "impi_2021_6", "mkl": "mkl_2022_1-module", },
     "mpcdf_intel_oneapi_2022_3": {"compiler": "intel_21_7_1", "compiler_x": "intel_22_2_1_x", "impi": "impi_2021_7", "mkl": "mkl_2022_2-module", },
-    "mpcdf_intel_oneapi_2023_1": {"compiler_x": "intel_23_1_0_x", "impi": "impi_2021_9", "mkl": "mkl_2023_1-module", },
+    "mpcdf_intel_oneapi_2023_1": {"compiler": "intel_23_1_0_x", "impi": "impi_2021_9", "mkl": "mkl_2023_1-module", },
 }
 
 all_mkls = {ic["mkl"] for ic in intel_parallel_studio.values()}
 
 # Some rotations
 mpi_parallel_studio = {value["impi"]: dict({"ps": key}, **value) for key, value in intel_parallel_studio.items()}
-compiler_parallel_studio = {value["compiler"]: dict({"ps": key}, **value) for key, value in intel_parallel_studio.items() if "compiler" in value}
+compiler_parallel_studio = {value["compiler"]: dict({"ps": key}, **value) for key, value in intel_parallel_studio.items()}
 compiler_x_parallel_studio = {value.get("compiler_x"): dict({"ps": key}, **value) for key, value in intel_parallel_studio.items()}
 
 
@@ -204,7 +204,7 @@ def valid_mpi(compiler, mpi):
     the package software:dist / mpcdf_cluster_macros
     """
     if compiler.startswith("intel") and mpi.startswith("impi"):
-        if compiler.endswith("_x"):
+        if compiler in compiler_x_parallel_studio:
             return mpi == compiler_x_parallel_studio[compiler]["impi"]
         return mpi == compiler_parallel_studio[compiler]["impi"]
     if compiler.startswith("pgi"):