Changeset 1474

Timestamp:

10/26/18 17:33:59 (5 years ago)

Author:

mafoipsl

Message:

On Irene for all xxxcmip6 sub-project, force dfldatadir to gencmip6.
Thanks to PC, move initialisation of RUN_DIR after module switch operation.

File:

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

trunk/libIGCM/libIGCM_sys/libIGCM_sys_irene.ksh

@@ -165 +165 @@
 #====================================================
 #- RUN_DIR_PATH : Temporary working directory (=> TMP)
-typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${CCCSCRATCHDIR}/RUN_DIR/${BRIDGE_MSUB_JOBID}_${$}}
+#typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${CCCSCRATCHDIR}/RUN_DIR/${BRIDGE_MSUB_JOBID}_${$}}
 
 #====================================================
@@ -215 +215 @@
     # 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}"
+    if [ X"$( echo ${PROJECT} | grep cmip6 )" != "X" ] ; then
+      module switch dfldatadir dfldatadir/gencmip6
+      IGCM_debug_Print 1 "Load dfldatadir for forced gencmip6 project"
+    else 
+      module switch dfldatadir dfldatadir/${PROJECT}
+      IGCM_debug_Print 1 "Load dfldatadir for project ${PROJECT}"
+    fi
   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
+    IGCM_debug_Print 1 "Load dfldatadir for DataProject red in config.card : ${config_UserChoices_DataProject}"
+  fi
+
+ #====================================================
+ #- RUN_DIR_PATH : Temporary working directory (=> TMP)
+ typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${CCCSCRATCHDIR}/RUN_DIR/${BRIDGE_MSUB_JOBID}_${$}}
 
   if [ ! X${config_UserChoices_ARCHIVE} = X ]; then