Changeset 1585 for branches/libIGCM_CESMEP/ins_job

Timestamp:

04/25/23 14:26:44 (12 months ago)

Author:

ssenesi

Message:

merge branch libIGCM_CESMEP with trunk that handles RedHat8 on Irene

File:

• branches/libIGCM_CESMEP/ins_job (modified) (5 diffs)

branches/libIGCM_CESMEP/ins_job

@@ -116 +116 @@
 #  { print - "directory 'modipsl' unreachable"; exit 3; }
 W_W=${d_n}'/../libIGCM'
+#W_W=${d_n}  # S.Senesi - not sure of the intent in line above, but that clashes with using a symbolic link for libIGCM in modipsl/, which is must useful for development
 [[ ! -d ${W_W} ]] && { print - "${W_W} unreachable"; exit 3; }
 libIGCM=$(cd ${W_W};/bin/pwd;)
 F_JOB=${libIGCM}'/AA_job';
 [[ ! -f ${F_JOB} ]] && { print - "${F_JOB} unreachable"; exit 3; }
+F_JOB_DEBUG=${libIGCM}'/AA_job_debug';
+[[ ! -f ${F_JOB_DEBUG} ]] && { print - "${F_JOB_DEBUG} unreachable"; exit 3; }
 F_RCI=${libIGCM}'/run.card.init';
 [[ ! -f ${F_RCI} ]] && { print - "${F_RCI} unreachable"; exit 3; }
@@ -404 +407 @@
   echo MPIEnvironment is ${MPIEnvironment}
 
-elif [ X"${SYSTEM}" == "Xlxiv8" ] || [ X"${SYSTEM}" == "Xifort_CICLAD" ] ; then
+elif [ X"${SYSTEM}" == "Xobelix" ] || [ X"${SYSTEM}" == "Xifort_CICLAD" ] ; then
   # obelix, ciclad, climserv
   echo ""
@@ -558 +561 @@
   # openMPthreads : NUMBER OF OpenMP THREADS
 
+  # File name for Job_debug
+  n_f='Job_debug_'${JobName};
+  [[ ${x_v} = 'verbose' ]] && print - "\nWorking with file ${F_CFG}\nin directory ${j}\nfor ${n_f}";
+  sed -e "/^${W_W} */ s///" \
+      -e "/^${W_P}/d"       \
+      -e "s%::modipsl::%${F_MOD}%" \
+      -e "s/::Jobname::/${JobName}/" \
+      -e "s/::default_project::/${ProjectID}/" \
+      -e "s/::WallTime::/${WallTime}/" \
+      ${F_JOB_DEBUG} > ${libIGCM}'/'${n_f}
+  chmod u+x ${libIGCM}'/'${n_f}
+
+  # update Headers so that ressources description are accurate (MPMD/SPMD/...)
+  IGCM_sys_updateHeaders ${libIGCM}'/'${n_f}
+
   # File name for Job
   n_f='Job_'${JobName};
@@ -573 +591 @@
   # update Headers so that ressources description are accurate (MPMD/SPMD/...)
   IGCM_sys_updateHeaders ${j}'/'${n_f}
+  
 done
 
@@ -583 +602 @@
   i_f=${i##*/};
   [[ ${i_f} = 'AA_job' ]] && { continue; }
+  [[ ${i_f} = 'AA_job_debug' ]]  && { continue; }
   j=${i%/*}; n_f=${i_f#AA_}'.job';
   [[ ${x_f} = 'false' ]] && [[ -f ${j}'/'${n_f} ]] && { ins_job_Warning; continue; }