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

Timestamp:

10/30/12 10:32:53 (12 years ago)

Author:

sdipsl

Message:

• bugfix #47
• AddNoise? path added to sys_mercure

File:

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

trunk/libIGCM/libIGCM_ensemble/libIGCM_ensemble.ksh

@@ -83 +83 @@
   _0_)
     IGCM_debug_Print 1 "No periodic start"
+    CastPeriodicStart=false
     return
     ;;
   *[Yy]|*[Mm])
+    CastPeriodicStart=true
     IGCM_debug_Print 1 "Periodic length : ${ensemble_Ens_PERTURB_PERIODICITE}" ;;
   *)
@@ -102 +104 @@
   esac
 
-  # A few checks Non-Period case:
+  # A few checks for the Non-Periodic case:
   DateNum=0
   while [ $DateNum -lt ${#ensemble_Ens_PERTURB_NONPERIODIC[*]} ] ; do
@@ -110 +112 @@
     _0_)
       IGCM_debug_Print 1 "No non-periodic start"
+      CastNonPeriodicStart=false
       return
       ;;
     *[Yy]|*[Mm])
       IGCM_debug_Print 1 "Non-periodic duration : ${ensemble_Ens_PERTURB_DUREE_NONPERIODIC[$DateNum]}"
+      CastNonPeriodicStart=true
       ;;
     *)
@@ -131 +135 @@
 
   echo "Manage periodic starts"
+
+  [ ${CastPeriodicStart} = false ] && return
 
 #.. Manage periodic starts ..
@@ -232 +238 @@
 
   echo "Manage non periodic starts"
+
+  [ ${CastNonPeriodicStart} = false ] && return
 
   DateNum=0
@@ -412 +420 @@
   #.. FileIn ? => RestartDate ..
   DirIn="${ensemble_Ens_PERTURB_INITPATH}/${ensemble_Ens_PERTURB_INITFROM}/${PerturbComp}/Restart"
-  FileIn="${ensemble_Ens_PERTURB_INITFROM}_${RestartDate}_${PerturbFile}.nc"
+  FileIn="${PerturbComp}_${ensemble_Ens_PERTURB_INITFROM}_${RestartDate}_${PerturbFile}.nc"
   DirOut="${RestartDir}/${MemberDir}/${PerturbComp}/Restart"
 #  FileOut="${ensemble_Ens_PERTURB_INITFROM}_${RestartDate}_${PerturbFile}_${MemberDir}.nc"