Changeset 2068 for branches/DEV_r1837_MLF/NEMO/OPA_SRC/DOM/domvvl.F90

Timestamp:

2010-09-06T17:56:51+02:00 (14 years ago)

Author:

mlelod

Message:

ticket: #663 ensuring restartability and conservation

File:

• branches/DEV_r1837_MLF/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) (2 diffs)

branches/DEV_r1837_MLF/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -130 +130 @@
             zcoeff = 0.5 * umask(ji,jj,1) * umask(ji,jj+1,1) / ( e1f(ji,jj) * e2f(ji,jj) )
             ! before fields
-            zv_t_ij       = zs_t(ji  ,jj  ) * sshb(ji  ,jj  ,jk)
-            zv_t_ip1j     = zs_t(ji+1,jj  ) * sshb(ji+1,jj  ,jk)
-            zv_t_ijp1     = zs_t(ji  ,jj+1) * sshb(ji  ,jj+1,jk)
+            zv_t_ij       = zs_t(ji  ,jj  ) * sshb(ji  ,jj  )
+            zv_t_ip1j     = zs_t(ji+1,jj  ) * sshb(ji+1,jj  )
+            zv_t_ijp1     = zs_t(ji  ,jj+1) * sshb(ji  ,jj+1)
             sshu_b(ji,jj) = zcoefu * ( zv_t_ij + zv_t_ip1j )
             sshv_b(ji,jj) = zcoefv * ( zv_t_ij + zv_t_ijp1 )
             ! now fields
-            zv_t_ij       = zs_t(ji  ,jj  ) * sshn(ji  ,jj  ,jk)
-            zv_t_ip1j     = zs_t(ji+1,jj  ) * sshn(ji+1,jj  ,jk)
-            zv_t_ijp1     = zs_t(ji  ,jj+1) * sshn(ji  ,jj+1,jk)
-            zv_t_ip1jp1   = zs_t(ji  ,jj+1) * sshn(ji  ,jj+1,jk)
+            zv_t_ij       = zs_t(ji  ,jj  ) * sshn(ji  ,jj  )
+            zv_t_ip1j     = zs_t(ji+1,jj  ) * sshn(ji+1,jj  )
+            zv_t_ijp1     = zs_t(ji  ,jj+1) * sshn(ji  ,jj+1)
+            zv_t_ip1jp1   = zs_t(ji  ,jj+1) * sshn(ji  ,jj+1)
             sshu_n(ji,jj) = zcoefu * ( zv_t_ij + zv_t_ip1j )
             sshv_n(ji,jj) = zcoefv * ( zv_t_ij + zv_t_ijp1 )
@@ -162 +162 @@
          END DO
       END DO
-      CALL lbc_lnk( fse3u_b, 'U', 1. )               ! lateral boundary conditions
-      CALL lbc_lnk( fse3v_b, 'U', 1. )
+      CALL lbc_lnk( fse3u_b(:,:,:), 'U', 1. )               ! lateral boundary conditions
+      CALL lbc_lnk( fse3v_b(:,:,:), 'V', 1. )
       ! Add initial scale factor to scale factor anomaly
       fse3u_b(:,:,:) = fse3u_b(:,:,:) + fse3u_0(:,:,:)