Skip to content
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

Jump to bottom

Added specific reference to 'master' version in mom5 and oasis packages #153

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added specific reference to 'master' version in mom5 and oasis packages #153

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
534e90c
Added specific reference to 'master' version in mom5 and oasis packages
atteggiani Oct 14, 2024
c973cce
Fixed Ruff errors 'f-string without placeholders' in oasis
atteggiani Oct 14, 2024
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
2 changes: 1 addition & 1 deletion packages/mom5/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Mom5(MakefilePackage):
multi=False,
description="Build MOM5 to support a particular use case.")

with when("@:access-esm0,access-esm2:"):
with when("@master"):
depends_on("netcdf-c@4.7.4:")
depends_on("netcdf-fortran@4.5.2:")
# Depend on virtual package "mpi".
Expand Down
6 changes: 3 additions & 3 deletions packages/oasis3-mct/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Oasis3Mct(MakefilePackage):
variant("deterministic", default=False, description="Deterministic build.")
variant("optimisation_report", default=False, description="Generate optimisation reports.")

with when("@:access-esm0,access-esm2:"):
with when("@master"):
depends_on("netcdf-fortran@4.5.2:")
# Depend on virtual package "mpi".
depends_on("mpi")
Expand Down Expand Up @@ -251,7 +251,7 @@ def edit(self, spec, prefix):
f = $(F90)
"""

config["gcc"] = f"""
config["gcc"] = """
# Compiling and other commands
MAKE = make
F90 = mpif90 -Wall -fallow-argument-mismatch
Expand Down Expand Up @@ -295,7 +295,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
Loading