Changeset 1585 for branches/libIGCM_CESMEP/libIGCM_sys/libIGCM_sys_irene.ksh

Timestamp:

04/25/23 14:26:44 (15 months ago)

Author:

ssenesi

Message:

merge branch libIGCM_CESMEP with trunk that handles RedHat8 on Irene

File:

• branches/libIGCM_CESMEP/libIGCM_sys/libIGCM_sys_irene.ksh (modified) (8 diffs)

branches/libIGCM_CESMEP/libIGCM_sys/libIGCM_sys_irene.ksh

@@ -38 +38 @@
 #====================================================
 # Turn in dry run mode ? (sys_Put_Rest, sys_Put_Out, sys_Get)
-typeset -r DRYRUN=${DRYRUN:=0}
+if ([ X${DRYRUN} != X ] && [ ${DRYRUN} = 4 ]) ; then
+  typeset -r DRYRUN=0
+  typeset -r DRYRUN_DEBUG=4
+else
+  typeset -r DRYRUN=${DRYRUN:=0}
+  typeset -r DRYRUN_DEBUG=0
+fi
+
 
 # YOU MUST COMPILE YOUR EXE FILES FOR DRYRUN MODE !
@@ -54 +61 @@
 # |    3     |       yes           |    no      |  no     |      no                   |
 # -------------------------------------------------------------------------------------
+# |    4     |       yes           |    yes     |  creation of RUN_DIR and Job_debug  |
+# -------------------------------------------------------------------------------------
+
 
 #=====================================================
@@ -70 +80 @@
 typeset MASTER=irene
 # add default project on irene
-if [ ! -z $BRIDGE_MSUB_PROJECT ]; then 
-    typeset PROJECT=$(echo ${BRIDGE_MSUB_PROJECT} | cut -d@ -f1 )
-else
-    typeset PROJECT=$(echo ${CCCHOME} | cut -d/ -f5 )
-fi
+typeset PROJECT=$(echo ${BRIDGE_MSUB_PROJECT:=gen0826} | 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}
@@ -96 +107 @@
 # Set environment tools (ferret, nco, cdo, rebuild, ...)
 #====================================================
+typeset CCCOS=${CCCOS:=$( ccc_os )}
+
 if [ X${TaskType} = Xcomputing ] ; then
   IGCM_debug_Print 1 "Modules will be loaded later in IGCM_sys_activ_variables."
 else
   module purge > /dev/null 2>&1
-  ##. /ccc/cont003/home/igcmg/igcmg/MachineEnvironment/irene/env_irene > /dev/null 2>&1
-  . $( ccc_home -u igcmg)/MachineEnvironment/irene/env_irene > /dev/null 2>&1
-  ##. /ccc/cont003/home/igcmg/igcmg/MachineEnvironment/irene/env_atlas_irene > /dev/null 2>&1
-  . $( ccc_home -u igcmg)/MachineEnvironment/irene/env_atlas_irene > /dev/null 2>&1
+  if [ X${CCCOS} = X"Rhel_8__x86_64" ] ; then
+      . $( ccc_home -u igcmg)/MachineEnvironment/irene/env_atlas_irene > /dev/null 2>&1
+  else
+      . $( ccc_home -u igcmg)/MachineEnvironment/irene_prev/env_irene > /dev/null 2>&1
+      . $( ccc_home -u igcmg)/MachineEnvironment/irene_prev/env_atlas_irene > /dev/null 2>&1
+  fi
 
   export PCMDI_MP=/ccc/work/cont003/igcmg/igcmg/PCMDI-MP
@@ -214 +229 @@
 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} = XDEFAULT ]; then
@@ -222 +238 @@
       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}"
@@ -231 +246 @@
     IGCM_debug_Print 1 "Load dfldatadir for DataProject read 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
     #====================================================
@@ -275 +290 @@
     R_FIG=${STORAGE}/IGCM_OUT
   fi
-
   #====================================================
   #- CMIP6 (hosting CMIP6 files produced by XIOS2 and configured by dr2xml)