From 539f6fe50530b871086fe31b5668944f28f6db46 Mon Sep 17 00:00:00 2001
From: anton-seaice <anton.steketee@anu.edu.au>
Date: Wed, 2 Oct 2024 15:12:08 +1000
Subject: [PATCH 1/2] Put intake generation into seperate qsub job

---
 payu_config/archive.sh                         |  5 ++---
 payu_config/archive_scripts/build_intake_ds.py |  4 ++--
 payu_config/archive_scripts/build_intake_ds.sh | 11 +++++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 payu_config/archive_scripts/build_intake_ds.sh

diff --git a/payu_config/archive.sh b/payu_config/archive.sh
index f098f15..e35144a 100644
--- a/payu_config/archive.sh
+++ b/payu_config/archive.sh
@@ -1,6 +1,5 @@
-#!/usr/bin/bash -i
-
 source $(dirname "$0")/archive_scripts/archive_cice_restarts.sh
 source $(dirname "$0")/archive_scripts/concat_ice_daily.sh
 source $(dirname "$0")/archive_scripts/standardise_mom6_filenames.sh
-python3 $(dirname "$0")/archive_scripts/build_intake_ds.py
+
+qsub -lstorage=gdata/hh5+${PBS_NCI_STORAGE} -v SCRIPTS_DIR=$(dirname "$0"),PROJECT $(dirname "$0")/archive_scripts/build_intake_ds.sh
\ No newline at end of file
diff --git a/payu_config/archive_scripts/build_intake_ds.py b/payu_config/archive_scripts/build_intake_ds.py
index 1d06513..7aed3ff 100644
--- a/payu_config/archive_scripts/build_intake_ds.py
+++ b/payu_config/archive_scripts/build_intake_ds.py
@@ -22,7 +22,7 @@
 
 METADATA_FILENAME = "metadata.yaml"
 UUID_FIELD = "experiment_uuid"
-ARCHIVE_PATH = "archive"
+ARCHIVE_PATH = "archive/"
 
 
 def description():
@@ -35,7 +35,7 @@ def description():
         metadata = YAML().load(metadata_filename)
         uuid = metadata.get(UUID_FIELD, None)
     else:
-        warn(f"{METADATA_FILENAME} not found in archive folder")
+        warn(f"{METADATA_FILENAME} not found in config folder")
         uuid = False
 
     # Check git status of this .py file
diff --git a/payu_config/archive_scripts/build_intake_ds.sh b/payu_config/archive_scripts/build_intake_ds.sh
new file mode 100644
index 0000000..567c21e
--- /dev/null
+++ b/payu_config/archive_scripts/build_intake_ds.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/bash
+#PBS -l ncpus=24 
+#PBS -l mem=96GB 
+#PBS -q normal 
+#PBS -l walltime=02:00:00
+#PBS -l wd
+
+module use /g/data/hh5/public/modules 
+module load conda/analysis3-24.01
+
+python3 $SCRIPTS_DIR/archive_scripts/build_intake_ds.py

From 134da9f0df1acd090e8b2c3d96c5bef91dec8b9f Mon Sep 17 00:00:00 2001
From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com>
Date: Tue, 8 Oct 2024 13:24:12 +1100
Subject: [PATCH 2/2] Update payu_config/archive_scripts/build_intake_ds.py

Co-authored-by: minghang.li <minghang.li1@anu.edu.au>
---
 payu_config/archive_scripts/build_intake_ds.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/payu_config/archive_scripts/build_intake_ds.py b/payu_config/archive_scripts/build_intake_ds.py
index 7aed3ff..0439111 100644
--- a/payu_config/archive_scripts/build_intake_ds.py
+++ b/payu_config/archive_scripts/build_intake_ds.py
@@ -22,7 +22,7 @@
 
 METADATA_FILENAME = "metadata.yaml"
 UUID_FIELD = "experiment_uuid"
-ARCHIVE_PATH = "archive/"
+ARCHIVE_PATH = "archive"
 
 
 def description():