Merge pull request #4317 from jedwards4b/fix_multi_driver_restart

fix for multi driver restarts


Fix Multi driver restart tests with nuopc.
Test suite: ERR_C3_Ln9.f19_f19_mg17.FHIST.cheyenne_intel.cam-outfrq9s
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes #4316

User interface changes?:

Update gh-pages html (Y/N)?:

CIME/case/case_submit.py

@@ -65,10 +65,10 @@ def _submit(
         # only checks for the first instance in a multidriver case
         if case.get_value("COMP_INTERFACE") == "nuopc":
             rpointer = "rpointer.cpl"
-        elif case.get_value("MULTI_DRIVER"):
-            rpointer = "rpointer.drv_0001"
         else:
             rpointer = "rpointer.drv"
+        if case.get_value("MULTI_DRIVER"):
+            rpointer = rpointer + "_0001"
         expect(
             os.path.exists(os.path.join(rundir, rpointer)),
             "CONTINUE_RUN is true but this case does not appear to have restart files staged in {} {}".format(