Changeset 1387 for branches/libIGCM

Timestamp:

2009-04-07T16:57:50+02:00 (15 years ago)

Author:

flavoni

Message:

update timeseries and subbasins.nc in opa9.card, see ticket : #392

Location:

branches/libIGCM/ORCA2_LIM/IGCM00/COMP

Files:

• opa9.card (modified) (5 diffs)
• opa9.driver (modified) (8 diffs)

branches/libIGCM/ORCA2_LIM/IGCM00/COMP/opa9.card

@@ -6 +6 @@
 #============================
 #--v3, v3_1
-OPA_version=v3
+OPA_version=v3_1
 #============================
 
@@ -28 +28 @@
             (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/taux_1m.nc, .),\
             (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/tauy_1m.nc, .),\
+            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/subbasins.nc, .)
 
 [ParametersFiles]
@@ -43 +44 @@
         (${PREFIX_NWRITE}_${DATE_OPA}_grid_V.nc, ${R_OUT_OCE_NWRITE}/${PREFIX}_${WF1}_grid_V.nc, Post_1M_grid_V),\
         (${PREFIX_NWRITE}_${DATE_OPA}_grid_W.nc, ${R_OUT_OCE_NWRITE}/${PREFIX}_${WF1}_grid_W.nc, Post_1M_grid_W),\
+        (${PREFIX_NWRITE}_${DATE_OPA}_diaptr.nc, ${R_OUT_OCE_NWRITE}/${PREFIX}_${WF1}_diaptr.nc, Post_1M_diaptr),\
         (${PREFIX_NWRITE}_${DATE_OPA}_trends.nc, ${R_OUT_OCE_NWRITE}/${PREFIX}_${WF1}_trends.nc, NONE),\
         (${PREFIX_NWRITE}_${DATE_OPA}_diagap.nc, ${R_OUT_OCE_NWRITE}/${PREFIX}_${WF1}_diagap.nc, NONE),\
@@ -53 +55 @@
 Patches = ()
 GatherWithInternal = (nav_lon, nav_lat, deptht, time_counter)
-TimeSeriesVars = (sowaflup, sohefldo, soicecov, sosaline, sossheig, sosstsst)
+TimeSeriesVars = (sohtc300, sohefldo, soicecov, somxl010, sosaline, sossheig, sosstsst, sowaflcd, sowaflup)
 
 [Post_1M_grid_U]
@@ -70 +72 @@
 TimeSeriesVars =
 
+[Post_1M_diaptr]
+Patches = ()
+GatherWithInternal = (lat, deptht, depthw, time_counter)
+TimeSeriesVars = (zotemglo, zosalglo, zomsfglo, zotematl, zosalatl, zomsfatl, zotempac, zosalpac, zomsfpac, zotemind, zosalind, zomsfind, zotemipc, zosalipc, zomsfipc, sohtatl, sostatl, sohtpac, sostpac, sohtind, sostind, sohtipc, sostipc, sophtadv, sophtove, sophtldf, sopstadv, sopstove, zomsfeiv, sophteiv, sopsteiv)

branches/libIGCM/ORCA2_LIM/IGCM00/COMP/opa9.driver

@@ -7 +7 @@
     JOB_NAME=${config_UserChoices_JobName}
 
-    if [ -z "${opa_UserChoices_OPA_NDT_DAY}" ] ; then
-   OPA_NDT_DAY=15
-    else
-   OPA_NDT_DAY=${opa_UserChoices_OPA_NDT_DAY}
-    fi
+########################################
+# old version: less compact
+#    if [ -z "${opa_UserChoices_OPA_NDT_DAY}" ] ; then
+#  OPA_NDT_DAY=15
+#    else
+#  OPA_NDT_DAY=${opa_UserChoices_OPA_NDT_DAY}
+#    fi
+########################################
+     OPA_NDT_DAY=${opa_UserChoices_OPA_NDT_DAY:=15}
+
 
     ##--Variables used by OPA --
@@ -98 +103 @@
     OPA_NSTOCK="${OPA_NITEND}"
 
-    ## Verification of number of time step in a day
+    ## Verification of number of time steps per day
     (( NB_SEC_DAY_MODEL = OPA_NDT_DAY * OPA_RDT ))
     (( NB_SEC_DAY = 60 * 60 * 24 ))
@@ -104 +109 @@
     if [ ${NB_SEC_DAY_MODEL} -ne ${NB_SEC_DAY} ]
    then
-        echo " VERIFIER OPA_NDT_DAY dans le job ${JOB} "
+        echo " VERIFY OPA_NDT_DAY in opa9.card "
         exit
     fi
@@ -111 +116 @@
     if ( [ "${CumulPeriod}" -eq 1 ] && [ "${config_OCE_Restart}" = "n" ] ) ; then
 
-        #echo "PAS DE RESTART OPA"
+        #echo "NO OPA RESTART"
    OPA_LRSTAR=.FALSE.
    OPA_NRSTDT=0
-        #echo pas de meshmask en parallele
+        #Put OPA_NMSH=0 when OPA runnig in parallel mode 
    OPA_NMSH=1
    ( [ X${BATCH_NUM_PROC_TOT} != X ] && [ "${BATCH_NUM_PROC_TOT}" -gt 1 ] ) && OPA_NMSH=0
@@ -120 +125 @@
     elif ( [ "${CumulPeriod}" -eq 1 ] && [ "${config_OCE_Restart}" = "y" ] ) ; then
 
-        #echo "RESTART OPA"
+        #echo "OPA RESTART"
    OPA_LRSTAR=.TRUE.
    OPA_NRSTDT=1
@@ -127 +132 @@
     else
 
-        #echo "RESTART OPA"
+        #echo "OPA RESTART"
    OPA_LRSTAR=.TRUE.
    OPA_NRSTDT=2
@@ -133 +138 @@
 
     fi
-
+   
+     ## nleapy configuration
    case ${config_UserChoices_CalendarType} in
          leap)
@@ -173 +179 @@
 
     if [ -f date.file ] ; then
-        # Prefix use in opa.card AND in lim.card :
+        # Prefix use in opa.card AND in lim2.card :
    DATE_OPA=$( cat date.file | \
        sed "s/\ ${config_UserChoices_JobName}_[0-9]*[a-z]_\([0-9]*_[0-9]*\)_\ */\1/g" )
-###DATE_OPA=$( $DATE_OPABF | cut -c1-30 )
+        ###DATE_OPA=$( $DATE_OPABF | cut -c1-30 )
    MainPrefix=${config_UserChoices_JobName}_1d_${DATE_OPA}
    SecondPrefix=${config_UserChoices_JobName}_5d_${DATE_OPA}