Changeset 1486 for trunk/libIGCM

Timestamp:

06/17/19 17:50:03 (5 years ago)

Author:

jgipsl

Message:

• Added eval on ExeNameIn? after it has been controled that it is not equal "". This is done to enable variables in the executable name. For example gcm_${ResolAtm?}.nc
• Initialized variables ResolAtm?, ResolOce?, OptMode? which can be used in the Executable section in config.card if they are set in the UserChoices? section in the same config.card.

Location:

trunk/libIGCM

Files:

• libIGCM_comp/libIGCM_comp.ksh (modified) (2 diffs)
• libIGCM_config/libIGCM_config.ksh (modified) (3 diffs)

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -1006 +1006 @@
     eval ExeNameIn=\${config_Executable_${comp}[0]}
     eval ExeNameOut=\${config_Executable_${comp}[1]}
-
-    # If missing executable and DRYRUN is set to 0 or 1  then stop!
-    if [ ${DRYRUN} -le 1 ] && [ X${ExeNameIn} != X\"\" ] &&  [ ! -f ${R_EXE}/${ExeNameIn} ] ; then
-      IGCM_debug_Exit "IGCM_comp_GetInputBinaryFiles missing executable ${ExeNameIn}"
+    # Test if missing executable and DRYRUN is set to 0 or 1, then stop!
+    if [ ${DRYRUN} -le 1 ] && [ X${ExeNameIn} != X\"\" ] ; then
+        # The executable is set in config.card and is different from ""
+        # Use eval to expand ExeNameIn if variables are used in the name 
+        eval ExeNameIn=${ExeNameIn}
+        if [ ! -f ${R_EXE}/${ExeNameIn} ] ; then
+            IGCM_debug_Exit "IGCM_comp_GetInputBinaryFiles missing executable ${ExeNameIn}"
+        fi
     fi
 
@@ -1069 +1073 @@
     # Copy executable for this component
     eval ExeNameIn=\${config_Executable_${comp}[0]}
+    eval ExeNameIn=${ExeNameIn}
     eval ExeNameOut=\${config_Executable_${comp}[1]}
 

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -38 +38 @@
     IGCM_debug_Print 3 "${option} : ${auxprint}"
   done
+
+  # Set variables with shorter names on some variables which  
+  # are used in the executable name in config.card
+  ResolAtm=${config_UserChoices_ResolAtm}
+  ResolOce=${config_UserChoices_ResolOce}
+  OptMode=${config_UserChoices_OptMode}
 
   #==================================
@@ -653 +659 @@
 
       # Keep the first executable found and the first CompName
-      ExeNameFirst=${ExeNameIn}
+      eval ExeNameFirst=${ExeNameIn}
       CompNameFirst=${comp}
 
@@ -1110 +1116 @@
         (( ExeSize=0 ))
       else
+        eval ExeNameIn=${ExeNameIn}
         LS_bin=${R_EXE}/${ExeNameIn}
         IGCM_sys_FileSize ${LS_bin} ExeSize