Changeset 1399 for tags/libIGCM_v3.0_beta1/libIGCM_comp

Timestamp:

07/05/17 20:18:51 (7 years ago)

Author:

sdipsl

Message:

CMIP6 workflow. Merging trunk into branch 'branch' r:1375:1398

File:

• tags/libIGCM_v3.0_beta1/libIGCM_comp/libIGCM_comp.ksh (modified) (3 diffs)

tags/libIGCM_v3.0_beta1/libIGCM_comp/libIGCM_comp.ksh

@@ -778 +778 @@
               if [ X${OCE_PROC_MPI} != X ] ; then
                 if [ ${OCE_PROC_MPI} -ne ${nb_restart_file} ] ; then
-                  IGCM_sys_rebuild ${generic_restart_file_name_out}.${extension_out} ${generic_restart_file_name_out}_????.${extension_out}
+                  IGCM_sys_rebuild_nemo ${generic_restart_file_name_out} ${nb_restart_file} ${extension_out} ${generic_restart_file_name_out}_????.${extension_out}
                   IGCM_sys_Rm ${generic_restart_file_name_out}_????.${extension_out}
                 fi
@@ -1326 +1326 @@
   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
 
   # Check if AUTO is set on the same line as keyid and keyattrib
   if [  $( grep -w ${keyid} ${filein} | grep AUTO | wc -l ) = 1 ] ; then
-    # Modifification will be done
+    # Modification will be done
     modify=yes
   else
@@ -1715 +1720 @@
           if [ X${AsynchronousRebuild} = Xfalse ] ; then
             IGCM_debug_Print 2 "Rebuilding ${file_in} online"
-            IGCM_sys_rebuild ${file_in} ${generic_file_name}_[0-9]*.nc
+            #
+            # for output.abort file, let use rebuild_NEMO : 13s instead of 20 mn.
+            if [ ${file_in} = output.abort.nc ] ; then
+              IGCM_sys_rebuild_nemo ${generic_file_name} ${nb_rebuild_file} "nc" ${generic_file_name}_[0-9]*.nc
+            else
+              IGCM_sys_rebuild ${file_in} ${generic_file_name}_[0-9]*.nc
+            fi
           else
             IGCM_debug_Print 2 "Preparing offline rebuild for ${file_in}"