Merge branch 'jgfouca/cime/fix_batch_submit' into master (PR #3205)

Fix no_batch determination in case_submit

Fixes #3166

[BFB]

* origin/jgfouca/cime/fix_batch_submit:
  Fix no_batch determination in case_submit

cime/scripts/lib/CIME/case/case_submit.py

@@ -56,8 +56,9 @@ def _submit(case, job=None, no_batch=False, prereq=None, allow_fail=False, resub
     # flag will stay in effect for the duration of the RESUBMITs
     env_batch = case.get_env("batch")
     external_workflow = case.get_value("EXTERNAL_WORKFLOW")
-    if resubmit and env_batch.get_batch_system_type() == "none" or external_workflow:
+    if env_batch.get_batch_system_type() == "none" or resubmit and external_workflow:
         no_batch = True
+
     if no_batch:
         batch_system = "none"
     else: