@@ -17,20 +17,17 @@ class Oasis3Mct(MakefilePackage):
1717
1818 maintainers ("harshula" , "penguian" )
1919
20- version ("access-om2" , branch = "master" , preferred = True )
20+ version ("stable" , branch = "master" , preferred = True )
21+ # TODO: Remove the "access-om2" once it is no longer being used anywhere
22+ version ("access-om2" , branch = "master" )
2123 version ("access-esm1.5" , branch = "access-esm1.5" )
2224
2325 variant ("deterministic" , default = False , description = "Deterministic build." )
2426 variant ("optimisation_report" , default = False , description = "Generate optimisation reports." )
2527
26- with when ("@:access-esm0,access-esm2:" ):
27- depends_on ("netcdf-fortran@4.5.2:" )
28- # Depend on virtual package "mpi".
29- depends_on ("mpi" )
30- with when ("@access-esm1.5" ):
31- depends_on ("netcdf-fortran@4.5.1:" )
32- # Depend on "openmpi".
33- depends_on ("openmpi" )
28+ depends_on ("netcdf-fortran@4.5.2:" )
29+ # Depend on virtual package "mpi".
30+ depends_on ("mpi" )
3431
3532 phases = ["edit" , "build" , "install" ]
3633
@@ -250,7 +247,7 @@ def edit(self, spec, prefix):
250247f = $(F90)
251248"""
252249
253- config ["gcc" ] = f """
250+ config ["gcc" ] = """
254251# Compiling and other commands
255252MAKE = make
256253F90 = mpif90 -Wall -fallow-argument-mismatch
@@ -294,7 +291,7 @@ def edit(self, spec, prefix):
294291 # Add support for the ifx compiler
295292 config ["oneapi" ] = config ["intel" ]
296293
297- config ["post" ] = f """
294+ config ["post" ] = """
298295f90FLAGS_1 = $(F90FLAGS_1)
299296FFLAGS_1 = $(F90FLAGS_1)
300297fFLAGS_1 = $(F90FLAGS_1)
0 commit comments