Changeset 522

Timestamp:

12/02/11 19:17:07 (13 years ago)

Author:

sdipsl

Message:

Source driver from ${SUBMIT_DIR}/DRIVER/ if it exists ; otherwise back to default
Add yyyymm_m1, yyyymm_p1, month_m1, month_p1 and day as available global variables. Needed by LMDZ-REPROBUS
Add IGCM_date_GetYearMonthDay function
JG

Location:

trunk/libIGCM

Files:

• libIGCM_comp/libIGCM_comp.ksh (modified) (1 diff)
• libIGCM_config/libIGCM_config.ksh (modified) (4 diffs)
• libIGCM_date/libIGCM_date.ksh (modified) (1 diff)

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -52 +52 @@
         # Debug Print :
         IGCM_debug_Print 2 "Initialize following component library"
-        IGCM_debug_Print 2 ${SUBMIT_DIR}/COMP/${compname}.driver
-        IGCM_debug_Print 3 "With tag : ${comptagname}"
-        # Source component library
-        . ${SUBMIT_DIR}/COMP/${compname}.driver
+
+        # Source drivers in directory DRIVER if it exist
+        # else source them from directory COMP
+        if [ -d ${SUBMIT_DIR}/DRIVER ] ; then
+            IGCM_debug_Print 2 ${SUBMIT_DIR}/DRIVER/${compname}.driver
+            # Source component library
+            . ${SUBMIT_DIR}/DRIVER/${compname}.driver
+        else
+            IGCM_debug_Print 2 ${SUBMIT_DIR}/COMP/${compname}.driver
+            # Source component library
+            . ${SUBMIT_DIR}/COMP/${compname}.driver
+        fi
+        IGCM_debug_Print 3 "With tag : ${comptagname}"
+        
 
         # Debug Print

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -396 +396 @@
         #================================================#
 
-        IGCM_date_GetYearMonth $DateBegin year month
-        year_m1=$(( year - 1 ))
-        year_p1=$(( year + 1 )) 
+        IGCM_date_GetYearMonthDay $DateBegin year month day
         IGCM_config_Analyse_PeriodLength
 
@@ -477 +475 @@
         fi
 
-        IGCM_date_GetYearMonth $PeriodDateBegin year month
-        year_m1=$(( year - 1 ))
-        year_p1=$(( year + 1 )) 
+        IGCM_date_GetYearMonthDay $PeriodDateBegin year month day
         IGCM_config_Analyse_PeriodLength
 
@@ -486 +482 @@
     fi    
     OldPrefix=${config_UserChoices_JobName}_${PeriodDateEnd}
-  
+
+    # BEGIN: SHOULD GO IN A FUNCTION FROM libIGCM_date.ksh
+    # Compute year_m1 and year_p1 (year minus 1Y and year plus 1Y)
+    year_m1=$(( year - 1 ))
+    year_p1=$(( year + 1 ))     
+    # Compute month_m1 (month minus 1M)
+    # Compute yyyymm_m1 (yyyymm minus 1M)
+    month_m1=$(( month - 1 ))
+    if [ ${month_m1} = 0 ]; then
+        month_m1=12
+        yyyymm_m1=${year_m1}12
+    elif [ ${month_m1} -le 9 ]; then
+        month_m1=0${month_m1}
+        yyyymm_m1=${year}${month_m1}
+    else
+        yyyymm_m1=${year}${month_m1}
+    fi
+    # Compute month_p1 (month plus 1M)
+    # Compute yyyymm_p1 (yyyymm plus 1M)
+    month_p1=$(( month + 1 ))
+    if [ ${month_p1} = 13 ]; then
+        month_p1=01
+        yyyymm_p1=${year_p1}01
+    elif [ ${month_p1} -le 9 ]; then
+        month_p1=0${month_p1}
+        yyyymm_p1=${year}${month_p1}
+    else
+        yyyymm_p1=${year}${month_p1}
+    fi
+    #IGCM_debug_Print 1 "jg 1 month_m1 = ${month_m1} month_p1 = ${month_p1} "
+    #IGCM_debug_Print 1 "jg 1 calculate yyyymm_m1 = ${yyyymm_m1} "
+    #IGCM_debug_Print 1 "jg 1 calculate yyyymm_p1 = ${yyyymm_p1} "
+
+    # END: SHOULD GO IN A FUNCTION FROM libIGCM_date.ksh
+
     #===================================================================#
     # Prepare variables available for ${COMP}.card and ${COMP}.driver   #
@@ -735 +765 @@
 
     PeriodDateBegin=$( IGCM_date_AddDaysToGregorianDate ${PeriodDateEnd} 1 )
-    IGCM_date_GetYearMonth $PeriodDateBegin year month
+    IGCM_date_GetYearMonthDay $PeriodDateBegin year month day
     year_m1=$(( year - 1 ))
     year_p1=$(( year + 1 ))

trunk/libIGCM/libIGCM_date/libIGCM_date.ksh

@@ -159 +159 @@
 
     IGCM_debug_PopStack "IGCM_date_GetYearMonth"
+}
+
+#==================================================================
+function IGCM_date_GetYearMonthDay
+{
+    IGCM_debug_PushStack "IGCM_date_GetYearMonthDay" $@
+
+    # from a yyyymmdd date format return 
+    # a yyyy year, mm month and dd day
+    # usage IGCM_date_GetYearMonthDay yyyymmdd year_var month_var day_var
+
+    # if there is no argument on the command line, 
+    # then assume that a yyyymmdd formated date is being 
+    # piped in
+    typeset dt
+    if [ $# = 0 ]
+        then
+        read dt
+    else
+        dt=$1
+    fi
+
+    # break the yyyymmdd into separate parts for year, month and day
+    eval $2=$( echo $( IGCM_date_GregorianDigit ${dt} ) \
+        | sed -e "s/\([0-9]\{${dY}\}\)\([0-9]\{2\}\)\([0-9]\{2\}\)/\1/" )
+    eval $3=$( echo $( IGCM_date_GregorianDigit ${dt} ) \
+        | sed -e "s/\([0-9]\{${dY}\}\)\([0-9]\{2\}\)\([0-9]\{2\}\)/\2/" )
+    eval $4=$( echo $( IGCM_date_GregorianDigit ${dt} ) \
+        | sed -e "s/\([0-9]\{${dY}\}\)\([0-9]\{2\}\)\([0-9]\{2\}\)/\3/" )
+
+    IGCM_debug_PopStack "IGCM_date_GetYearMonthDay"
 }