From cecd14f80893be11b4c1f542d5d8afa73b40e79f Mon Sep 17 00:00:00 2001
From: Alice Bertini <aliceb@ucar.edu>
Date: Mon, 23 Nov 2015 11:10:22 -0700
Subject: [PATCH] Update st_archive and lt_archive with multiple bug fixes.

Update st_archive to remove creation of hardlinks between
[comp]/rest and rest/[dname] which caused problems with both
HPSS (duplicate files) and the copying of restart sets. Remove
the DOUT_S_SAVE_EVERY_NTH_RESTART_FILE_SET option in favor of
a different option to select which days of the month to save - not yet
implimented. Test lt_archive with new batch system code and ensure HPSS
queue submission works on YS. Waiting to test on NERSC.

Test suite: ERR.f19_g16.B1850W
Test baseline:  N/A
Test namelist changes: N/A
Test status: bit for bit

Fixes: #308

Code review:
---
 scripts/Tools/st_archive | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/Tools/st_archive b/scripts/Tools/st_archive
index 00409a7036f..3b0573fca97 100755
--- a/scripts/Tools/st_archive
+++ b/scripts/Tools/st_archive
@@ -647,7 +647,7 @@ sub moveFiles
     }
 # 
 # also get the file that matches the dname for this suffix and
-# add remove from the the restdir to delete duplicates
+# copy to the restdir for a complete restart set
 #
     my @restFiles = grep(/${dname}/, @files);
     if( $#restFiles == 0 ) {
@@ -655,8 +655,7 @@ sub moveFiles
 	if ( $#path >= 0 ) {
 	    $restFile = $path[$#path];
 	    if ( -f $dest . "/" . $restFile ) {
-##		link ( $dest . "/" . $restFile, $restdir . "/" . $restFile );
-		unlink( $dest . "/" . $restFile );
+		copy( $dest . "/" . $restFile, $restdir . "/" . $restFile );
 	    }
 	}
     }