Changeset 1312 for trunk/NEMO/TOP_SRC

Timestamp:

2009-02-16T17:35:36+01:00 (15 years ago)

Author:

smasson

Message:

add a namelist logical to mask land points in NetCDF outputs, see ticket:322

Location:

trunk/NEMO/TOP_SRC

Files:

• SED/sedwri.F90 (modified) (1 diff)
• TRP/trdmld_trc.F90 (modified) (3 diffs)
• trcdia.F90 (modified) (1 diff)

trunk/NEMO/TOP_SRC/SED/sedwri.F90

@@ -58 +58 @@
       ! Define frequency of output and means
       zdt = dtsed
+      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 = nwrised * zdt
-!!      clop = "inst(x)"           ! no use of the mask value (require less cpu time)
-      clop="inst(only(x))"   ! put 1.e+20 on land (very expensive!!)
+      clop = "inst("//TRIM(clop)//")"
 #else
       zsto = zdt
-!!      clop = "ave(x)"              ! no use of the mask value (require less cpu time)
-      clop="ave(only(x))"    ! put 1.e+20 on land (very expensive!!)
+      clop = "ave("//TRIM(clop)//")"
 #endif
       zout = nwrised * zdt

trunk/NEMO/TOP_SRC/TRP/trdmld_trc.F90

@@ -1391 +1391 @@
       ! II.1 Define frequency of output and means
       ! -----------------------------------------
+      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
       IF( .NOT. ln_trdmld_trc_instant ) THEN
@@ -1396 +1399 @@
       ENDIF
       zsto = ntrd_trc * rdt
-      clop ="inst(only(x))"
+      clop = "inst("//TRIM(clop)//")"
 #  else
       IF( ln_trdmld_trc_instant ) THEN
@@ -1403 +1406 @@
          zsto = ntrd_trc * rdt                                    ! mean  diags : we DO NOT use any IOIPSL time averaging
       ENDIF
-      clop ="ave(only(x))"
+      clop = "ave("//TRIM(clop)//")"
 #  endif
       zout = ntrd_trc * rdt

trunk/NEMO/TOP_SRC/trcdia.F90

@@ -123 +123 @@
       ! 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 = nwritetrc * rdt
-      clop = 'inst(only(x))'
+      clop = "inst("//TRIM(clop)//")"
 # else
       zsto = zdt
-      clop = 'ave(only(x))'
+      clop = "ave("//TRIM(clop)//")"
 # endif
       zout = nwritetrc * zdt