Changeset 1828 for modipsl/trunk/util/ins_job

Timestamp:

07/20/12 11:01:47 (12 years ago)

Author:

jgipsl

Message:

Merged branche modipsl/newdev into modipsl/trunk . Changes are :

• Cleaning up in mod.def. Fewer configurations are now distributed.
• ins_job : Added option for creating job for ensembles and updated use of new configuration v5.
• model :
  • Added coupled configuration IPSLCM5CHS and IPSLCM5CHT.
  • Added option DEFAULT : This option has for purpose to ask the user if he wants to change a component will extracting a configuration. This option is activated by adding DEFAULT in front of component name in mod.def. This option is not used for the moment.

File:

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

modipsl/trunk/util/ins_job

@@ -14 +14 @@
 
 Usage :
-  ${b_n} [-h] [-v]
+  ${b_n} [-h] [-v] [-e]
 
 Options :
   -h   : help
   -v   : verbose mode
+  -e   : turn on hindcast/forecast ensemble mode
 "
 }
@@ -35 +36 @@
 #-
 x_v='silencious';
-while getopts :hv V
-  do
-   case $V in
-    (h)  ins_job_Usage; exit 0;;
-    (v)  x_v='verbose';;
-    (:)  echo ${b_n}" : -"${OPTARG}" option : missing value" 1>&2;
-         exit 2;;
-    (\?) echo ${b_n}" : -"${OPTARG}" option : not supported" 1>&2;
-         exit 2;;
-    esac
-  done
+x_e=false;
+while getopts :hve V ; do
+  case $V in
+  (h)  ins_job_Usage; exit 0;;
+  (v)  x_v='verbose';;
+  (e)  x_e=true;;
+  (:)  echo ${b_n}" : -"${OPTARG}" option : missing value" 1>&2;
+  exit 2;;
+  (\?) echo ${b_n}" : -"${OPTARG}" option : not supported" 1>&2;
+  exit 2;;
+  esac
+done
 shift $(($OPTIND-1));
 #-
@@ -93 +95 @@
 #-
 DEBUG_debug=false
+MirrorlibIGCM=false
 . ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh
 . ${libIGCM}/libIGCM_card/libIGCM_card.ksh
+. ${libIGCM}/libIGCM_date/libIGCM_date.ksh
+. ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh
+if [ $x_e = 'true' ] ; then
+  . ${libIGCM}/libIGCM_ensemble/libIGCM_ensemble.ksh
+fi
 #-
 # Define the pattern string to substitute
@@ -109 +117 @@
  n_f=${F_RCI##*/};
 
- if [ ! X$( echo ${j} | grep USER_SPEC ) = X ] ; then
- # Do not treat config.card if it is in sub-directory of USER_SPEC
+ if [ ! X$( echo ${j} | grep EXPERIMENTS ) = X ] ; then
+ # Do not treat config.card if it is in sub-directory of EXPERIMENTS
  # Continue to next config.card
      continue
  else
      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
  
@@ -122 +142 @@
  config_UserChoices_JobClass=mono
  config_UserChoices_JobNumProcTot=1
- config_UserChoices_UserSpec=""
+ config_UserChoices_ExpType=""
  RESOL_ATM_3D=this_is_a_test_string
  RESOL=this_is_another_test_string
@@ -132 +152 @@
 # 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}
@@ -145 +166 @@
 
 # Add specific treatment for new type of directory structure 
-  if [ -d ${j}/USER_SPEC ] && [ -d ${j}/GENERAL ] ; then
-      echo "This is new configuration structure"
-
-      if [ "X${config_UserChoices_UserSpec}" = X ] ; then
+  if [ ${new_struct} == yes ] ; then
+
+      if [ "X${config_UserChoices_ExpType}" = 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"
+        echo "=> The variable ExpType must be added in config.card in section UserChoices"
+        echo "=> ExpType gives the directory for the .card configurtaion files for the wanted experiement. For exemple ExpType=IPSLCM5/historical"
         exit 4
       else
-        echo "UserSpec= ${config_UserChoices_UserSpec}"
+        echo "ExpType= ${config_UserChoices_ExpType}"
       fi
 
@@ -162 +182 @@
           continue
       fi
-      cp -r ${j}/USER_SPEC/${config_UserChoices_UserSpec} ${j}/${JobName}
+      cp -r ${j}/EXPERIMENTS/${config_UserChoices_ExpType} ${j}/${JobName}
       cp -r ${j}/GENERAL/* ${j}/${JobName}/.
       cp -f ${j}/${F_CFG}  ${j}/${JobName}/.
@@ -207 +227 @@
 done
 #-
+# Limited to hindcast/forecast Ensemble for the time being
+if [ ${x_e} = 'true' ] ; then
+  #.. Read input data from ensemble.card .. 
+  # TO BE CHANGED
+  FileName="ensemble.card"
+  SUBMIT_DIR=$( pwd )
+  RUN_DIR="${WORKDIR}/ENSEMBLE"
+  #
+  # Copy initial things around and define variables (hindcast/forecast case)
+  IGCM_ensemble_CastInit
+  # As it says
+  IGCM_sys_Cd ${SUBMIT_DIR}
+  IGCM_ensemble_CastPeriodicStarts
+  # As it says
+  IGCM_sys_Cd ${SUBMIT_DIR}
+  IGCM_ensemble_CastNonPeriodicStarts
+  # Done
+  IGCM_sys_Cp ${RUN_DIR}/CreatedDir.txt ${RUN_DIR}/Qsub.txt ${SUBMIT_DIR}
+  IGCM_sys_Cd ${SUBMIT_DIR}
+fi
+#-
 print - "";
 #-