- Timestamp:
- 2021-06-07T16:31:38+02:00 (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2021/dev_r14608_AGRIF_domcfg/tests/ISOMIP+/MY_SRC/eosbn2.F90
r14135 r14958 256 256 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 257 257 ! 258 DO_3D( 1, 1, 1, 1, 1, jpkm1 )258 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 259 259 ! 260 260 zh = pdep(ji,jj,jk) * r1_Z0 ! depth … … 292 292 CASE( np_seos ) !== simplified EOS ==! 293 293 ! 294 DO_3D( 1, 1, 1, 1, 1, jpkm1 )294 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 295 295 zt = pts (ji,jj,jk,jp_tem) - 10._wp 296 296 zs = pts (ji,jj,jk,jp_sal) - 35._wp … … 307 307 CASE( np_leos ) !== linear ISOMIP EOS ==! 308 308 ! 309 DO_3D( 1, 1, 1, 1, 1, jpkm1 )309 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 310 310 zt = pts (ji,jj,jk,jp_tem) - (-1._wp) 311 311 zs = pts (ji,jj,jk,jp_sal) - 34.2_wp … … 382 382 END DO 383 383 ! 384 DO_3D( 1, 1, 1, 1, 1, jpkm1 )384 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 385 385 ! 386 386 ! compute density (2*nn_sto_eos) times: … … 432 432 ! Non-stochastic equation of state 433 433 ELSE 434 DO_3D( 1, 1, 1, 1, 1, jpkm1 )434 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 435 435 ! 436 436 zh = pdep(ji,jj,jk) * r1_Z0 ! depth … … 470 470 CASE( np_seos ) !== simplified EOS ==! 471 471 ! 472 DO_3D( 1, 1, 1, 1, 1, jpkm1 )472 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 473 473 zt = pts (ji,jj,jk,jp_tem) - 10._wp 474 474 zs = pts (ji,jj,jk,jp_sal) - 35._wp … … 488 488 CASE( np_leos ) !== linear ISOMIP EOS ==! 489 489 ! 490 DO_3D( 1, 1, 1, 1, 1, jpkm1 )490 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 491 491 zt = pts (ji,jj,jk,jp_tem) - (-1._wp) 492 492 zs = pts (ji,jj,jk,jp_sal) - 34.2_wp … … 551 551 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 552 552 ! 553 DO_2D( 1, 1, 1, 1)553 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 554 554 ! 555 555 zh = pdep(ji,jj) * r1_Z0 ! depth … … 586 586 CASE( np_seos ) !== simplified EOS ==! 587 587 ! 588 DO_2D( 1, 1, 1, 1)588 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 589 589 ! 590 590 zt = pts (ji,jj,jp_tem) - 10._wp … … 602 602 CASE( np_leos ) !== ISOMIP EOS ==! 603 603 ! 604 DO_2D( 1, 1, 1, 1)604 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 605 605 ! 606 606 zt = pts (ji,jj,jp_tem) - (-1._wp) … … 625 625 626 626 SUBROUTINE eos_insitu_pot_2d( pts, prhop ) 627 !! 628 REAL(wp), DIMENSION(:,:,:), INTENT(in ) :: pts ! 1 : potential temperature [Celsius] 629 ! ! 2 : salinity [psu] 630 REAL(wp), DIMENSION(:,:) , INTENT( out) :: prhop ! potential density (surface referenced) 631 !! 632 CALL eos_insitu_pot_2d_t( pts, is_tile(pts), prhop, is_tile(prhop) ) 633 END SUBROUTINE eos_insitu_pot_2d 634 635 636 SUBROUTINE eos_insitu_pot_2d_t( pts, ktts, prhop, ktrhop ) 627 637 !!---------------------------------------------------------------------- 628 638 !! *** ROUTINE eos_insitu_pot *** … … 637 647 !! 638 648 !!---------------------------------------------------------------------- 639 REAL(wp), DIMENSION(jpi,jpj,jpts), INTENT(in ) :: pts ! 1 : potential temperature [Celsius] 649 INTEGER , INTENT(in ) :: ktts, ktrhop 650 REAL(wp), DIMENSION(A2D_T(ktts),JPTS), INTENT(in ) :: pts ! 1 : potential temperature [Celsius] 640 651 ! ! 2 : salinity [psu] 641 REAL(wp), DIMENSION( jpi,jpj), INTENT( out) :: prhop ! potential density (surface referenced)652 REAL(wp), DIMENSION(A2D_T(ktrhop) ), INTENT( out) :: prhop ! potential density (surface referenced) 642 653 ! 643 654 INTEGER :: ji, jj, jk, jsmp ! dummy loop indices … … 654 665 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 655 666 ! 656 DO_2D( 1, 1, 1, 1)667 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 657 668 ! 658 669 zt = pts (ji,jj,jp_tem) * r1_T0 ! temperature … … 675 686 CASE( np_seos ) !== simplified EOS ==! 676 687 ! 677 DO_2D( 1, 1, 1, 1)688 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 678 689 zt = pts (ji,jj,jp_tem) - 10._wp 679 690 zs = pts (ji,jj,jp_sal) - 35._wp … … 689 700 CASE( np_leos ) !== ISOMIP EOS ==! 690 701 ! 691 DO_2D( 1, 1, 1, 1)702 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 692 703 ! 693 704 zt = pts (ji,jj,jp_tem) - (-1._wp) … … 707 718 IF( ln_timing ) CALL timing_stop('eos-pot') 708 719 ! 709 END SUBROUTINE eos_insitu_pot_2d 720 END SUBROUTINE eos_insitu_pot_2d_t 710 721 711 722 … … 746 757 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 747 758 ! 748 DO_3D( 1, 1, 1, 1, 1, jpkm1 )759 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 749 760 ! 750 761 zh = gdept(ji,jj,jk,Kmm) * r1_Z0 ! depth … … 799 810 CASE( np_seos ) !== simplified EOS ==! 800 811 ! 801 DO_3D( 1, 1, 1, 1, 1, jpkm1 )812 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 802 813 zt = pts (ji,jj,jk,jp_tem) - 10._wp ! pot. temperature anomaly (t-T0) 803 814 zs = pts (ji,jj,jk,jp_sal) - 35._wp ! abs. salinity anomaly (s-S0) … … 815 826 CASE( np_leos ) !== linear ISOMIP EOS ==! 816 827 ! 817 DO_3D( 1, 1, 1, 1, 1, jpkm1 )828 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 818 829 zt = pts (ji,jj,jk,jp_tem) - (-1._wp) 819 830 zs = pts (ji,jj,jk,jp_sal) - 34.2_wp ! abs. salinity anomaly (s-S0) … … 881 892 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 882 893 ! 883 DO_2D( 1, 1, 1, 1)894 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 884 895 ! 885 896 zh = pdep(ji,jj) * r1_Z0 ! depth … … 934 945 CASE( np_seos ) !== simplified EOS ==! 935 946 ! 936 DO_2D( 1, 1, 1, 1)947 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 937 948 ! 938 949 zt = pts (ji,jj,jp_tem) - 10._wp ! pot. temperature anomaly (t-T0) … … 950 961 CASE( np_leos ) !== linear ISOMIP EOS ==! 951 962 ! 952 DO_2D( 1, 1, 1, 1)963 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 953 964 ! 954 965 zt = pts (ji,jj,jp_tem) - (-1._wp) ! pot. temperature anomaly (t-T0) … … 1124 1135 IF( ln_timing ) CALL timing_start('bn2') 1125 1136 ! 1126 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.F901137 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 1127 1138 zrw = ( gdepw(ji,jj,jk ,Kmm) - gdept(ji,jj,jk,Kmm) ) & 1128 1139 & / ( gdept(ji,jj,jk-1,Kmm) - gdept(ji,jj,jk,Kmm) ) … … 1418 1429 CASE( np_leos ) !== linear ISOMIP EOS ==! 1419 1430 ! 1420 DO_3D( 1, 1, 1, 1, 1, jpkm1 )1431 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 1421 1432 zt = pts(ji,jj,jk,jp_tem) - (-1._wp) ! temperature anomaly (t-T0) 1422 1433 zs = pts (ji,jj,jk,jp_sal) - 34.2_wp ! abs. salinity anomaly (s-S0)
Note: See TracChangeset
for help on using the changeset viewer.
