Changeset 1461 for trunk/libIGCM

Timestamp:

06/26/18 19:38:38 (6 years ago)

Author:

jgipsl

Message:

Ticket #342
Changes for dfldatadir at irene:
Add optional variable DataProject? in config.card UserSection?. This variable is read only at irene in the function IGCM_sys_defineArchives.

• The variable DataProject? is used to change project where to store IGCM_OUT (including scratch/work/store)
• If the variable is set equal DEFAULT or if it is not set, then the module dfldatadir corresponding to the project used for submission is loaded
• If DataProject? is set in config.card, then the corresponding module dfldatadir is loaded

Note: RUN_DIR_PATH is set before dfldatadir is loaded and therefor RUN_DIR_PATH might be on another project. It'll be on the project corresponding to the module loaded in the terminal when submitting the main job. When libIGCM resubmittes next period, the module dfldatadir in last period will be transmitted and the RUN_DIR will be on the same project as IGCM_OUT output.

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_irene.ksh (modified) (3 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_irene.ksh

@@ -105 +105 @@
 fi
 
-# Use CMIP6 storage space when using project id gch0316
-[[ "X${PROJECT}" = "Xgch0316" && ! $(module list --terse 2>&1 | grep dfldatadir/gencmip6) ]] && module switch dfldatadir dfldatadir/gencmip6
-
 # FYI
 [ ! X${TaskType} = Xchecking ] && IGCM_debug_Print 1 "List of loaded modules:"
@@ -202 +199 @@
 #D-function IGCM_sys_defineArchives
 #D-* Purpose:
+#D-* Load dfldatadir module : According to project used for submission (default) or set in config.card (optional)
 #D-* Define ARCHIVE : Dedicated to large files
 #D-* Define STORAGE : Dedicated to small/medium files
@@ -212 +210 @@
 function IGCM_sys_defineArchives {
   IGCM_debug_PushStack "IGCM_sys_defineArchives"
+
+  # Load dfldatadir depending on the project used for submission (default) or set in config.card (optional)
+  if [ X${config_UserChoices_DataProject} = X ] || [ X${config_UserChoices_DataProject} = DEFAULT ]; then
+    # Default option: Change the dfldatadir according to the project used for submission
+    # The variable DataProject in section UserChoices in config.card is not set or is set to DEFAULT
+    module switch dfldatadir dfldatadir/${PROJECT}
+    IGCM_debug_Print 1 "Load dfldatadir for project ${PROJECT}"
+  else
+    # Use the project set by the variable DataProject in section UserChoices in config.card
+    module switch dfldatadir dfldatadir/${config_UserChoices_DataProject}
+    IGCM_debug_Print 1 "Load dfldatadir for project ${config_UserChoices_DataProject}"
+  fi
 
   if [ ! X${config_UserChoices_ARCHIVE} = X ]; then