Changeset 8

Timestamp:

05/29/08 21:32:29 (16 years ago)

Author:

mmaipsl

Message:

MM: Add SmoothFiles? with last commit (r6) corrections.

Location:

branches/SmoothFiles

Files:

• AA_job (modified) (1 diff)
• libIGCM_card/IGCM_card_PrintOption.awk (modified) (1 diff)
• libIGCM_card/IGCM_card_PrintSection.awk (modified) (1 diff)
• libIGCM_comp/libIGCM_comp.ksh (modified) (2 diffs)
• libIGCM_config/libIGCM_config.ksh (modified) (1 diff)
• libIGCM_date/libIGCM_date.ksh (modified) (3 diffs)
• libIGCM_sys/IGCM_add_out.awk (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_calculo.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_claude.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_default.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_mercure.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_mercureTX.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_rhodes.ksh (modified) (1 diff)

branches/SmoothFiles/AA_job

@@ -242 +242 @@
     #D-
     # ------------------------------------------------------------------
+    #D- Get Smooth Files (special files in time LAND COVER CHANGE ...)
+    #D- READ AND USE BY GCM AT SOME EXECUTIONS.
+    # ------------------------------------------------------------------
+    IGCM_comp_GetInputSmoothFiles
+
+    #D-
+    # ------------------------------------------------------------------
     #D- Get Boundaries Conditions (SST, WIND[X,Y,Z], LAI ...)
     #D- READ AND USE BY GCM AT EACH EXECUTION.

branches/SmoothFiles/libIGCM_card/IGCM_card_PrintOption.awk

@@ -43 +43 @@
 exit_value=0
 if (nbarg != 4) {
-        print "Usage:  $
+        print "Usage: IGCM_card_PrintOption [-d] file section option" 
         print 
         print "Args:"

branches/SmoothFiles/libIGCM_card/IGCM_card_PrintSection.awk

@@ -41 +41 @@
 exit_value=0
 if (nbarg != 3) {
-        print "Usage:  $
+        print "Usage: IGCM_card_PrintSection [-d] file section" 
         print 
         print "Args:"

branches/SmoothFiles/libIGCM_comp/libIGCM_comp.ksh

@@ -94 +94 @@
             for option in ${card_UserChoices[*]} ; do
                 IGCM_card_DefineVariableFromOption ${card} UserChoices ${option}
-                eval IGCM_debug_Print 3 "${compname}_UserChoices_values: ${card_UserChoices[*]}"
+                eval IGCM_debug_Print 3 "${compname}_UserChoices_values: ${option} \${card_UserChoices_${option}}"
             done
         fi
@@ -198 +198 @@
 
 #=======================================================================
+# Definition of Smooth modulo function
+# usage : 
+# IGCM_SmoothModulo StringModulo value
+#
+# StringModulo : A string of min max and modulo like definition of Scilab vectors.
+# [min]:[modulo:][max]
+# where :
+# [] value are optionnals; 
+# empty min equal 1
+# empty max equal infinity
+# modulo not given or empty equal 1
+# empty string or just ':' equal always.
+#
+# value : the value to test with the definition
+#
+# return : true(1)/false(0) 
+function IGCM_SmoothModulo
+{
+    IGCM_debug_PushStack "IGCM_SmoothModulo"
+    typeset defVector ModValue
+
+    eval set +A defVector -- $( echo "${1}" | \
+        awk -F ':' '{print ($1 == "" ? 1 : $1) " " (NF==3 ? ($2 == "" ? 1 : $2) : 1) " " (NF==3 ? ($3 == "" ? -1 : $3) : ($2 == "" ? -1 : $2))}' )
+
+    # Test limits : 
+    # ${defVector[0]} <= ${2} <= ${defVector[2]} 
+    #                                      or ${defVector[2]} == -1
+    if ( [ ${2} -ge ${defVector[0]} ] && \
+         ( [ ${2} -le ${defVector[2]} ] || \
+           [ ${defVector[2]} -lt 0 ] ) ) ; then
+
+        # Test modulo
+        ModValue=$( expr \( ${2} - ${defVector[0]} \) % ${defVector[1]} )
+        if [ ${ModValue} -eq 0 ] ;  then
+            echo true
+            IGCM_debug_PopStack "IGCM_SmoothModulo"
+            return 1
+        else
+            echo false
+            IGCM_debug_PopStack "IGCM_SmoothModulo"
+            return 0
+        fi
+    else
+        echo false
+        IGCM_debug_PopStack "IGCM_SmoothModulo"
+        return 0
+    fi
+}
+
+#=======================================================================
+function IGCM_comp_GetInputSmoothFiles
+{
+    IGCM_debug_PushStack "IGCM_comp_GetInputSmoothFiles"
+
+    # Debug Print :
+    echo
+    IGCM_debug_Print 1 "IGCM_comp_GetInputSmoothFiles :"
+    echo
+
+    typeset comp compname comptagname card ListFilesName FileName0 NbFiles i i_ i__
+    typeset file_in_ file_in file_out_ file_out ret SmoothDef
+
+    for comp in ${config_ListOfComponents[*]} ; do
+
+        echo "-----"
+        # Define component
+        eval compname=\${config_ListOfComponents_${comp}[0]} > /dev/null 2>&1
+        eval comptagname=\${config_ListOfComponents_${comp}[1]} > /dev/null 2>&1
+
+        # Debug Print :
+        IGCM_debug_Print 3 "Smooth files ${compname}"
+
+        card=${SUBMIT_DIR}/COMP/${compname}.card
+
+        IGCM_card_DefineArrayFromOption ${card} SmoothFiles List
+        ListFilesName=${compname}_SmoothFiles_List
+        eval FileName0=\${${ListFilesName}[0]} > /dev/null 2>&1
+
+        if [ X${FileName0} != X${NULL_STR} ] ; then
+            eval NbFiles=\${#${ListFilesName}[@]} > /dev/null 2>&1
+
+            (( i=0 ))
+            until [ $i -ge $NbFiles ]; do
+
+                eval file_in_=\${${ListFilesName}[$i]} > /dev/null 2>&1
+                eval file_in=${file_in_}
+                (( i_ = i+1 ))
+                eval file_out_=\${${ListFilesName}[$i_]} > /dev/null 2>&1
+                eval file_out=${file_out_}
+
+                # define CumulPeriod definition for this file
+                (( i__ = i+2 ))
+                eval SmoothDef=\${${ListFilesName}[$i__]}
+                IGCM_debug_Print 3 "  ${file_in} ${SmoothDef}"
+                eval ret=$( IGCM_SmoothModulo ${SmoothDef} ${CumulPeriod} )
+                if [ X${ret} = Xtrue ] ; then
+                    IGCM_sys_Get ${file_in} ${file_out}
+
+                    IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}
+                fi
+                (( i=i+3 ))
+            done
+        fi
+    done
+    
+    IGCM_debug_PopStack "IGCM_comp_GetInputSmoothFiles"
+}
+
+#=======================================================================
 function IGCM_comp_GetInputBoundaryFiles
 {

branches/SmoothFiles/libIGCM_config/libIGCM_config.ksh

@@ -204 +204 @@
                 (( PeriodLengthInDays = 1 )) ;;
             *) 
-                IGCM_debug_Exit "IGCM_config_PeriodStart " ${config_UserChoices_PeriodLength} " invalid period length :  $
+                IGCM_debug_Exit "IGCM_config_PeriodStart " ${config_UserChoices_PeriodLength} " invalid period length : choose in 1Y, 1M, 5D, 1D."
                 IGCM_debug_Verif_Exit ;;
         esac

branches/SmoothFiles/libIGCM_date/libIGCM_date.ksh

@@ -218 +218 @@
 #D-#==================================================================
 #D-function IGCM_date_DaysInMonth
-#D-* Purpose:  $
+#D-* Purpose: Calculate the number of days in a month 
 #D-* Usage: IGCM_date_DaysInMonth yyyy mm
 #D-         or IGCM_date_DaysInMonth yyyymmdd
@@ -493 +493 @@
 #D-#==================================================================
 #D-function IGCM_date_DaysBetweenJulianDate
-#D-* Purpose:  $
+#D-* Purpose: Calculate the days difference between two dates and reports 
 #D-           the number days as jul1 - jul2 
 #D-* Usage: IGCM_date_DaysBetweenJulianDate jul1 jul2
@@ -578 +578 @@
 #D-#==================================================================
 #D-function IGCM_date_DaysBetweenGregorianDate ()
-#D-* Purpose:  $
+#D-* Purpose: Calculate the days difference between two dates and reports 
 #D-           the number days as grg1 - grg2 
 #D-* Usage: IGCM_date_DaysBetweenGregorianDate grg1 grg2

branches/SmoothFiles/libIGCM_sys/IGCM_add_out.awk

@@ -43 +43 @@
   exit_value=0
   if (nbarg != 2) {
-    print "Usage:  $
+    print "Usage: IGCM_add_out.awk [-d] file.output" 
     print 
     print "Args:"

branches/SmoothFiles/libIGCM_sys/libIGCM_sys_calculo.ksh

@@ -968 +968 @@
 #D-#==================================================
 #D-function IGCM_sys_GetDate_FichArchive
-#D-* Purpose:  $
+#D-* Purpose: donne la date filesys d'un fichier sur le filesystem ARCHIVE 
 #D-* Examples:
 #D-

branches/SmoothFiles/libIGCM_sys/libIGCM_sys_claude.ksh

@@ -983 +983 @@
 #D-#==================================================
 #D-function IGCM_sys_GetDate_FichArchive
-#D-* Purpose:  $
+#D-* Purpose: donne la date filesys d'un fichier sur le filesystem ARCHIVE 
 #D-* Examples:
 #D-

branches/SmoothFiles/libIGCM_sys/libIGCM_sys_default.ksh

@@ -968 +968 @@
 #D-#==================================================
 #D-function IGCM_sys_GetDate_FichArchive
-#D-* Purpose:  $
+#D-* Purpose: donne la date filesys d'un fichier sur le filesystem ARCHIVE 
 #D-* Examples:
 #D-

branches/SmoothFiles/libIGCM_sys/libIGCM_sys_mercure.ksh

@@ -847 +847 @@
 #D-#==================================================
 #D-function IGCM_sys_GetDate_FichArchive
-#D-* Purpose:  $
+#D-* Purpose: donne la date filesys d'un fichier sur le filesystem ARCHIVE 
 #D-* Examples:
 #D-

branches/SmoothFiles/libIGCM_sys/libIGCM_sys_mercureTX.ksh

@@ -974 +974 @@
 #D-#==================================================
 #D-function IGCM_sys_GetDate_FichArchive
-#D-* Purpose:  $
+#D-* Purpose: donne la date filesys d'un fichier sur le filesystem ARCHIVE 
 #D-* Examples:
 #D-

branches/SmoothFiles/libIGCM_sys/libIGCM_sys_rhodes.ksh

@@ -943 +943 @@
 #D-#==================================================
 #D-function IGCM_sys_GetDate_FichArchive
-#D-* Purpose:  $
+#D-* Purpose: donne la date filesys d'un fichier sur le filesystem ARCHIVE 
 #D-* Examples:
 #D-