Changeset 10877 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DYN/dynvor.F90
- Timestamp:
- 2019-04-16T11:50:59+02:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DYN/dynvor.F90
r10874 r10877 96 96 CONTAINS 97 97 98 SUBROUTINE dyn_vor( kt )98 SUBROUTINE dyn_vor( kt, Kmm, puu, pvv, Krhs ) 99 99 !!---------------------------------------------------------------------- 100 100 !! 101 101 !! ** Purpose : compute the lateral ocean tracer physics. 102 102 !! 103 !! ** Action : - Update ( ua,va) with the now vorticity term trend103 !! ** Action : - Update (puu(:,:,:,Krhs),pvv(:,:,:,Krhs)) with the now vorticity term trend 104 104 !! - save the trends in (ztrdu,ztrdv) in 2 parts (relative 105 105 !! and planetary vorticity trends) and send them to trd_dyn 106 106 !! for futher diagnostics (l_trddyn=T) 107 107 !!---------------------------------------------------------------------- 108 INTEGER, INTENT( in ) :: kt ! ocean time-step index 108 INTEGER , INTENT( in ) :: kt ! ocean time-step index 109 INTEGER , INTENT( in ) :: Kmm, Krhs ! ocean time level indices 110 REAL(wp), DIMENSION(jpi,jpj,jpk,jpt), INTENT(inout) :: puu, pvv ! ocean velocity field and RHS of momentum equation 109 111 ! 110 112 REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: ztrdu, ztrdv … … 117 119 ALLOCATE( ztrdu(jpi,jpj,jpk), ztrdv(jpi,jpj,jpk) ) 118 120 ! 119 ztrdu(:,:,:) = ua(:,:,:) !* planetary vorticity trend (including Stokes-Coriolis force)120 ztrdv(:,:,:) = va(:,:,:)121 ztrdu(:,:,:) = puu(:,:,:,Krhs) !* planetary vorticity trend (including Stokes-Coriolis force) 122 ztrdv(:,:,:) = pvv(:,:,:,Krhs) 121 123 SELECT CASE( nvor_scheme ) 122 CASE( np_ENS ) ; CALL vor_ens( kt, ncor, un , vn , ua, va) ! enstrophy conserving scheme123 IF( ln_stcor ) CALL vor_ens( kt, ncor, usd, vsd, ua, va) ! add the Stokes-Coriolis trend124 CASE( np_ENE, np_MIX ) ; CALL vor_ene( kt, ncor, un , vn , ua, va) ! energy conserving scheme125 IF( ln_stcor ) CALL vor_ene( kt, ncor, usd, vsd, ua, va) ! add the Stokes-Coriolis trend126 CASE( np_ENT ) ; CALL vor_enT( kt, ncor, un , vn , ua, va) ! energy conserving scheme (T-pts)127 IF( ln_stcor ) CALL vor_enT( kt, ncor, usd, vsd, ua, va) ! add the Stokes-Coriolis trend128 CASE( np_EET ) ; CALL vor_eeT( kt, ncor, un , vn , ua, va) ! energy conserving scheme (een with e3t)129 IF( ln_stcor ) CALL vor_eeT( kt, ncor, usd, vsd, ua, va) ! add the Stokes-Coriolis trend130 CASE( np_EEN ) ; CALL vor_een( kt, ncor, un , vn , ua, va) ! energy & enstrophy scheme131 IF( ln_stcor ) CALL vor_een( kt, ncor, usd, vsd, ua, va) ! add the Stokes-Coriolis trend124 CASE( np_ENS ) ; CALL vor_ens( kt, Kmm, ncor, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! enstrophy conserving scheme 125 IF( ln_stcor ) CALL vor_ens( kt, Kmm, ncor, usd, vsd, puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! add the Stokes-Coriolis trend 126 CASE( np_ENE, np_MIX ) ; CALL vor_ene( kt, Kmm, ncor, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! energy conserving scheme 127 IF( ln_stcor ) CALL vor_ene( kt, Kmm, ncor, usd, vsd, puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! add the Stokes-Coriolis trend 128 CASE( np_ENT ) ; CALL vor_enT( kt, Kmm, ncor, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! energy conserving scheme (T-pts) 129 IF( ln_stcor ) CALL vor_enT( kt, Kmm, ncor, usd, vsd, puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! add the Stokes-Coriolis trend 130 CASE( np_EET ) ; CALL vor_eeT( kt, Kmm, ncor, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! energy conserving scheme (een with e3t) 131 IF( ln_stcor ) CALL vor_eeT( kt, Kmm, ncor, usd, vsd, puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! add the Stokes-Coriolis trend 132 CASE( np_EEN ) ; CALL vor_een( kt, Kmm, ncor, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! energy & enstrophy scheme 133 IF( ln_stcor ) CALL vor_een( kt, Kmm, ncor, usd, vsd, puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! add the Stokes-Coriolis trend 132 134 END SELECT 133 ztrdu(:,:,:) = ua(:,:,:) - ztrdu(:,:,:)134 ztrdv(:,:,:) = va(:,:,:) - ztrdv(:,:,:)135 ztrdu(:,:,:) = puu(:,:,:,Krhs) - ztrdu(:,:,:) 136 ztrdv(:,:,:) = pvv(:,:,:,Krhs) - ztrdv(:,:,:) 135 137 CALL trd_dyn( ztrdu, ztrdv, jpdyn_pvo, kt ) 136 138 ! 137 139 IF( n_dynadv /= np_LIN_dyn ) THEN !* relative vorticity or metric trend (only in non-linear case) 138 ztrdu(:,:,:) = ua(:,:,:)139 ztrdv(:,:,:) = va(:,:,:)140 ztrdu(:,:,:) = puu(:,:,:,Krhs) 141 ztrdv(:,:,:) = pvv(:,:,:,Krhs) 140 142 SELECT CASE( nvor_scheme ) 141 CASE( np_ENT ) ; CALL vor_enT( kt, nrvm, un , vn , ua, va) ! energy conserving scheme (T-pts)142 CASE( np_EET ) ; CALL vor_eeT( kt, nrvm, un , vn , ua, va) ! energy conserving scheme (een with e3t)143 CASE( np_ENE ) ; CALL vor_ene( kt, nrvm, un , vn , ua, va) ! energy conserving scheme144 CASE( np_ENS, np_MIX ) ; CALL vor_ens( kt, nrvm, un , vn , ua, va) ! enstrophy conserving scheme145 CASE( np_EEN ) ; CALL vor_een( kt, nrvm, un , vn , ua, va) ! energy & enstrophy scheme143 CASE( np_ENT ) ; CALL vor_enT( kt, Kmm, nrvm, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! energy conserving scheme (T-pts) 144 CASE( np_EET ) ; CALL vor_eeT( kt, Kmm, nrvm, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! energy conserving scheme (een with e3t) 145 CASE( np_ENE ) ; CALL vor_ene( kt, Kmm, nrvm, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! energy conserving scheme 146 CASE( np_ENS, np_MIX ) ; CALL vor_ens( kt, Kmm, nrvm, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! enstrophy conserving scheme 147 CASE( np_EEN ) ; CALL vor_een( kt, Kmm, nrvm, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! energy & enstrophy scheme 146 148 END SELECT 147 ztrdu(:,:,:) = ua(:,:,:) - ztrdu(:,:,:)148 ztrdv(:,:,:) = va(:,:,:) - ztrdv(:,:,:)149 ztrdu(:,:,:) = puu(:,:,:,Krhs) - ztrdu(:,:,:) 150 ztrdv(:,:,:) = pvv(:,:,:,Krhs) - ztrdv(:,:,:) 149 151 CALL trd_dyn( ztrdu, ztrdv, jpdyn_rvo, kt ) 150 152 ENDIF … … 156 158 SELECT CASE ( nvor_scheme ) !== vorticity trend added to the general trend ==! 157 159 CASE( np_ENT ) !* energy conserving scheme (T-pts) 158 CALL vor_enT( kt, ntot, un , vn , ua, va) ! total vorticity trend159 IF( ln_stcor ) CALL vor_enT( kt, ncor, usd, vsd, ua, va) ! add the Stokes-Coriolis trend160 CALL vor_enT( kt, Kmm, ntot, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! total vorticity trend 161 IF( ln_stcor ) CALL vor_enT( kt, Kmm, ncor, usd, vsd, puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! add the Stokes-Coriolis trend 160 162 CASE( np_EET ) !* energy conserving scheme (een scheme using e3t) 161 CALL vor_eeT( kt, ntot, un , vn , ua, va) ! total vorticity trend162 IF( ln_stcor ) CALL vor_eeT( kt, ncor, usd, vsd, ua, va) ! add the Stokes-Coriolis trend163 CALL vor_eeT( kt, Kmm, ntot, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! total vorticity trend 164 IF( ln_stcor ) CALL vor_eeT( kt, Kmm, ncor, usd, vsd, puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! add the Stokes-Coriolis trend 163 165 CASE( np_ENE ) !* energy conserving scheme 164 CALL vor_ene( kt, ntot, un , vn , ua, va) ! total vorticity trend165 IF( ln_stcor ) CALL vor_ene( kt, ncor, usd, vsd, ua, va) ! add the Stokes-Coriolis trend166 CALL vor_ene( kt, Kmm, ntot, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! total vorticity trend 167 IF( ln_stcor ) CALL vor_ene( kt, Kmm, ncor, usd, vsd, puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! add the Stokes-Coriolis trend 166 168 CASE( np_ENS ) !* enstrophy conserving scheme 167 CALL vor_ens( kt, ntot, un , vn , ua, va) ! total vorticity trend168 IF( ln_stcor ) CALL vor_ens( kt, ncor, usd, vsd, ua, va) ! add the Stokes-Coriolis trend169 CALL vor_ens( kt, Kmm, ntot, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! total vorticity trend 170 IF( ln_stcor ) CALL vor_ens( kt, Kmm, ncor, usd, vsd, puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! add the Stokes-Coriolis trend 169 171 CASE( np_MIX ) !* mixed ene-ens scheme 170 CALL vor_ens( kt, nrvm, un , vn , ua, va) ! relative vorticity or metric trend (ens)171 CALL vor_ene( kt, ncor, un , vn , ua, va) ! planetary vorticity trend (ene)172 IF( ln_stcor ) CALL vor_ene( kt, ncor, usd, vsd, ua, va) ! add the Stokes-Coriolis trend172 CALL vor_ens( kt, Kmm, nrvm, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! relative vorticity or metric trend (ens) 173 CALL vor_ene( kt, Kmm, ncor, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! planetary vorticity trend (ene) 174 IF( ln_stcor ) CALL vor_ene( kt, Kmm, ncor, usd, vsd, puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! add the Stokes-Coriolis trend 173 175 CASE( np_EEN ) !* energy and enstrophy conserving scheme 174 CALL vor_een( kt, ntot, un , vn , ua, va) ! total vorticity trend175 IF( ln_stcor ) CALL vor_een( kt, ncor, usd, vsd, ua, va) ! add the Stokes-Coriolis trend176 CALL vor_een( kt, Kmm, ntot, puu(:,:,:,Kmm) , pvv(:,:,:,Kmm) , puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! total vorticity trend 177 IF( ln_stcor ) CALL vor_een( kt, Kmm, ncor, usd, vsd, puu(:,:,:,Krhs), pvv(:,:,:,Krhs) ) ! add the Stokes-Coriolis trend 176 178 END SELECT 177 179 ! … … 187 189 188 190 189 SUBROUTINE vor_enT( kt, kvor, pu, pv, pu_rhs, pv_rhs )191 SUBROUTINE vor_enT( kt, Kmm, kvor, pu, pv, pu_rhs, pv_rhs ) 190 192 !!---------------------------------------------------------------------- 191 193 !! *** ROUTINE vor_enT *** … … 203 205 !! where rvor is the relative vorticity at f-point 204 206 !! 205 !! ** Action : - Update ( ua,va) with the now vorticity term trend207 !! ** Action : - Update (puu(:,:,:,Krhs),pvv(:,:,:,Krhs)) with the now vorticity term trend 206 208 !!---------------------------------------------------------------------- 207 209 INTEGER , INTENT(in ) :: kt ! ocean time-step index 210 INTEGER , INTENT(in ) :: Kmm ! ocean time level index 208 211 INTEGER , INTENT(in ) :: kvor ! total, planetary, relative, or metric 209 212 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu, pv ! now velocities … … 270 273 SELECT CASE( kvor ) !== volume weighted vorticity considered ==! 271 274 CASE ( np_COR ) !* Coriolis (planetary vorticity) 272 zwt(:,:) = ff_t(:,:) * e1e2t(:,:)*e3t _n(:,:,jk)275 zwt(:,:) = ff_t(:,:) * e1e2t(:,:)*e3t(:,:,jk,Kmm) 273 276 CASE ( np_RVO ) !* relative vorticity 274 277 DO jj = 2, jpj 275 278 DO ji = 2, jpi ! vector opt. 276 279 zwt(ji,jj) = r1_4 * ( zwz(ji-1,jj ,jk) + zwz(ji,jj ,jk) & 277 & + zwz(ji-1,jj-1,jk) + zwz(ji,jj-1,jk) ) * e1e2t(ji,jj)*e3t _n(ji,jj,jk)280 & + zwz(ji-1,jj-1,jk) + zwz(ji,jj-1,jk) ) * e1e2t(ji,jj)*e3t(ji,jj,jk,Kmm) 278 281 END DO 279 282 END DO … … 282 285 DO ji = 2, jpi 283 286 zwt(ji,jj) = ( ( pv(ji,jj,jk) + pv(ji,jj-1,jk) ) * di_e2u_2(ji,jj) & 284 & - ( pu(ji,jj,jk) + pu(ji-1,jj,jk) ) * dj_e1v_2(ji,jj) ) * e3t _n(ji,jj,jk)287 & - ( pu(ji,jj,jk) + pu(ji-1,jj,jk) ) * dj_e1v_2(ji,jj) ) * e3t(ji,jj,jk,Kmm) 285 288 END DO 286 289 END DO … … 289 292 DO ji = 2, jpi ! vector opt. 290 293 zwt(ji,jj) = ( ff_t(ji,jj) + r1_4 * ( zwz(ji-1,jj ,jk) + zwz(ji,jj ,jk) & 291 & + zwz(ji-1,jj-1,jk) + zwz(ji,jj-1,jk) ) ) * e1e2t(ji,jj)*e3t _n(ji,jj,jk)294 & + zwz(ji-1,jj-1,jk) + zwz(ji,jj-1,jk) ) ) * e1e2t(ji,jj)*e3t(ji,jj,jk,Kmm) 292 295 END DO 293 296 END DO … … 297 300 zwt(ji,jj) = ( ff_t(ji,jj) * e1e2t(ji,jj) & 298 301 & + ( pv(ji,jj,jk) + pv(ji,jj-1,jk) ) * di_e2u_2(ji,jj) & 299 & - ( pu(ji,jj,jk) + pu(ji-1,jj,jk) ) * dj_e1v_2(ji,jj) ) * e3t _n(ji,jj,jk)302 & - ( pu(ji,jj,jk) + pu(ji-1,jj,jk) ) * dj_e1v_2(ji,jj) ) * e3t(ji,jj,jk,Kmm) 300 303 END DO 301 304 END DO … … 307 310 DO jj = 2, jpjm1 308 311 DO ji = 2, jpim1 ! vector opt. 309 pu_rhs(ji,jj,jk) = pu_rhs(ji,jj,jk) + r1_4 * r1_e1e2u(ji,jj) / e3u _n(ji,jj,jk) &312 pu_rhs(ji,jj,jk) = pu_rhs(ji,jj,jk) + r1_4 * r1_e1e2u(ji,jj) / e3u(ji,jj,jk,Kmm) & 310 313 & * ( zwt(ji+1,jj) * ( pv(ji+1,jj,jk) + pv(ji+1,jj-1,jk) ) & 311 314 & + zwt(ji ,jj) * ( pv(ji ,jj,jk) + pv(ji ,jj-1,jk) ) ) 312 315 ! 313 pv_rhs(ji,jj,jk) = pv_rhs(ji,jj,jk) - r1_4 * r1_e1e2v(ji,jj) / e3v _n(ji,jj,jk) &316 pv_rhs(ji,jj,jk) = pv_rhs(ji,jj,jk) - r1_4 * r1_e1e2v(ji,jj) / e3v(ji,jj,jk,Kmm) & 314 317 & * ( zwt(ji,jj+1) * ( pu(ji,jj+1,jk) + pu(ji-1,jj+1,jk) ) & 315 318 & + zwt(ji,jj ) * ( pu(ji,jj ,jk) + pu(ji-1,jj ,jk) ) ) … … 322 325 323 326 324 SUBROUTINE vor_ene( kt, kvor, pun, pvn, pua, pva)327 SUBROUTINE vor_ene( kt, Kmm, kvor, pu_mm, pv_mm, pu_rhs, pv_rhs ) 325 328 !!---------------------------------------------------------------------- 326 329 !! *** ROUTINE vor_ene *** … … 334 337 !! The general trend of momentum is increased due to the vorticity 335 338 !! term which is given by: 336 !! voru = 1/e1u mj-1[ (rvor+f)/e3f mi(e1v*e3v vn) ]337 !! vorv = 1/e2v mi-1[ (rvor+f)/e3f mj(e2u*e3u un) ]339 !! voru = 1/e1u mj-1[ (rvor+f)/e3f mi(e1v*e3v pvv(:,:,:,Kmm)) ] 340 !! vorv = 1/e2v mi-1[ (rvor+f)/e3f mj(e2u*e3u puu(:,:,:,Kmm)) ] 338 341 !! where rvor is the relative vorticity 339 342 !! 340 !! ** Action : - Update ( ua,va) with the now vorticity term trend343 !! ** Action : - Update (puu(:,:,:,Krhs),pvv(:,:,:,Krhs)) with the now vorticity term trend 341 344 !! 342 345 !! References : Sadourny, r., 1975, j. atmos. sciences, 32, 680-689. 343 346 !!---------------------------------------------------------------------- 344 347 INTEGER , INTENT(in ) :: kt ! ocean time-step index 348 INTEGER , INTENT(in ) :: Kmm ! ocean time level index 345 349 INTEGER , INTENT(in ) :: kvor ! total, planetary, relative, or metric 346 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu n, pvn! now velocities347 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu a, pva! total v-trend350 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu_mm, pv_mm ! now velocities 351 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu_rhs, pv_rhs ! total v-trend 348 352 ! 349 353 INTEGER :: ji, jj, jk ! dummy loop indices … … 368 372 DO jj = 1, jpjm1 369 373 DO ji = 1, fs_jpim1 ! vector opt. 370 zwz(ji,jj) = ( e2v(ji+1,jj ) * pv n(ji+1,jj ,jk) - e2v(ji,jj) * pvn(ji,jj,jk) &371 & - e1u(ji ,jj+1) * pu n(ji ,jj+1,jk) + e1u(ji,jj) * pun(ji,jj,jk) ) * r1_e1e2f(ji,jj)374 zwz(ji,jj) = ( e2v(ji+1,jj ) * pv_mm(ji+1,jj ,jk) - e2v(ji,jj) * pv_mm(ji,jj,jk) & 375 & - e1u(ji ,jj+1) * pu_mm(ji ,jj+1,jk) + e1u(ji,jj) * pu_mm(ji,jj,jk) ) * r1_e1e2f(ji,jj) 372 376 END DO 373 377 END DO … … 375 379 DO jj = 1, jpjm1 376 380 DO ji = 1, fs_jpim1 ! vector opt. 377 zwz(ji,jj) = ( pv n(ji+1,jj ,jk) + pvn(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) &378 & - ( pu n(ji ,jj+1,jk) + pun(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj)381 zwz(ji,jj) = ( pv_mm(ji+1,jj ,jk) + pv_mm(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) & 382 & - ( pu_mm(ji ,jj+1,jk) + pu_mm(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj) 379 383 END DO 380 384 END DO … … 382 386 DO jj = 1, jpjm1 383 387 DO ji = 1, fs_jpim1 ! vector opt. 384 zwz(ji,jj) = ff_f(ji,jj) + ( e2v(ji+1,jj) * pv n(ji+1,jj,jk) - e2v(ji,jj) * pvn(ji,jj,jk) &385 & - e1u(ji,jj+1) * pu n(ji,jj+1,jk) + e1u(ji,jj) * pun(ji,jj,jk) ) * r1_e1e2f(ji,jj)388 zwz(ji,jj) = ff_f(ji,jj) + ( e2v(ji+1,jj) * pv_mm(ji+1,jj,jk) - e2v(ji,jj) * pv_mm(ji,jj,jk) & 389 & - e1u(ji,jj+1) * pu_mm(ji,jj+1,jk) + e1u(ji,jj) * pu_mm(ji,jj,jk) ) * r1_e1e2f(ji,jj) 386 390 END DO 387 391 END DO … … 389 393 DO jj = 1, jpjm1 390 394 DO ji = 1, fs_jpim1 ! vector opt. 391 zwz(ji,jj) = ff_f(ji,jj) + ( pv n(ji+1,jj ,jk) + pvn(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) &392 & - ( pu n(ji ,jj+1,jk) + pun(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj)395 zwz(ji,jj) = ff_f(ji,jj) + ( pv_mm(ji+1,jj ,jk) + pv_mm(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) & 396 & - ( pu_mm(ji ,jj+1,jk) + pu_mm(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj) 393 397 END DO 394 398 END DO … … 406 410 407 411 IF( ln_sco ) THEN 408 zwz(:,:) = zwz(:,:) / e3f _n(:,:,jk)409 zwx(:,:) = e2u(:,:) * e3u _n(:,:,jk) * pun(:,:,jk)410 zwy(:,:) = e1v(:,:) * e3v _n(:,:,jk) * pvn(:,:,jk)412 zwz(:,:) = zwz(:,:) / e3f(:,:,jk) 413 zwx(:,:) = e2u(:,:) * e3u(:,:,jk,Kmm) * pu_mm(:,:,jk) 414 zwy(:,:) = e1v(:,:) * e3v(:,:,jk,Kmm) * pv_mm(:,:,jk) 411 415 ELSE 412 zwx(:,:) = e2u(:,:) * pu n(:,:,jk)413 zwy(:,:) = e1v(:,:) * pv n(:,:,jk)416 zwx(:,:) = e2u(:,:) * pu_mm(:,:,jk) 417 zwy(:,:) = e1v(:,:) * pv_mm(:,:,jk) 414 418 ENDIF 415 419 ! !== compute and add the vorticity term trend =! … … 420 424 zx1 = zwx(ji-1,jj) + zwx(ji-1,jj+1) 421 425 zx2 = zwx(ji ,jj) + zwx(ji ,jj+1) 422 pu a(ji,jj,jk) = pua(ji,jj,jk) + r1_4 * r1_e1u(ji,jj) * ( zwz(ji ,jj-1) * zy1 + zwz(ji,jj) * zy2 )423 pv a(ji,jj,jk) = pva(ji,jj,jk) - r1_4 * r1_e2v(ji,jj) * ( zwz(ji-1,jj ) * zx1 + zwz(ji,jj) * zx2 )426 pu_rhs(ji,jj,jk) = pu_rhs(ji,jj,jk) + r1_4 * r1_e1u(ji,jj) * ( zwz(ji ,jj-1) * zy1 + zwz(ji,jj) * zy2 ) 427 pv_rhs(ji,jj,jk) = pv_rhs(ji,jj,jk) - r1_4 * r1_e2v(ji,jj) * ( zwz(ji-1,jj ) * zx1 + zwz(ji,jj) * zx2 ) 424 428 END DO 425 429 END DO … … 430 434 431 435 432 SUBROUTINE vor_ens( kt, kvor, pun, pvn, pua, pva)436 SUBROUTINE vor_ens( kt, Kmm, kvor, pu_mm, pv_mm, pu_rhs, pv_rhs ) 433 437 !!---------------------------------------------------------------------- 434 438 !! *** ROUTINE vor_ens *** … … 441 445 !! potential enstrophy of a horizontally non-divergent flow. the 442 446 !! trend of the vorticity term is given by: 443 !! voru = 1/e1u mj-1[ (rvor+f)/e3f ] mj-1[ mi(e1v*e3v vn) ]444 !! vorv = 1/e2v mi-1[ (rvor+f)/e3f ] mi-1[ mj(e2u*e3u un) ]445 !! Add this trend to the general momentum trend ( ua,va):446 !! ( ua,va) = (ua,va) + ( voru , vorv )447 !! 448 !! ** Action : - Update ( ua,va) arrays with the now vorticity term trend447 !! voru = 1/e1u mj-1[ (rvor+f)/e3f ] mj-1[ mi(e1v*e3v pvv(:,:,:,Kmm)) ] 448 !! vorv = 1/e2v mi-1[ (rvor+f)/e3f ] mi-1[ mj(e2u*e3u puu(:,:,:,Kmm)) ] 449 !! Add this trend to the general momentum trend (puu(:,:,:,Krhs),pvv(:,:,:,Krhs)): 450 !! (puu(:,:,:,Krhs),pvv(:,:,:,Krhs)) = (puu(:,:,:,Krhs),pvv(:,:,:,Krhs)) + ( voru , vorv ) 451 !! 452 !! ** Action : - Update (puu(:,:,:,Krhs),pvv(:,:,:,Krhs)) arrays with the now vorticity term trend 449 453 !! 450 454 !! References : Sadourny, r., 1975, j. atmos. sciences, 32, 680-689. 451 455 !!---------------------------------------------------------------------- 452 456 INTEGER , INTENT(in ) :: kt ! ocean time-step index 457 INTEGER , INTENT(in ) :: Kmm ! ocean time level index 453 458 INTEGER , INTENT(in ) :: kvor ! total, planetary, relative, or metric 454 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu n, pvn! now velocities455 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu a, pva! total v-trend459 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu_mm, pv_mm ! now velocities 460 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu_rhs, pv_rhs ! total v-trend 456 461 ! 457 462 INTEGER :: ji, jj, jk ! dummy loop indices … … 475 480 DO jj = 1, jpjm1 476 481 DO ji = 1, fs_jpim1 ! vector opt. 477 zwz(ji,jj) = ( e2v(ji+1,jj ) * pv n(ji+1,jj ,jk) - e2v(ji,jj) * pvn(ji,jj,jk) &478 & - e1u(ji ,jj+1) * pu n(ji ,jj+1,jk) + e1u(ji,jj) * pun(ji,jj,jk) ) * r1_e1e2f(ji,jj)482 zwz(ji,jj) = ( e2v(ji+1,jj ) * pv_mm(ji+1,jj ,jk) - e2v(ji,jj) * pv_mm(ji,jj,jk) & 483 & - e1u(ji ,jj+1) * pu_mm(ji ,jj+1,jk) + e1u(ji,jj) * pu_mm(ji,jj,jk) ) * r1_e1e2f(ji,jj) 479 484 END DO 480 485 END DO … … 482 487 DO jj = 1, jpjm1 483 488 DO ji = 1, fs_jpim1 ! vector opt. 484 zwz(ji,jj) = ( pv n(ji+1,jj ,jk) + pvn(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) &485 & - ( pu n(ji ,jj+1,jk) + pun(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj)489 zwz(ji,jj) = ( pv_mm(ji+1,jj ,jk) + pv_mm(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) & 490 & - ( pu_mm(ji ,jj+1,jk) + pu_mm(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj) 486 491 END DO 487 492 END DO … … 489 494 DO jj = 1, jpjm1 490 495 DO ji = 1, fs_jpim1 ! vector opt. 491 zwz(ji,jj) = ff_f(ji,jj) + ( e2v(ji+1,jj ) * pv n(ji+1,jj ,jk) - e2v(ji,jj) * pvn(ji,jj,jk) &492 & - e1u(ji ,jj+1) * pu n(ji ,jj+1,jk) + e1u(ji,jj) * pun(ji,jj,jk) ) * r1_e1e2f(ji,jj)496 zwz(ji,jj) = ff_f(ji,jj) + ( e2v(ji+1,jj ) * pv_mm(ji+1,jj ,jk) - e2v(ji,jj) * pv_mm(ji,jj,jk) & 497 & - e1u(ji ,jj+1) * pu_mm(ji ,jj+1,jk) + e1u(ji,jj) * pu_mm(ji,jj,jk) ) * r1_e1e2f(ji,jj) 493 498 END DO 494 499 END DO … … 496 501 DO jj = 1, jpjm1 497 502 DO ji = 1, fs_jpim1 ! vector opt. 498 zwz(ji,jj) = ff_f(ji,jj) + ( pv n(ji+1,jj ,jk) + pvn(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) &499 & - ( pu n(ji ,jj+1,jk) + pun(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj)503 zwz(ji,jj) = ff_f(ji,jj) + ( pv_mm(ji+1,jj ,jk) + pv_mm(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) & 504 & - ( pu_mm(ji ,jj+1,jk) + pu_mm(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj) 500 505 END DO 501 506 END DO … … 513 518 ! 514 519 IF( ln_sco ) THEN !== horizontal fluxes ==! 515 zwz(:,:) = zwz(:,:) / e3f _n(:,:,jk)516 zwx(:,:) = e2u(:,:) * e3u _n(:,:,jk) * pun(:,:,jk)517 zwy(:,:) = e1v(:,:) * e3v _n(:,:,jk) * pvn(:,:,jk)520 zwz(:,:) = zwz(:,:) / e3f(:,:,jk) 521 zwx(:,:) = e2u(:,:) * e3u(:,:,jk,Kmm) * pu_mm(:,:,jk) 522 zwy(:,:) = e1v(:,:) * e3v(:,:,jk,Kmm) * pv_mm(:,:,jk) 518 523 ELSE 519 zwx(:,:) = e2u(:,:) * pu n(:,:,jk)520 zwy(:,:) = e1v(:,:) * pv n(:,:,jk)524 zwx(:,:) = e2u(:,:) * pu_mm(:,:,jk) 525 zwy(:,:) = e1v(:,:) * pv_mm(:,:,jk) 521 526 ENDIF 522 527 ! !== compute and add the vorticity term trend =! … … 527 532 zvau =-r1_8 * r1_e2v(ji,jj) * ( zwx(ji-1,jj ) + zwx(ji-1,jj+1) & 528 533 & + zwx(ji ,jj ) + zwx(ji ,jj+1) ) 529 pu a(ji,jj,jk) = pua(ji,jj,jk) + zuav * ( zwz(ji ,jj-1) + zwz(ji,jj) )530 pv a(ji,jj,jk) = pva(ji,jj,jk) + zvau * ( zwz(ji-1,jj ) + zwz(ji,jj) )534 pu_rhs(ji,jj,jk) = pu_rhs(ji,jj,jk) + zuav * ( zwz(ji ,jj-1) + zwz(ji,jj) ) 535 pv_rhs(ji,jj,jk) = pv_rhs(ji,jj,jk) + zvau * ( zwz(ji-1,jj ) + zwz(ji,jj) ) 531 536 END DO 532 537 END DO … … 537 542 538 543 539 SUBROUTINE vor_een( kt, kvor, pun, pvn, pua, pva)544 SUBROUTINE vor_een( kt, Kmm, kvor, pu_mm, pv_mm, pu_rhs, pv_rhs ) 540 545 !!---------------------------------------------------------------------- 541 546 !! *** ROUTINE vor_een *** … … 548 553 !! both the horizontal kinetic energy and the potential enstrophy 549 554 !! when horizontal divergence is zero (see the NEMO documentation) 550 !! Add this trend to the general momentum trend ( ua,va).551 !! 552 !! ** Action : - Update ( ua,va) with the now vorticity term trend555 !! Add this trend to the general momentum trend (puu(:,:,:,Krhs),pvv(:,:,:,Krhs)). 556 !! 557 !! ** Action : - Update (puu(:,:,:,Krhs),pvv(:,:,:,Krhs)) with the now vorticity term trend 553 558 !! 554 559 !! References : Arakawa and Lamb 1980, Mon. Wea. Rev., 109, 18-36 555 560 !!---------------------------------------------------------------------- 556 561 INTEGER , INTENT(in ) :: kt ! ocean time-step index 562 INTEGER , INTENT(in ) :: Kmm ! ocean time level index 557 563 INTEGER , INTENT(in ) :: kvor ! total, planetary, relative, or metric 558 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu n, pvn! now velocities559 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu a, pva! total v-trend564 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu_mm, pv_mm ! now velocities 565 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu_rhs, pv_rhs ! total v-trend 560 566 ! 561 567 INTEGER :: ji, jj, jk ! dummy loop indices … … 582 588 DO jj = 1, jpjm1 583 589 DO ji = 1, fs_jpim1 ! vector opt. 584 ze3f = ( e3t _n(ji,jj+1,jk)*tmask(ji,jj+1,jk) + e3t_n(ji+1,jj+1,jk)*tmask(ji+1,jj+1,jk) &585 & + e3t _n(ji,jj ,jk)*tmask(ji,jj ,jk) + e3t_n(ji+1,jj ,jk)*tmask(ji+1,jj ,jk) )590 ze3f = ( e3t(ji,jj+1,jk,Kmm)*tmask(ji,jj+1,jk) + e3t(ji+1,jj+1,jk,Kmm)*tmask(ji+1,jj+1,jk) & 591 & + e3t(ji,jj ,jk,Kmm)*tmask(ji,jj ,jk) + e3t(ji+1,jj ,jk,Kmm)*tmask(ji+1,jj ,jk) ) 586 592 IF( ze3f /= 0._wp ) THEN ; z1_e3f(ji,jj) = 4._wp / ze3f 587 593 ELSE ; z1_e3f(ji,jj) = 0._wp … … 592 598 DO jj = 1, jpjm1 593 599 DO ji = 1, fs_jpim1 ! vector opt. 594 ze3f = ( e3t _n(ji,jj+1,jk)*tmask(ji,jj+1,jk) + e3t_n(ji+1,jj+1,jk)*tmask(ji+1,jj+1,jk) &595 & + e3t _n(ji,jj ,jk)*tmask(ji,jj ,jk) + e3t_n(ji+1,jj ,jk)*tmask(ji+1,jj ,jk) )600 ze3f = ( e3t(ji,jj+1,jk,Kmm)*tmask(ji,jj+1,jk) + e3t(ji+1,jj+1,jk,Kmm)*tmask(ji+1,jj+1,jk) & 601 & + e3t(ji,jj ,jk,Kmm)*tmask(ji,jj ,jk) + e3t(ji+1,jj ,jk,Kmm)*tmask(ji+1,jj ,jk) ) 596 602 zmsk = ( tmask(ji,jj+1,jk) + tmask(ji+1,jj+1,jk) & 597 603 & + tmask(ji,jj ,jk) + tmask(ji+1,jj ,jk) ) … … 613 619 DO jj = 1, jpjm1 614 620 DO ji = 1, fs_jpim1 ! vector opt. 615 zwz(ji,jj,jk) = ( e2v(ji+1,jj ) * pv n(ji+1,jj,jk) - e2v(ji,jj) * pvn(ji,jj,jk) &616 & - e1u(ji ,jj+1) * pu n(ji,jj+1,jk) + e1u(ji,jj) * pun(ji,jj,jk) ) * r1_e1e2f(ji,jj)*z1_e3f(ji,jj)621 zwz(ji,jj,jk) = ( e2v(ji+1,jj ) * pv_mm(ji+1,jj,jk) - e2v(ji,jj) * pv_mm(ji,jj,jk) & 622 & - e1u(ji ,jj+1) * pu_mm(ji,jj+1,jk) + e1u(ji,jj) * pu_mm(ji,jj,jk) ) * r1_e1e2f(ji,jj)*z1_e3f(ji,jj) 617 623 END DO 618 624 END DO … … 620 626 DO jj = 1, jpjm1 621 627 DO ji = 1, fs_jpim1 ! vector opt. 622 zwz(ji,jj,jk) = ( ( pv n(ji+1,jj,jk) + pvn(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) &623 & - ( pu n(ji,jj+1,jk) + pun(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj) ) * z1_e3f(ji,jj)628 zwz(ji,jj,jk) = ( ( pv_mm(ji+1,jj,jk) + pv_mm(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) & 629 & - ( pu_mm(ji,jj+1,jk) + pu_mm(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj) ) * z1_e3f(ji,jj) 624 630 END DO 625 631 END DO … … 627 633 DO jj = 1, jpjm1 628 634 DO ji = 1, fs_jpim1 ! vector opt. 629 zwz(ji,jj,jk) = ( ff_f(ji,jj) + ( e2v(ji+1,jj ) * pv n(ji+1,jj,jk) - e2v(ji,jj) * pvn(ji,jj,jk) &630 & - e1u(ji ,jj+1) * pu n(ji,jj+1,jk) + e1u(ji,jj) * pun(ji,jj,jk) ) &635 zwz(ji,jj,jk) = ( ff_f(ji,jj) + ( e2v(ji+1,jj ) * pv_mm(ji+1,jj,jk) - e2v(ji,jj) * pv_mm(ji,jj,jk) & 636 & - e1u(ji ,jj+1) * pu_mm(ji,jj+1,jk) + e1u(ji,jj) * pu_mm(ji,jj,jk) ) & 631 637 & * r1_e1e2f(ji,jj) ) * z1_e3f(ji,jj) 632 638 END DO … … 635 641 DO jj = 1, jpjm1 636 642 DO ji = 1, fs_jpim1 ! vector opt. 637 zwz(ji,jj,jk) = ( ff_f(ji,jj) + ( pv n(ji+1,jj ,jk) + pvn(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) &638 & - ( pu n(ji ,jj+1,jk) + pun(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj) ) * z1_e3f(ji,jj)643 zwz(ji,jj,jk) = ( ff_f(ji,jj) + ( pv_mm(ji+1,jj ,jk) + pv_mm(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) & 644 & - ( pu_mm(ji ,jj+1,jk) + pu_mm(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj) ) * z1_e3f(ji,jj) 639 645 END DO 640 646 END DO … … 657 663 ! 658 664 ! !== horizontal fluxes ==! 659 zwx(:,:) = e2u(:,:) * e3u _n(:,:,jk) * pun(:,:,jk)660 zwy(:,:) = e1v(:,:) * e3v _n(:,:,jk) * pvn(:,:,jk)665 zwx(:,:) = e2u(:,:) * e3u(:,:,jk,Kmm) * pu_mm(:,:,jk) 666 zwy(:,:) = e1v(:,:) * e3v(:,:,jk,Kmm) * pv_mm(:,:,jk) 661 667 662 668 ! !== compute and add the vorticity term trend =! … … 683 689 zva = - r1_12 * r1_e2v(ji,jj) * ( ztsw(ji,jj+1) * zwx(ji-1,jj+1) + ztse(ji,jj+1) * zwx(ji ,jj+1) & 684 690 & + ztnw(ji,jj ) * zwx(ji-1,jj ) + ztne(ji,jj ) * zwx(ji ,jj ) ) 685 pu a(ji,jj,jk) = pua(ji,jj,jk) + zua686 pv a(ji,jj,jk) = pva(ji,jj,jk) + zva691 pu_rhs(ji,jj,jk) = pu_rhs(ji,jj,jk) + zua 692 pv_rhs(ji,jj,jk) = pv_rhs(ji,jj,jk) + zva 687 693 END DO 688 694 END DO … … 694 700 695 701 696 SUBROUTINE vor_eeT( kt, kvor, pun, pvn, pua, pva)702 SUBROUTINE vor_eeT( kt, Kmm, kvor, pu_mm, pv_mm, pu_rhs, pv_rhs ) 697 703 !!---------------------------------------------------------------------- 698 704 !! *** ROUTINE vor_eeT *** … … 705 711 !! a modified version of Arakawa and Lamb (1980) scheme (see vor_een). 706 712 !! The change consists in 707 !! Add this trend to the general momentum trend ( ua,va).708 !! 709 !! ** Action : - Update ( ua,va) with the now vorticity term trend713 !! Add this trend to the general momentum trend (puu(:,:,:,Krhs),pvv(:,:,:,Krhs)). 714 !! 715 !! ** Action : - Update (puu(:,:,:,Krhs),pvv(:,:,:,Krhs)) with the now vorticity term trend 710 716 !! 711 717 !! References : Arakawa and Lamb 1980, Mon. Wea. Rev., 109, 18-36 712 718 !!---------------------------------------------------------------------- 713 719 INTEGER , INTENT(in ) :: kt ! ocean time-step index 720 INTEGER , INTENT(in ) :: Kmm ! ocean time level index 714 721 INTEGER , INTENT(in ) :: kvor ! total, planetary, relative, or metric 715 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu n, pvn! now velocities716 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu a, pva! total v-trend722 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu_mm, pv_mm ! now velocities 723 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pu_rhs, pv_rhs ! total v-trend 717 724 ! 718 725 INTEGER :: ji, jj, jk ! dummy loop indices … … 746 753 DO jj = 1, jpjm1 747 754 DO ji = 1, fs_jpim1 ! vector opt. 748 zwz(ji,jj,jk) = ( e2v(ji+1,jj ) * pv n(ji+1,jj ,jk) - e2v(ji,jj) * pvn(ji,jj,jk) &749 & - e1u(ji ,jj+1) * pu n(ji ,jj+1,jk) + e1u(ji,jj) * pun(ji,jj,jk) ) &755 zwz(ji,jj,jk) = ( e2v(ji+1,jj ) * pv_mm(ji+1,jj ,jk) - e2v(ji,jj) * pv_mm(ji,jj,jk) & 756 & - e1u(ji ,jj+1) * pu_mm(ji ,jj+1,jk) + e1u(ji,jj) * pu_mm(ji,jj,jk) ) & 750 757 & * r1_e1e2f(ji,jj) 751 758 END DO … … 754 761 DO jj = 1, jpjm1 755 762 DO ji = 1, fs_jpim1 ! vector opt. 756 zwz(ji,jj,jk) = ( pv n(ji+1,jj ,jk) + pvn(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) &757 & - ( pu n(ji ,jj+1,jk) + pun(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj)763 zwz(ji,jj,jk) = ( pv_mm(ji+1,jj ,jk) + pv_mm(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) & 764 & - ( pu_mm(ji ,jj+1,jk) + pu_mm(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj) 758 765 END DO 759 766 END DO … … 761 768 DO jj = 1, jpjm1 762 769 DO ji = 1, fs_jpim1 ! vector opt. 763 zwz(ji,jj,jk) = ( ff_f(ji,jj) + ( e2v(ji+1,jj ) * pv n(ji+1,jj ,jk) - e2v(ji,jj) * pvn(ji,jj,jk) &764 & - e1u(ji ,jj+1) * pu n(ji ,jj+1,jk) + e1u(ji,jj) * pun(ji,jj,jk) ) &770 zwz(ji,jj,jk) = ( ff_f(ji,jj) + ( e2v(ji+1,jj ) * pv_mm(ji+1,jj ,jk) - e2v(ji,jj) * pv_mm(ji,jj,jk) & 771 & - e1u(ji ,jj+1) * pu_mm(ji ,jj+1,jk) + e1u(ji,jj) * pu_mm(ji,jj,jk) ) & 765 772 & * r1_e1e2f(ji,jj) ) 766 773 END DO … … 769 776 DO jj = 1, jpjm1 770 777 DO ji = 1, fs_jpim1 ! vector opt. 771 zwz(ji,jj,jk) = ff_f(ji,jj) + ( pv n(ji+1,jj ,jk) + pvn(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) &772 & - ( pu n(ji ,jj+1,jk) + pun(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj)778 zwz(ji,jj,jk) = ff_f(ji,jj) + ( pv_mm(ji+1,jj ,jk) + pv_mm(ji,jj,jk) ) * di_e2v_2e1e2f(ji,jj) & 779 & - ( pu_mm(ji ,jj+1,jk) + pu_mm(ji,jj,jk) ) * dj_e1u_2e1e2f(ji,jj) 773 780 END DO 774 781 END DO … … 791 798 792 799 ! !== horizontal fluxes ==! 793 zwx(:,:) = e2u(:,:) * e3u _n(:,:,jk) * pun(:,:,jk)794 zwy(:,:) = e1v(:,:) * e3v _n(:,:,jk) * pvn(:,:,jk)800 zwx(:,:) = e2u(:,:) * e3u(:,:,jk,Kmm) * pu_mm(:,:,jk) 801 zwy(:,:) = e1v(:,:) * e3v(:,:,jk,Kmm) * pv_mm(:,:,jk) 795 802 796 803 ! !== compute and add the vorticity term trend =! … … 798 805 ztne(1,:) = 0 ; ztnw(1,:) = 0 ; ztse(1,:) = 0 ; ztsw(1,:) = 0 799 806 DO ji = 2, jpi ! split in 2 parts due to vector opt. 800 z1_e3t = 1._wp / e3t _n(ji,jj,jk)807 z1_e3t = 1._wp / e3t(ji,jj,jk,Kmm) 801 808 ztne(ji,jj) = ( zwz(ji-1,jj ,jk) + zwz(ji ,jj ,jk) + zwz(ji ,jj-1,jk) ) * z1_e3t 802 809 ztnw(ji,jj) = ( zwz(ji-1,jj-1,jk) + zwz(ji-1,jj ,jk) + zwz(ji ,jj ,jk) ) * z1_e3t … … 806 813 DO jj = 3, jpj 807 814 DO ji = fs_2, jpi ! vector opt. ok because we start at jj = 3 808 z1_e3t = 1._wp / e3t _n(ji,jj,jk)815 z1_e3t = 1._wp / e3t(ji,jj,jk,Kmm) 809 816 ztne(ji,jj) = ( zwz(ji-1,jj ,jk) + zwz(ji ,jj ,jk) + zwz(ji ,jj-1,jk) ) * z1_e3t 810 817 ztnw(ji,jj) = ( zwz(ji-1,jj-1,jk) + zwz(ji-1,jj ,jk) + zwz(ji ,jj ,jk) ) * z1_e3t … … 819 826 zva = - r1_12 * r1_e2v(ji,jj) * ( ztsw(ji,jj+1) * zwx(ji-1,jj+1) + ztse(ji,jj+1) * zwx(ji ,jj+1) & 820 827 & + ztnw(ji,jj ) * zwx(ji-1,jj ) + ztne(ji,jj ) * zwx(ji ,jj ) ) 821 pu a(ji,jj,jk) = pua(ji,jj,jk) + zua822 pv a(ji,jj,jk) = pva(ji,jj,jk) + zva828 pu_rhs(ji,jj,jk) = pu_rhs(ji,jj,jk) + zua 829 pv_rhs(ji,jj,jk) = pv_rhs(ji,jj,jk) + zva 823 830 END DO 824 831 END DO
Note: See TracChangeset
for help on using the changeset viewer.
