Changeset 1970 for branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/IGCM00/COMP/opa9.driver

Timestamp:

2010-06-25T16:58:03+02:00 (14 years ago)

Author:

acc

Message:

ticket #684 step 5: Add in changes from the trunk between revisions 1821 and 1879.

File:

• branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/IGCM00/COMP/opa9.driver (modified) (6 diffs)

branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/IGCM00/COMP/opa9.driver

@@ -49 +49 @@
     (( DaysSinceJC = $( IGCM_date_DaysSinceJC ${DateBegin} ) + 1 ))
 
-    # Definition from opa9.card of List_jobsbc used to do to interannual and climatological runs 
+    # Definition from opa9.card of List_jobsbc and List_runsbc used to do to interannual and climatological runs 
    IGCM_card_DefineArrayFromOption ${SUBMIT_DIR}/COMP/opa9.card Interannual List_jobsbc
         set -A ListFormulationJobsbc -- \${opa9_Interannual_Listjobsc${opa9_Interannual_List_jobsbc}[*]}
@@ -71 +71 @@
    typeset file 
 
-   (( final_year =${InitYear} + ${PeriodLengthInYears} - 1 ))
+   (( PeriodCumulPeriod =  ${CumulPeriod} - 1 )) 
+   (( PeriodInitYear =${InitYear} + ${PeriodCumulPeriod} * ${PeriodLengthInYears} ))
+   (( PeriodFinalYear =${InitYear} + ${PeriodLengthInYears}*${CumulPeriod} - 1 ))
+
         NbFileInter=${#opa9_Interannual_List_jobsbc[*]}
-
         (( NbFileInter_tot=${#opa9_Interannual_List_jobsbc[*]} * ${PeriodLengthInYears} ))
-
    (( i = 0 ))
 
-   while [ ${year} -le ${final_year} ] ; do #copy in ONCE of ALL necessary files for all PeriodLength
+   while [ ${year} -le ${PeriodFinalYear} ] ; do #copy in ONCE of ALL necessary files for all PeriodLength
        
        while [ $i -lt ${NbFileInter} ] ; do
       
       eval file=${opa9_Interannual_List_jobsbc[$i]}
-      # download (year-1) if it is first year and first month of run
-      if [ X${year} = X${InitYear} ] ; then  
-            if [ X${Period} = X1 ] ; then
+      if [ X${year} = X${PeriodInitYear} ] ; then  
                            if [ ${month} -eq 01 ] ; then
-                  # if year-1 does not exist create a dummy file (NEMO will use same year)
+                  # if year-1 does not exist we copy year in (year-1)
                   eval jobsbc_file_ym1=${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/${file}_$(( year - 1 )).nc
                   if  [ ! -f ${jobsbc_file_ym1} ] ; then
@@ -97 +96 @@
                   fi
 
-                              IGCM_sys_Get ${jobsbc_file_ym1} ${runsbc_file_ym1}
+                            IGCM_sys_Get ${jobsbc_file_ym1} ${runsbc_file_ym1}
                            fi
-                    fi
       fi
       
@@ -111 +109 @@
       
       # download (year+1) if it is last year of run
-      if [ X${year} = X${final_year} ] ; then   
+      if [ X${year} = X${PeriodFinalYear} ] ; then    
    
           eval jobsbc_file_yp1=${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/${file}_$(( year + 1 )).nc
@@ -118 +116 @@
           if  [ ! -f ${runsbc_file_yp1} ] ; then
          
-              # if year+1 does not exist create a dummy file (NEMO will use same year)
+              # if year+1 does not exist we copy year in (year+1)
          if  [ ! -f ${jobsbc_file_yp1} ] ; then
-             eval jobsbc_file_ym1=${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/${file}_${year}.nc
-                eval runsbc_file_ym1=${file}_noy.nc
+             eval jobsbc_file_yp1=${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/${file}_${year}.nc
+                eval runsbc_file_yp1=${file}_noy.nc
          else
-             eval jobsbc_file_ym1=${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/${file}_$(( year + 1 )).nc
-             eval runsbc_file_ym1=${file}_y$(( year + 1 )).nc
+             eval jobsbc_file_yp1=${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/${file}_$(( year + 1 )).nc
+             eval runsbc_file_yp1=${file}_y$(( year + 1 )).nc
          fi
          IGCM_sys_Get ${jobsbc_file_yp1} ${runsbc_file_yp1}
@@ -138 +136 @@
        (( i = 0 ))
    done
+
     # End interannual
     elif [ X${opa9_UserChoices_Interannual_Run} = Xn ] ; then