Changeset 1386

Timestamp:

04/03/17 16:54:43 (8 years ago)

Author:

jgipsl

Message:

IGCM_comp_modifyXmlFile: Do not stop for nonblocker case if the keyid was not found in the file. See ticket ​https://forge.ipsl.jussieu.fr/libigcm/ticket/325

File:

• trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh (modified) (1 diff)

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -1366 +1366 @@
   fi
 
-  # Test if keyid is set in filein, otherwise exit
+  # Test if keyid is set in filein. If not exit for case all cases(blocker, force) except nonblocker.
   if [ $( grep -w ${keyid} ${filein} | wc -l ) = 0 ] ; then
-    # Variable key is not set in filein, stop.
-    IGCM_debug_Exit "IGCM_comp_modifyXmlFile : ${keyid} is not set in the file. Bad syntax of ${filein} file."
-    IGCM_debug_PopStack "IGCM_comp_modifyXmlFile"
-    return
+      if [ ${type} = nonblocker ] ; then
+          # This is a nonblocker case, print warning but do nothing else
+          IGCM_debug_Print 1 "IGCM_comp_modifyXmlFile: ${keyid} is not set in ${filein}. This is a nonblocker call so nothing is done."
+      else
+          # This is a blocker or force case : stop now
+          IGCM_debug_Exit "IGCM_comp_modifyXmlFile : ${keyid} is not set in the file. Bad syntax of ${filein} file."
+          IGCM_debug_PopStack "IGCM_comp_modifyXmlFile"
+          return
+      fi
   fi