New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 5836 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90 – NEMO

Ignore:
Timestamp:
2015-10-26T15:49:40+01:00 (8 years ago)
Author:
cetlod
Message:

merge the simplification branch onto the trunk, see ticket #1612

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90

    r5069 r5836  
    181181         DO jj = 2, jpjm1                          ! divergence of horizontal momentum fluxes 
    182182            DO ji = fs_2, fs_jpim1   ! vector opt. 
    183                zbu = e1u(ji,jj) * e2u(ji,jj) * fse3u(ji,jj,jk) 
    184                zbv = e1v(ji,jj) * e2v(ji,jj) * fse3v(ji,jj,jk) 
     183               zbu = e1e2u(ji,jj) * fse3u(ji,jj,jk) 
     184               zbv = e1e2v(ji,jj) * fse3v(ji,jj,jk) 
    185185               ! 
    186186               ua(ji,jj,jk) = ua(ji,jj,jk) - (  zfu_t(ji+1,jj  ,jk) - zfu_t(ji  ,jj  ,jk)    & 
     
    203203      DO jk = 1, jpkm1                       ! ==================== ! 
    204204         !                                         ! Vertical volume fluxesÊ 
    205          zfw(:,:,jk) = 0.25 * e1t(:,:) * e2t(:,:) * wn(:,:,jk) 
     205         zfw(:,:,jk) = 0.25 * e1e2t(:,:) * wn(:,:,jk) 
    206206         ! 
    207207         IF( jk == 1 ) THEN                        ! surface/bottom advective fluxes                    
     
    233233            DO ji = fs_2, fs_jpim1   ! vector opt. 
    234234               ua(ji,jj,jk) =  ua(ji,jj,jk) - ( zfu_uw(ji,jj,jk) - zfu_uw(ji,jj,jk+1) )    & 
    235                   &  / ( e1u(ji,jj) * e2u(ji,jj) * fse3u(ji,jj,jk) ) 
     235                  &  / ( e1e2u(ji,jj) * fse3u(ji,jj,jk) ) 
    236236               va(ji,jj,jk) =  va(ji,jj,jk) - ( zfv_vw(ji,jj,jk) - zfv_vw(ji,jj,jk+1) )    & 
    237                   &  / ( e1v(ji,jj) * e2v(ji,jj) * fse3v(ji,jj,jk) ) 
     237                  &  / ( e1e2v(ji,jj) * fse3v(ji,jj,jk) ) 
    238238            END DO 
    239239         END DO 
Note: See TracChangeset for help on using the changeset viewer.