[Dart-dev] DART/branches Revision: 11164

[dart at ucar.edu]

raeder at ucar.edu
2017-02-28 07:35:51 -0700 (Tue, 28 Feb 2017)
96
Made removal of unneeded restart sets more specific,
to be sure to preserve inflation restarts.



Modified: DART/branches/rma_trunk/models/cam-fv/scripts_cesm1_5/assimilate.csh
===================================================================
--- DART/branches/rma_trunk/models/cam-fv/scripts_cesm1_5/assimilate.csh	2017-02-28 14:22:17 UTC (rev 11163)
+++ DART/branches/rma_trunk/models/cam-fv/scripts_cesm1_5/assimilate.csh	2017-02-28 14:35:51 UTC (rev 11164)
@@ -144,11 +144,11 @@
    if ( $sec_o_day !~ '00000' || \
        ($sec_o_day =~ '00000' && $day_o_month % 4 != 0) ) then
       echo "Removing unneeded restart file set from RUNDIR: "
-      echo "    $rm_date[1]"'*.{r,rs,rh0,h0,i}*-*'${day_o_month}-${sec_o_day}
+      echo "    $rm_date[1]"'*.{r,rs,rh0,h0,i}.*'${day_o_month}-${sec_o_day}
       # Remove member restarts (but not DART output)
       # Note that *cpl.ha.* is retained, and any h#, #>0.
       #        $CASE                          DD          -SSSSS
-      $REMOVE  $rm_date[1]*.{r,rs,rh0,h0,i}*${day_o_month}-${sec_o_day}* &
+      $REMOVE  $rm_date[1]*.{r,rs,rh0,h0,i}.*${day_o_month}-${sec_o_day}* &
 
       # Remove log files: *YYMMDD-HHMMSS.  
       $REMOVE  *$rm_log[$rm_slot]*  &
@@ -160,7 +160,7 @@
       set save_root = $archive/rest/$save_date[$piece]
       if (! -d $save_root) then
          mkdir -p $save_root
-         $MOVE $rm_date[1]*.{r,rs,rh0,h0,i}*${day_o_month}-${sec_o_day}*  $save_root &
+         $MOVE $rm_date[1]*.{r,rs,rh0,h0,i}.*${day_o_month}-${sec_o_day}*  $save_root &
          $MOVE                         *inf*${day_o_month}-${sec_o_day}*  $save_root &
 
       endif

Modified: DART/branches/rma_trunk/models/cam-fv/scripts_cesm2_0/assimilate.csh
===================================================================
--- DART/branches/rma_trunk/models/cam-fv/scripts_cesm2_0/assimilate.csh	2017-02-28 14:22:17 UTC (rev 11163)
+++ DART/branches/rma_trunk/models/cam-fv/scripts_cesm2_0/assimilate.csh	2017-02-28 14:35:51 UTC (rev 11164)
@@ -135,11 +135,11 @@
    if ( $sec_o_day !~ '00000' || \
        ($sec_o_day =~ '00000' && $day_o_month % BOGUS_save_every_Mth != 0) ) then
       echo "Removing unneeded restart file set from RUNDIR: "
-      echo "    $rm_date[1]"'*.{r,rs,rh0,h0,i}*-*'${day_o_month}-${sec_o_day}
+      echo "    $rm_date[1]"'*.{r,rs,rh0,h0,i}.*'${day_o_month}-${sec_o_day}
       # Remove member restarts (but not DART output)
       # Note that *cpl.ha.* is retained, and any h#, #>0.
       #        $CASE                          DD          -SSSSS
-      $REMOVE  $rm_date[1]*.{r,rs,rh0,h0,i}*${day_o_month}-${sec_o_day}* &
+      $REMOVE  $rm_date[1]*.{r,rs,rh0,h0,i}.*${day_o_month}-${sec_o_day}* &
 
       # Remove log files: *YYMMDD-HHMMSS.  
       $REMOVE  *$rm_log[$rm_slot]*  &
@@ -151,7 +151,7 @@
       set save_root = $archive/rest/$save_date[$piece]
       if (! -d $save_root) then
          mkdir -p $save_root
-         $MOVE $rm_date[1]*.{r,rs,rh0,h0,i}*${day_o_month}-${sec_o_day}*  $save_root &
+         $MOVE $rm_date[1]*.{r,rs,rh0,h0,i}.*${day_o_month}-${sec_o_day}*  $save_root &
          $MOVE                         *inf*${day_o_month}-${sec_o_day}*  $save_root &
 
       endif