- Timestamp:
- 2015-10-31T08:40:45+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
r5541 r5845 172 172 173 173 !! * Substitutions 174 # include "domzgr_substitute.h90"175 174 # include "vectopt_loop_substitute.h90" 176 175 !!---------------------------------------------------------------------- … … 587 586 DO ji = 1, jpi 588 587 ! 589 zh = fsdept(ji,jj,jk) * r1_Z0 ! depth588 zh = gdept_n(ji,jj,jk) * r1_Z0 ! depth 590 589 zt = pts (ji,jj,jk,jp_tem) * r1_T0 ! temperature 591 590 zs = SQRT( ABS( pts(ji,jj,jk,jp_sal) + rdeltaS ) * r1_S0 ) ! square root salinity … … 645 644 zt = pts (ji,jj,jk,jp_tem) - 10._wp ! pot. temperature anomaly (t-T0) 646 645 zs = pts (ji,jj,jk,jp_sal) - 35._wp ! abs. salinity anomaly (s-S0) 647 zh = fsdept(ji,jj,jk)! depth in meters at t-point646 zh = gdept_n(ji,jj,jk) ! depth in meters at t-point 648 647 ztm = tmask(ji,jj,jk) ! land/sea bottom mask = surf. mask 649 648 ! … … 913 912 DO jj = 1, jpj ! surface and bottom value set to zero one for all in istate.F90 914 913 DO ji = 1, jpi 915 zrw = ( fsdepw(ji,jj,jk ) - fsdept(ji,jj,jk) ) &916 & / ( fsdept(ji,jj,jk-1) - fsdept(ji,jj,jk) )914 zrw = ( gdepw_n(ji,jj,jk ) - gdept_n(ji,jj,jk) ) & 915 & / ( gdept_n(ji,jj,jk-1) - gdept_n(ji,jj,jk) ) 917 916 ! 918 917 zaw = pab(ji,jj,jk,jp_tem) * (1. - zrw) + pab(ji,jj,jk-1,jp_tem) * zrw … … 921 920 pn2(ji,jj,jk) = grav * ( zaw * ( pts(ji,jj,jk-1,jp_tem) - pts(ji,jj,jk,jp_tem) ) & 922 921 & - zbw * ( pts(ji,jj,jk-1,jp_sal) - pts(ji,jj,jk,jp_sal) ) ) & 923 & / fse3w(ji,jj,jk) * tmask(ji,jj,jk)922 & / e3w_n(ji,jj,jk) * tmask(ji,jj,jk) 924 923 END DO 925 924 END DO … … 1129 1128 DO ji = 1, jpi 1130 1129 ! 1131 zh = fsdept(ji,jj,jk) * r1_Z0 ! depth1130 zh = gdept_n(ji,jj,jk) * r1_Z0 ! depth 1132 1131 zt = pts (ji,jj,jk,jp_tem) * r1_T0 ! temperature 1133 1132 zs = SQRT( ABS( pts(ji,jj,jk,jp_sal) + rdeltaS ) * r1_S0 ) ! square root salinity … … 1193 1192 zt = pts(ji,jj,jk,jp_tem) - 10._wp ! temperature anomaly (t-T0) 1194 1193 zs = pts (ji,jj,jk,jp_sal) - 35._wp ! abs. salinity anomaly (s-S0) 1195 zh = fsdept(ji,jj,jk)! depth in meters at t-point1194 zh = gdept_n(ji,jj,jk) ! depth in meters at t-point 1196 1195 ztm = tmask(ji,jj,jk) ! tmask 1197 1196 zn = 0.5_wp * zh * r1_rau0 * ztm
Note: See TracChangeset
for help on using the changeset viewer.