Changeset 888 for trunk/libIGCM/libIGCM_ensemble/libIGCM_ensemble.ksh

Timestamp:

07/08/13 17:37:53 (11 years ago)

Author:

sdipsl

Message:

• find tar file in dmf_import also for the hindcast/forecast case

File:

• trunk/libIGCM/libIGCM_ensemble/libIGCM_ensemble.ksh (modified) (4 diffs)

trunk/libIGCM/libIGCM_ensemble/libIGCM_ensemble.ksh

@@ -182 +182 @@
 
     IGCM_debug_Print 2 "${DateBegin} => ${DateEnd} : ${StartDir}"
-    echo "${DateBegin} ${DateEnd} ${StartDir}" >> CreatedDir.txt
+    echo "${DateBegin} ${DateEnd} ${StartDir}" >> ${RUN_DIR}/CreatedDir.txt
 
   # - Create directory for current DateBegin
@@ -219 +219 @@
 
         # Dump command to be lauched
-        echo "cd ${StartDir}/${MemberDir}/ ;"  >> Qsub.${StartDir}.txt
-        echo "${SUBMIT} ${JobName} ; cd -"     >> Qsub.${StartDir}.txt
+        echo "cd ${StartDir}/${MemberDir}/ ;"  >> ${RUN_DIR}/Qsub.${StartDir}.txt
+        echo "${SUBMIT} ${JobName} ; cd -"     >> ${RUN_DIR}/Qsub.${StartDir}.txt
       fi
 
@@ -299 +299 @@
       ln -s ../../.libmpi .
       IGCM_sys_Cd ${RUN_DIR}
-      echo "${DateBegin} ${DateEnd} ${StartDir}" >> CreatedDir.txt
+      echo "${DateBegin} ${DateEnd} ${StartDir}" >> ${RUN_DIR}/CreatedDir.txt
     fi
-    PeriodDateEnd=$( grep -m1 ${StartDir} CreatedDir.txt | cut -f2 -d\  )
+    PeriodDateEnd=$( grep -m1 ${StartDir} ${RUN_DIR}/CreatedDir.txt | cut -f2 -d\  )
 
   # - Create directory in which to store new restart files if it does'nt already exist
@@ -508 +508 @@
 
       # Look for the tar file we want if we did not found it already
-      for PotentialTarFile in $( find ${ensemble_Ens_PERTURB_INITPATH}/${ensemble_Ens_PERTURB_INITFROM}/RESTART -name "${ensemble_Ens_PERTURB_INITFROM}_*_restart.tar" -print ) ; do
-        IsMatching=$( echo ${PotentialTarFile##*/} | sed "s:^${ensemble_Ens_PERTURB_INITFROM}_::" | sed "s:\.restart\.tar$::" | gawk -F_ -v restartdate=${RestartDate} '{if (($1 < restartdate) && ($2 >= restartdate)) {print $1"_"$2}}' )
+      for PotentialTarFile in $( find ${ensemble_Ens_PERTURB_INITPATH}/${ensemble_Ens_PERTURB_INITFROM}/RESTART -name "${ensemble_Ens_PERTURB_INITFROM}_*restart*.tar" -print ) ; do
+        IsMatching=$( echo ${PotentialTarFile##*/} | sed "s:_restart::" | sed "s:^${ensemble_Ens_PERTURB_INITFROM}_::" | sed "s:\.tar$::" | gawk -F_ -v restartdate=${RestartDate} '{if (($1 <= restartdate) && ($2 >= restartdate)) {print $1"_"$2}}' )
         if [ ! X${IsMatching} = X ] ; then
           TarFileFound=${PotentialTarFile}