Changeset 93 for trunk

Timestamp:

04/10/09 14:22:38 (15 years ago)

Author:

sdipsl

Message:

• Add ZNL atlas for ORCA2_LIM2 and ORCA2_LIM2_PISCES
• Bugfix for vargas IGCM_sys_Qsub and IGCM_sys_QsubPost function

Location:

trunk/libIGCM

Files:

• AA_atlas_ORCA_LIM (modified) (2 diffs)
• libIGCM_sys/libIGCM_sys_vargas.ksh (modified) (2 diffs)

trunk/libIGCM/AA_atlas_ORCA_LIM

@@ -132 +132 @@
 
 # WHILE WAITING FOR A MORE GENERIC SOLUTION
-if [ ${config_UserChoices_TagName} = "IPSLCM5" ] ; then
+if ( [ ${config_UserChoices_TagName} = "IPSLCM5" ] || [ ${config_UserChoices_TagName} = "ORCA2_LIM2" ] || [ ${config_UserChoices_TagName} = "ORCA2_LIM2_PISCES" ] ) ; then
     IGCM_sys_Get ${R_OUT_OCE}/Analyse/SE/${config_UserChoices_JobName}_SE_${YEARS}_1M_diaptr.nc  ${RUN_DIR} ;
     atlas -o ${RUN_DIR}/${R_ATLAS}/ZNL   -d -l ${FER_ATLAS}/atlas_l_${RESOL_OCE}_znl.cfg         ${RUN_DIR}/${config_UserChoices_JobName}_SE_${YEARS}_1M_diaptr.nc ;
@@ -151 +151 @@
 IGCM_sys_Rm ${config_UserChoices_JobName}_SE_${YEARS}_1M_icemod.nc      
 # WHILE WAITING FOR A MORE GENERIC SOLUTION
-if [ ${config_UserChoices_TagName} = "IPSLCM5" ] ; then
+if ( [ ${config_UserChoices_TagName} = "IPSLCM5" ] || [ ${config_UserChoices_TagName} = "ORCA2_LIM2" ] ) ; then
     IGCM_sys_Rm ${config_UserChoices_JobName}_SE_${YEARS}_1M_diaptr.nc ; 
 fi

trunk/libIGCM/libIGCM_sys/libIGCM_sys_vargas.ksh

@@ -431 +431 @@
     fi
     {
-      [ ${#@} = 1 ] &&  { cd $LOADL_STEP_INITDIR ; llsubmit $1 ; cd - ; }
-      [ ${#@} = 2 ] &&  { cd $2 ; llsubmit $1 ; cd - ; }
+      [ ${#@} = 1 ] &&  { cd $LOADL_STEP_INITDIR ; /usr/local/bin/llsubmit $1 ; ERROR=$? ; cd - ; }
+      [ ${#@} = 2 ] &&  { cd $2 ; /usr/local/bin/llsubmit $1 ; ERROR=$? ; cd - ; }
     }
-    if [ $? -gt 0 ] ; then
+    if [ ${ERROR} -gt 0 ] ; then
         echo "IGCM_sys_Qsub : erreur $@."
         IGCM_debug_Exit "IGCM_sys_Qsub"
@@ -452 +452 @@
     fi
     cd ${POST_DIR}
-    /usr/local/bin/llsubmit ${libIGCM_POST}/$1.job
+    /opt/ibmll/LoadL/full/bin/llsubmit ${libIGCM_POST}/$1.job
     cd -
     if [ $? -gt 0 ] ; then