Changeset 1479 for trunk/libIGCM

Timestamp:

03/18/19 14:56:05 (5 years ago)

Author:

jgipsl

Message:

Added possibility to source a different file than the default one containing module load. To use this options, set in config.card UserChoices? section
EnvFile?=...

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_irene.ksh (modified) (1 diff)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_irene.ksh

@@ -1079 +1079 @@
 #D- MODULE specifications
 # --------------------------------------------------------------------
-  module purge > /dev/null 2>&1 
-  if [ X${compilerVersion} = XV17 ] ; then
-    IGCM_debug_Print 1 "IGCM_sys_active_variables : Using compiler version V17"
+  # Source the file EnvFile containing all module load needed to run the model.
+  # Use default a default file on the shared account or use an optional file specified in config.card.
+  if [ X${config_UserChoices_EnvFile} = X ] || [ X${config_UserChoices_EnvFile} = DEFAULT ] ; then
+      IGCM_debug_Print 1 "IGCM_sys_active_variables : Default modules will be used"
+      module purge > /dev/null 2>&1 
+      if [ X${compilerVersion} = XV17 ] ; then
+          IGCM_debug_Print 1 "IGCM_sys_active_variables : Using compiler version V17"
+          ## EnvFile=/ccc/cont003/home/igcmg/igcmg/MachineEnvironment/irene/env_irene > /dev/null 2>&1
+          EnvFile=$( ccc_home -u igcmg)/MachineEnvironment/irene/env_irene > /dev/null 2>&1
+      else
+          IGCM_debug_Exit "This compiler version is not yet supported : ${compilerVersion}"
+      fi
   else
-    IGCM_debug_Exit "This compiler version is not yet supported : ${compilerVersion}"
-  fi
-  ##. /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
+      # EnvFile is set in config.card
+      IGCM_debug_Print 1 "EnvFile set in config.card will be used"
+      EnvFile=${config_UserChoices_EnvFile}
+  fi
+  IGCM_debug_Print 1 "IGCM_sys_active_variables : Following EnvFile will be used :" 
+  IGCM_debug_Print 1 ${EnvFile}
+  . ${EnvFile}
+
   IGCM_debug_Print 1 "IGCM_sys_active_variables : Now loaded modules for Irene. "
   module list