Changeset 155 for CONFIG/trunk/IPSLCM4_v2/EXP00/COMP/opa.driver

Timestamp:

10/01/07 16:03:44 (17 years ago)

Author:

sdipsl

Message:

Modifications :

• Better output frequency and output name management for OPA-LIM

File:

• CONFIG/trunk/IPSLCM4_v2/EXP00/COMP/opa.driver (modified) (2 diffs)

CONFIG/trunk/IPSLCM4_v2/EXP00/COMP/opa.driver

@@ -64 +64 @@
     ##--Write Frequency Purpose ....
     frequency=$( echo ${config_OCE_WriteFrequency} | awk "-F " '{print $1}' )
-
+    factor=$( echo ${frequency} | sed -e "s/[yYmMdD]//" )
     case ${frequency} in
         1Y|1y)
-            (( ORCA_NWRITE = ORCA_NPDT_JOUR * $( IGCM_date_DaysInYear  ${year} ) ))          ;
-            PREFIX_OPA=${config_UserChoices_JobName}_1y ;;
+            (( ORCA_NWRITE = ORCA_NPDT_JOUR * factor * $( IGCM_date_DaysInYear  ${year} ) ))          ;
+            PREFIX_NWRITE=${config_UserChoices_JobName}_${factor}y ;
+            R_OUT_OCE_NWRITE=${R_OUT_OCE_O_Y} ;
+            R_OUT_ICE_NWRITE=${R_OUT_ICE_O_Y} ;
+            WF1=${factor}Y ;;
         1M|1m)
-            (( ORCA_NWRITE = ORCA_NPDT_JOUR * $( IGCM_date_DaysInMonth ${year} ${month} ) )) ;
-            PREFIX_OPA=${config_UserChoices_JobName}_1m ;;
+            (( ORCA_NWRITE = ORCA_NPDT_JOUR * factor * $( IGCM_date_DaysInMonth ${year} ${month} ) )) ;
+            PREFIX_NWRITE=${config_UserChoices_JobName}_${factor}m ;
+            R_OUT_OCE_NWRITE=${R_OUT_OCE_O_M} ;
+            R_OUT_ICE_NWRITE=${R_OUT_ICE_O_M} ;
+            WF1=${factor}M ;;
         *D|*d)
-            (( ORCA_NWRITE = ORCA_NPDT_JOUR * $( echo ${frequency} | sed -e "s/[dD]//" ) ))  ;
-            PREFIX_OPA=${config_UserChoices_JobName}_$( echo ${frequency} | sed -e "s/[dD]//" )d ;;
+            (( ORCA_NWRITE = ORCA_NPDT_JOUR * factor  ))  ;
+            PREFIX_NWRITE=${config_UserChoices_JobName}_${factor}d ;
+            R_OUT_OCE_NWRITE=${R_OUT_OCE_O_D} ;
+            R_OUT_ICE_NWRITE=${R_OUT_ICE_O_D} ;
+            WF1=${factor}D ;;
         *)
             (( ORCA_NWRITE = 0 ))                                                            ;;
@@ -82 +91 @@
     if [ ${NbFreq} -eq 2 ] ; then
         frequency=$( echo ${config_OCE_WriteFrequency} | awk "-F " '{print $2}' )
+        factor=$( echo ${frequency} | sed -e "s/[yYmMdD]//" )
         case ${frequency} in
-            1Y|1y)
-                (( ORCA_NWRIHF = ORCA_NPDT_JOUR * $( IGCM_date_DaysInYear  ${year} ) ))          ;
-                PREFIX_HF=${config_UserChoices_JobName}_1y ;;
-            1M|1m)
-                (( ORCA_NWRIHF = ORCA_NPDT_JOUR * $( IGCM_date_DaysInMonth ${year} ${month} ) )) ;
-                PREFIX_HF=${config_UserChoices_JobName}_1m ;;
+            *Y|*y)
+                (( ORCA_NWRIHF = ORCA_NPDT_JOUR * factor * $( IGCM_date_DaysInYear  ${year} ) ))          ;
+                PREFIX_NWRIHF=${config_UserChoices_JobName}_${factor}y ;
+                R_OUT_OCE_NWRIHF=${R_OUT_OCE_O_Y} ;
+                WF2=${factor}Y ;;
+            *M|*m)
+                (( ORCA_NWRIHF = ORCA_NPDT_JOUR * factor * $( IGCM_date_DaysInMonth ${year} ${month} ) )) ;
+                PREFIX_NWRIHF=${config_UserChoices_JobName}_${factor}m ;
+                R_OUT_OCE_NWRIHF=${R_OUT_OCE_O_M} ;
+                WF2=${factor}M ;;
             *D|*d)
-                (( ORCA_NWRIHF = ORCA_NPDT_JOUR * $( echo ${frequency} | sed -e "s/[dD]//" ) ))  ;
-                PREFIX_HF=${config_UserChoices_JobName}_$( echo ${frequency} | sed -e "s/[dD]//" )d ;;
+                (( ORCA_NWRIHF = ORCA_NPDT_JOUR * factor ))  ;
+                PREFIX_NWRIHF=${config_UserChoices_JobName}_${factor}d ;
+                R_OUT_OCE_NWRIHF=${R_OUT_OCE_O_D} ;
+                WF2=${factor}D ;;
             *)
                 (( ORCA_NWRIHF = 0 ))                                                            ;;