Changeset 3562 for trunk

Timestamp:

2012-11-15T17:17:48+01:00 (11 years ago)

Author:

rblod

Message:

Fix vvl and flux formulae, see ticket #952

Location:

trunk/NEMOGCM/NEMO/OPA_SRC

Files:

• DOM/istate.F90 (modified) (2 diffs)
• DYN/dynnxt.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90

@@ -106 +106 @@
          hdivb(:,:,:) = 0._wp   ;   hdivn(:,:,:) = 0._wp
          !
-         !                                       ! define e3u_b, e3v_b from e3t_b initialized in domzgr
-         CALL dom_vvl_2( nit000, fse3u_b(:,:,:), fse3v_b(:,:,:) )
-         !
          IF( cp_cfg == 'eel' ) THEN
             CALL istate_eel                      ! EEL   configuration : start from pre-defined U,V T-S fields
@@ -133 +130 @@
             ENDDO
          ENDIF
+         !                                       ! define e3u_b, e3v_b from e3t_b initialized in domzgr
+         CALL dom_vvl_2( nit000, fse3u_b(:,:,:), fse3v_b(:,:,:) )
          ! 
       ENDIF

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

@@ -248 +248 @@
                DO jk = 1, jpkm1                       ! Leap-Frog - Asselin filter and swap: 
                   DO jj = 1, jpj                      !                   applied on thickness weighted velocity
-                     DO ji = 1, jpim1                 !                              ---------------------------
+                     DO ji = 1, jpi                   !                              ---------------------------
                         zue3a = ua(ji,jj,jk) * fse3u_a(ji,jj,jk)
                         zve3a = va(ji,jj,jk) * fse3v_a(ji,jj,jk)
@@ -268 +268 @@
                fse3u_b(:,:,1:jpkm1) = ze3u_f(:,:,1:jpkm1)      ! e3u_b <-- filtered scale factor
                fse3v_b(:,:,1:jpkm1) = ze3v_f(:,:,1:jpkm1)
-               CALL lbc_lnk( ub, 'U', -1. )                    ! lateral boundary conditions
-               CALL lbc_lnk( vb, 'V', -1. )
             ENDIF
             !