From f1437171c8c183996302e3b94a099548a5c3ed21 Mon Sep 17 00:00:00 2001 From: Alberto Invernizzi Date: Wed, 17 Jan 2024 15:58:16 +0100 Subject: [PATCH 1/5] add 2212 ltd version --- recipes/openfoam/ltd/2212/mc/compilers.yaml | 5 +++++ recipes/openfoam/ltd/2212/mc/config.yaml | 7 +++++++ recipes/openfoam/ltd/2212/mc/environments.yaml | 13 +++++++++++++ recipes/openfoam/ltd/2212/mc/modules.yaml | 13 +++++++++++++ 4 files changed, 38 insertions(+) create mode 100644 recipes/openfoam/ltd/2212/mc/compilers.yaml create mode 100644 recipes/openfoam/ltd/2212/mc/config.yaml create mode 100644 recipes/openfoam/ltd/2212/mc/environments.yaml create mode 100644 recipes/openfoam/ltd/2212/mc/modules.yaml diff --git a/recipes/openfoam/ltd/2212/mc/compilers.yaml b/recipes/openfoam/ltd/2212/mc/compilers.yaml new file mode 100644 index 00000000..5db9c480 --- /dev/null +++ b/recipes/openfoam/ltd/2212/mc/compilers.yaml @@ -0,0 +1,5 @@ +bootstrap: + spec: gcc@11 +gcc: + specs: + - gcc@11 diff --git a/recipes/openfoam/ltd/2212/mc/config.yaml b/recipes/openfoam/ltd/2212/mc/config.yaml new file mode 100644 index 00000000..e15a4944 --- /dev/null +++ b/recipes/openfoam/ltd/2212/mc/config.yaml @@ -0,0 +1,7 @@ +name: openfoam +description: OpenFOAM Ltd v2212 +store: /user-environment +spack: + repo: https://github.com/spack/spack.git + commit: releases/v0.21 +modules: true diff --git a/recipes/openfoam/ltd/2212/mc/environments.yaml b/recipes/openfoam/ltd/2212/mc/environments.yaml new file mode 100644 index 00000000..6f0cf13f --- /dev/null +++ b/recipes/openfoam/ltd/2212/mc/environments.yaml @@ -0,0 +1,13 @@ +openfoam-env: + compiler: + - toolchain: gcc + spec: gcc@11 + mpi: + spec: cray-mpich + unify: true + specs: + - openfoam@2212 + views: + openfoam: + develop: + exclude: ['openfoam'] diff --git a/recipes/openfoam/ltd/2212/mc/modules.yaml b/recipes/openfoam/ltd/2212/mc/modules.yaml new file mode 100644 index 00000000..00e3e6d4 --- /dev/null +++ b/recipes/openfoam/ltd/2212/mc/modules.yaml @@ -0,0 +1,13 @@ +modules: + default: + arch_folder: false + roots: + tcl: /user-environment/modules + tcl: + all: + autoload: none + hash_length: 0 + projections: + openfoam: "openfoam/{version}" + include: [openfoam] + exclude: ["%gcc@11", "%gcc@7"] From 585eb3269ee1ca062ec3c28dbc41a8d5c12f99e6 Mon Sep 17 00:00:00 2001 From: Alberto Invernizzi Date: Wed, 17 Jan 2024 16:04:37 +0100 Subject: [PATCH 2/5] add ci configuration also for openfoam ltd --- config.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config.yaml b/config.yaml index 6f09d303..0919b70f 100644 --- a/config.yaml +++ b/config.yaml @@ -82,6 +82,13 @@ uenvs: deploy: eiger: [zen2] develop: False + # OpenFOAM Ltd + openfoam-ltd: + "2212": + recipes: + zen2: 2212/mc + deploy: + eiger: [zen2] # OpenFOAM Foundation openfoam-org: "8": From edb3f83b7846b0ee350332141aea68c2a48a043f Mon Sep 17 00:00:00 2001 From: Alberto Invernizzi Date: Mon, 22 Jan 2024 11:46:48 +0100 Subject: [PATCH 3/5] enable 64bit labels --- recipes/openfoam/ltd/2212/mc/environments.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/openfoam/ltd/2212/mc/environments.yaml b/recipes/openfoam/ltd/2212/mc/environments.yaml index 6f0cf13f..1a80c379 100644 --- a/recipes/openfoam/ltd/2212/mc/environments.yaml +++ b/recipes/openfoam/ltd/2212/mc/environments.yaml @@ -6,7 +6,7 @@ openfoam-env: spec: cray-mpich unify: true specs: - - openfoam@2212 + - openfoam@2212 +int64 views: openfoam: develop: From 76981f6cf0c5ab101a82515cfcdc7cf74bfa1143 Mon Sep 17 00:00:00 2001 From: Alberto Invernizzi Date: Tue, 23 Jan 2024 08:40:52 +0100 Subject: [PATCH 4/5] leftover change after rebase to adapt to new folder structure --- recipes/{openfoam/ltd => openfoam-ltd}/2212/mc/compilers.yaml | 0 recipes/{openfoam/ltd => openfoam-ltd}/2212/mc/config.yaml | 0 recipes/{openfoam/ltd => openfoam-ltd}/2212/mc/environments.yaml | 0 recipes/{openfoam/ltd => openfoam-ltd}/2212/mc/modules.yaml | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename recipes/{openfoam/ltd => openfoam-ltd}/2212/mc/compilers.yaml (100%) rename recipes/{openfoam/ltd => openfoam-ltd}/2212/mc/config.yaml (100%) rename recipes/{openfoam/ltd => openfoam-ltd}/2212/mc/environments.yaml (100%) rename recipes/{openfoam/ltd => openfoam-ltd}/2212/mc/modules.yaml (100%) diff --git a/recipes/openfoam/ltd/2212/mc/compilers.yaml b/recipes/openfoam-ltd/2212/mc/compilers.yaml similarity index 100% rename from recipes/openfoam/ltd/2212/mc/compilers.yaml rename to recipes/openfoam-ltd/2212/mc/compilers.yaml diff --git a/recipes/openfoam/ltd/2212/mc/config.yaml b/recipes/openfoam-ltd/2212/mc/config.yaml similarity index 100% rename from recipes/openfoam/ltd/2212/mc/config.yaml rename to recipes/openfoam-ltd/2212/mc/config.yaml diff --git a/recipes/openfoam/ltd/2212/mc/environments.yaml b/recipes/openfoam-ltd/2212/mc/environments.yaml similarity index 100% rename from recipes/openfoam/ltd/2212/mc/environments.yaml rename to recipes/openfoam-ltd/2212/mc/environments.yaml diff --git a/recipes/openfoam/ltd/2212/mc/modules.yaml b/recipes/openfoam-ltd/2212/mc/modules.yaml similarity index 100% rename from recipes/openfoam/ltd/2212/mc/modules.yaml rename to recipes/openfoam-ltd/2212/mc/modules.yaml From af57765b2326b55113228e33b8e351c7008d03b2 Mon Sep 17 00:00:00 2001 From: Alberto Invernizzi Date: Tue, 23 Jan 2024 14:29:01 +0100 Subject: [PATCH 5/5] switch to gcc@12 as suggested --- recipes/openfoam-ltd/2212/mc/compilers.yaml | 4 ++-- recipes/openfoam-ltd/2212/mc/environments.yaml | 2 +- recipes/openfoam-ltd/2212/mc/modules.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/openfoam-ltd/2212/mc/compilers.yaml b/recipes/openfoam-ltd/2212/mc/compilers.yaml index 5db9c480..c3bc6ac6 100644 --- a/recipes/openfoam-ltd/2212/mc/compilers.yaml +++ b/recipes/openfoam-ltd/2212/mc/compilers.yaml @@ -1,5 +1,5 @@ bootstrap: - spec: gcc@11 + spec: gcc@12 gcc: specs: - - gcc@11 + - gcc@12 diff --git a/recipes/openfoam-ltd/2212/mc/environments.yaml b/recipes/openfoam-ltd/2212/mc/environments.yaml index 1a80c379..9d7027ec 100644 --- a/recipes/openfoam-ltd/2212/mc/environments.yaml +++ b/recipes/openfoam-ltd/2212/mc/environments.yaml @@ -1,7 +1,7 @@ openfoam-env: compiler: - toolchain: gcc - spec: gcc@11 + spec: gcc@12 mpi: spec: cray-mpich unify: true diff --git a/recipes/openfoam-ltd/2212/mc/modules.yaml b/recipes/openfoam-ltd/2212/mc/modules.yaml index 00e3e6d4..7d8c1d0e 100644 --- a/recipes/openfoam-ltd/2212/mc/modules.yaml +++ b/recipes/openfoam-ltd/2212/mc/modules.yaml @@ -10,4 +10,4 @@ modules: projections: openfoam: "openfoam/{version}" include: [openfoam] - exclude: ["%gcc@11", "%gcc@7"] + exclude: ["%gcc@12", "%gcc@7"]