Only set drv_restart_pointer for branch type (NOTE: will also need to…

… allow continue_run as well), add it as a file that will be put into cpl.input_data_list for existence checking, fixing #525

cime_config/config_component.xml

@@ -404,13 +404,16 @@
 
   <entry id="DRV_RESTART_POINTER">
     <type>char</type>
-    <default_value>rpointer.cpl</default_value>
+    <default_value>rpointer.cpl.${RUN_STARTDATE}-${RUN_REFTOD}</default_value>
     <group>run_begin_stop_restart</group>
     <file>env_run.xml</file>
     <desc>
       Name of the restart pointer file, this can be used to restart from an
       intermediate restart by appending the restart date and time in format YYYY-MM-DD-SSSSS
     </desc>
+    <values>
+       <value>rpointer.cpl.${RUN_STARTDATE}-${RUN_REFTOD}</value>
+    </values>
   </entry>
 
   <entry id="PAUSE_OPTION">

cime_config/namelist_definition_drv.xml

@@ -18,6 +18,14 @@
     </values>
   </entry>
 
+  <entry id="rundir" modify_via_xml="RUNDIR">
+    <type>char</type>
+    <category>nuopc</category>
+    <group>DRIVER_attributes</group>
+    <values>
+      <value>$RUNDIR</value>
+    </values>
+  </entry>
   <entry id="pio_asyncio_ntasks" modify_via_xml="PIO_ASYNCIO_NTASKS">
     <type>integer</type>
     <category>pio</category>
@@ -165,12 +173,16 @@
   <entry id="drv_restart_pointer" modify_via_xml="DRV_RESTART_POINTER">
     <type>char</type>
     <category>expdef</category>
+    <default_value>none</default_value>
+    <!-- IMPORTANT NOTE: The relative path option MUST be used with a version of cime that allows it cime PR#4739 allows this -->
+    <input_pathname>rel:rundir</input_pathname>
     <group>DRIVER_attributes</group>
     <desc>
       Driver restart pointer file to initialize time info
     </desc>
     <values>
-      <value>$DRV_RESTART_POINTER</value>
+      <value>none</value>
+      <value run_type="branch">$DRV_RESTART_POINTER</value>
     </values>
   </entry>