Changeset 1482 for trunk

Timestamp:

04/15/19 09:59:53 (5 years ago)

Author:

jgipsl

Message:

Add check if the EnvFile? exists if it is set in config.card. Else the default file will be sourced in the same way as if EnvFile? is not set in config.card.

File:

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

trunk/libIGCM/libIGCM_sys/libIGCM_sys_irene.ksh

@@ -1081 +1081 @@
   # 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
+  if [ ! X${config_UserChoices_EnvFile} = X ] && [ -f ${config_UserChoices_EnvFile} ] ; then
+      # EnvFile is set in config.card and the file exists
+      IGCM_debug_Print 1 "EnvFile set in config.card will be used"
+      EnvFile=${config_UserChoices_EnvFile}
+  else
       IGCM_debug_Print 1 "IGCM_sys_active_variables : Default modules will be used"
       module purge > /dev/null 2>&1 
@@ -1091 +1095 @@
           IGCM_debug_Exit "This compiler version is not yet supported : ${compilerVersion}"
       fi
-  else
-      # 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 :"