- 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/TRA/eosbn2.F90
r12511 r13540 180 180 !! * Substitutions 181 181 # include "do_loop_substitute.h90" 182 # include "domzgr_substitute.h90" 182 183 !!---------------------------------------------------------------------- 183 184 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 237 238 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 238 239 ! 239 DO_3D _11_11(1, jpkm1 )240 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 240 241 ! 241 242 zh = pdep(ji,jj,jk) * r1_Z0 ! depth … … 273 274 CASE( np_seos ) !== simplified EOS ==! 274 275 ! 275 DO_3D _11_11(1, jpkm1 )276 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 276 277 zt = pts (ji,jj,jk,jp_tem) - 10._wp 277 278 zs = pts (ji,jj,jk,jp_sal) - 35._wp … … 337 338 END DO 338 339 ! 339 DO_3D _11_11(1, jpkm1 )340 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 340 341 ! 341 342 ! compute density (2*nn_sto_eos) times: … … 387 388 ! Non-stochastic equation of state 388 389 ELSE 389 DO_3D _11_11(1, jpkm1 )390 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 390 391 ! 391 392 zh = pdep(ji,jj,jk) * r1_Z0 ! depth … … 425 426 CASE( np_seos ) !== simplified EOS ==! 426 427 ! 427 DO_3D _11_11(1, jpkm1 )428 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 428 429 zt = pts (ji,jj,jk,jp_tem) - 10._wp 429 430 zs = pts (ji,jj,jk,jp_sal) - 35._wp … … 479 480 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 480 481 ! 481 DO_2D _11_11482 DO_2D( 1, 1, 1, 1 ) 482 483 ! 483 484 zh = pdep(ji,jj) * r1_Z0 ! depth … … 514 515 CASE( np_seos ) !== simplified EOS ==! 515 516 ! 516 DO_2D _11_11517 DO_2D( 1, 1, 1, 1 ) 517 518 ! 518 519 zt = pts (ji,jj,jp_tem) - 10._wp … … 562 563 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 563 564 ! 564 DO_3D _11_11(1, jpkm1 )565 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 565 566 ! 566 567 zh = gdept(ji,jj,jk,Kmm) * r1_Z0 ! depth … … 615 616 CASE( np_seos ) !== simplified EOS ==! 616 617 ! 617 DO_3D _11_11(1, jpkm1 )618 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 618 619 zt = pts (ji,jj,jk,jp_tem) - 10._wp ! pot. temperature anomaly (t-T0) 619 620 zs = pts (ji,jj,jk,jp_sal) - 35._wp ! abs. salinity anomaly (s-S0) … … 669 670 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 670 671 ! 671 DO_2D _11_11672 DO_2D( 1, 1, 1, 1 ) 672 673 ! 673 674 zh = pdep(ji,jj) * r1_Z0 ! depth … … 722 723 CASE( np_seos ) !== simplified EOS ==! 723 724 ! 724 DO_2D _11_11725 DO_2D( 1, 1, 1, 1 ) 725 726 ! 726 727 zt = pts (ji,jj,jp_tem) - 10._wp ! pot. temperature anomaly (t-T0) … … 872 873 IF( ln_timing ) CALL timing_start('bn2') 873 874 ! 874 DO_3D _11_11( 2, jpkm1 )875 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.F90 875 876 zrw = ( gdepw(ji,jj,jk ,Kmm) - gdept(ji,jj,jk,Kmm) ) & 876 877 & / ( gdept(ji,jj,jk-1,Kmm) - gdept(ji,jj,jk,Kmm) ) … … 920 921 z1_T0 = 1._wp/40._wp 921 922 ! 922 DO_2D _11_11923 DO_2D( 1, 1, 1, 1 ) 923 924 ! 924 925 zt = ctmp (ji,jj) * z1_T0 … … 973 974 ! 974 975 z1_S0 = 1._wp / 35.16504_wp 975 DO_2D _11_11976 DO_2D( 1, 1, 1, 1 ) 976 977 zs= SQRT( ABS( psal(ji,jj) ) * z1_S0 ) ! square root salinity 977 978 ptf(ji,jj) = ((((1.46873e-03_wp*zs-9.64972e-03_wp)*zs+2.28348e-02_wp)*zs & … … 1080 1081 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 1081 1082 ! 1082 DO_3D _11_11(1, jpkm1 )1083 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 1083 1084 ! 1084 1085 zh = gdept(ji,jj,jk,Kmm) * r1_Z0 ! depth … … 1139 1140 CASE( np_seos ) !== Vallis (2006) simplified EOS ==! 1140 1141 ! 1141 DO_3D _11_11(1, jpkm1 )1142 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 1142 1143 zt = pts(ji,jj,jk,jp_tem) - 10._wp ! temperature anomaly (t-T0) 1143 1144 zs = pts (ji,jj,jk,jp_sal) - 35._wp ! abs. salinity anomaly (s-S0)
Note: See TracChangeset
for help on using the changeset viewer.