Changeset 1185 for trunk

Timestamp:

04/02/15 15:55:22 (9 years ago)

Author:

sdipsl

Message:

Bugfix. It failed if run.card contained PeriodState?="Fatal" and PeriodDateBegin?, PeriodDateEnd? and CumulPeriod? were empty.

File:

• trunk/libIGCM/AA_clean_month (modified) (3 diffs)

trunk/libIGCM/AA_clean_month

@@ -94 +94 @@
   IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration CumulPeriod
 
+  # 
+  if [ X${run_Configuration_CumulPeriod} = X ] ; then
+    echo -e "\033[1;32mCumulPeriod is empty so we want to erase run.card to start properly. Do you want that?"
+    echo -n -e " Your answer (y/n) : \033[m"
+    read reponse
+    case ${reponse} in
+
+    oui|OUI|o|y|yes|YES)
+      echo "OK. Now you can submit the Job : ${SUBMIT_DIR}/Job_${config_UserChoices_JobName}."
+      IGCM_sys_Rm ${SUBMIT_DIR}/run.card
+      ;;
+    non|NON|n|no|NO)
+      echo "Nothing to do !"
+      ;;
+    esac
+    exit 0
+  fi
+
   PeriodDateEnd=$( IGCM_date_ConvertFormatToGregorian ${run_Configuration_PeriodDateEnd} )
   echo "Search files with ${PeriodDateEnd} in ${R_SAVE}"
@@ -186 +204 @@
   fi
 
-  if ( [ X${run_Configuration_CumulPeriod} = X ] || [ X${run_Configuration_CumulPeriod} = X1 ] ); then
-
+  if [ X${run_Configuration_CumulPeriod} = X1 ] ; then
     echo -e "\033[1;32mCumulPeriod=1 so we want to erase run.card to start properly. Do you want that too?"
     echo -n -e " Your answer (y/n) : \033[m"
@@ -201 +218 @@
         ;;
     esac
-
   fi
 fi