fix cice5 restart pointers (#535)

payu-org · Oct 25, 2024 · 27aac37 · 27aac37
1 parent 74be036
commit 27aac37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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()