Changeset 1563 for branches/libIGCM_CESMEP

Timestamp:

10/15/22 17:10:09 (18 months ago)

Author:

ssenesi

Message:

Better gues default_project on irene(-amd) in libIGCM_sys

Location:

branches/libIGCM_CESMEP/libIGCM_sys

Files:

• libIGCM_sys_irene-amd.ksh (modified) (1 diff)
• libIGCM_sys_irene.ksh (modified) (4 diffs)

branches/libIGCM_CESMEP/libIGCM_sys/libIGCM_sys_irene-amd.ksh

@@ -70 +70 @@
 typeset MASTER=irene-amd
 # add default project on irene-amd
-typeset PROJECT=$(echo ${BRIDGE_MSUB_PROJECT:=::default_project::} | cut -d@ -f1 )
+if [ ! -z $BRIDGE_MSUB_PROJECT ]; then 
+    typeset PROJECT=$(echo ${BRIDGE_MSUB_PROJECT} | cut -d@ -f1 )
+else
+    typeset PROJECT=$(echo ${CCCHOME} | cut -d/ -f5 )
+fi
 # jobWarningDelay in seconds
 typeset jobWarningDelay=${BRIDGE_MSUB_MAXTIME}

branches/libIGCM_CESMEP/libIGCM_sys/libIGCM_sys_irene.ksh

@@ -70 +70 @@
 typeset MASTER=irene
 # add default project on irene
-typeset PROJECT=$(echo ${BRIDGE_MSUB_PROJECT:=::default_project::} | cut -d@ -f1 )
+set -x
+if [ ! -z $BRIDGE_MSUB_PROJECT ]; then 
+    typeset PROJECT=$(echo ${BRIDGE_MSUB_PROJECT} | cut -d@ -f1 )
+else
+    typeset PROJECT=$(echo ${CCCHOME} | cut -d/ -f5 )
+fi
+set +x
 # jobWarningDelay in seconds
 typeset jobWarningDelay=${BRIDGE_MSUB_MAXTIME}
@@ -210 +216 @@
 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
+  if [ X${config_UserChoices_DataProject} = X ] || [ X${config_UserChoices_DataProject} = XDEFAULT ]; 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
@@ -219 +224 @@
       IGCM_debug_Print 1 "Load dfldatadir for forced gencmip6 project"
     else 
+      echo "Load dfldatadir for project ${PROJECT}"
       module switch dfldatadir dfldatadir/${PROJECT}
       IGCM_debug_Print 1 "Load dfldatadir for project ${PROJECT}"
@@ -225 +231 @@
     # 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 DataProject red in config.card : ${config_UserChoices_DataProject}"
-  fi
-
+    IGCM_debug_Print 1 "Load dfldatadir for DataProject read in config.card : ${config_UserChoices_DataProject}"
+  fi
  #====================================================
  #- RUN_DIR_PATH : Temporary working directory (=> TMP)