Changeset 1312 for trunk/NEMO/OPA_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/OPA_SRC

Files:

• DIA/diagap.F90 (modified) (1 diff)
• DIA/diaptr.F90 (modified) (1 diff)
• DIA/diawri.F90 (modified) (1 diff)
• DOM/domain.F90 (modified) (2 diffs)
• IOM/in_out_manager.F90 (modified) (1 diff)
• TRD/trdmld.F90 (modified) (3 diffs)
• TRD/trdvor.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/DIA/diagap.F90

@@ -153 +153 @@
          ! Define frequency of output and means
          zsto = ngap * 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 = ngap * zdt
          zmax = FLOAT( nitend - nit000 + 1 ) * zdt

trunk/NEMO/OPA_SRC/DIA/diaptr.F90

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

trunk/NEMO/OPA_SRC/DIA/diawri.F90

@@ -129 +129 @@
       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 = nwrite * 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 = nwrite * zdt

trunk/NEMO/OPA_SRC/DOM/domain.F90

@@ -142 +142 @@
       NAMELIST/namrun/ no    , cexper, cn_ocerst_in, cn_ocerst_out, ln_rstart, nrstdt,   &
          &             nit000, nitend, ndate0      , nleapy       , ninist   , nstock,   &
-         &             nwrite, ln_dimgnnn
+         &             nwrite, ln_dimgnnn, ln_mskland
 
       NAMELIST/namdom/ ntopo , e3zps_min, e3zps_rat, nmsh   ,   &
@@ -174 +174 @@
          WRITE(numout,*) '           frequency of output file        nwrite    = ', nwrite
          WRITE(numout,*) '           multi file dimgout           ln_dimgnnn   = ', ln_dimgnnn
+         WRITE(numout,*) '           mask land points             ln_mskland   = ', ln_mskland
       ENDIF
 

trunk/NEMO/OPA_SRC/IOM/in_out_manager.F90

@@ -39 +39 @@
    LOGICAL            ::   ln_dimgnnn    = .FALSE.     !: type of dimgout. (F): 1 file for all proc
                                                        !:                  (T): 1 file per proc
+   LOGICAL            ::   ln_mskland    = .FALSE.     !: mask land points in NetCDF outputs (costly: + ~15%)
    !!----------------------------------------------------------------------
    !! was in restart but moved here because of the OFF line... better solution should be found...

trunk/NEMO/OPA_SRC/TRD/trdmld.F90

@@ -824 +824 @@
       ! 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_instant ) THEN
@@ -829 +832 @@
       END IF
       zsto = ntrd * rdt
-      clop ="inst(only(x))"
+      clop = "inst("//TRIM(clop)//")"
 #  else
       IF( ln_trdmld_instant ) THEN
@@ -836 +839 @@
          zsto = ntrd * rdt          ! mean  diags : we DO NOT use any IOIPSL time averaging
       END IF
-      clop ="ave(only(x))"
+      clop = "ave("//TRIM(clop)//")"
 #  endif
       zout = ntrd * rdt

trunk/NEMO/OPA_SRC/TRD/trdvor.F90

@@ -539 +539 @@
       ! 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
       zsto = nwrite*rdt
-      clop ="inst(x)"
+      clop = "inst("//TRIM(clop)//")"
 #else
       zsto = rdt
-      clop ="ave(x)"
+      clop = "ave("//TRIM(clop)//")"
 #endif
       zout = ntrd*rdt