Skip to content

Use oasis3-mct master branch in ACCESS-ESM1.6 #311

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
dougiesquire merged 2 commits into from
Sep 2, 2025
Merged

Use oasis3-mct master branch in ACCESS-ESM1.6 #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5f921a
mom5: depend on oasis3-mct, not oasis3-mct@access-esm1.5, with versio…
dougiesquire Aug 26, 2025
50861eb
oasis3-mct: add stable version (preferred)
dougiesquire Aug 27, 2025
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
8 changes: 3 additions & 5 deletions packages/mom5/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,12 @@ class Mom5(CMakePackage, MakefilePackage):

with when("@access-om2,legacy-access-om2-bgc"):
depends_on("datetime-fortran")
depends_on("oasis3-mct+deterministic", when="+deterministic")
depends_on("oasis3-mct~deterministic", when="~deterministic")
depends_on("libaccessom2+deterministic", when="+deterministic")
depends_on("libaccessom2~deterministic", when="~deterministic")

with when("@access-esm1.6"):
depends_on("oasis3-mct@access-esm1.5+deterministic", when="+deterministic")
depends_on("oasis3-mct@access-esm1.5~deterministic", when="~deterministic")
with when("@access-om2,legacy-access-om2-bgc,access-esm1.6"):
depends_on("oasis3-mct+deterministic", when="+deterministic")
depends_on("oasis3-mct~deterministic", when="~deterministic")

# NOTE: Spack will also match "access-om2-legacy-bgc" here, that's why
# it has been renamed to "legacy-access-om2-bgc".
Expand Down
19 changes: 8 additions & 11 deletions packages/oasis3-mct/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,22 @@ class Oasis3Mct(MakefilePackage):

maintainers("harshula", "penguian")

version("stable", branch="master", preferred=True)
version(
"upstream",
branch="OASIS3-MCT_5.0",
git="https://gitlab.com/cerfacs/oasis3-mct.git",
)
version("access-om2", branch="master", preferred=True)
# 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")

variant("deterministic", default=False, description="Deterministic build.")
variant("optimisation_report", default=False, description="Generate optimisation reports.")

with when("@:access-esm0,access-esm2:"):
depends_on("netcdf-fortran@4.5.2:")
# Depend on virtual package "mpi".
depends_on("mpi")
with when("@access-esm1.5"):
depends_on("netcdf-fortran@4.5.1:")
# Depend on "openmpi".
depends_on("openmpi")
depends_on("netcdf-fortran@4.5.2:")
# Depend on virtual package "mpi".
depends_on("mpi")
Comment thread
penguian marked this conversation as resolved.

phases = ["edit", "build", "install"]

Expand Down Expand Up @@ -143,7 +140,7 @@ def edit(self, spec, prefix):
f = $(F90)
"""

config["gcc"] = f"""
config["gcc"] = """
Comment thread
dougiesquire marked this conversation as resolved.
# Compiling and other commands
MAKE = make
F90 = mpif90 -Wall -fallow-argument-mismatch
Expand Down Expand Up @@ -187,7 +184,7 @@ def edit(self, spec, prefix):
# Add support for the ifx compiler
config["oneapi"] = config["intel"]

config["post"] = f"""
config["post"] = """
f90FLAGS_1 = $(F90FLAGS_1)
FFLAGS_1 = $(F90FLAGS_1)
fFLAGS_1 = $(F90FLAGS_1)
Expand Down
⚡