Changeset 1033 for trunk/libIGCM

Timestamp:

07/29/14 16:24:50 (10 years ago)

Author:

sdipsl

Message:

See #186 issue a clear warning when requesting time series ifrom card but variable has not produced. Is an error in PROD just a
WARNING in other cases.

File:

• trunk/libIGCM/AA_create_ts (modified) (7 diffs)

trunk/libIGCM/AA_create_ts

@@ -467 +467 @@
       for var in $( eval echo \${LISTE_VARS_${file}[*]} ) ; do
         #
-        liste_file[${#liste_file[*]}]=${file_path}/${TS_Dir}/${config_UserChoices_JobName}_${date}_${FlagDir}_${var}.nc
+        IGCM_sys_TestFileArchive ${file_path}/${TS_Dir}/${config_UserChoices_JobName}_${date}_${FlagDir}_${var}.nc
+        if [ $? = 0 ] ; then
+          liste_file[${#liste_file[*]}]=${file_path}/${TS_Dir}/${config_UserChoices_JobName}_${date}_${FlagDir}_${var}.nc
+        else
+          IGCM_debug_Print 1 "WARNING ${file_path}/${TS_Dir}/${config_UserChoices_JobName}_${date}_${FlagDir}_${var}.nc dont exist"
+        fi
         #
       done
@@ -473 +478 @@
     if [ X${file} != X${NULL_STR} ] ; then
       IGCM_sys_Get /l liste_file[*] ${RUN_DIR_PATH}/${comp}
-
-      # Even if some files are missing we tried to continue
-      # Either ListVar in compname.card are asked but not present in original history file
-      # Either a previous TS task failed
-      ExitFlag=false
       IGCM_debug_Verif_Exit_Post
     fi
@@ -689 +689 @@
       for var in $( eval echo \${LISTE_VARS_${file}[*]} ) ; do
         #
+        # We skip variables not in the first file of the list.
+        # Seems overkill to test thel all... but will do if needed
+        ncdump -hv ${var} ${liste_file_tmp[0]} > /dev/null 2>&1
+        if [ ! $? = 0 ] ; then
+          IGCM_debug_Print 1 "WARNING We skip ${var}, not present within ${liste_file_tmp[0]}"
+          continue
+        fi
+        #
         if [ "${FLAG_B}" = "TRUE" ] ; then
           # WE CONCATENATE WITH EXISTING FILES
@@ -694 +702 @@
           file_out=${config_UserChoices_JobName}_${DATE_BUILD_END}_${FlagDir}_${var}.nc
           IGCM_sys_ncrcat --hst -v ${liste_coord}${var} ${file1} ${liste_file_tmp[*]} ${file_out}
+          IGCM_debug_Verif_Exit_Post
           #
           IGCM_sys_Rm ${file1}
@@ -701 +710 @@
             [ ! "${file1}" = "${config_UserChoices_JobName}_${DateBegin}_${DATE_FIN_JOB_B}_${FlagDir}_${var}.nc" ] && eval MENAGE \${R_OUT_${comp}}/Analyse/${TS_Dir} ${file1} ${file_out}
           fi
-
-          ExitFlag=false
         else
           # OR NOT
           IGCM_sys_ncrcat --hst -v ${liste_coord}${var} ${liste_file_tmp[*]} ${config_UserChoices_JobName}_${DATE_BUILD}_${FlagDir}_${var}.nc
+          IGCM_debug_Verif_Exit_Post
         fi
 
@@ -739 +747 @@
             # Put global history attribut
             IGCM_sys_ncatted -Oh -a history,global,o,c,"build by libIGCM/create_ts" ${file_out_YE}
+            IGCM_debug_Verif_Exit_Post
             #
             eval IGCM_sys_Put_Out ${file_out_YE} \${R_OUT_${comp}}/Analyse/TS_MO_YE/${file_out_YE}
@@ -746 +755 @@
           #
           IGCM_sys_Rm ${file_out}
-          ExitFlag=false
           #
         fi