From 16fce5cc3ba5c58d48791d558058e1c23bb975d2 Mon Sep 17 00:00:00 2001
From: James Edwards <jedwards@ucar.edu>
Date: Wed, 15 Nov 2023 10:59:30 -0700
Subject: [PATCH] adds support for job priority field in pbs

---
 config/cesm/machines/config_batch.xml           |  3 +++
 config/xml_schemas/config_batch.xsd             | 17 +++++++++++++----
 .../mct/cime_config/config_component.xml        | 10 ++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/config/cesm/machines/config_batch.xml b/config/cesm/machines/config_batch.xml
index 559462c4b1b..2bbcb114465 100644
--- a/config/cesm/machines/config_batch.xml
+++ b/config/cesm/machines/config_batch.xml
@@ -390,6 +390,9 @@
 
   <batch_system MACH="derecho" type="pbs" >
     <batch_submit>qsub</batch_submit>
+    <submit_args>
+      <argument> -l job_priority=$JOB_PRIORITY </argument>
+    </submit_args>
     <directives>
       <directive default="/bin/bash" > -S {{ shell }}  </directive>
       <directive> -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}</directive>
diff --git a/config/xml_schemas/config_batch.xsd b/config/xml_schemas/config_batch.xsd
index c35e205f998..53c15b41641 100644
--- a/config/xml_schemas/config_batch.xsd
+++ b/config/xml_schemas/config_batch.xsd
@@ -127,13 +127,22 @@
 
   <xs:element name="submit_args">
     <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="arg"/>
-      </xs:sequence>
+      <xs:choice>
+        <xs:element name="arg" maxOccurs="unbounded">
+          <xs:complexType>
+            <xs:attribute name="flag" use="required"/>
+            <xs:attribute name="name"/>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="argument" maxOccurs="unbounded">
+          <xs:complexType mixed="true">
+            <xs:attribute name="job_queue"/>
+          </xs:complexType>
+        </xs:element>
+      </xs:choice>
     </xs:complexType>
   </xs:element>
 
-
   <xs:element name="arg">
     <xs:complexType>
       <xs:attribute name="flag" use="required"/>
diff --git a/src/drivers/mct/cime_config/config_component.xml b/src/drivers/mct/cime_config/config_component.xml
index 8a780e56d78..b0fc582f855 100644
--- a/src/drivers/mct/cime_config/config_component.xml
+++ b/src/drivers/mct/cime_config/config_component.xml
@@ -493,6 +493,16 @@
    <desc>List of job ids for most recent case.submit</desc>
  </entry>
 
+ <entry id="JOB_PRIORITY">
+   <type>char</type>
+   <default_value>regular</default_value>
+   <valid_values>regular,premium,economy</valid_values>
+   <group>run_begin_stop_restart</group>
+   <file>env_run.xml</file>
+   <desc>job priority for systems supporting this option</desc>
+ </entry>
+
+
   <!-- ===================================================================== -->
   <!-- definitions archive -->
   <!-- ===================================================================== -->