better names?

Author: anton-seaice

…anifests/access-esm3/intel.spack.yaml.j2 …anifests/access_esm3/intel.spack.yaml.j2.github/build-ci/manifests/access-esm3/intel.spack.yaml.j2 renamed to .github/build-ci/manifests/access_esm3/intel.spack.yaml.j2 .github/build-ci/manifests/access-esm3/intel.spack.yaml.j2 renamed to .github/build-ci/manifests/access_esm3/intel.spack.yaml.j2

@@ -158,7 +158,7 @@ class UmBasePackage(Package):
         when="+DR_HOOK")
     depends_on("eccodes +fortran +netcdf", type=("build", "link", "run"),
         when="+eccodes")
-    depends_on("netcdf-fortran@4.5.2", type=("build", "link", "run"),
+    depends_on("netcdf-fortran@4.5.2:", type=("build", "link", "run"),
         when="+netcdf")
 
     phases = ["build", "install"]

spack_repo/access/nri/build_systems/um_base.py

@@ -15,7 +15,7 @@
     "MOM6-CICE6",
     "CICE6-WW3",
     "MOM6-CICE6-WW3",
-    "MOM6-UM13", 
+    "MOM6-UM13",
     "MOM6-CICE6-UM13",
 )
 

spack_repo/access/nri/packages/access3/package.py

@@ -15,7 +15,7 @@ class Um(UmBasePackage):
 
     variant("model", default="vn13", description="Model configuration.",
         values=("vn13", "vn13p0-rns", "vn13p1-am", "vn13p5-rns"), multi=False)
-
+    variant("access3", default=False)
     # List of model variants that have been migrated to Github sources.
     # Defined in parent class and overridden here.
     github_models = ("vn13", "vn13p1-am")
@@ -46,6 +46,10 @@ class Um(UmBasePackage):
     variant("mpi", default=True, description="Build with MPI")
     depends_on("mpi", when="+mpi", type=("build", "link", "run"))
 
+    with when("+access3"):
+        depends_on("esmf")
+        conflicts("~netcdf")
+
     def setup_run_environment(self, env):
         """
         Set the built path into the environment.
@@ -81,9 +85,15 @@ def install(self, spec, prefix):
 
     def __create_pkgconfig(self, spec, prefix):
 
+<<<<<<< Updated upstream
         um_version = self.spec.version.value
 
         mkdirp(self.__pkgdir)
+=======
+        pkgdir = f"{prefix}/lib/pkgconfig"
+
+        mkdirp(pkgdir)
+>>>>>>> Stashed changes
         for k in self.__libs:
             text = f"""\
 prefix={prefix}
@@ -92,11 +102,20 @@ def __create_pkgconfig(self, spec, prefix):
 includedir=${{prefix}}/include
 
 Name: {k}
+<<<<<<< Updated upstream
 Description: UM {um_version} {k} Library for Fortran
 Version: {um_version}
 Libs: -L${{libdir}} -l{k}
 Cflags: -I${{includedir}}/{k}
 """
+=======
+Description: UM {self.spec.version} {k} Library for Fortran
+Version: {self.spec.version}
+Libs: -L${{libdir}} -l{k}
+Cflags: -I${{includedir}}/{k}
+"""
+
+>>>>>>> Stashed changes
             pcpath = join_path(self.__pkgdir, "um-" + k + ".pc")
             with open(pcpath, "w", encoding="utf-8") as pc:
                 nchars_written = pc.write(text)