Merge branch 'jgfouca/cime/fix_blues_submit' into master (PR #1319)

Fix for blues submit.

Make 'batch' queue the default. Hack up some python so that
-q batch is not passed to qsub.

Fixes #1318

[BFB]

* jgfouca/cime/fix_blues_submit:
  Fix for blues submit.

cime/cime_config/acme/machines/config_batch.xml

@@ -159,7 +159,8 @@
         <directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}</directive>
       </directives>
       <queues>
-	<queue walltimemax="01:00:00" jobmin="1" jobmax="4096" default="true">shared</queue>
+	<queue walltimemax="01:00:00" jobmin="1" jobmax="64">shared</queue>
+	<queue walltimemax="03:00:00" jobmin="64" jobmax="4096" default="true">batch</queue>
       </queues>
     </batch_system>
 

cime/utils/python/CIME/XML/env_batch.py

@@ -278,6 +278,10 @@ def get_submit_args(self, case, job):
                     if flag == "-n" and rval<= 0:
                         rval = 1
 
+                    if flag == "-q" and rval == "batch" and case.get_value("MACH") == "blues":
+                        # Special case. Do not provide '-q batch' for blues
+                        continue
+
                     if flag.rfind("=", len(flag)-1, len(flag)) >= 0 or\
                        flag.rfind(":", len(flag)-1, len(flag)) >= 0:
                         submitargs+=" %s%s"%(flag,str(rval).strip())