Changeset 1574

Timestamp:

02/06/23 10:10:12 (8 months ago)

Author:

aclsce

Message:

Modified debug run_dir functionality to copy the arch.env into the run_directory.

Location:

trunk/libIGCM

Files:

• AA_job_debug (modified) (2 diffs)
• ins_job (modified) (3 diffs)
• libIGCM_sys/libIGCM_sys.ksh (modified) (2 diffs)

trunk/libIGCM/AA_job_debug

@@ -179 +179 @@
 #-Q- mesoipsl . /etc/profile.d/modules.sh
 
-. ::ENVFILE::
+. ./arch.env
 
 module list
 
+# Enable the copy of binary files from modipsl directory (default n)
+# Could be useful in case of modifications (and so recompilation) in the sources
+copy_executable=n
+
 #D------------------------------------------------------
 #D- EXECUTION
-#D-     - Copy binary files from modipsl directory
+#D-     - Copy binary files from modipsl directory (only if copy_executable=y)
 #D-     - Remove of some out restart files 
 #D-     - Execution
@@ -192 +196 @@
 cd ${SUBMIT_DIR}
 
+if [ X${copy_executable} = Xy ] ; then
 while read EXEIN EXEOUT ;do
  eval EXEIN=${EXEIN}
  cp ${MODIPSL}/bin/${EXEIN} ${EXEOUT}
 done < components_binary.txt
+fi
 
 if [ X${SRF_comp} = Xy ] ; then

trunk/libIGCM/ins_job

@@ -560 +560 @@
   # 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};
@@ -575 +590 @@
   # update Headers so that ressources description are accurate (MPMD/SPMD/...)
   IGCM_sys_updateHeaders ${j}'/'${n_f}
-
-  n_f='Job_debug_'${JobName};
-  [[ ${x_f} = 'false' ]] && [[ -f ${j}'/'${n_f} ]] && { ins_job_Warning; continue; }
-  [[ ${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}
   
 done
@@ -601 +601 @@
   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; }

trunk/libIGCM/libIGCM_sys/libIGCM_sys.ksh

@@ -1668 +1668 @@
       done
    SUBMIT_DIRECTORY=$(grep SUBMIT_DIR ${libIGCM}/libIGCM_sys/libIGCM_sys_${SYSTEM}.ksh | grep -m1 typeset | cut -dx -f2)
-      sed -e "s%::ENVFILE::%${EnvFile}%" \
-          -e "s%::EXECUTION::%${EXECUTION}%" \
+      sed -e "s%::EXECUTION::%${EXECUTION}%" \
           -e "s%::EXECUTION_TYPE::%${executionType}%" \
           -e "s%::JOBNAME::%${config_UserChoices_JobName}%" \
@@ -1678 +1677 @@
           -e "s%::CHM_comp::%${CHM_comp}%" \
           ${libIGCM}/Job_debug_${config_UserChoices_JobName} > ${RUN_DIR}/Job_debug_${config_UserChoices_JobName}
+      cp ${EnvFile} ${RUN_DIR}/.
       echo
       echo "############################################"