Restore restart drv_clmin and renaming of clm.rst files

Author: George Artavanis

test/python/clm_restart_real_data.py

@@ -204,10 +204,24 @@
     if file_path.is_file():
         cp(str(file_path), restart_second_dir)
 
+# Rename drv_clmin_restart.dat to drv_clmin.dat for restart
+drv_clmin_restart_path = os.path.join(restart_second_dir, "drv_clmin_restart.dat")
+drv_clmin_path = os.path.join(restart_second_dir, "drv_clmin.dat")
+if os.path.exists(drv_clmin_restart_path):
+    os.rename(drv_clmin_restart_path, drv_clmin_path)
+    print(f"Renamed drv_clmin_restart.dat to drv_clmin.dat in restart directory")
+
 # Copy redistributed restart files
 for rst_file in glob.glob(os.path.join(new_restart_dir, 'clm.rst.*')):
     cp(rst_file, restart_second_dir)
 
+# Rename restart files from timestamp 0 to restart_timestamp (24)
+# ParFlow expects restart files with the timestep number when restarting
+for rst_file in glob.glob(os.path.join(restart_second_dir, 'clm.rst.00000.*')):
+    new_name = rst_file.replace('clm.rst.00000.', f'clm.rst.{restart_timestamp:05d}.')
+    os.rename(rst_file, new_name)
+    print(f"Renamed {os.path.basename(rst_file)} to {os.path.basename(new_name)}")
+
 # Create second part of restart run from YAML
 restart_second_script_path = os.path.join(restart_second_dir, "clm_restart_run.yaml")
 restart_second_run = Run.from_definition(restart_second_script_path)