From d873fb4eaafbf9403d3f0158f9d0041229b94549 Mon Sep 17 00:00:00 2001
From: Harshula Jayasuriya <harshula.jayasuriya@anu.edu.au>
Date: Wed, 11 Dec 2024 10:45:10 +1100
Subject: [PATCH] cice5: Anton's feedback

---
 packages/cice5/package.py | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/packages/cice5/package.py b/packages/cice5/package.py
index 4b6ef59..c73e361 100644
--- a/packages/cice5/package.py
+++ b/packages/cice5/package.py
@@ -38,11 +38,12 @@ class Cice5(MakefilePackage):
         depends_on("libaccessom2+deterministic", when="+deterministic")
         depends_on("libaccessom2~deterministic", when="~deterministic")
 
-    phases = ["set_targets", "edit", "build", "install"]
+    phases = ["set_deps_targets", "edit", "build", "install"]
 
     __buildscript = "spack-build.sh"
     __buildscript_path = join_path("bld", __buildscript)
 
+    __deps = {"includes": "", "ldflags": ""}
     __targets = {}
 
     def url_for_version(self, version):
@@ -71,13 +72,19 @@ def add_target(self, ntask, driver, grid, blocks):
         self.__targets[ntask]["grid"] = grid
         self.__targets[ntask]["blocks"] = blocks
 
-    def set_targets(self, spec, prefix):
+    def set_deps_targets(self, spec, prefix):
+
+        ideps = ["oasis3-mct", "libaccessom2", "netcdf-fortran"]
 
         if self.spec.satisfies("@access-esm1.6"):
             # The integer represents environment variable NTASK
             self.__targets = {12: {}}
             self.add_target(12, "access-esm1.6", "360x300", "12x1")
 
+            # NOTE: The order of the libraries matter during the linking step!
+            ldeps = ["oasis3-mct", "netcdf-c", "netcdf-fortran"]
+            lstr = ""
+
         else:
             # The integer represents environment variable NTASK
             self.__targets = {24: {}, 480: {}, 722: {}, 1682: {}}
@@ -96,6 +103,21 @@ def set_targets(self, spec, prefix):
             self.add_target(722, "auscom", "3600x2700", "90x90")
             self.add_target(1682, "auscom", "3600x2700", "200x180")
 
+            ideps.insert(0, "parallelio")
+
+            # NOTE: The order of the libraries matter during the linking step!
+            # NOTE: datetime-fortran is a dependency of libaccessom2.
+            ldeps = ["oasis3-mct", "libaccessom2", "netcdf-c", "netcdf-fortran", "datetime-fortran"]
+            lstr = self.make_linker_args(spec, "parallelio", "-lpiof -lpioc")
+
+        istr = join_path((spec["oasis3-mct"].headers).cpp_flags, "psmile.MPI1")
+        self.__deps["includes"]
+            = " ".join([istr] + [(spec[d].headers).cpp_flags for d in ideps])
+
+        self.__deps["ldflags"]
+            = " ".join([lstr] + [self.get_linker_args(spec, d) for d in ldeps])
+
+
     def edit(self, spec, prefix):
 
         srcdir = self.stage.source_path
@@ -105,16 +127,8 @@ def edit(self, spec, prefix):
         copy(join_path(self.package_dir, self.__buildscript), buildscript_dest)
 
         config = {}
-
-        istr = join_path((spec["oasis3-mct"].headers).cpp_flags, "psmile.MPI1")
-        ideps = ["parallelio", "oasis3-mct", "libaccessom2", "netcdf-fortran"]
-        incs = " ".join([istr] + [(spec[d].headers).cpp_flags for d in ideps])
-
-        lstr = self.make_linker_args(spec, "parallelio", "-lpiof -lpioc")
-        # NOTE: The order of the libraries matter during the linking step!
-        # NOTE: datetime-fortran is a dependency of libaccessom2.
-        ldeps = ["oasis3-mct", "libaccessom2", "netcdf-c", "netcdf-fortran", "datetime-fortran"]
-        libs = " ".join([lstr] + [self.get_linker_args(spec, d) for d in ldeps])
+        incs = self.__deps["includes"]
+        libs = self.__deps["ldflags"]
 
         # TODO: https://github.com/ACCESS-NRI/ACCESS-OM/issues/12
         NCI_OPTIM_FLAGS = "-g3 -O2 -axCORE-AVX2 -debug all -check none -traceback -assume buffered_io"