Changeset 1401

Timestamp:

07/07/17 10:41:03 (8 years ago)

Author:

sdipsl

Message:

• Comfort modifications. See #332 #333 #334

Location:

trunk/libIGCM

Files:

• AA_purge_simulation (modified) (1 diff)
• ins_job (modified) (4 diffs)
• libIGCM_comp/libIGCM_comp.ksh (modified) (2 diffs)

trunk/libIGCM/AA_purge_simulation

@@ -104 +104 @@
 
   oui|OUI|o|y|yes|YES)
-    echo "OK. It will be erased."
-    for dir in ${ListDirectories[@]} ; do
-      IGCM_sys_RshArchive rm -rf ${dir}
-    done
-    # Remove dods hardlink
-    IGCM_sys_Dods_Rm
-    # Remove run.card
-    rm -f ${SUBMIT_DIR}/run.card
-    # Remove Script_Output
-    rm -f ${SUBMIT_DIR}/Script_Output_*.??????
-    # Remove the Debug directory
-    rm -rf ${SUBMIT_DIR}/Debug
-    # Send a message telling we want to purge
-    IGCM_debug_sendAMQP_Purge 
-    echo "done."
+
+    ERASE=FALSE
+    if [ X${config_UserChoices_SpaceName} = XTEST ] ; then
+      ERASE=TRUE
+    else
+      echo -e "\033[1;32mPlease type in the exact Job Name of the simulation to erase?"
+      read jobname
+      if [ X${config_UserChoices_JobName} = X${jobname} ; then
+        ERASE=TRUE
+      fi
+    fi
+
+    if [ X${ERASE} = XTRUE ] ; then
+      echo "OK. It will be erased."
+      for dir in ${ListDirectories[@]} ; do
+        IGCM_sys_RshArchive rm -rf ${dir}
+      done
+      # Remove dods hardlink
+      IGCM_sys_Dods_Rm
+      # Remove run.card
+      rm -f ${SUBMIT_DIR}/run.card
+      # Remove Script_Output
+      rm -f ${SUBMIT_DIR}/Script_Output_*.??????
+      # Remove the Debug directory
+      rm -rf ${SUBMIT_DIR}/Debug
+      # Send a message telling we want to purge
+      IGCM_debug_sendAMQP_Purge 
+      echo "done."
+    fi
     ;;
   non|NON|n|no|NO)

trunk/libIGCM/ins_job

@@ -33 +33 @@
   -v                  : verbose mode
   -e                  : turn on ensemble mode (hindcast/forecast or date restart)
+  -f                  : ins_job is force to create jobs even if they already exist
 on curie only : 
   -p project          : add default project on curie
@@ -76 +77 @@
 x_v='silencious';
 x_e=false;
+x_f=false;
 x_p=false;
 x_c=false;
 x_m=false;
-while getopts :hvec:p:m: V ; do
+while getopts :hvefc:p:m: V ; do
   case $V in
   (h)  ins_job_Usage; exit 0;;
   (v)  x_v='verbose';;
   (e)  x_e=true;;
+  (f)  x_f=true;;
   (p)  x_p=true
        ProjectID=${OPTARG} ;;
@@ -368 +371 @@
   # File name for Job
   n_f='Job_'${JobName};
-  [[ -f ${j}'/'${n_f} ]] && { ins_job_Warning; continue; }
+  [[ ${x_f} = 'false' ]] && [[ -f ${j}'/'${n_f} ]] && { ins_job_Warning; continue; }
   [[ ${x_v} = 'verbose' ]] && print - "\nWorking with file ${F_CFG}\nin directory ${j}\nfor ${n_f}";
   sed -e "/^${W_W} */ s///" \
@@ -391 +394 @@
   [[ ${i_f} = 'AA_job' ]] && { continue; }
   j=${i%/*}; n_f=${i_f#AA_}'.job';
-  [[ -f ${j}'/'${n_f} ]] && { ins_job_Warning; continue; }
+  [[ ${x_f} = 'false' ]] && [[ -f ${j}'/'${n_f} ]] && { ins_job_Warning; continue; }
   [[ ${x_v} = 'verbose' ]] && print - "\nIn directory ${j}\n${i_f} -> ${n_f}"
   sed -e "/^${W_W} */ s///" \

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -292 +292 @@
       do_init="y"
       # Do we need to bring initial state file for this component
-      if [ "${config_Restarts_OverRule}" = "y" ] ; then
+      if ( [ "${config_Restarts_OverRule}" = "y" ] || [ "${config_Restarts_OverRule}" = "Y" ] ) ; then
         eval do_init="n"
       else
@@ -684 +684 @@
     if ( ${FirstInitialize} ) ; then
 
-      if [ "${config_Restarts_OverRule}" = "y" ] ; then
+      if ( [ "${config_Restarts_OverRule}" = "y" ] || [ "${config_Restarts_OverRule}" = "Y" ] ) ; then
         eval config_${comp}_Restart="y"
         eval config_${comp}_RestartDate=${config_Restarts_RestartDate}