[Dart-dev] [6512] DART/trunk/models/CESM/shell_scripts: remove redundant script variable $MYCASE, since the calling cesm

[nancy at ucar.edu]

Revision: 6512
Author:   nancy
Date:     2013-10-11 16:33:10 -0600 (Fri, 11 Oct 2013)
Log Message:
-----------
remove redundant script variable $MYCASE, since the calling cesm
script sets $CASE to the same thing, and we inherit that environment.

Modified Paths:
--------------
    DART/trunk/models/CESM/shell_scripts/cam_assimilate.csh
    DART/trunk/models/CESM/shell_scripts/clm_assimilate.csh
    DART/trunk/models/CESM/shell_scripts/pop_assimilate.csh

-------------- next part --------------
Modified: DART/trunk/models/CESM/shell_scripts/cam_assimilate.csh
===================================================================
--- DART/trunk/models/CESM/shell_scripts/cam_assimilate.csh	2013-10-11 22:31:22 UTC (rev 6511)
+++ DART/trunk/models/CESM/shell_scripts/cam_assimilate.csh	2013-10-11 22:33:10 UTC (rev 6512)
@@ -66,7 +66,6 @@
 set FILE = `head -n 1 rpointer.atm_0001`
 set FILE = $FILE:t
 set FILE = $FILE:r
-set MYCASE = `echo $FILE | sed -e "s#\..*##"`
 set ATM_DATE_EXT = `echo $FILE:e`
 set ATM_DATE     = `echo $FILE:e | sed -e "s#-# #g"`
 set ATM_YEAR     = `echo $ATM_DATE[1] | bc`
@@ -366,8 +365,8 @@
    # make sure there are no old output logs hanging around
    $REMOVE output.${member}.cam_to_dart
 
-   set ATM_INITIAL_FILENAME = `printf ../../${MYCASE}.cam_%04d.i.${ATM_DATE_EXT}.nc ${member}`
-   set ATM_HISTORY_FILENAME = `ls -1t ../../${MYCASE}.cam*.h0.* | head -n 1`
+   set ATM_INITIAL_FILENAME = `printf ../../${CASE}.cam_%04d.i.${ATM_DATE_EXT}.nc ${member}`
+   set ATM_HISTORY_FILENAME = `ls -1t ../../${CASE}.cam*.h0.* | head -n 1`
    set     DART_IC_FILENAME = `printf filter_ics.%04d     ${member}`
    set    DART_RESTART_FILE = `printf filter_restart.%04d ${member}`
 
@@ -420,8 +419,8 @@
 # CAM:static_init_model() always needs a caminput.nc and a cam_phis.nc
 # for geometry information, etc.
 
-set ATM_INITIAL_FILENAME = ../${MYCASE}.cam_0001.i.${ATM_DATE_EXT}.nc
-set ATM_HISTORY_FILENAME = `ls -1t ../${MYCASE}.cam*.h0.* | head -n 1`
+set ATM_INITIAL_FILENAME = ../${CASE}.cam_0001.i.${ATM_DATE_EXT}.nc
+set ATM_HISTORY_FILENAME = `ls -1t ../${CASE}.cam*.h0.* | head -n 1`
 
 ${LINK} $ATM_INITIAL_FILENAME caminput.nc
 ${LINK} $ATM_HISTORY_FILENAME cam_phis.nc
@@ -514,7 +513,7 @@
 
    set inst_string = `printf _%04d $member`
 
-   set ATM_INITIAL_FILENAME = ${MYCASE}.cam${inst_string}.i.${ATM_DATE_EXT}.nc
+   set ATM_INITIAL_FILENAME = ${CASE}.cam${inst_string}.i.${ATM_DATE_EXT}.nc
 
    ${LINK} ${ATM_INITIAL_FILENAME} cam_initial${inst_string}.nc || exit -9
 

Modified: DART/trunk/models/CESM/shell_scripts/clm_assimilate.csh
===================================================================
--- DART/trunk/models/CESM/shell_scripts/clm_assimilate.csh	2013-10-11 22:31:22 UTC (rev 6511)
+++ DART/trunk/models/CESM/shell_scripts/clm_assimilate.csh	2013-10-11 22:33:10 UTC (rev 6512)
@@ -66,7 +66,6 @@
 set FILE = `head -n 1 rpointer.lnd_0001`
 set FILE = $FILE:t
 set FILE = $FILE:r
-set MYCASE = `echo $FILE | sed -e "s#\..*##"`
 set LND_DATE_EXT = `echo $FILE:e`
 set LND_DATE     = `echo $FILE:e | sed -e "s#-# #g"`
 set LND_YEAR     = `echo $LND_DATE[1] | bc`

Modified: DART/trunk/models/CESM/shell_scripts/pop_assimilate.csh
===================================================================
--- DART/trunk/models/CESM/shell_scripts/pop_assimilate.csh	2013-10-11 22:31:22 UTC (rev 6511)
+++ DART/trunk/models/CESM/shell_scripts/pop_assimilate.csh	2013-10-11 22:33:10 UTC (rev 6512)
@@ -66,7 +66,6 @@
 set FILE = `head -n 1 rpointer.ocn_0001.restart`
 set FILE = $FILE:t
 set FILE = $FILE:r
-set MYCASE = `echo $FILE | sed -e "s#\..*##"`
 set OCN_DATE_EXT = `echo $FILE:e`
 set OCN_DATE     = `echo $FILE:e | sed -e "s#-# #g"`
 set OCN_YEAR     = `echo $OCN_DATE[1] | bc`
@@ -375,7 +374,7 @@
    # make sure there are no old output logs hanging around
    $REMOVE output.${member}.pop_to_dart
 
-   set OCN_RESTART_FILENAME = `printf ${MYCASE}.pop_%04d.r.${OCN_DATE_EXT}.nc  ${member}`
+   set OCN_RESTART_FILENAME = `printf ${CASE}.pop_%04d.r.${OCN_DATE_EXT}.nc  ${member}`
    set     OCN_NML_FILENAME = `printf pop2_in_%04d        ${member}`
    set     DART_IC_FILENAME = `printf filter_ics.%04d     ${member}`
    set    DART_RESTART_FILE = `printf filter_restart.%04d ${member}`