- Timestamp:
- 2020-11-27T17:26:33+01:00 (4 years ago)
- Location:
- NEMO/branches/2020/tickets_icb_1900
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/tickets_icb_1900
- Property svn:externals
-
NEMO/branches/2020/tickets_icb_1900/src/OCE/DIA/diaar5.F90
r13237 r13899 110 110 ! 111 111 IF( iom_use( 'e3tb' ) ) THEN ! bottom layer thickness 112 DO_2D _11_11112 DO_2D( 1, 1, 1, 1 ) 113 113 ikb = mbkt(ji,jj) 114 114 z2d(ji,jj) = e3t(ji,jj,ikb,Kmm) … … 144 144 IF( ln_linssh ) THEN 145 145 IF( ln_isfcav ) THEN 146 DO ji = 1, jpi 147 DO jj = 1, jpj 148 iks = mikt(ji,jj) 149 zbotpres(ji,jj) = zbotpres(ji,jj) + ssh(ji,jj,Kmm) * zrhd(ji,jj,iks) + riceload(ji,jj) 150 END DO 151 END DO 146 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 147 iks = mikt(ji,jj) 148 zbotpres(ji,jj) = zbotpres(ji,jj) + ssh(ji,jj,Kmm) * zrhd(ji,jj,iks) + riceload(ji,jj) 149 END_2D 152 150 ELSE 153 151 zbotpres(:,:) = zbotpres(:,:) + ssh(:,:,Kmm) * zrhd(:,:,1) … … 195 193 ! ! Mean density anomalie, temperature and salinity 196 194 ztsn(:,:,:,:) = 0._wp ! ztsn(:,:,1,jp_tem/sal) is used here as 2D Workspace for temperature & salinity 197 DO_3D _11_11(1, jpkm1 )195 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 198 196 zztmp = e1e2t(ji,jj) * e3t(ji,jj,jk,Kmm) 199 197 ztsn(ji,jj,1,jp_tem) = ztsn(ji,jj,1,jp_tem) + zztmp * ts(ji,jj,jk,jp_tem,Kmm) … … 255 253 IF( iom_use( 'tosmint_pot') ) THEN 256 254 z2d(:,:) = 0._wp 257 DO_3D _11_11(1, jpkm1 )255 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 258 256 z2d(ji,jj) = z2d(ji,jj) + rho0 * e3t(ji,jj,jk,Kmm) * ztpot(ji,jj,jk) 259 257 END_3D … … 276 274 zpe(:,:) = 0._wp 277 275 IF( ln_zdfddm ) THEN 278 DO_3D _11_11(2, jpk )276 DO_3D( 1, 1, 1, 1, 2, jpk ) 279 277 IF( rn2(ji,jj,jk) > 0._wp ) THEN 280 278 zrw = ( gdept(ji,jj,jk,Kmm) - gdepw(ji,jj,jk,Kmm) ) / e3w(ji,jj,jk,Kmm) … … 289 287 END_3D 290 288 ELSE 291 DO_3D _11_11(1, jpk )289 DO_3D( 1, 1, 1, 1, 1, jpk ) 292 290 zpe(ji,jj) = zpe(ji,jj) + avt(ji,jj,jk) * MIN(0._wp,rn2(ji,jj,jk)) * rho0 * e3w(ji,jj,jk,Kmm) 293 291 END_3D … … 324 322 325 323 z2d(:,:) = puflx(:,:,1) 326 DO_3D _00_00(1, jpkm1 )324 DO_3D( 0, 0, 0, 0, 1, jpkm1 ) 327 325 z2d(ji,jj) = z2d(ji,jj) + puflx(ji,jj,jk) 328 326 END_3D … … 338 336 ! 339 337 z2d(:,:) = pvflx(:,:,1) 340 DO_3D _00_00(1, jpkm1 )338 DO_3D( 0, 0, 0, 0, 1, jpkm1 ) 341 339 z2d(ji,jj) = z2d(ji,jj) + pvflx(ji,jj,jk) 342 340 END_3D … … 385 383 zvol0 (:,:) = 0._wp 386 384 thick0(:,:) = 0._wp 387 DO_3D _11_11( 1, jpkm1)385 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) ! interpolation of salinity at the last ocean level (i.e. the partial step) 388 386 idep = tmask(ji,jj,jk) * e3t_0(ji,jj,jk) 389 387 zvol0 (ji,jj) = zvol0 (ji,jj) + idep * e1e2t(ji,jj) … … 396 394 ALLOCATE( zsaldta(jpi,jpj,jpk,jpts) ) 397 395 CALL iom_open ( 'sali_ref_clim_monthly', inum ) 398 CALL iom_get ( inum, jpdom_ data, 'vosaline' , zsaldta(:,:,:,1), 1 )399 CALL iom_get ( inum, jpdom_ data, 'vosaline' , zsaldta(:,:,:,2), 12 )396 CALL iom_get ( inum, jpdom_global, 'vosaline' , zsaldta(:,:,:,1), 1 ) 397 CALL iom_get ( inum, jpdom_global, 'vosaline' , zsaldta(:,:,:,2), 12 ) 400 398 CALL iom_close( inum ) 401 399 … … 403 401 sn0(:,:,:) = sn0(:,:,:) * tmask(:,:,:) 404 402 IF( ln_zps ) THEN ! z-coord. partial steps 405 DO_2D _11_11403 DO_2D( 1, 1, 1, 1 ) ! interpolation of salinity at the last ocean level (i.e. the partial step) 406 404 ik = mbkt(ji,jj) 407 405 IF( ik > 1 ) THEN
Note: See TracChangeset
for help on using the changeset viewer.