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 15061 for NEMO/trunk/src/OCE/stpmlf.F90 – NEMO

Ignore:
Timestamp:
2021-06-25T15:13:40+02:00 (15 months ago)
Author:
clem
Message:

nn_hls=2: orca2 runs in debug mode.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/OCE/stpmlf.F90

    r15023 r15061  
    478478      REAL(wp), DIMENSION(jpi,jpj,jpk,jpt), INTENT(inout) ::   puu, pvv   ! velocities 
    479479      ! 
    480       INTEGER  ::   jk   ! dummy loop indices 
     480      INTEGER  ::   ji,jj, jk   ! dummy loop indices 
    481481      REAL(wp), DIMENSION(jpi,jpj) ::   zue, zve 
    482482      !!---------------------------------------------------------------------- 
     
    484484      ! Ensure below that barotropic velocities match time splitting estimate 
    485485      ! Compute actual transport and replace it with ts estimate at "after" time step 
    486       zue(:,:) = e3u(:,:,1,Kaa) * puu(:,:,1,Kaa) * umask(:,:,1) 
    487       zve(:,:) = e3v(:,:,1,Kaa) * pvv(:,:,1,Kaa) * vmask(:,:,1) 
     486      DO_2D( 0, 0, 0, 0 ) 
     487         zue(ji,jj) = e3u(ji,jj,1,Kaa) * puu(ji,jj,1,Kaa) * umask(ji,jj,1) 
     488         zve(ji,jj) = e3v(ji,jj,1,Kaa) * pvv(ji,jj,1,Kaa) * vmask(ji,jj,1) 
     489      END_2D 
    488490      DO jk = 2, jpkm1 
    489          zue(:,:) = zue(:,:) + e3u(:,:,jk,Kaa) * puu(:,:,jk,Kaa) * umask(:,:,jk) 
    490          zve(:,:) = zve(:,:) + e3v(:,:,jk,Kaa) * pvv(:,:,jk,Kaa) * vmask(:,:,jk) 
     491         DO_2D( 0, 0, 0, 0 ) 
     492            zue(ji,jj) = zue(ji,jj) + e3u(ji,jj,jk,Kaa) * puu(ji,jj,jk,Kaa) * umask(ji,jj,jk) 
     493            zve(ji,jj) = zve(ji,jj) + e3v(ji,jj,jk,Kaa) * pvv(ji,jj,jk,Kaa) * vmask(ji,jj,jk) 
     494         END_2D 
    491495      END DO 
    492496      DO jk = 1, jpkm1 
    493          puu(:,:,jk,Kaa) = ( puu(:,:,jk,Kaa) - zue(:,:) * r1_hu(:,:,Kaa) + uu_b(:,:,Kaa) ) * umask(:,:,jk) 
    494          pvv(:,:,jk,Kaa) = ( pvv(:,:,jk,Kaa) - zve(:,:) * r1_hv(:,:,Kaa) + vv_b(:,:,Kaa) ) * vmask(:,:,jk) 
     497         DO_2D( 0, 0, 0, 0 ) 
     498            puu(ji,jj,jk,Kaa) = ( puu(ji,jj,jk,Kaa) - zue(ji,jj) * r1_hu(ji,jj,Kaa) + uu_b(ji,jj,Kaa) ) * umask(ji,jj,jk) 
     499            pvv(ji,jj,jk,Kaa) = ( pvv(ji,jj,jk,Kaa) - zve(ji,jj) * r1_hv(ji,jj,Kaa) + vv_b(ji,jj,Kaa) ) * vmask(ji,jj,jk) 
     500         END_2D 
    495501      END DO 
    496502      ! 
     
    501507         ! so that asselin contribution is removed at the same time 
    502508         DO jk = 1, jpkm1 
    503             puu(:,:,jk,Kmm) = ( puu(:,:,jk,Kmm) - un_adv(:,:)*r1_hu(:,:,Kmm) + uu_b(:,:,Kmm) )*umask(:,:,jk) 
    504             pvv(:,:,jk,Kmm) = ( pvv(:,:,jk,Kmm) - vn_adv(:,:)*r1_hv(:,:,Kmm) + vv_b(:,:,Kmm) )*vmask(:,:,jk) 
     509            DO_2D( 0, 0, 0, 0 ) 
     510               puu(ji,jj,jk,Kmm) = ( puu(ji,jj,jk,Kmm) - un_adv(ji,jj)*r1_hu(ji,jj,Kmm) + uu_b(ji,jj,Kmm) )*umask(ji,jj,jk) 
     511               pvv(ji,jj,jk,Kmm) = ( pvv(ji,jj,jk,Kmm) - vn_adv(ji,jj)*r1_hv(ji,jj,Kmm) + vv_b(ji,jj,Kmm) )*vmask(ji,jj,jk) 
     512            END_2D 
    505513         END DO 
    506514      ENDIF 
Note: See TracChangeset for help on using the changeset viewer.