Changeset 10640

Timestamp:

2019-02-06T13:33:10+01:00 (6 years ago)

Author:

jamesharle

Message:

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

Location:

NEMO/releases/release-4.0

Files:

• cfgs/AMM12/EXPREF/file_def_nemo-oce.xml (modified) (1 diff)
• src/OCE/DIA/dia25h.F90 (modified) (3 diffs)

NEMO/releases/release-4.0/cfgs/AMM12/EXPREF/file_def_nemo-oce.xml

@@ -67 +67 @@
 
      <file id="file15" name_suffix="_25hourm_grid_W" description="ocean W grid variables, 25h meaned" enabled=".TRUE." >
-     <field field_ref="vomecrtz25h"          name="vomerctz"  operation="instant" enabled=".TRUE."/>
-     <field field_ref="woce"                 name="vovecrtz"  operation="instant" enabled=".TRUE."/>
+     <field field_ref="vovecrtz25h"          name="vovecrtz"  operation="instant" enabled=".TRUE."/>
      <field field_ref="avt25h"               name="votkeavt"  operation="instant" enabled=".TRUE."/>
      <field field_ref="avm25h"               name="votkeavm"  operation="instant" enabled=".TRUE."/>

NEMO/releases/release-4.0/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(:,:,:))