Changeset 10641 for NEMO/trunk/src

Timestamp:

2019-02-06T13:48:11+01:00 (5 years ago)

Author:

jamesharle

Message:

Correction for un-initialised variable wn_25h in 25hour meaning
diagnostics (see ticket #2233).

File:

• NEMO/trunk/src/OCE/DIA/dia25h.F90 (modified) (3 diffs)

NEMO/trunk/src/OCE/DIA/dia25h.F90

@@ -100 +100 @@
       un_25h  (:,:,:) = ub  (:,:,:)
       vn_25h  (:,:,:) = vb  (:,:,:)
-      wn_25h  (:,:,:) = wn  (:,:,:)
       avt_25h (:,:,:) = avt (:,:,:)
       avm_25h (:,:,:) = avm (:,:,:)
@@ -148 +147 @@
       ! local variable for debugging
       ll_print = ll_print .AND. lwp
+
+      ! wn_25h could not be initialised in dia_25h_init, so we do it here instead
+      IF( kt == nn_it000 ) THEN
+         wn_25h(:,:,:) = wn(:,:,:)
+      ENDIF
 
       ! Sum of 25 hourly instantaneous values to give a 25h mean from 24hours every day
@@ -223 +227 @@
          CALL iom_put("vomecrty25h", zw3d  )   ! j-current
          zw3d(:,:,:) = wn_25h(:,:,:)*wmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
-         CALL iom_put("vomecrtz25h", zw3d )   ! k-current
+         CALL iom_put("vovecrtz25h", zw3d )   ! k-current
          ! Write vertical physics
          zw3d(:,:,:) = avt_25h(:,:,:)*wmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))