Changeset 1806

Timestamp:

07/12/12 20:10:19 (12 years ago)

Author:

jgipsl

Message:

Added capability to have severel configurations with .resol files in same modipsl. This was not possible for the case when JobName? contains RESOL_ATM_3D variable (CREATE job).

File:

• modipsl/branches/newconfig/util/ins_job (modified) (3 diffs)

modipsl/branches/newconfig/util/ins_job

@@ -122 +122 @@
      print - "\nWorking with file ${F_CFG}\nin directory ${j}\nfor ${n_f}";
  fi
+
+ # Find out if new structure and set .resol filename
+ if [ -d ${j}/EXPERIMENTS ] && [ -d ${j}/GENERAL ] ; then
+     # New Structure
+     echo "This is new configuration structure"
+     new_struct=yes
+     resolfile=$j/.resol
+ else
+     # Old Structure
+     new_struct=no
+     resolfile=$j/../.resol
+ fi
  
  # Get all variables declared in section UserChoices in config.card
@@ -138 +150 @@
 # Find the JobName : JobName might contain the variable RESOL_ATM_3D that will be replaced by what is in .resol file
  if [ ! X$( echo ${config_UserChoices_JobName} | grep ${RESOL_ATM_3D} ) = X ] ; then
-    TRUERESOL=$( find ../ -name ".resol" -exec tail -1 {} \; | awk "-F=" '{print $2}' )
+    TRUERESOL=$( tail -1 $resolfile | awk "-F=" '{print $2}' )
+    echo TRUERESOL = $TRUERESOL
     JobName=$( echo ${config_UserChoices_JobName} | sed -e "s/${RESOL_ATM_3D}/${TRUERESOL}/" )
     IGCM_card_WriteOption ${j}'/'${F_CFG} UserChoices JobName ${JobName}
  elif [ ! X$( echo ${config_UserChoices_JobName} | grep ${RESOL} ) = X ] ; then
-     TRUERESOL=$( find ../ -name ".resol" -exec head -1 {} \; )
+     TRUERESOL=$( head -1 $resolfile  )
      JobName=$( echo ${config_UserChoices_JobName} | sed -e "s/${RESOL}/${TRUERESOL}/" )
      IGCM_card_WriteOption ${j}'/'${F_CFG} UserChoices JobName ${JobName}
@@ -151 +164 @@
 
 # Add specific treatment for new type of directory structure 
-  if [ -d ${j}/EXPERIMENTS ] && [ -d ${j}/GENERAL ] ; then
-      echo "This is new configuration structure"
+  if [ ${new_struct} == yes ] ; then
 
       if [ "X${config_UserChoices_ExpType}" = X ] ; then