Changeset 923

Timestamp:

08/14/13 14:39:17 (11 years ago)

Author:

sdipsl

Message:

cleanup

Location:

trunk/libIGCM/libIGCM_sys

Files:

• libIGCM_sys_curie.ksh (modified) (2 diffs)
• libIGCM_sys_obelix.ksh (modified) (2 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh

@@ -686 +686 @@
   fi
   typeset options status
-#  if [ ${config_UserChoices_JobName}.${CumulPeriod} = "." ] ; then
-    options=" -o ${SUBMIT_DIR}/${Script_Output} -e ${SUBMIT_DIR}/${Script_Output}"
-#  else
-#    options=" -o ${SUBMIT_DIR}/${Script_Output} -e ${SUBMIT_DIR}/${Script_Output} -r ${config_UserChoices_JobName}.${CumulPeriod}"
-#  fi
+  options="-o ${SUBMIT_DIR}/${Script_Output} -e ${SUBMIT_DIR}/${Script_Output}"
 
   /usr/bin/ccc_msub ${options} < $1
@@ -711 +707 @@
     echo "IGCM_sys_QsubPost :" $@
   fi
-  typeset status
+  typeset options status
   MY_PROJECT=$(echo ${BRIDGE_MSUB_PROJECT:=${DEFAULT_PROJECT}} | cut -d@ -f1 )
-  /usr/bin/ccc_msub -Q normal -A ${MY_PROJECT} -o ${POST_DIR}/${Script_Post_Output}.out -e ${POST_DIR}/${Script_Post_Output}.out ${libIGCM_POST}/$1.job
+  options="-Q normal -A ${MY_PROJECT} -o ${POST_DIR}/${Script_Post_Output}.out -e ${POST_DIR}/${Script_Post_Output}.out"
+
+  /usr/bin/ccc_msub ${options} < ${libIGCM_POST}/$1.job
   status=$?
   if [ ${status} -gt 0 ] ; then
-    IGCM_debug_Print 2 "IGCM_sys_QsubPost $1 : error code ${status}"
+    IGCM_debug_Print 2 "IGCM_sys_QsubPost ${options} ${libIGCM_POST}/$1.job : error code ${status}"
     IGCM_debug_Exit "IGCM_sys_QsubPost"
   fi

trunk/libIGCM/libIGCM_sys/libIGCM_sys_obelix.ksh

@@ -576 +576 @@
     echo "IGCM_sys_Qsub :" $@
   fi
-  typeset status
-  #/usr/local/bin/qsub -q medium -o ${SUBMIT_DIR}/${Script_Output} -N ${config_UserChoices_JobName}.${CumulPeriod} < $1
-  /usr/local/bin/qsub -q medium -o ${SUBMIT_DIR}/${Script_Output} -N ${config_UserChoices_JobName} < $1
+  typeset options status
+  options="-o ${SUBMIT_DIR}/${Script_Output}"
+  /usr/local/bin/qsub ${options} < $1
   status=$?
   if [ ${status} -gt 0 ] ; then
@@ -597 +597 @@
     echo "IGCM_sys_QsubPost :" $@
   fi
-  typeset status
-  /usr/local/bin/qsub -q medium -o ${POST_DIR}/${Script_Post_Output}.out ${libIGCM_POST}/$1.job -v ${listVarEnv}
+  typeset options status
+  options="-o ${POST_DIR}/${Script_Post_Output}.out -v ${listVarEnv}"
+  /usr/local/bin/qsub ${options} < ${libIGCM_POST}/$1.job
   status=$?
   if [ ${status} -gt 0 ] ; then
-    IGCM_debug_Print 2 "IGCM_sys_QsubPost $1 : error code ${status}"
+    IGCM_debug_Print 2 "IGCM_sys_QsubPost ${options} ${libIGCM_POST}/$1.job : error code ${status}"
     IGCM_debug_Exit "IGCM_sys_QsubPost"
   fi