Changeset 10689 for NEMO/branches/2019/fix_ticket2229/src/OCE/DIA/dia25h.F90

Timestamp:

2019-02-15T14:55:37+01:00 (5 years ago)

Author:

mathiot

Message:

update branch to the head of the trunk r10688 (ticket #2229)

Location:

NEMO/branches/2019/fix_ticket2229

Files:

• . (modified) (1 prop)
• src/OCE/DIA/dia25h.F90 (modified) (3 diffs)

NEMO/branches/2019/fix_ticket2229

@@ -1 @@
-^/utils/build/arch        arch
-^/utils/build/makenemo    makenemo
-^/utils/build/mk          mk
-^/utils/tools             tools
-^/vendors/AGRIF/dev       ext/AGRIF
-^/vendors/FCM             ext/FCM
-^/vendors/IOIPSL          ext/IOIPSL
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL

@@ -1 @@
-^/utils/build/arch        arch
-^/utils/build/makenemo    makenemo
-^/utils/build/mk          mk
-^/utils/tools             tools
-^/vendors/AGRIF/dev       ext/AGRIF
-^/vendors/FCM             ext/FCM
-^/vendors/IOIPSL          ext/IOIPSL
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL

NEMO/branches/2019/fix_ticket2229/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(:,:,:))

@@ -1 @@
-^/utils/build/arch        arch
-^/utils/build/makenemo    makenemo
-^/utils/build/mk          mk
-^/utils/tools             tools
-^/vendors/AGRIF/dev       ext/AGRIF
-^/vendors/FCM             ext/FCM
-^/vendors/IOIPSL          ext/IOIPSL
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL