- Timestamp:
- 2020-09-29T12:41:06+02:00 (4 years ago)
- Location:
- NEMO/branches/2020/r12377_ticket2386
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/r12377_ticket2386
- Property svn:externals
-
old new 3 3 ^/utils/build/mk@HEAD mk 4 4 ^/utils/tools@HEAD tools 5 ^/vendors/AGRIF/dev @HEADext/AGRIF5 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS ext/AGRIF 6 6 ^/vendors/FCM@HEAD ext/FCM 7 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL 8 8 9 9 # SETTE 10 ^/utils/CI/sette@ HEADsette10 ^/utils/CI/sette@13507 sette
-
- Property svn:externals
-
NEMO/branches/2020/r12377_ticket2386/src/OCE/DIA/diaptr.F90
r12511 r13540 60 60 61 61 LOGICAL :: ll_init = .TRUE. !: tracers trend flag (set from namelist in trdini) 62 62 63 !! * Substitutions 63 64 # include "do_loop_substitute.h90" 65 # include "domzgr_substitute.h90" 64 66 !!---------------------------------------------------------------------- 65 67 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 117 119 zmask(:,:,:) = 0._wp 118 120 zts(:,:,:,:) = 0._wp 119 DO_3D _10_11(1, jpkm1 )121 DO_3D( 1, 0, 1, 1, 1, jpkm1 ) 120 122 zvfc = e1v(ji,jj) * e3v(ji,jj,jk,Kmm) 121 123 zmask(ji,jj,jk) = vmask(ji,jj,jk) * zvfc … … 188 190 zts(:,:,:,:) = 0._wp 189 191 IF( iom_use( 'zotem' ) .OR. iom_use( 'zosal' ) .OR. iom_use( 'zosrf' ) ) THEN ! i-mean i-k-surface 190 DO_3D _11_11(1, jpkm1 )192 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 191 193 zsfc = e1t(ji,jj) * e3t(ji,jj,jk,Kmm) 192 194 zmask(ji,jj,jk) = tmask(ji,jj,jk) * zsfc … … 278 280 IF( iom_use( 'sopstvtr' ) .OR. iom_use( 'sophtvtr' ) ) THEN 279 281 zts(:,:,:,:) = 0._wp 280 DO_3D _10_11(1, jpkm1 )282 DO_3D( 1, 0, 1, 1, 1, jpkm1 ) 281 283 zvfc = e1v(ji,jj) * e3v(ji,jj,jk,Kmm) 282 284 zts(ji,jj,jk,jp_tem) = (ts(ji,jj,jk,jp_tem,Kmm)+ts(ji,jj+1,jk,jp_tem,Kmm)) * 0.5 * zvfc !Tracers averaged onto V grid … … 353 355 btmsk(:,:,1) = tmask_i(:,:) 354 356 CALL iom_open( 'subbasins', inum, ldstop = .FALSE. ) 355 CALL iom_get( inum, jpdom_ data, 'atlmsk', btmsk(:,:,2) ) ! Atlantic basin356 CALL iom_get( inum, jpdom_ data, 'pacmsk', btmsk(:,:,3) ) ! Pacific basin357 CALL iom_get( inum, jpdom_ data, 'indmsk', btmsk(:,:,4) ) ! Indian basin357 CALL iom_get( inum, jpdom_global, 'atlmsk', btmsk(:,:,2) ) ! Atlantic basin 358 CALL iom_get( inum, jpdom_global, 'pacmsk', btmsk(:,:,3) ) ! Pacific basin 359 CALL iom_get( inum, jpdom_global, 'indmsk', btmsk(:,:,4) ) ! Indian basin 358 360 CALL iom_close( inum ) 359 361 btmsk(:,:,5) = MAX ( btmsk(:,:,3), btmsk(:,:,4) ) ! Indo-Pacific basin … … 503 505 ijpj = jpj 504 506 p_fval(:) = 0._wp 505 DO_3D _00_00(1, jpkm1 )507 DO_3D( 0, 0, 0, 0, 1, jpkm1 ) 506 508 p_fval(jj) = p_fval(jj) + pvflx(ji,jj,jk) * pmsk(ji,jj) * tmask_i(ji,jj) 507 509 END_3D … … 536 538 ijpj = jpj 537 539 p_fval(:) = 0._wp 538 DO_2D _00_00540 DO_2D( 0, 0, 0, 0 ) 539 541 p_fval(jj) = p_fval(jj) + pvflx(ji,jj) * pmsk(ji,jj) * tmask_i(ji,jj) 540 542 END_2D … … 565 567 p_fval(:,:) = 0._wp 566 568 DO jc = 1, jpnj ! looping over all processors in j axis 567 DO_2D _00_00569 DO_2D( 0, 0, 0, 0 ) 568 570 p_fval(ji,jj) = p_fval(ji,jj-1) + pva(ji,jj) * tmask_i(ji,jj) 569 571 END_2D 570 CALL lbc_lnk( 'diaptr', p_fval, 'U', -1. )572 CALL lbc_lnk( 'diaptr', p_fval, 'U', -1.0_wp ) 571 573 END DO 572 574 ! … … 604 606 p_fval(:,:) = 0._wp 605 607 ! 606 DO_3D _00_00(1, jpkm1 )608 DO_3D( 0, 0, 0, 0, 1, jpkm1 ) 607 609 p_fval(jj,jk) = p_fval(jj,jk) + pta(ji,jj,jk) * pmsk(ji,jj) * tmask_i(ji,jj) 608 610 END_3D
Note: See TracChangeset
for help on using the changeset viewer.