- Timestamp:
- 2019-11-22T15:29:17+01:00 (4 years ago)
- Location:
- NEMO/branches/2019/dev_r11943_MERGE_2019/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r11943_MERGE_2019/src
- Property svn:mergeinfo deleted
-
NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/eosbn2.F90
r11536 r11949 566 566 567 567 568 SUBROUTINE rab_3d( pts, pab )568 SUBROUTINE rab_3d( pts, pab, Kmm ) 569 569 !!---------------------------------------------------------------------- 570 570 !! *** ROUTINE rab_3d *** … … 576 576 !! ** Action : - pab : thermal/haline expansion ratio at T-points 577 577 !!---------------------------------------------------------------------- 578 INTEGER , INTENT(in ) :: Kmm ! time level index 578 579 REAL(wp), DIMENSION(jpi,jpj,jpk,jpts), INTENT(in ) :: pts ! pot. temperature & salinity 579 580 REAL(wp), DIMENSION(jpi,jpj,jpk,jpts), INTENT( out) :: pab ! thermal/haline expansion ratio … … 594 595 DO ji = 1, jpi 595 596 ! 596 zh = gdept _n(ji,jj,jk) * r1_Z0 ! depth597 zh = gdept(ji,jj,jk,Kmm) * r1_Z0 ! depth 597 598 zt = pts (ji,jj,jk,jp_tem) * r1_T0 ! temperature 598 599 zs = SQRT( ABS( pts(ji,jj,jk,jp_sal) + rdeltaS ) * r1_S0 ) ! square root salinity … … 652 653 zt = pts (ji,jj,jk,jp_tem) - 10._wp ! pot. temperature anomaly (t-T0) 653 654 zs = pts (ji,jj,jk,jp_sal) - 35._wp ! abs. salinity anomaly (s-S0) 654 zh = gdept _n(ji,jj,jk) ! depth in meters at t-point655 zh = gdept(ji,jj,jk,Kmm) ! depth in meters at t-point 655 656 ztm = tmask(ji,jj,jk) ! land/sea bottom mask = surf. mask 656 657 ! … … 679 680 680 681 681 SUBROUTINE rab_2d( pts, pdep, pab )682 SUBROUTINE rab_2d( pts, pdep, pab, Kmm ) 682 683 !!---------------------------------------------------------------------- 683 684 !! *** ROUTINE rab_2d *** … … 687 688 !! ** Action : - pab : thermal/haline expansion ratio at T-points 688 689 !!---------------------------------------------------------------------- 690 INTEGER , INTENT(in ) :: Kmm ! time level index 689 691 REAL(wp), DIMENSION(jpi,jpj,jpts) , INTENT(in ) :: pts ! pot. temperature & salinity 690 692 REAL(wp), DIMENSION(jpi,jpj) , INTENT(in ) :: pdep ! depth [m] … … 793 795 794 796 795 SUBROUTINE rab_0d( pts, pdep, pab )797 SUBROUTINE rab_0d( pts, pdep, pab, Kmm ) 796 798 !!---------------------------------------------------------------------- 797 799 !! *** ROUTINE rab_0d *** … … 801 803 !! ** Action : - pab : thermal/haline expansion ratio at T-points 802 804 !!---------------------------------------------------------------------- 805 INTEGER , INTENT(in ) :: Kmm ! time level index 803 806 REAL(wp), DIMENSION(jpts) , INTENT(in ) :: pts ! pot. temperature & salinity 804 807 REAL(wp), INTENT(in ) :: pdep ! depth [m] … … 889 892 890 893 891 SUBROUTINE bn2( pts, pab, pn2 )894 SUBROUTINE bn2( pts, pab, pn2, Kmm ) 892 895 !!---------------------------------------------------------------------- 893 896 !! *** ROUTINE bn2 *** … … 903 906 !! 904 907 !!---------------------------------------------------------------------- 908 INTEGER , INTENT(in ) :: Kmm ! time level index 905 909 REAL(wp), DIMENSION(jpi,jpj,jpk,jpts), INTENT(in ) :: pts ! pot. temperature and salinity [Celsius,psu] 906 910 REAL(wp), DIMENSION(jpi,jpj,jpk,jpts), INTENT(in ) :: pab ! thermal/haline expansion coef. [Celsius-1,psu-1] … … 916 920 DO jj = 1, jpj ! surface and bottom value set to zero one for all in istate.F90 917 921 DO ji = 1, jpi 918 zrw = ( gdepw _n(ji,jj,jk ) - gdept_n(ji,jj,jk) ) &919 & / ( gdept _n(ji,jj,jk-1) - gdept_n(ji,jj,jk) )922 zrw = ( gdepw(ji,jj,jk ,Kmm) - gdept(ji,jj,jk,Kmm) ) & 923 & / ( gdept(ji,jj,jk-1,Kmm) - gdept(ji,jj,jk,Kmm) ) 920 924 ! 921 925 zaw = pab(ji,jj,jk,jp_tem) * (1. - zrw) + pab(ji,jj,jk-1,jp_tem) * zrw … … 924 928 pn2(ji,jj,jk) = grav * ( zaw * ( pts(ji,jj,jk-1,jp_tem) - pts(ji,jj,jk,jp_tem) ) & 925 929 & - zbw * ( pts(ji,jj,jk-1,jp_sal) - pts(ji,jj,jk,jp_sal) ) ) & 926 & / e3w _n(ji,jj,jk) * wmask(ji,jj,jk)930 & / e3w(ji,jj,jk,Kmm) * wmask(ji,jj,jk) 927 931 END DO 928 932 END DO … … 1093 1097 1094 1098 1095 SUBROUTINE eos_pen( pts, pab_pe, ppen )1099 SUBROUTINE eos_pen( pts, pab_pe, ppen, Kmm ) 1096 1100 !!---------------------------------------------------------------------- 1097 1101 !! *** ROUTINE eos_pen *** … … 1113 1117 !! pab_pe(:,:,:,jp_sal) is beta_pe 1114 1118 !!---------------------------------------------------------------------- 1119 INTEGER , INTENT(in ) :: Kmm ! time level index 1115 1120 REAL(wp), DIMENSION(jpi,jpj,jpk,jpts), INTENT(in ) :: pts ! pot. temperature & salinity 1116 1121 REAL(wp), DIMENSION(jpi,jpj,jpk,jpts), INTENT( out) :: pab_pe ! alpha_pe and beta_pe … … 1132 1137 DO ji = 1, jpi 1133 1138 ! 1134 zh = gdept _n(ji,jj,jk) * r1_Z0 ! depth1139 zh = gdept(ji,jj,jk,Kmm) * r1_Z0 ! depth 1135 1140 zt = pts (ji,jj,jk,jp_tem) * r1_T0 ! temperature 1136 1141 zs = SQRT( ABS( pts(ji,jj,jk,jp_sal) + rdeltaS ) * r1_S0 ) ! square root salinity … … 1196 1201 zt = pts(ji,jj,jk,jp_tem) - 10._wp ! temperature anomaly (t-T0) 1197 1202 zs = pts (ji,jj,jk,jp_sal) - 35._wp ! abs. salinity anomaly (s-S0) 1198 zh = gdept _n(ji,jj,jk) ! depth in meters at t-point1203 zh = gdept(ji,jj,jk,Kmm) ! depth in meters at t-point 1199 1204 ztm = tmask(ji,jj,jk) ! tmask 1200 1205 zn = 0.5_wp * zh * r1_rau0 * ztm
Note: See TracChangeset
for help on using the changeset viewer.