Changeset 1316

Timestamp:

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

Author:

smasson

Message:

continue changeset:1312, see ticke:322

Location:

trunk/NEMO

Files:

• OPA_SRC/DIA/diaptr.F90 (modified) (3 diffs)
• TOP_SRC/trcdia.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/DIA/diaptr.F90

@@ -419 +419 @@
       CHARACTER (len=40)       ::   clhstnam, clop                   ! temporary names
       INTEGER                  ::   iline, it, ji                    !
-      REAL(wp)                 ::   zsto, zout, zdt, zmax, zjulian   ! temporary scalars
+      REAL(wp)                 ::   zsto, zout, zdt, zjulian   ! temporary scalars
       REAL(wp), DIMENSION(jpj) ::   zphi, zfoo
       !!----------------------------------------------------------------------
       
-      ! Define frequency of output and means
-      zdt = rdt
-      IF( nacc == 1 ) zdt = rdtmin
-      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 = nf_ptr * zdt
-      clop = "inst("//TRIM(clop)//")"
-#else
-      zsto=zdt
-      clop = "ave("//TRIM(clop)//")"
-#endif
-      zout = nf_ptr * zdt
-      zmax = ( nitend - nit000 + 1 ) * zdt
-      
-         
       ! define time axis
       it = kt - nit000 + 1
@@ -446 +429 @@
       ! --------------
       IF( kt == nit000 ) THEN
-      
-      zdt = rdt
-      IF( nacc == 1 ) zdt = rdtmin
+         
+         zdt = rdt
+         IF( nacc == 1 ) zdt = rdtmin
 
          ! Reference latitude
@@ -482 +465 @@
          ! Define frequency of output and means
          zsto = nf_ptr * zdt
-         clop = "ave(x)"
+         IF( ln_mskland )   THEN   ;   clop = "ave(only(x))"   ! put 1.e+20 on land (very expensive!!)
+         ELSE                      ;   clop = "ave(x)"         ! no use of the mask value (require less cpu time)
+         ENDIF
          zout = nf_ptr * zdt
          zfoo(:) = 0.e0

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