Changeset 1316 for trunk/NEMO/TOP_SRC/trcdia.F90

Timestamp:

2009-02-17T16:12:46+01:00 (15 years ago)

Author:

smasson

Message:

continue changeset:1312, see ticke:322

File:

• trunk/NEMO/TOP_SRC/trcdia.F90 (modified) (3 diffs)

trunk/NEMO/TOP_SRC/trcdia.F90

@@ -263 +263 @@
       ! Define frequency of output and means
       zdt = rdt
+      IF( ln_mskland )   THEN   ;   clop = "only(x)"   ! put 1.e+20 on land (very expensive!!)
+      ELSE                      ;   clop = "x"         ! no use of the mask value (require less cpu time)
+      ENDIF
 #  if defined key_diainstant
       zsto = nwritetrd * rdt
-      clop = 'inst(only(x))'
+      clop = "inst("//TRIM(clop)//")"
 #  else
       zsto = zdt
-      clop = 'ave(only(x))'
+      clop = "ave("//TRIM(clop)//")"
 #  endif
       zout = nwritetrd * zdt
@@ -506 +509 @@
       ! Define frequency of output and means
       zdt = rdt
+      IF( ln_mskland )   THEN   ;   clop = "only(x)"   ! put 1.e+20 on land (very expensive!!)
+      ELSE                      ;   clop = "x"         ! no use of the mask value (require less cpu time)
+      ENDIF
 #  if defined key_diainstant
       zsto=nwritedia*zdt
-      clop='inst(only(x))'
+      clop = "inst("//TRIM(clop)//")"
 #  else
       zsto=zdt
-      clop='ave(only(x))'
+      clop = "ave("//TRIM(clop)//")"
 #  endif
       zout=nwritedia*zdt
@@ -656 +662 @@
       ! Define frequency of output and means
       zdt = rdt
+      IF( ln_mskland )   THEN   ;   clop = "only(x)"   ! put 1.e+20 on land (very expensive!!)
+      ELSE                      ;   clop = "x"         ! no use of the mask value (require less cpu time)
+      ENDIF
 #        if defined key_diainstant
       zsto=nwritebio*zdt
-      clop='inst(only(x))'
+      clop = "inst("//TRIM(clop)//")"
 #        else
       zsto=zdt
-      clop='ave(only(x))'
+      clop = "ave("//TRIM(clop)//")"
 #        endif
       zout=nwritebio*zdt