Skip to content

Add oasis3-mct version 5.2 #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aidanheerdegen merged 14 commits into from
Jan 30, 2026
Merged

Add oasis3-mct version 5.2 #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
67077dc
Add oasis3-mct version 5.2
aidanheerdegen Jan 23, 2026
53bed0d
Add bespoke CI for oasis3-mct to check stable and version 5.2
aidanheerdegen Jan 23, 2026
023e60b
Remove 5.2 gcc testing
aidanheerdegen Jan 27, 2026
39e88ac
Add back in gcc with v5.2 and additional flags
aidanheerdegen Jan 28, 2026
a7c450d
Move oasis3-mct v5 gcc build into separate manifest with compile options
aidanheerdegen Jan 28, 2026
ce93ab1
Remove v5 gcc CI test
aidanheerdegen Jan 28, 2026
bcc7e35
Modify pkgconfig version logic for v5
aidanheerdegen Jan 29, 2026
dbcd449
Turn on ssh access
aidanheerdegen Jan 29, 2026
809ec6b
Set allow ssh to false, but keep option in for future
aidanheerdegen Jan 29, 2026
911b54f
Remove upstream 5.2 version
aidanheerdegen Jan 29, 2026
c909ebf
Remove deleted version from url_for_version check
aidanheerdegen Jan 29, 2026
b603357
Add back in gcc test build for oasis3-mct v5
aidanheerdegen Jan 29, 2026
d98e583
Use same gcc CI test file for both versions of oasis3-mct
aidanheerdegen Jan 30, 2026
8bf8bac
Move OASIS3-mct compiler flags into SPR
aidanheerdegen Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .github/build-ci/manifests/oasis3-mct/gcc.spack.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
spack:
specs:
# package is defined in the workflows inputs.spack-manifest-data-pairs
# And the gcc_compilers are defined in the standard_definitions.json data file
# Test default (stable) and 5.2 (latest)
- '{{ package }} %{{ gcc_compiler }}'
- '{{ package }}@5.2 %{{ gcc_compiler }}'
packages:
all:
require:
- '%{{ gcc_compiler }} target={{ target }}'
concretizer:
unify: false
view: false
13 changes: 13 additions & 0 deletions .github/build-ci/manifests/oasis3-mct/intel.spack.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
spack:
specs:
# package is defined in the workflows inputs.spack-manifest-data-pairs
# And the intel_compilers are defined in the standard_definitions.json data file
- '{{ package }} %{{ intel_compiler }}'
- '{{ package }}@5.2 %{{ intel_compiler }}'
packages:
all:
require:
- '%{{ intel_compiler }} target={{ target }}'
concretizer:
unify: false
view: false
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,5 +143,6 @@ jobs:
spack-packages-ref: ${{ needs.setup-ci.outputs.spack-packages-ref }}
spack-config-ref: ${{ needs.setup-ci.outputs.spack-config-ref }}
spack-ref: ${{ needs.setup-ci.outputs.spack-ref }}
allow-ssh-into-spack-install: false
secrets:
spack-install-command-pat: ${{ secrets.SPACK_INSTALL_COMMAND_PAT }}
13 changes: 5 additions & 8 deletions packages/oasis3-mct/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,12 @@ class Oasis3Mct(MakefilePackage):
maintainers("harshula", "penguian")

version("stable", branch="master", preferred=True)
version("5.2", tag="5.2", commit="fadc2145cfbd89261aa418e8dd4f754ba273735e")
version(
"upstream",
branch="OASIS3-MCT_5.0",
git="https://gitlab.com/cerfacs/oasis3-mct.git",
)
version(
"OASIS3-MCT_5.2",
tag="OASIS3-MCT_5.2",
git="https://gitlab.com/cerfacs/oasis3-mct.git",
)
# TODO: Remove the "access-om2" once it is no longer being used anywhere
version("access-om2", branch="master")
version("access-esm1.5", branch="access-esm1.5")
Expand Down Expand Up @@ -64,15 +60,15 @@ class Oasis3Mct(MakefilePackage):

# TODO: Remove this function when it is no longer required
def url_for_version(self, version):
if self.spec.satisfies("@upstream,OASIS3-MCT_5.2"):
if self.spec.satisfies("@upstream"):
raise ValueError("url_for_version() called for version @upstream")

return "https://github.com/ACCESS-NRI/oasis3-mct/tarball/{0}".format(version)

def __create_pkgconfig(self, spec, prefix):

oasis_version = "2.0"
if self.spec.satisfies("@upstream,OASIS3-MCT_5.2"):
if self.spec.satisfies("@upstream,5:"):
oasis_version = "5"

mkdirp(self.__pkgdir)
Expand Down Expand Up @@ -148,7 +144,8 @@ def edit(self, spec, prefix):
config["gcc"] = """
# Compiling and other commands
MAKE = make
F90 = mpif90 -Wall -fallow-argument-mismatch
# Consider adding following flags if breaks for gfortran > v10: -fdefault-real-8 -fdefault-double-8
F90 = mpif90 -Wall -fallow-argument-mismatch -ffree-line-length-0
CC = gcc
LD = mpif90
MCT_FCFLAGS =
Expand Down