From 27aac372dba2752e1d58ab1d66db799e7891e103 Mon Sep 17 00:00:00 2001
From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com>
Date: Fri, 25 Oct 2024 15:33:04 +1100
Subject: [PATCH] fix cice5 restart pointers (#535)

---
 payu/models/access.py | 4 +++-
 payu/models/cice.py   | 5 -----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/payu/models/access.py b/payu/models/access.py
index 80769a3b..a2946275 100644
--- a/payu/models/access.py
+++ b/payu/models/access.py
@@ -47,12 +47,14 @@ def __init__(self, expt, name, config):
                 model.copy_restarts = True
 
                 model.set_timestep = model.set_access_timestep
-                model.get_ptr_restart_dir = model.get_access_ptr_restart_dir
 
             if model.model_type == 'cice5':
                 model.access_restarts.extend(['u_star.nc', 'sicemass.nc'])
 
             if model.model_type == 'cice':
+                # The ACCESS build of CICE assumes that restart_dir is 'RESTART'
+                model.get_ptr_restart_dir = lambda : '.'
+
                 # Structure of model coupling namelist
                 model.cpl_fname = 'input_ice.nml'
                 model.cpl_group = 'coupling'
diff --git a/payu/models/cice.py b/payu/models/cice.py
index 50f29c1f..3a27a978 100644
--- a/payu/models/cice.py
+++ b/payu/models/cice.py
@@ -150,11 +150,6 @@ def set_model_output_paths(self):
     def get_ptr_restart_dir(self):
         return os.path.relpath(self.work_init_path, self.work_path)
 
-    def get_access_ptr_restart_dir(self):
-        # The ACCESS build of CICE assumes that restart_dir is 'RESTART'
-        # TODO: Move to ACCESS driver
-        return '.'
-
     def setup(self):
         super(Cice, self).setup()