Changeset 2271

Timestamp:

07/02/14 18:19:55 (10 years ago)

Author:

sdipsl

Message:

add-on for ensemble handling:
update variable name
ensemble.card taken into account when a new directory is created by v5 configuration

NL

File:

• modipsl/trunk/util/ins_job (modified) (5 diffs)

modipsl/trunk/util/ins_job

@@ -163 +163 @@
 #-
 F_CFG='config.card';
+F_CFG_ENS='ensemble.card';
+SUBMIT_DIR_ENS=$( pwd )
 for i in $(find ${d_n}/.. -name ${F_CFG} -print)
 do
@@ -243 +245 @@
     cp -r ${j}/GENERAL/* ${j}/${JobName}/.
     cp -f ${j}/${F_CFG}  ${j}/${JobName}/.
+    if [ -f ${F_CFG_ENS} ] ; then
+        cp -f ${j}/${F_CFG_ENS}  ${j}/${JobName}/.
+        SUBMIT_DIR_ENS=${j}/${JobName}
+    fi
     rm -f ${j}/${F_CFG}
+    rm -f ${j}/${F_CFG_ENS}
     rm -f ${j}/${F_CFG}.bak
     j=${j}/${JobName}
@@ -299 +306 @@
 if [ ${x_e} = 'true' ] ; then
   #.. Read input data from ensemble.card .. 
-  # TO BE CHANGED
-  FileName="ensemble.card"
-  SUBMIT_DIR=$( pwd )
+  SUBMIT_DIR=${SUBMIT_DIR_ENS}
   RUN_DIR="${WORKDIR}/ENSEMBLE"
   #
   # Copy initial things around and define variables (hindcast/forecast case)
+  IGCM_sys_Cd ${SUBMIT_DIR}
   IGCM_ensemble_Init
   
@@ -312 +318 @@
 
   if [[ ${ensemble_Ens_DATE_active} = 'y' ]] ; then
+    IGCM_sys_Cd ${SUBMIT_DIR}
     IGCM_ensemble_DateInit
     # As it says
@@ -324 +331 @@
   
   if [[ ${ensemble_Ens_PERTURB_active} = 'y' ]] ; then
+    IGCM_sys_Cd ${SUBMIT_DIR}
     IGCM_ensemble_CastInit
     # As it says