Changeset 409 for trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

Timestamp:

01/19/11 17:52:56 (13 years ago)

Author:

sdipsl

Message:

• correct bug with TS 3D without chunck see ticket #52
• catch return code from all nco operator except ncrcat and exit if SpaceName? is PROD. clean error code handling. Special case for cdo command. see ticket #51
  • it means that if SpaceName?=PROD all must run absolutely perfectly ; otherwise libIGCM will stop.
• For Smooth file, first access is always true for Period=1. Get Files when SmoothMin?<CumulPeriod?<SmoothMax? and modulo [min]:[modulo:][max] is true. see ticket #44
• Under testing : do not use unless you are willing to help testing.

File:

• trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh (modified) (6 diffs)

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -318 +318 @@
            [ ${defVector[2]} -lt 0 ] ) ) ; then
 
+        # Save Smooth Min and Max. Needed to call IGCM_sys_Get when appropriate
+        SmoothMin=${defVector[0]}
+        SmoothMax=${defVector[2]}
         # Test modulo
         ModValue=$( expr \( ${2} - ${defVector[0]} \) % ${defVector[1]} )
@@ -382 +385 @@
                 IGCM_debug_Print 3 "  ${file_in} ${SmoothDef}"
                 eval ret=$( IGCM_SmoothModulo ${SmoothDef} ${CumulPeriod} )
-                if ( [ X${ret} = Xtrue ] || [ ${Period} -eq 1 ] ) ; then
+                if ( [ X${ret} = Xtrue ] || ( [ ${Period} -eq 1 ] && [ ${CumulPeriod} -ge ${SmoothMin} ] && [ ${CumulPeriod} -le ${SmoothMax} ) ) ; then
                     IGCM_sys_Get ${file_in} ${file_out}
-
                     #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}
                 fi
@@ -929 +931 @@
                         if [ $DRYRUN -le 1 ]; then
                             echo "IGCM_sys_rebuild ${file_in} ${generic_file_name}_*.nc   " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
-                            echo "IGCM_debug_Verif_Exit                                   " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+                            echo "IGCM_debug_Verif_Exit_Post                              " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                         fi
                         #
@@ -938 +940 @@
                                     echo ". ${libIGCM_POST}/libIGCM_post/IGCM_${Patch}.ksh" >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                                     echo "IGCM_${Patch} ${file_in}                        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+                                    echo "IGCM_debug_Verif_Exit_Post                      " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                                 done
                             fi
@@ -944 +947 @@
                         if [ $DRYRUN -le 1 ]; then
                             echo "IGCM_sys_Put_Out ${file_in} ${file_out}                 " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
-                            echo "IGCM_debug_Verif_Exit                                   " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+                            echo "IGCM_debug_Verif_Exit_Post                              " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                             echo "IGCM_sys_Rm ${generic_file_name}_*.nc                   " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                         fi
@@ -978 +981 @@
                                     echo ". ${libIGCM_POST}/libIGCM_post/IGCM_${Patch}.ksh    " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                                     echo "IGCM_${Patch} ${file_in}                            " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+                                    echo "IGCM_debug_Verif_Exit_Post                          " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                                 done
                                 #
                                 echo "IGCM_sys_Put_Out ${file_in} ${file_out}                 " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
-                                echo "IGCM_debug_Verif_Exit                                   " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+                                echo "IGCM_debug_Verif_Exit_Post                              " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                                 #
                             fi