diff --git a/src/components/tool/guide/EresearchJob/EresearchInstructions.js b/src/components/tool/guide/EresearchJob/EresearchInstructions.js index 0f216d1e..78ae5d1a 100644 --- a/src/components/tool/guide/EresearchJob/EresearchInstructions.js +++ b/src/components/tool/guide/EresearchJob/EresearchInstructions.js @@ -74,6 +74,7 @@ export function EresearchInstructions({ config }) { 1 - ? ":" + arrayConfig?.step - : "", ]; const wallTimeStr = @@ -66,6 +60,11 @@ export function LyraStartInstructions({ `#PBS -N ${jobName}`, `#PBS -l walltime=${wallTimeStr}`, `#PBS -l ${resources.join(":")}`, + ...(jobInstanceType === "Array" + ? [ + `#PBS -J ${arrayConfig?.firstIndex}-${arrayConfig?.upperBound}${arrayConfig?.step > 1 ? `:${arrayConfig?.step}` : ""}`, + ] + : []), "", "cd $PBS_O_WORKDIR", "", @@ -101,7 +100,7 @@ export function LyraStartInstructions({ ${jobName}.pbs`, + `cat <<'EOF' > ${scriptPath || `${jobName}.pbs`}`, ...batchJobScript, "EOF", "", @@ -111,7 +110,7 @@ export function LyraStartInstructions({ Run the following command to confirm the contents of the script: diff --git a/src/components/tool/guide/Instructions/StatusInstructions.js b/src/components/tool/guide/Instructions/StatusInstructions.js index 3de73a2e..c4d2b206 100644 --- a/src/components/tool/guide/Instructions/StatusInstructions.js +++ b/src/components/tool/guide/Instructions/StatusInstructions.js @@ -7,9 +7,9 @@ import InstructionInput from "./InstructionInput"; import InstructionHeading from "./components/InstructionHeading"; import InstructionText from "./components/InstructionText"; -export function LyraStatusInstructions({ jobType, jobName }) { +export function LyraStatusInstructions({ jobType, jobName, jobInstanceType }) { const [jobId, setJobId] = useState(""); - const jobIdOrPlaceholder = jobId || "1234567"; + const jobIdOrPlaceholder = jobId || "12345678"; return ( <> @@ -28,17 +28,52 @@ export function LyraStatusInstructions({ jobType, jobName }) { errorText="Job ID must only contain numbers" /> Job status - - Check the status of your jobs by running the following command: - - + + Check the status of your jobs by running the following command: + + + /> + + )} + {jobInstanceType === "Array" && ( + <> + + Check the status of your array jobs by running the following + command: + + + + Check the status of your array sub-jobs by running the following + command: + + + + )} The job status will be shown in the S column. @@ -105,39 +140,81 @@ ${jobIdOrPlaceholder}.pbs username quick job-name -- 1 4 32gb 01:00 Q Run the following command to see the output files: - + {jobInstanceType === "Standalone" && ( + + )} + {jobInstanceType === "Array" && ( + + )} Run the following command to see the output of the job: - + {jobInstanceType === "Standalone" && ( + + )} + {jobInstanceType === "Array" && ( + + )} Run the following command to see the error output of the job: - + {jobInstanceType === "Standalone" && ( + + )} + {jobInstanceType === "Array" && ( + + )} Use the following command to get more detailed information about the job, including resource usage.