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

Timestamp:

2010-07-09T14:40:45+02:00 (14 years ago)

Author:

acc

Message:

ticket #684 step 8: Add in changes from the trunk between revisions 1879 and the 3.2.1 tag (rev 1986)

File:

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

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

@@ -86 +86 @@
       if [ X${year} = X${PeriodInitYear} ] ; then  
                            if [ ${month} -eq 01 ] ; then
-                  # if year-1 does not exist we copy year in (year-1)
+                  # if year-1 does not exist we create a file _noym1.nc copy of year
                   eval jobsbc_file_ym1=${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/${file}_$(( year - 1 )).nc
                   if  [ ! -f ${jobsbc_file_ym1} ] ; 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 runsbc_file_ym1=${file}_noym1.nc
                   else
                       eval jobsbc_file_ym1=${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/${file}_$(( year - 1 )).nc
@@ -116 +116 @@
           if  [ ! -f ${runsbc_file_yp1} ] ; then
          
-              # if year+1 does not exist we copy year in (year+1)
+              # if year+1 does not exist we create a file _noyp1.nc copy of year
+            eval jobsbc_file_yp1=${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/${file}_$(( year + 1 )).nc
          if  [ ! -f ${jobsbc_file_yp1} ] ; then
              eval jobsbc_file_yp1=${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/${file}_${year}.nc
-                eval runsbc_file_yp1=${file}_noy.nc
+                eval runsbc_file_yp1=${file}_noyp1.nc
          else
              eval jobsbc_file_yp1=${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/${file}_$(( year + 1 )).nc