Changeset 1619

Timestamp:

12/15/11 11:34:32 (12 years ago)

Author:

jgipsl

Message:

• Moved IGCM_card_DefineArrayFromSection higher up in the script to that IGCM_card_DefineVariableFromOption can be removed from several places.
• Corrected test if UserSpec? variable exist in config.card.

File:

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

modipsl/trunk/util/ins_job

@@ -110 +110 @@
  print - "\nWorking with file ${F_CFG}\nin directory ${j}\nfor ${n_f}";
 
+ if [ ! X$( echo ${j} | grep USER_SPEC ) = X ] ; then
+ # Do not treat config.card if it is in sub-directory of USER_SPEC
+ # Continue to next config.card
+     echo "USER_SPEC directory exist in path, do not use this config.card"
+     continue
+ fi
+ 
+ # Get all variables declared in section UserChoices in config.card
+ IGCM_card_DefineArrayFromSection ${j}'/'${F_CFG} UserChoices
+ # Set default values
+ config_UserChoices_JobClass=mono
+ config_UserChoices_JobNumProcTot=1
+ config_UserChoices_UserSpec=""
+ typeset option
+ for option in ${config_UserChoices[*]} ; do
+     IGCM_card_DefineVariableFromOption ${j}'/'${F_CFG} UserChoices ${option}
+ done
+
 # Add specific treatment for new type of directory structure 
-  if [ ! X$( echo ${j} | grep USER_SPEC ) = X ] ; then
-      echo "USER_SPEC directory exist in path, do not use this config.card"
-      continue
-  fi
-
   if [ -d ${j}/USER_SPEC ] && [ -d ${j}/GENERAL ] ; then
       echo "This is new configuration structure"
-      IGCM_card_DefineVariableFromOption ${j}'/'${F_CFG} UserChoices JobName
-      IGCM_card_DefineVariableFromOption ${j}'/'${F_CFG} UserChoices UserSpec
       echo "JobName=${config_UserChoices_JobName}"
-      if [ X${config_UserChoices_UserSpec} = X ] ; then
-        echo "The variable UserSpec must be added in config.card in section UserChoices"
-        echo "UserSpec gives the directory for the .card configurtaion files for the wanted experiement. For exemple UserSpec=IPSLCM5/historical"
-        echo "UserSpec= $Config_UserChoices_UserSpec "
-        continue
+
+      if [ "X${config_UserChoices_UserSpec}" = X ] ; then
+        echo "\nERROR in ${j}/config.card"
+        echo "ins_job stops here"
+        echo "=> The variable UserSpec must be added in config.card in section UserChoices"
+        echo "=> UserSpec gives the directory for the .card configurtaion files for the wanted experiement. For exemple UserSpec=IPSLCM5/historical"
+        exit 4
       else
-        echo "UserSpec= $Config_UserChoices_UserSpec "
+        echo "UserSpec= ${config_UserChoices_UserSpec}"
       fi
 
@@ -150 +163 @@
  RESOL_ATM_3D=this_is_a_test_string
  RESOL=this_is_another_test_string
- IGCM_card_DefineVariableFromOption ${j}'/'${F_CFG} UserChoices JobName
  if [ ! X$( echo ${config_UserChoices_JobName} | grep ${RESOL_ATM_3D} ) = X ] ; then
     TRUERESOL=$( find ../ -name ".resol" -exec tail -1 {} \; | awk "-F=" '{print $2}' )
@@ -163 +175 @@
  fi
  
- # Other options are not always needed
- IGCM_card_DefineArrayFromSection ${j}'/'${F_CFG} UserChoices
- # Default values
- config_UserChoices_JobClass=mono
- config_UserChoices_JobNumProcTot=1
- # config.card optionnal values
- typeset option
- for option in ${config_UserChoices[*]} ; do
-     IGCM_card_DefineVariableFromOption ${j}'/'${F_CFG} UserChoices ${option}
- done
  # File name for Job
  n_f='Job_'${config_UserChoices_JobName};