- Timestamp:
- 2020-11-27T17:26:33+01:00 (4 years ago)
- Location:
- NEMO/branches/2020/tickets_icb_1900
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
tests/ISOMIP+/MY_SRC/eosbn2.F90 (modified) (25 diffs)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/tickets_icb_1900
- Property svn:externals
-
NEMO/branches/2020/tickets_icb_1900/tests/ISOMIP+/MY_SRC/eosbn2.F90
r12905 r13899 182 182 !! * Substitutions 183 183 # include "do_loop_substitute.h90" 184 # include "domzgr_substitute.h90" 184 185 !!---------------------------------------------------------------------- 185 186 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 243 244 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 244 245 ! 245 DO_3D _11_11(1, jpkm1 )246 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 246 247 ! 247 248 zh = pdep(ji,jj,jk) * r1_Z0 ! depth … … 279 280 CASE( np_seos ) !== simplified EOS ==! 280 281 ! 281 DO_3D _11_11(1, jpkm1 )282 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 282 283 zt = pts (ji,jj,jk,jp_tem) - 10._wp 283 284 zs = pts (ji,jj,jk,jp_sal) - 35._wp … … 294 295 CASE( np_leos ) !== linear ISOMIP EOS ==! 295 296 ! 296 DO_3D _11_11(1, jpkm1 )297 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 297 298 zt = pts (ji,jj,jk,jp_tem) - (-1._wp) 298 299 zs = pts (ji,jj,jk,jp_sal) - 34.2_wp … … 356 357 END DO 357 358 ! 358 DO_3D _11_11(1, jpkm1 )359 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 359 360 ! 360 361 ! compute density (2*nn_sto_eos) times: … … 406 407 ! Non-stochastic equation of state 407 408 ELSE 408 DO_3D _11_11(1, jpkm1 )409 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 409 410 ! 410 411 zh = pdep(ji,jj,jk) * r1_Z0 ! depth … … 444 445 CASE( np_seos ) !== simplified EOS ==! 445 446 ! 446 DO_3D _11_11(1, jpkm1 )447 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 447 448 zt = pts (ji,jj,jk,jp_tem) - 10._wp 448 449 zs = pts (ji,jj,jk,jp_sal) - 35._wp … … 462 463 CASE( np_leos ) !== linear ISOMIP EOS ==! 463 464 ! 464 DO_3D _11_11(1, jpkm1 )465 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 465 466 zt = pts (ji,jj,jk,jp_tem) - (-1._wp) 466 467 zs = pts (ji,jj,jk,jp_sal) - 34.2_wp … … 513 514 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 514 515 ! 515 DO_2D _11_11516 DO_2D( 1, 1, 1, 1 ) 516 517 ! 517 518 zh = pdep(ji,jj) * r1_Z0 ! depth … … 548 549 CASE( np_seos ) !== simplified EOS ==! 549 550 ! 550 DO_2D _11_11551 DO_2D( 1, 1, 1, 1 ) 551 552 ! 552 553 zt = pts (ji,jj,jp_tem) - 10._wp … … 564 565 CASE( np_leos ) !== ISOMIP EOS ==! 565 566 ! 566 DO_2D _11_11567 DO_2D( 1, 1, 1, 1 ) 567 568 ! 568 569 zt = pts (ji,jj,jp_tem) - (-1._wp) … … 611 612 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 612 613 ! 613 DO_3D _11_11(1, jpkm1 )614 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 614 615 ! 615 616 zh = gdept(ji,jj,jk,Kmm) * r1_Z0 ! depth … … 664 665 CASE( np_seos ) !== simplified EOS ==! 665 666 ! 666 DO_3D _11_11(1, jpkm1 )667 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 667 668 zt = pts (ji,jj,jk,jp_tem) - 10._wp ! pot. temperature anomaly (t-T0) 668 669 zs = pts (ji,jj,jk,jp_sal) - 35._wp ! abs. salinity anomaly (s-S0) … … 680 681 CASE( np_leos ) !== linear ISOMIP EOS ==! 681 682 ! 682 DO_3D _11_11(1, jpkm1 )683 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 683 684 zt = pts (ji,jj,jk,jp_tem) - (-1._wp) 684 685 zs = pts (ji,jj,jk,jp_sal) - 34.2_wp ! abs. salinity anomaly (s-S0) … … 734 735 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 735 736 ! 736 DO_2D _11_11737 DO_2D( 1, 1, 1, 1 ) 737 738 ! 738 739 zh = pdep(ji,jj) * r1_Z0 ! depth … … 787 788 CASE( np_seos ) !== simplified EOS ==! 788 789 ! 789 DO_2D _11_11790 DO_2D( 1, 1, 1, 1 ) 790 791 ! 791 792 zt = pts (ji,jj,jp_tem) - 10._wp ! pot. temperature anomaly (t-T0) … … 803 804 CASE( np_leos ) !== linear ISOMIP EOS ==! 804 805 ! 805 DO_2D _11_11806 DO_2D( 1, 1, 1, 1 ) 806 807 ! 807 808 zt = pts (ji,jj,jp_tem) - (-1._wp) ! pot. temperature anomaly (t-T0) … … 965 966 IF( ln_timing ) CALL timing_start('bn2') 966 967 ! 967 DO_3D _11_11( 2, jpkm1 )968 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 968 969 zrw = ( gdepw(ji,jj,jk ,Kmm) - gdept(ji,jj,jk,Kmm) ) & 969 970 & / ( gdept(ji,jj,jk-1,Kmm) - gdept(ji,jj,jk,Kmm) ) … … 1013 1014 z1_T0 = 1._wp/40._wp 1014 1015 ! 1015 DO_2D _11_111016 DO_2D( 1, 1, 1, 1 ) 1016 1017 ! 1017 1018 zt = ctmp (ji,jj) * z1_T0 … … 1066 1067 ! 1067 1068 z1_S0 = 1._wp / 35.16504_wp 1068 DO_2D _11_111069 DO_2D( 1, 1, 1, 1 ) 1069 1070 zs= SQRT( ABS( psal(ji,jj) ) * z1_S0 ) ! square root salinity 1070 1071 ptf(ji,jj) = ((((1.46873e-03_wp*zs-9.64972e-03_wp)*zs+2.28348e-02_wp)*zs & … … 1173 1174 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 1174 1175 ! 1175 DO_3D _11_11(1, jpkm1 )1176 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 1176 1177 ! 1177 1178 zh = gdept(ji,jj,jk,Kmm) * r1_Z0 ! depth … … 1232 1233 CASE( np_seos ) !== Vallis (2006) simplified EOS ==! 1233 1234 ! 1234 DO_3D _11_11(1, jpkm1 )1235 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 1235 1236 zt = pts(ji,jj,jk,jp_tem) - 10._wp ! temperature anomaly (t-T0) 1236 1237 zs = pts (ji,jj,jk,jp_sal) - 35._wp ! abs. salinity anomaly (s-S0) … … 1248 1249 CASE( np_leos ) !== linear ISOMIP EOS ==! 1249 1250 ! 1250 DO_3D _11_11(1, jpkm1 )1251 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 1251 1252 zt = pts(ji,jj,jk,jp_tem) - (-1._wp) ! temperature anomaly (t-T0) 1252 1253 zs = pts (ji,jj,jk,jp_sal) - 34.2_wp ! abs. salinity anomaly (s-S0) … … 1723 1724 ! 1724 1725 CASE( np_leos ) !== Linear ISOMIP EOS ==! 1726 1727 r1_S0 = 0.875_wp/35.16504_wp ! Used to convert CT in potential temperature when using bulk formulae (eos_pt_from_ct) 1728 1725 1729 IF(lwp) THEN 1726 1730 WRITE(numout,*) … … 1731 1735 WRITE(numout,*) ' saline cont. coef. rn_b0 = ', rn_b0 1732 1736 ENDIF 1737 l_useCT = .TRUE. ! Use conservative temperature 1733 1738 ! 1734 1739 CASE DEFAULT !== ERROR in neos ==!
Note: See TracChangeset
for help on using the changeset viewer.
