Changeset 612 for trunk/NEMO/OFF_SRC

Timestamp:

2007-02-21T13:50:29+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_bugfix_020:CE:correction of time interpolating data to take into account interannual files

File:

• trunk/NEMO/OFF_SRC/dtadyn.F90 (modified) (4 diffs)

trunk/NEMO/OFF_SRC/dtadyn.F90

@@ -237 +237 @@
          iperm1 = MOD(INT(zt),ndtadyn)
       ELSE
-         iperm1 = MOD(INT(zt),(ndtatot-1))
+         iperm1 = MOD(INT(zt),(ndtatot-1)) + 1
       ENDIF
       iper = iperm1 + 1
@@ -805 +805 @@
 #  if defined key_traldf_c2d
       CALL iom_get ( numfl_w, jpdom_data, 'soleahtw', zahtw (:,: ), jkenr )
-#   if   defined key_traldf_eiv 
+#   if   defined key_trcldf_eiv 
       CALL iom_get ( numfl_w, jpdom_data, 'soleaeiw', zaeiw (:,: ), jkenr )
 #   endif
@@ -827 +827 @@
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1   ! vector opt.
-               zhdiv(ji,jj,jk) = ( e2u(ji,jj) * udta(ji,jj,jk,2) - e2u(ji-1,jj) * udta(ji-1,jj,jk,2)      &
-                  &               + e1v(ji,jj) * vdta(ji,jj,jk,2) - e1v(ji,jj-1) * vdta(ji,jj-1,jk,2) )   &
+#if defined key_zco
+               zhdiv(ji,jj,jk) = (  e2u(ji,jj) * udta(ji,jj,jk,2) - e2u(ji-1,jj  ) * udta(ji-1,jj  ,jk,2)      &
+                  &               + e1v(ji,jj) * vdta(ji,jj,jk,2) - e1v(ji  ,jj-1) * vdta(ji  ,jj-1,jk,2)  )   &
                   &            / ( e1t(ji,jj) * e2t(ji,jj) )
+#else
+               zhdiv(ji,jj,jk) =   &
+                  (  e2u(ji,jj)*fse3u(ji,jj,jk)*udta(ji,jj,jk,2) - e2u(ji-1,jj)*fse3u(ji-1,jj,jk)*udta(ji-1,jj,jk,2)       &
+                  +  e1v(ji,jj)*fse3v(ji,jj,jk)*vdta(ji,jj,jk,2) - e1v(ji,jj-1)*fse3v(ji,jj-1,jk)*vdta(ji,jj-1,jk,2)  )    &
+                  / ( e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )
+#endif
             END DO
-         END DO
-      END DO
-      
+         END DO         
+      ENDDO
+
+      ! Lateral boundary conditions on hdiv
+      CALL lbc_lnk( zhdiv, 'T', 1. )
+
+
+      ! computation of vertical velocity from the bottom
       zw(:,:,jpk) = 0.
-
-      ! Computation from the bottom
       DO jk = jpkm1, 1, -1
          zw(:,:,jk) = zw(:,:,jk+1) - fse3t(:,:,jk) * zhdiv(:,:,jk)
@@ -848 +858 @@
 #if ! defined key_off_degrad && defined key_traldf_c2d
       ahtwdta(:,:,2)  = zahtw(:,:) * tmask(:,:,1)
-#if defined key_traldf_eiv
+#if defined key_trcldf_eiv
       aeiwdta(:,:,2)  = zaeiw(:,:) * tmask(:,:,1)
 #endif