v2

Author: anton-seaice

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

@@ -40,80 +40,6 @@ class Um(UmBasePackage):
     depends_on("gcom@8.3", when="@13.5:13.7", type=("build", "link"))
     depends_on("gcom@8.4", when="@13.8", type=("build", "link"))
     depends_on("gcom@8.4:", when="@13.9:", type=("build", "link"))
-<<<<<<< Updated upstream
-=======
-    depends_on("fiat@um", type=("build", "link", "run"),
-        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"),
-        when="+netcdf")
-
-    phases = ["build", "install"]
-
-    # The dependency name, include paths, and ld_flags from
-    # the FCM config for each library configured via FCM.
-    _lib_cfg = {
-        "DR_HOOK": {
-            "includes": [
-                join_path("include", "fiat"),
-                join_path("module", "fiat"),
-                join_path("module", "parkind_dp")],
-            "dep_name": "fiat",
-            "fcm_name": "drhook",
-            "fcm_ld_flags": "-lfiat -lparkind_dp"},
-        "eccodes": {
-            "includes": ["include"],
-            "dep_name": "eccodes",
-            "fcm_name": "eccodes",
-            "fcm_ld_flags": "-leccodes_f90 -leccodes"},
-        "netcdf": {
-            "includes": ["include"],
-            "dep_name": "netcdf-fortran",
-            "fcm_name": "netcdf",
-            "fcm_ld_flags": "-lnetcdff -lnetcdf"}}
-
-    # Optional Github sources to be used in build (i.e. AM3)
-    _resource_cfg = {
-        "jules_ref": {
-            "sources_var": "jules_sources",
-            "git_url": "https://github.com/ACCESS-NRI/JULES.git",
-            "subdir": "jules"},
-        "um_ref": {
-            "sources_var": "um_sources",
-            "git_url": "https://github.com/ACCESS-NRI/UM.git",
-            "subdir": "um"}}
-
-    __builddir = "build-atmos"
-    # __incdir = join_path(__builddir, "build", "lib")
-    __libdir = join_path(__builddir, "lib")
-    __pkgdir = join_path(__libdir, "pkgconfig")
-
-    def _config_file_path(self, model):
-        """
-        Return the pathname of the Rose app config file
-        corresponding to model.
-        """
-        return join_path(
-            self.package_dir, "model", model, "rose-app.conf")
-
-
-    def _get_linker_args(self, spec, fcm_libname):
-        """
-        Return the linker flags corresponding to fcm_libname,
-        a library name configured via FCM.
-        """
-        dep_name = self._lib_cfg[fcm_libname]["dep_name"]
-        ld_flags = [
-            spec[dep_name].libs.ld_flags,
-            self._lib_cfg[fcm_libname]["fcm_ld_flags"]]
-        # The reason for the explicit -rpath is:
-        # https://github.com/ACCESS-NRI/spack-packages/issues/14#issuecomment-1653651447
-        rpaths = ["-Wl,-rpath=" + d for d in spec[dep_name].libs.directories]
-
-        # Both ld_flags and rpaths are lists of strings.
-        return " ".join(ld_flags + rpaths)
->>>>>>> Stashed changes
 
     # Include openmpi directly.
     # https://github.com/ACCESS-NRI/access-spack-packages/issues/293