From 7bf514db7fd7131e1bda4ae6b79a2ba093beb2a5 Mon Sep 17 00:00:00 2001
From: Spencer Wong <spencer.wong@anu.edu.au>
Date: Tue, 18 Feb 2025 10:25:18 +1100
Subject: [PATCH] Add optional soil.nml and pft_params.nml for esm1p6

---
 payu/models/access_esm1p6.py | 6 ++++++
 payu/models/um.py            | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/payu/models/access_esm1p6.py b/payu/models/access_esm1p6.py
index c99df987..303aa6cb 100644
--- a/payu/models/access_esm1p6.py
+++ b/payu/models/access_esm1p6.py
@@ -81,6 +81,12 @@ def __init__(self, expt, name, config):
                 # Simulation length in seconds for new run
                 model.runtime_key = "runtime"
 
+            if model.model_type == 'um':
+                # Additional Cable 3 namelists
+                model.optional_config_files = list(
+                    set(['pft_params.nml', 'soil.nml']) |
+                    set(model.optional_config_files)
+                )
 
     def setup(self):
         if not self.top_level_model:
diff --git a/payu/models/um.py b/payu/models/um.py
index 6aa24a58..341870ec 100644
--- a/payu/models/um.py
+++ b/payu/models/um.py
@@ -43,7 +43,7 @@ def __init__(self, expt, name, config):
             'STASHC', 'UAFILES_A', 'UAFLDS_A',
             'cable.nml', 'um_env.yaml'
             ]
-        self.optional_config_files = ['input_atm.nml', 'parexe']
+        self.optional_config_files.extend(['input_atm.nml', 'parexe'])
 
         self.restart = 'restart_dump.astart'