Skip to content

Fix syntax for esm1.5 (doesn't use cable as a library) #372

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
anton-seaice merged 2 commits into from
Feb 1, 2026
Merged

Fix syntax for esm1.5 (doesn't use cable as a library) #372

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
4434130
Only build intel for packages with gcom, per #342
anton-seaice Jan 30, 2026
b84bcf8
Use if rather than 'with when()' in functions
anton-seaice 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
13 changes: 13 additions & 0 deletions .github/build-ci/manifests/access-esm1p5/intel.spack.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This manifest is the same as the default for the intel compiler.
# We provide a manifest in this folder to suppress the default build using the
# gcc compiler from occuring, due to https://github.com/ACCESS-NRI/access-spack-packages/issues/342
spack:
specs:
- '{{ package }} %{{ intel_compiler }}'
packages:
all:
require:
- '%{{ intel_compiler }}'
concretizer:
unify: false
view: false
3 changes: 2 additions & 1 deletion .github/build-ci/manifests/um7/intel.spack.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
# gcc compiler from occuring, due to https://github.com/ACCESS-NRI/access-spack-packages/issues/342
spack:
specs:
- '{{ package }} %{{ intel_compiler }}'
- '{{ package }}@access-esm1.5 %{{ intel_compiler }}'
- '{{ package }}@access-esm1.6 %{{ intel_compiler }}'
packages:
all:
require:
Expand Down
6 changes: 3 additions & 3 deletions packages/um7/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def setup_build_environment(self, env):
join_path(self.spec["oasis3-mct"].prefix.include, subdir)
for subdir in ["psmile.MPI1", "mct"]]
ideps = ["gcom4", "netcdf-fortran"]
with when("@access-esm1.6"):
if self.spec.satisfies("@access-esm1.6"):
ideps.append("cable")
incs = [self.spec[d].prefix.include for d in ideps] + oasis3_incs
for ipath in incs:
Expand Down Expand Up @@ -102,7 +102,7 @@ def edit(self, spec, prefix):
"""

ldeps = ["oasis3-mct", "netcdf-fortran", "dummygrib"]
with when("@access-esm1.6"):
if self.spec.satisfies("@access-esm1.6"):
ldeps.append("cable")
libs = " ".join([self._get_linker_args(spec, d) for d in ldeps] + ["-lgcom"])

Expand Down Expand Up @@ -151,7 +151,7 @@ def edit(self, spec, prefix):
# string for older versions of UM7 which include CABLE as
# source code.
CABLE_excl_deps = ""
with when("@access-esm1.6"):
if self.spec.satisfies("@access-esm1.6"):
CABLE_excl_deps = """
excl_dep USE::cable_def_types_mod
excl_dep USE::cbl_masks_mod
Expand Down