Changeset 1508 for trunk

Timestamp:

12/09/19 15:49:14 (4 years ago)

Author:

jgipsl

Message:

Correct switch of multi-project using variable DataProject? or by the project set in the main job:
Use full path instead of variable $STORE, $WORK and $SCRATCH.

/gpfsstore/rech/${DataProject?}/${LOGIN}
/gpfswork/rech/${DataProject?}/${LOGIN}
/gpfsscratch/rech/${DataProject?}/${LOGIN}

This is done because "eval $(idrenv -d xxx)" can not be used in a job on computing nodes.

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_jeanzay.ksh (modified) (6 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_jeanzay.ksh

@@ -194 +194 @@
   if [ X${config_UserChoices_DataProject} = X ] || [ X${config_UserChoices_DataProject} = DEFAULT ]; then
     # The variable DataProject is not set in in section UserChoices in config.card or it is set to DEFAULT
-    # Default option: Change IDRPROJ according to the project used for submission
-
-    # jg following line does not work in a submitted job:
-    eval $(idrenv -d ${PROJECT})
+    # Default option: Set DataProject according to the project used for submission
+    DataProject=${PROJECT}
   else
     # Use the project set by the variable DataProject in section UserChoices in config.card
-    eval $(idrenv -d ${config_UserChoices_DataProject})
-    IGCM_debug_Print 1 "Change DataProject red in config.card : ${config_UserChoices_DataProject}"
-  fi
-  IGCM_debug_Print 1 "Data project for output to be used: ${IDRPROJ}"
+    IGCM_debug_Print 1 "Use DataProject as set in config.card : ${config_UserChoices_DataProject}"
+    DataProject=${config_UserChoices_DataProject}
+  fi
+  IGCM_debug_Print 1 "Data project for output to be used: ${DataProject}"
 
   #====================================================
   #- RUN_DIR_PATH : Temporary working directory (=> TMP)
-  typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${SCRATCH}/RUN_DIR/${SLURM_JOBID}_${$}}
+  typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=/gpfsscratch/rech/${DataProject}/${LOGIN}/RUN_DIR/${SLURM_JOBID}_${$}}
 
   if [ ! X${config_UserChoices_ARCHIVE} = X ]; then
@@ -216 +214 @@
     #====================================================
     #- ARCHIVE (dedicated to large files)
-    ARCHIVE=${STORE}
+    ARCHIVE=/gpfsstore/rech/${DataProject}/${LOGIN}
   fi
 
@@ -226 +224 @@
     #====================================================
     #- STORAGE (dedicated to small/medium files)
-    STORAGE=${WORK}
+    STORAGE=/gpfswork/rech/${DataProject}/${LOGIN}
   fi
 
@@ -232 +230 @@
     #====================================================
     #- R_OUT
-    R_OUT=${SCRATCH}/IGCM_OUT
+    R_OUT=/gpfsscratch/rech/${DataProject}/${LOGIN}/IGCM_OUT
 
     #====================================================
     #- R_FIG (hosting figures : monitoring and atlas, and/or small files)
-    R_FIG=${SCRATCH}/IGCM_OUT
+    R_FIG=/gpfsscratch/rech/${DataProject}/${LOGIN}/IGCM_OUT
 
     IGCM_debug_Print 1 "SpaceName=TEST ==> OVERRULE destination path directories"
@@ -256 +254 @@
   #====================================================
   #- R_BUF (ONLY FOR double copy an scratch)
-  R_BUF=${SCRATCH}/IGCM_OUT
+  R_BUF=/gpfsscratch/rech/${DataProject}/${LOGIN}/IGCM_OUT
 
   IGCM_debug_Print 1 "R_OUT has been defined = ${R_OUT}"
@@ -1435 +1433 @@
     IGCM_debug_Print 1 "Please check the RUN_DIR_PATH definition in your Job : Job_${config_UserChoices_JobName}"
     IGCM_debug_Exit "This will stop the job"
+  elif ( [ X${RUN_DIR_PATH} = X${HOME} ] || [ X${RUN_DIR_PATH} = X/gpfswork/rech/${DataProject}/${LOGIN} ] || [ X${RUN_DIR_PATH} = X/gpfsscratch/rech/${DataProject}/${LOGIN} ] || [ X${RUN_DIR_PATH} = X/gpfsstore/rech/${DataProject}/${LOGIN} ] ) ; then
+    IGCM_debug_Print 1 "Variable RUN_DIR_PATH is pointing to an important directory : ${RUN_DIR_PATH}"
+    IGCM_debug_Print 1 "Please check the RUN_DIR_PATH definition in your Job : Job_${config_UserChoices_JobName}"
+    IGCM_debug_Exit "This will stop the job"
   fi
   IGCM_debug_PopStack "IGCM_sys_check_path"