- Timestamp:
- 2020-11-27T15:42:26+01:00 (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/TRA/eosbn2.F90
r13819 r13898 250 250 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 251 251 ! 252 DO_3D( 1, 1, 1, 1, 1, jpkm1 )252 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 253 253 ! 254 254 zh = pdep(ji,jj,jk) * r1_Z0 ! depth … … 286 286 CASE( np_seos ) !== simplified EOS ==! 287 287 ! 288 DO_3D( 1, 1, 1, 1, 1, jpkm1 )288 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 289 289 zt = pts (ji,jj,jk,jp_tem) - 10._wp 290 290 zs = pts (ji,jj,jk,jp_sal) - 35._wp … … 363 363 END DO 364 364 ! 365 DO_3D( 1, 1, 1, 1, 1, jpkm1 )365 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 366 366 ! 367 367 ! compute density (2*nn_sto_eos) times: … … 413 413 ! Non-stochastic equation of state 414 414 ELSE 415 DO_3D( 1, 1, 1, 1, 1, jpkm1 )415 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 416 416 ! 417 417 zh = pdep(ji,jj,jk) * r1_Z0 ! depth … … 451 451 CASE( np_seos ) !== simplified EOS ==! 452 452 ! 453 DO_3D( 1, 1, 1, 1, 1, jpkm1 )453 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 454 454 zt = pts (ji,jj,jk,jp_tem) - 10._wp 455 455 zs = pts (ji,jj,jk,jp_sal) - 35._wp … … 518 518 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 519 519 ! 520 DO_2D( 1, 1, 1, 1)520 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 521 521 ! 522 522 zh = pdep(ji,jj) * r1_Z0 ! depth … … 553 553 CASE( np_seos ) !== simplified EOS ==! 554 554 ! 555 DO_2D( 1, 1, 1, 1)555 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 556 556 ! 557 557 zt = pts (ji,jj,jp_tem) - 10._wp … … 612 612 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 613 613 ! 614 DO_3D( 1, 1, 1, 1, 1, jpkm1 )614 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 615 615 ! 616 616 zh = gdept(ji,jj,jk,Kmm) * r1_Z0 ! depth … … 665 665 CASE( np_seos ) !== simplified EOS ==! 666 666 ! 667 DO_3D( 1, 1, 1, 1, 1, jpkm1 )667 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 668 668 zt = pts (ji,jj,jk,jp_tem) - 10._wp ! pot. temperature anomaly (t-T0) 669 669 zs = pts (ji,jj,jk,jp_sal) - 35._wp ! abs. salinity anomaly (s-S0) … … 731 731 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 732 732 ! 733 DO_2D( 1, 1, 1, 1)733 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 734 734 ! 735 735 zh = pdep(ji,jj) * r1_Z0 ! depth … … 784 784 CASE( np_seos ) !== simplified EOS ==! 785 785 ! 786 DO_2D( 1, 1, 1, 1)786 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 787 787 ! 788 788 zt = pts (ji,jj,jp_tem) - 10._wp ! pot. temperature anomaly (t-T0) … … 946 946 IF( ln_timing ) CALL timing_start('bn2') 947 947 ! 948 DO_3D( 1, 1, 1, 1, 2, jpkm1 ) ! interior points only (2=< jk =< jpkm1 ); surface and bottom value set to zero one for all in istate.F90948 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 2, jpkm1 ) ! interior points only (2=< jk =< jpkm1 ); surface and bottom value set to zero one for all in istate.F90 949 949 zrw = ( gdepw(ji,jj,jk ,Kmm) - gdept(ji,jj,jk,Kmm) ) & 950 950 & / ( gdept(ji,jj,jk-1,Kmm) - gdept(ji,jj,jk,Kmm) )
Note: See TracChangeset
for help on using the changeset viewer.