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 5061 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90 – NEMO

Ignore:
Timestamp:
2015-02-05T15:14:40+01:00 (9 years ago)
Author:
flavoni
Message:

bug fix on dynadv_ubs.F90, see ticket 1339

File:
1 edited

Legend:

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

    r4990 r5061  
    1616   USE oce            ! ocean dynamics and tracers 
    1717   USE dom_oce        ! ocean space and time domain 
    18    USE trd_oce        ! trends: ocean variables 
    19    USE trddyn         ! trend manager: dynamics 
    20    ! 
     18   USE trdmod         ! ocean dynamics trends 
     19   USE trdmod_oce     ! ocean variables trends 
    2120   USE in_out_manager ! I/O manager 
    2221   USE prtctl         ! Print control 
    2322   USE lbclnk         ! ocean lateral boundary conditions (or mpp link) 
    2423   USE lib_mpp        ! MPP library 
    25    USE wrk_nemo       ! Memory Allocation 
    26    USE timing         ! Timing 
     24   USE wrk_nemo        ! Memory Allocation 
     25   USE timing          ! Timing 
    2726 
    2827   IMPLICIT NONE 
     
    116115         DO jj = 2, jpjm1                          ! laplacian 
    117116            DO ji = fs_2, fs_jpim1   ! vector opt. 
     117               ! 
    118118               zlu_uu(ji,jj,jk,1) = ( ub (ji+1,jj,jk)-2.*ub (ji,jj,jk)+ub (ji-1,jj,jk) ) * umask(ji,jj,jk) 
    119                zlv_vv(ji,jj,jk,1) = ( vb (ji,jj+1,jk)-2.*vb (ji,jj,jk)+vb (ji,jj-1,jk) ) * vmask(ji,jj,jk)  
    120                zlu_uv(ji,jj,jk,1) = ( ub (ji,jj+1,jk)-2.*ub (ji,jj,jk)+ub (ji,jj-1,jk) ) * umask(ji,jj,jk) 
    121                zlv_vu(ji,jj,jk,1) = ( vb (ji+1,jj,jk)-2.*vb (ji,jj,jk)+vb (ji-1,jj,jk) ) * vmask(ji,jj,jk) 
     119               zlv_vv(ji,jj,jk,1) = ( vb (ji,jj+1,jk)-2.*vb (ji,jj,jk)+vb (ji,jj-1,jk) ) * vmask(ji,jj,jk) 
     120               zlu_uv(ji,jj,jk,1) = ( ub (ji,jj+1,jk)-ub (ji,jj,jk) ) * fmask(ji,jj,jk)-( ub (ji,jj,jk)-ub (ji,jj-1,jk) ) * fmask(ji,jj-1,jk) 
     121               zlv_vu(ji,jj,jk,1) = ( vb (ji+1,jj,jk)-vb (ji,jj,jk) ) * fmask(ji,jj,jk)-( vb (ji,jj,jk)-vb (ji-1,jj,jk) ) * fmask(ji-1,jj,jk) 
    122122               ! 
    123123               zlu_uu(ji,jj,jk,2) = ( zfu(ji+1,jj,jk)-2.*zfu(ji,jj,jk)+zfu(ji-1,jj,jk) ) * umask(ji,jj,jk) 
    124124               zlv_vv(ji,jj,jk,2) = ( zfv(ji,jj+1,jk)-2.*zfv(ji,jj,jk)+zfv(ji,jj-1,jk) ) * vmask(ji,jj,jk) 
    125                zlu_uv(ji,jj,jk,2) = ( zfu(ji,jj+1,jk)-2.*zfu(ji,jj,jk)+zfu(ji,jj-1,jk) ) * umask(ji,jj,jk) 
    126                zlv_vu(ji,jj,jk,2) = ( zfv(ji+1,jj,jk)-2.*zfv(ji,jj,jk)+zfv(ji-1,jj,jk) ) * vmask(ji,jj,jk) 
     125               zlu_uv(ji,jj,jk,2) = ( zfu (ji,jj+1,jk)-zfu (ji,jj,jk) ) * fmask(ji,jj,jk)-( zfu (ji,jj,jk)-zfu (ji,jj-1,jk) ) * fmask(ji,jj-1,jk) 
     126               zlv_vu(ji,jj,jk,2) = ( zfv (ji+1,jj,jk)-zfv (ji,jj,jk) ) * fmask(ji,jj,jk)-( zfv (ji,jj,jk)-zfv (ji-1,jj,jk) ) * fmask(ji-1,jj,jk) 
    127127            END DO 
    128128         END DO 
     
    197197         zfu_uw(:,:,:) = ua(:,:,:) - zfu_uw(:,:,:) 
    198198         zfv_vw(:,:,:) = va(:,:,:) - zfv_vw(:,:,:) 
    199          CALL trd_dyn( zfu_uw, zfv_vw, jpdyn_keg, kt ) 
     199         CALL trd_mod( zfu_uw, zfv_vw, jpdyn_trd_had, 'DYN', kt ) 
    200200         zfu_t(:,:,:) = ua(:,:,:) 
    201201         zfv_t(:,:,:) = va(:,:,:) 
     
    246246         zfu_t(:,:,:) = ua(:,:,:) - zfu_t(:,:,:) 
    247247         zfv_t(:,:,:) = va(:,:,:) - zfv_t(:,:,:) 
    248          CALL trd_dyn( zfu_t, zfv_t, jpdyn_zad, kt ) 
     248         CALL trd_mod( zfu_t, zfv_t, jpdyn_trd_zad, 'DYN', kt ) 
    249249      ENDIF 
    250250      !                                            ! Control print 
Note: See TracChangeset for help on using the changeset viewer.