Changeset 7990 for branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90

Timestamp:

2017-04-29T17:24:54+02:00 (7 years ago)

Author:

gm

Message:

#1880 (HPC-09): OPA remove avmu, avmv from zdf modules + move CALL tke(gls)_rst & gls_rst in zdftke(gls) + rename zdftmx and zdfqiao

File:

• branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90 (modified) (5 diffs)

branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90

@@ -9 +9 @@
    USE dom_oce         ! ocean space and time domain
    USE zdf_oce         ! ocean vertical physics    
-   USE zdfgls, ONLY: mxln
+   USE zdfgls   , ONLY : hmxn
    USE in_out_manager  ! I/O units
    USE iom             ! I/0 library
@@ -107 +107 @@
       IF( ln_zdfgls ) THEN
          en_25h(:,:,:) = en(:,:,:)
-         rmxln_25h(:,:,:) = mxln(:,:,:)
+         rmxln_25h(:,:,:) = hmxn(:,:,:)
       ENDIF
 #if defined key_lim3 || defined key_lim2
@@ -169 +169 @@
          IF( ln_zdfgls ) THEN
             en_25h(:,:,:)        = en_25h(:,:,:) + en(:,:,:)
-            rmxln_25h(:,:,:)      = rmxln_25h(:,:,:) + mxln(:,:,:)
+            rmxln_25h(:,:,:)      = rmxln_25h(:,:,:) + hmxn(:,:,:)
          ENDIF
          cnt_25h = cnt_25h + 1
@@ -217 +217 @@
          zw3d(:,:,:) = vn_25h(:,:,:)*vmask(:,:,:) + zmdi*(1.0-vmask(:,:,:))
          CALL iom_put("vomecrty25h", zw3d  )   ! j-current
-         zw3d(:,:,:) = wn_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+         zw3d(:,:,:) = wn_25h(:,:,:)*wmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
          CALL iom_put("vomecrtz25h", zw3d )   ! k-current
          ! Write vertical physics
-         zw3d(:,:,:) = avt_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+         zw3d(:,:,:) = avt_25h(:,:,:)*wmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
          CALL iom_put("avt25h", zw3d )   ! diffusivity
-         zw3d(:,:,:) = avm_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+         zw3d(:,:,:) = avm_25h(:,:,:)*wmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
          CALL iom_put("avm25h", zw3d)   ! viscosity
          IF( ln_zdftke ) THEN
-            zw3d(:,:,:) = en_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+            zw3d(:,:,:) = en_25h(:,:,:)*wmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
             CALL iom_put("tke25h", zw3d)   ! tke
          ENDIF
          IF( ln_zdfgls ) THEN
-            zw3d(:,:,:) = en_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+            zw3d(:,:,:) = en_25h(:,:,:)*wmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
             CALL iom_put("tke25h", zw3d)   ! tke
-            zw3d(:,:,:) = rmxln_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+            zw3d(:,:,:) = rmxln_25h(:,:,:)*wmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
             CALL iom_put( "mxln25h",zw3d)
          ENDIF
@@ -249 +249 @@
          IF( ln_zdfgls ) THEN
             en_25h(:,:,:) = en(:,:,:)
-            rmxln_25h(:,:,:) = mxln(:,:,:)
+            rmxln_25h(:,:,:) = hmxn(:,:,:)
          ENDIF
          cnt_25h = 1