Changeset 672

Timestamp:

06/26/09 12:20:34 (15 years ago)

Author:

sdipsl

Message:

• Adapt this part to 39 levels (ie .resol can have 2 lines)

File:

• modipsl/trunk/util/ins_job (modified) (1 diff)

modipsl/trunk/util/ins_job

@@ -114 +114 @@
   }
  # We keep explicitly JobName because it is not optionnal.
- RESOL=this_is_a_test_string
+ 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} ) = X ] ; then 
-    TRUERESOL=$( find ../ -name ".resol" -exec cat {} \; )
-    config_UserChoices_JobName=$( echo ${config_UserChoices_JobName} | sed -e "s/${RESOL}/${TRUERESOL}/" )
+ if [ ! X$( echo ${config_UserChoices_JobName} | grep ${RESOL_ATM_3D} ) = X ] ; then
+    TRUERESOL=$( find ../ -name ".resol" -exec tail -1 {} \; | awk "-F=" '{print $2}' )
+    config_UserChoices_JobName=$( echo ${config_UserChoices_JobName} | sed -e "s/${RESOL_ATM_3D}/${TRUERESOL}/" )
     IGCM_card_WriteOption ${j}'/'${F_CFG} UserChoices JobName ${config_UserChoices_JobName}
+ else
+    if [ ! X$( echo ${config_UserChoices_JobName} | grep ${RESOL} ) = X ] ; then
+            TRUERESOL=$( find ../ -name ".resol" -exec head -1 {} \; )
+            config_UserChoices_JobName=$( echo ${config_UserChoices_JobName} | sed -e "s/${RESOL}/${TRUERESOL}/" )
+            IGCM_card_WriteOption ${j}'/'${F_CFG} UserChoices JobName ${config_UserChoices_JobName}
+    fi
  fi