Changeset 1489 for trunk/libIGCM/ins_job

Timestamp:

09/17/19 10:55:34 (5 years ago)

Author:

flavoni

Message:

razionalitation of ensembles and ins_job (-e), remove useless options

File:

• trunk/libIGCM/ins_job (modified) (6 diffs)

trunk/libIGCM/ins_job

@@ -359 +359 @@
       echo "Directory ${j}/${JobName} exists already. It will not be overwritten."
       echo "Remove the existing directory or change JobName before relaunching ins_job."
-      continue
+      #continue
+      exit  
     fi
     echo "=> Submit directory ${JobName} will be created with cards from EXPERIMENTS/${config_UserChoices_ExpType}"
@@ -370 +371 @@
     fi
     rm -f ${j}/${F_CFG}
-    rm -f ${j}/${F_CFG_ENS}
+    # rm -f ${j}/${F_CFG_ENS}
     rm -f ${j}/${F_CFG}.bak
     j=${j}/${JobName}
@@ -452 +453 @@
 # Limited to hindcast/forecast and date restart Ensemble for the time being
 if [ ${x_e} = 'true' ] ; then
+    if [ ! -f ${F_CFG_ENS} ] ; then
+       echo ""
+       echo "################## WARNING ##################"
+       echo "No ensemble.card available in current directory"
+       echo ""
+       exit
+      #  continue
+   fi
+
   #.. Read input data from ensemble.card ..
   SUBMIT_DIR=${SUBMIT_DIR_ENS}
@@ -460 +470 @@
   IGCM_ensemble_Init
 
-  if [[ ${ensemble_Ens_PARAMETRIC_active} = 'y' ]] ; then
-    echo "WARNING: Parametric Ensemble is not implemented yet..."
-  fi
-
   if [[ ${ensemble_Ens_DATE_active} = 'y' ]] ; then
     IGCM_sys_Cd ${SUBMIT_DIR}
@@ -469 +475 @@
     # As it says
     IGCM_sys_Cd ${SUBMIT_DIR}
-    IGCM_ensemble_DatePeriodicStarts
-    # As it says
-    IGCM_sys_Cd ${SUBMIT_DIR}
     IGCM_ensemble_DateNonPeriodicStarts
-    # Clean
-    IGCM_sys_Rm -rf ${RUN_DIR}
   fi
 
@@ -484 +485 @@
     IGCM_ensemble_CastPeriodicStarts
     # As it says
-    IGCM_sys_Cd ${SUBMIT_DIR}
-    IGCM_ensemble_CastNonPeriodicStarts
-    # As it says
-    IGCM_sys_Cd ${SUBMIT_DIR}
-    IGCM_ensemble_CastMemberList
-    # Done
-    #IGCM_sys_Cp ${RUN_DIR}/CreatedDir.txt ${SUBMIT_DIR}
-    IGCM_sys_Cd ${SUBMIT_DIR}
-    # Clean
-    IGCM_sys_Rm -rf ${RUN_DIR}
-  fi
+    #IGCM_sys_Cd ${SUBMIT_DIR}
+    #IGCM_ensemble_CastMemberList
+  fi
+  # Done
+  IGCM_sys_Cd ${SUBMIT_DIR}
+  # Clean
+  IGCM_sys_Rm -rf ${RUN_DIR}
+  
 fi
 #-