Merge pull request #41 from noaa-ocs-modeling/develop

remove squeue display columns
noaa-ocs-modeling · Mar 19, 2021 · 2be074d · 2be074d
2 parents 5bf49db + 3890841
commit 2be074d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/coupledmodeldriver/job_script.py b/coupledmodeldriver/job_script.py
@@ -479,7 +479,7 @@ def __str__(self) -> str:
         if self.platform != Platform.LOCAL:
             # slurm queue output https://slurm.schedmd.com/squeue.html
             squeue_command = (
-                'squeue -u $USER -o "%.8i %.21j %.4C %.4D %.31E %.7a %.9P %.20V %.20S %.20e"'
+                'squeue -u $USER -o "%.8i %.21j %.4C %.4D %.31E %.20V %.20S %.20e"'
             )
             echo_squeue_command = squeue_command.replace('"', r'\"')
             lines.extend(

diff --git a/tests/data/reference/hera_shinnecock_ike/run_hera.sh b/tests/data/reference/hera_shinnecock_ike/run_hera.sh
@@ -22,5 +22,5 @@ for hotstart in ${DIRECTORY}/runs/*/; do
 done
 
 # display job queue with dependencies
-squeue -u $USER -o "%.8i %.21j %.4C %.4D %.31E %.7a %.9P %.20V %.20S %.20e"
-echo squeue -u $USER -o \"%.8i %.21j %.4C %.4D %.31E %.7a %.9P %.20V %.20S %.20e\"
+squeue -u $USER -o "%.8i %.21j %.4C %.4D %.31E %.20V %.20S %.20e"
+echo squeue -u $USER -o \"%.8i %.21j %.4C %.4D %.31E %.20V %.20S %.20e\"
diff --git a/tests/data/reference/stampede2_shinnecock_ike/run_stampede2.sh b/tests/data/reference/stampede2_shinnecock_ike/run_stampede2.sh
@@ -22,5 +22,5 @@ for hotstart in ${DIRECTORY}/runs/*/; do
 done
 
 # display job queue with dependencies
-squeue -u $USER -o "%.8i %.21j %.4C %.4D %.31E %.7a %.9P %.20V %.20S %.20e"
-echo squeue -u $USER -o \"%.8i %.21j %.4C %.4D %.31E %.7a %.9P %.20V %.20S %.20e\"
+squeue -u $USER -o "%.8i %.21j %.4C %.4D %.31E %.20V %.20S %.20e"
+echo squeue -u $USER -o \"%.8i %.21j %.4C %.4D %.31E %.20V %.20S %.20e\"