Changeset 4292 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA
- Timestamp:
- 2013-11-20T17:28:04+01:00 (10 years ago)
- Location:
- branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA
- Files:
-
- 9 edited
-
eosbn2.F90 (modified) (6 diffs)
-
traadv.F90 (modified) (2 diffs)
-
trabbl.F90 (modified) (8 diffs)
-
tradmp.F90 (modified) (1 diff)
-
traldf_bilap.F90 (modified) (3 diffs)
-
traldf_bilapg.F90 (modified) (4 diffs)
-
traldf_iso.F90 (modified) (3 diffs)
-
traldf_lap.F90 (modified) (5 diffs)
-
traqsr.F90 (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
r4162 r4292 74 74 CONTAINS 75 75 76 SUBROUTINE eos_insitu( pts, prd )76 SUBROUTINE eos_insitu( pts, prd, pdep ) 77 77 !!---------------------------------------------------------------------- 78 78 !! *** ROUTINE eos_insitu *** … … 114 114 ! ! 2 : salinity [psu] 115 115 REAL(wp), DIMENSION(:,:,:) , INTENT( out) :: prd ! in situ density [-] 116 REAL(wp), DIMENSION(:,:,:) , INTENT(in ) :: pdep ! depth [m] 116 117 !! 117 118 INTEGER :: ji, jj, jk ! dummy loop indices … … 140 141 zt = pts (ji,jj,jk,jp_tem) 141 142 zs = pts (ji,jj,jk,jp_sal) 142 zh = fsdept(ji,jj,jk) ! depth143 zh = pdep(ji,jj,jk) ! depth 143 144 zsr= zws (ji,jj,jk) ! square root salinity 144 145 ! … … 198 199 199 200 200 SUBROUTINE eos_insitu_pot( pts, prd, prhop )201 SUBROUTINE eos_insitu_pot( pts, prd, prhop, pdep ) 201 202 !!---------------------------------------------------------------------- 202 203 !! *** ROUTINE eos_insitu_pot *** … … 249 250 REAL(wp), DIMENSION(jpi,jpj,jpk ), INTENT( out) :: prd ! in situ density [-] 250 251 REAL(wp), DIMENSION(jpi,jpj,jpk ), INTENT( out) :: prhop ! potential density (surface referenced) 252 REAL(wp), DIMENSION(jpi,jpj,jpk ), INTENT(in ) :: pdep ! depth [m] 251 253 ! 252 254 INTEGER :: ji, jj, jk ! dummy loop indices … … 271 273 zt = pts (ji,jj,jk,jp_tem) 272 274 zs = pts (ji,jj,jk,jp_sal) 273 zh = fsdept(ji,jj,jk) ! depth275 zh = pdep(ji,jj,jk) ! depth 274 276 zsr= zws (ji,jj,jk) ! square root salinity 275 277 ! -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90
r4245 r4292 15 15 USE oce ! ocean dynamics and active tracers 16 16 USE dom_oce ! ocean space and time domain 17 USE domvvl ! variable vertical scale factors 17 18 USE traadv_cen2 ! 2nd order centered scheme (tra_adv_cen2 routine) 18 19 USE traadv_tvd ! TVD scheme (tra_adv_tvd routine) … … 94 95 zwn(:,:,jk) = e1t(:,:) * e2t(:,:) * wn(:,:,jk) 95 96 END DO 97 ! 98 IF( ln_vvl_ztilde .OR. ln_vvl_layer ) THEN 99 zun(:,:,:) = zun(:,:,:) + un_td(:,:,:) 100 zvn(:,:,:) = zvn(:,:,:) + vn_td(:,:,:) 101 ENDIF 102 ! 96 103 zun(:,:,jpk) = 0._wp ! no transport trough the bottom 97 104 zvn(:,:,jpk) = 0._wp ! no transport trough the bottom -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90
r4147 r4292 66 66 REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) :: ahu_bbl_0, ahv_bbl_0 ! diffusive bbl flux coefficients at u and v-points 67 67 REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:), PUBLIC :: e3u_bbl_0, e3v_bbl_0 ! thichness of the bbl (e3) at u and v-points (PUBLIC for TAM) 68 REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:), PUBLIC :: r1_e1e2t ! inverse of the cell surface at t-point [1/m2] (PUBLIC for TAM)69 68 70 69 !! * Substitutions … … 85 84 & vtr_bbl (jpi,jpj) , ahv_bbl (jpi,jpj) , mbkv_d (jpi,jpj) , mgrhv(jpi,jpj) , & 86 85 & ahu_bbl_0(jpi,jpj) , ahv_bbl_0(jpi,jpj) , & 87 & e3u_bbl_0(jpi,jpj) , e3v_bbl_0(jpi,jpj) , r1_e1e2t(jpi,jpj) , STAT= tra_bbl_alloc)86 & e3u_bbl_0(jpi,jpj) , e3v_bbl_0(jpi,jpj) , STAT= tra_bbl_alloc ) 88 87 ! 89 88 IF( lk_mpp ) CALL mpp_sum ( tra_bbl_alloc ) … … 217 216 # endif 218 217 ik = mbkt(ji,jj) ! bottom T-level index 219 zbtr = r1_e1 e2t(ji,jj) / fse3t(ji,jj,ik)218 zbtr = r1_e12t(ji,jj) / fse3t(ji,jj,ik) 220 219 pta(ji,jj,ik,jn) = pta(ji,jj,ik,jn) & 221 220 & + ( ahu_bbl(ji ,jj ) * ( zptb(ji+1,jj ) - zptb(ji ,jj ) ) & … … 279 278 ! 280 279 ! ! up -slope T-point (shelf bottom point) 281 zbtr = r1_e1 e2t(iis,jj) / fse3t(iis,jj,ikus)280 zbtr = r1_e12t(iis,jj) / fse3t(iis,jj,ikus) 282 281 ztra = zu_bbl * ( ptb(iid,jj,ikus,jn) - ptb(iis,jj,ikus,jn) ) * zbtr 283 282 pta(iis,jj,ikus,jn) = pta(iis,jj,ikus,jn) + ztra 284 283 ! 285 284 DO jk = ikus, ikud-1 ! down-slope upper to down T-point (deep column) 286 zbtr = r1_e1 e2t(iid,jj) / fse3t(iid,jj,jk)285 zbtr = r1_e12t(iid,jj) / fse3t(iid,jj,jk) 287 286 ztra = zu_bbl * ( ptb(iid,jj,jk+1,jn) - ptb(iid,jj,jk,jn) ) * zbtr 288 287 pta(iid,jj,jk,jn) = pta(iid,jj,jk,jn) + ztra 289 288 END DO 290 289 ! 291 zbtr = r1_e1 e2t(iid,jj) / fse3t(iid,jj,ikud)290 zbtr = r1_e12t(iid,jj) / fse3t(iid,jj,ikud) 292 291 ztra = zu_bbl * ( ptb(iis,jj,ikus,jn) - ptb(iid,jj,ikud,jn) ) * zbtr 293 292 pta(iid,jj,ikud,jn) = pta(iid,jj,ikud,jn) + ztra … … 301 300 ! 302 301 ! up -slope T-point (shelf bottom point) 303 zbtr = r1_e1 e2t(ji,ijs) / fse3t(ji,ijs,ikvs)302 zbtr = r1_e12t(ji,ijs) / fse3t(ji,ijs,ikvs) 304 303 ztra = zv_bbl * ( ptb(ji,ijd,ikvs,jn) - ptb(ji,ijs,ikvs,jn) ) * zbtr 305 304 pta(ji,ijs,ikvs,jn) = pta(ji,ijs,ikvs,jn) + ztra 306 305 ! 307 306 DO jk = ikvs, ikvd-1 ! down-slope upper to down T-point (deep column) 308 zbtr = r1_e1 e2t(ji,ijd) / fse3t(ji,ijd,jk)307 zbtr = r1_e12t(ji,ijd) / fse3t(ji,ijd,jk) 309 308 ztra = zv_bbl * ( ptb(ji,ijd,jk+1,jn) - ptb(ji,ijd,jk,jn) ) * zbtr 310 309 pta(ji,ijd,jk,jn) = pta(ji,ijd,jk,jn) + ztra 311 310 END DO 312 311 ! ! down-slope T-point (deep bottom point) 313 zbtr = r1_e1 e2t(ji,ijd) / fse3t(ji,ijd,ikvd)312 zbtr = r1_e12t(ji,ijd) / fse3t(ji,ijd,ikvd) 314 313 ztra = zv_bbl * ( ptb(ji,ijs,ikvs,jn) - ptb(ji,ijd,ikvd,jn) ) * zbtr 315 314 pta(ji,ijd,ikvd,jn) = pta(ji,ijd,ikvd,jn) + ztra … … 423 422 ztb (ji,jj) = tsb(ji,jj,ik,jp_tem) * tmask(ji,jj,1) ! bottom before T and S 424 423 zsb (ji,jj) = tsb(ji,jj,ik,jp_sal) * tmask(ji,jj,1) 425 zdep(ji,jj) = fsdept_0(ji,jj,ik)! bottom T-level reference depth424 zdep(ji,jj) = gdept_0(ji,jj,ik) ! bottom T-level reference depth 426 425 ! 427 426 zub(ji,jj) = un(ji,jj,mbku(ji,jj)) ! bottom velocity … … 601 600 IF( nn_eos /= 0 ) CALL ctl_stop ( ' bbl parameterisation requires eos = 0. We stop.' ) 602 601 603 604 ! !* inverse of surface of T-cells605 r1_e1e2t(:,:) = 1._wp / ( e1t(:,:) * e2t(:,:) )606 607 602 ! !* vertical index of "deep" bottom u- and v-points 608 603 DO jj = 1, jpjm1 ! (the "shelf" bottom k-indices are mbku and mbkv) … … 612 607 END DO 613 608 END DO 614 ! convert einto REAL to use lbc_lnk ; impose a min value of 1 as a zero can be set in lbclnk609 ! convert into REAL to use lbc_lnk ; impose a min value of 1 as a zero can be set in lbclnk 615 610 zmbk(:,:) = REAL( mbku_d(:,:), wp ) ; CALL lbc_lnk(zmbk,'U',1.) ; mbku_d(:,:) = MAX( INT( zmbk(:,:) ), 1 ) 616 611 zmbk(:,:) = REAL( mbkv_d(:,:), wp ) ; CALL lbc_lnk(zmbk,'V',1.) ; mbkv_d(:,:) = MAX( INT( zmbk(:,:) ), 1 ) 617 612 618 613 !* sign of grad(H) at u- and v-points 619 614 mgrhu(jpi,:) = 0. ; mgrhu(:,jpj) = 0. ; mgrhv(jpi,:) = 0. ; mgrhv(:,jpj) = 0. 620 615 DO jj = 1, jpjm1 621 616 DO ji = 1, jpim1 622 mgrhu(ji,jj) = INT( SIGN( 1.e0, fsdept_0(ji+1,jj,mbkt(ji+1,jj)) - fsdept_0(ji,jj,mbkt(ji,jj)) ) )623 mgrhv(ji,jj) = INT( SIGN( 1.e0, fsdept_0(ji,jj+1,mbkt(ji,jj+1)) - fsdept_0(ji,jj,mbkt(ji,jj)) ) )617 mgrhu(ji,jj) = INT( SIGN( 1.e0, gdept_0(ji+1,jj,mbkt(ji+1,jj)) - gdept_0(ji,jj,mbkt(ji,jj)) ) ) 618 mgrhv(ji,jj) = INT( SIGN( 1.e0, gdept_0(ji,jj+1,mbkt(ji,jj+1)) - gdept_0(ji,jj,mbkt(ji,jj)) ) ) 624 619 END DO 625 620 END DO 626 621 627 622 DO jj = 1, jpjm1 !* bbl thickness at u- (v-) point 628 DO ji = 1, jpim1 629 e3u_bbl_0(ji,jj) = MIN( fse3u_0(ji,jj,mbkt(ji+1,jj )), fse3u_0(ji,jj,mbkt(ji,jj)) )630 e3v_bbl_0(ji,jj) = MIN( fse3v_0(ji,jj,mbkt(ji ,jj+1)), fse3v_0(ji,jj,mbkt(ji,jj)) )623 DO ji = 1, jpim1 ! minimum of top & bottom e3u_0 (e3v_0) 624 e3u_bbl_0(ji,jj) = MIN( e3u_0(ji,jj,mbkt(ji+1,jj )), e3u_0(ji,jj,mbkt(ji,jj)) ) 625 e3v_bbl_0(ji,jj) = MIN( e3v_0(ji,jj,mbkt(ji ,jj+1)), e3v_0(ji,jj,mbkt(ji,jj)) ) 631 626 END DO 632 627 END DO -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90
r4247 r4292 795 795 clname = 'dist.coast' 796 796 itime = 0 797 CALL ymds2ju( 0 , 1 , 1 , 0._wp , zdate0 )798 CALL restini( 'NONE', jpi , jpj , glamt, gphit , &799 & jpk , gdept_ 0, clname, itime, zdate0, &797 CALL ymds2ju( 0 , 1 , 1 , 0._wp , zdate0 ) 798 CALL restini( 'NONE', jpi , jpj , glamt, gphit , & 799 & jpk , gdept_1d, clname, itime, zdate0, & 800 800 & rdt , icot ) 801 801 CALL restput( icot, 'Tcoast', jpi, jpj, jpk, 0, pdct ) -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilap.F90
r3294 r4292 110 110 DO jj = 1, jpjm1 111 111 DO ji = 1, fs_jpim1 ! vector opt. 112 zeeu(ji,jj) = e2u(ji,jj) * fse3u(ji,jj,jk) / e1u(ji,jj) * umask(ji,jj,jk)113 zeev(ji,jj) = e1v(ji,jj) * fse3v(ji,jj,jk) / e2v(ji,jj) * vmask(ji,jj,jk)112 zeeu(ji,jj) = re2u_e1u(ji,jj) * fse3u_n(ji,jj,jk) * umask(ji,jj,jk) 113 zeev(ji,jj) = re1v_e2v(ji,jj) * fse3v_n(ji,jj,jk) * vmask(ji,jj,jk) 114 114 END DO 115 115 END DO … … 133 133 DO jj = 2, jpjm1 ! Second derivative (divergence) time the eddy diffusivity coefficient 134 134 DO ji = fs_2, fs_jpim1 ! vector opt. 135 zbtr = 1.0 / ( e1 t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )135 zbtr = 1.0 / ( e12t(ji,jj) * fse3t_n(ji,jj,jk) ) 136 136 zlt(ji,jj) = fsahtt(ji,jj,jk) * zbtr * ( ztu(ji,jj,jk) - ztu(ji-1,jj,jk) & 137 137 & + ztv(ji,jj,jk) - ztv(ji,jj-1,jk) ) … … 151 151 DO ji = fs_2, fs_jpim1 ! vector opt. 152 152 ! horizontal diffusive trends 153 zbtr = 1.0 / ( e1 t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )153 zbtr = 1.0 / ( e12t(ji,jj) * fse3t_n(ji,jj,jk) ) 154 154 ztra = zbtr * ( ztu(ji,jj,jk) - ztu(ji-1,jj,jk) + ztv(ji,jj,jk) - ztv(ji,jj-1,jk) ) 155 155 ! add it to the general tracer trends -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilapg.F90
r3805 r4292 210 210 DO jj = 1, jpjm1 211 211 DO ji = 1, jpim1 212 zabe1 = e2u(ji,jj) * fse3u(ji,jj,jk) / e1u(ji,jj)213 zabe2 = e1v(ji,jj) * fse3v(ji,jj,jk) / e2v(ji,jj)212 zabe1 = re2u_e1u(ji,jj) * fse3u_n(ji,jj,jk) 213 zabe2 = re1v_e2v(ji,jj) * fse3v_n(ji,jj,jk) 214 214 215 215 zmku = 1./MAX( tmask(ji+1,jj,jk )+tmask(ji,jj,jk+1) & … … 279 279 DO jk = 2, jpkm1 280 280 DO ji = 2, jpim1 281 zcof0 = e1 t(ji,jj) * e2t(ji,jj) / fse3w(ji,jj,jk) &281 zcof0 = e12t(ji,jj) / fse3w_n(ji,jj,jk) & 282 282 & * ( wslpi(ji,jj,jk) * wslpi(ji,jj,jk) & 283 283 & + wslpj(ji,jj,jk) * wslpj(ji,jj,jk) ) … … 310 310 DO ji = 2, jpim1 311 311 ! eddy coef. divided by the volume element 312 zbtr = 1.0 / ( e1 t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )312 zbtr = 1.0 / ( e12t(ji,jj) * fse3t_n(ji,jj,jk) ) 313 313 ! vertical divergence 314 314 ztav = fsahtt(ji,jj,jk) * ( zftw(ji,jk) - zftw(ji,jk+1) ) … … 322 322 DO ji = 2, jpim1 323 323 ! inverse of the volume element 324 zbtr = 1.0 / ( e1 t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )324 zbtr = 1.0 / ( e12t(ji,jj) * fse3t_n(ji,jj,jk) ) 325 325 ! vertical divergence 326 326 ztav = zftw(ji,jk) - zftw(ji,jk+1) -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90
r3805 r4292 176 176 DO jj = 1 , jpjm1 177 177 DO ji = 1, fs_jpim1 ! vector opt. 178 zabe1 = ( fsahtu(ji,jj,jk) + pahtb0 ) * e2u(ji,jj) * fse3u(ji,jj,jk) / e1u(ji,jj)179 zabe2 = ( fsahtv(ji,jj,jk) + pahtb0 ) * e1v(ji,jj) * fse3v(ji,jj,jk) / e2v(ji,jj)178 zabe1 = ( fsahtu(ji,jj,jk) + pahtb0 ) * re2u_e1u(ji,jj) * fse3u_n(ji,jj,jk) 179 zabe2 = ( fsahtv(ji,jj,jk) + pahtb0 ) * re1v_e2v(ji,jj) * fse3v_n(ji,jj,jk) 180 180 ! 181 181 zmsku = 1. / MAX( tmask(ji+1,jj,jk ) + tmask(ji,jj,jk+1) & … … 201 201 DO jj = 2 , jpjm1 202 202 DO ji = fs_2, fs_jpim1 ! vector opt. 203 zbtr = 1.0 / ( e1 t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )203 zbtr = 1.0 / ( e12t(ji,jj) * fse3t_n(ji,jj,jk) ) 204 204 ztra = zbtr * ( zftu(ji,jj,jk) - zftu(ji-1,jj,jk) + zftv(ji,jj,jk) - zftv(ji,jj-1,jk) ) 205 205 pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) + ztra … … 288 288 DO jj = 2, jpjm1 289 289 DO ji = fs_2, fs_jpim1 ! vector opt. 290 zbtr = 1.0 / ( e1 t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )290 zbtr = 1.0 / ( e12t(ji,jj) * fse3t_n(ji,jj,jk) ) 291 291 ztra = ( ztfw(ji,jj,jk) - ztfw(ji,jj,jk+1) ) * zbtr 292 292 pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) + ztra -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90
r3294 r4292 31 31 32 32 PUBLIC tra_ldf_lap ! routine called by step.F90 33 34 REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:) :: e1ur, e2vr ! scale factor coefficients35 33 36 34 !! * Substitutions … … 85 83 IF(lwp) WRITE(numout,*) 'tra_ldf_lap : iso-level laplacian diffusion on ', cdtype 86 84 IF(lwp) WRITE(numout,*) '~~~~~~~~~~~ ' 87 !88 IF( .NOT. ALLOCATED( e1ur ) ) THEN89 ! This routine may be called for both active and passive tracers.90 ! Allocate and set saved arrays on first call only.91 ALLOCATE( e1ur(jpi,jpj), e2vr(jpi,jpj), STAT=ierr )92 IF( lk_mpp ) CALL mpp_sum( ierr )93 IF( ierr /= 0 ) CALL ctl_stop( 'STOP', 'tra_ldf_lap : unable to allocate arrays' )94 !95 e1ur(:,:) = e2u(:,:) / e1u(:,:)96 e2vr(:,:) = e1v(:,:) / e2v(:,:)97 ENDIF98 85 ENDIF 99 86 … … 107 94 DO jj = 1, jpjm1 108 95 DO ji = 1, fs_jpim1 ! vector opt. 109 zabe1 = fsahtu(ji,jj,jk) * umask(ji,jj,jk) * e1ur(ji,jj) * fse3u(ji,jj,jk)110 zabe2 = fsahtv(ji,jj,jk) * vmask(ji,jj,jk) * e2vr(ji,jj) * fse3v(ji,jj,jk)96 zabe1 = fsahtu(ji,jj,jk) * umask(ji,jj,jk) * re2u_e1u(ji,jj) * fse3u_n(ji,jj,jk) 97 zabe2 = fsahtv(ji,jj,jk) * vmask(ji,jj,jk) * re1v_e2v(ji,jj) * fse3v_n(ji,jj,jk) 111 98 ztu(ji,jj,jk) = zabe1 * ( ptb(ji+1,jj ,jk,jn) - ptb(ji,jj,jk,jn) ) 112 99 ztv(ji,jj,jk) = zabe2 * ( ptb(ji ,jj+1,jk,jn) - ptb(ji,jj,jk,jn) ) … … 120 107 ikv = mbkv(ji,jj) 121 108 IF( iku == jk ) THEN 122 zabe1 = fsahtu(ji,jj,iku) * umask(ji,jj,iku) * e1ur(ji,jj) * fse3u(ji,jj,iku)109 zabe1 = fsahtu(ji,jj,iku) * umask(ji,jj,iku) * re2u_e1u(ji,jj) * fse3u_n(ji,jj,iku) 123 110 ztu(ji,jj,jk) = zabe1 * pgu(ji,jj,jn) 124 111 ENDIF 125 112 IF( ikv == jk ) THEN 126 zabe2 = fsahtv(ji,jj,ikv) * vmask(ji,jj,ikv) * e2vr(ji,jj) * fse3v(ji,jj,ikv)113 zabe2 = fsahtv(ji,jj,ikv) * vmask(ji,jj,ikv) * re1v_e2v(ji,jj) * fse3v_n(ji,jj,ikv) 127 114 ztv(ji,jj,jk) = zabe2 * pgv(ji,jj,jn) 128 115 ENDIF … … 136 123 DO jj = 2, jpjm1 137 124 DO ji = fs_2, fs_jpim1 ! vector opt. 138 zbtr = 1._wp / ( e1 t(ji,jj) *e2t(ji,jj) * fse3t(ji,jj,jk) )125 zbtr = 1._wp / ( e12t(ji,jj) * fse3t_n(ji,jj,jk) ) 139 126 ! horizontal diffusive trends added to the general tracer trends 140 127 pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) + zbtr * ( ztu(ji,jj,jk) - ztu(ji-1,jj,jk) & -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90
r4207 r4292 466 466 ENDIF 467 467 468 IF(lwp) WRITE(numout,*) ' level of light extinction = ', nksr, ' ref depth = ', gdepw_ 0(nksr+1), ' m'468 IF(lwp) WRITE(numout,*) ' level of light extinction = ', nksr, ' ref depth = ', gdepw_1d(nksr+1), ' m' 469 469 ! 470 470 IF( nn_chldta == 1 ) THEN !* Chl data : set sf_chl structure … … 507 507 !CDIR NOVERRCHK 508 508 DO ji = 1, jpi 509 zc0 = ze0(ji,jj,jk-1) * EXP( - fse3t_0(ji,jj,jk-1) * xsi0r )510 zc1 = ze1(ji,jj,jk-1) * EXP( - fse3t_0(ji,jj,jk-1) * zekb(ji,jj) )511 zc2 = ze2(ji,jj,jk-1) * EXP( - fse3t_0(ji,jj,jk-1) * zekg(ji,jj) )512 zc3 = ze3(ji,jj,jk-1) * EXP( - fse3t_0(ji,jj,jk-1) * zekr(ji,jj) )509 zc0 = ze0(ji,jj,jk-1) * EXP( - e3t_0(ji,jj,jk-1) * xsi0r ) 510 zc1 = ze1(ji,jj,jk-1) * EXP( - e3t_0(ji,jj,jk-1) * zekb(ji,jj) ) 511 zc2 = ze2(ji,jj,jk-1) * EXP( - e3t_0(ji,jj,jk-1) * zekg(ji,jj) ) 512 zc3 = ze3(ji,jj,jk-1) * EXP( - e3t_0(ji,jj,jk-1) * zekr(ji,jj) ) 513 513 ze0(ji,jj,jk) = zc0 514 514 ze1(ji,jj,jk) = zc1 … … 536 536 IF(lwp) THEN 537 537 WRITE(numout,*) 538 IF(lwp) WRITE(numout,*) ' level of light extinction = ', nksr, ' ref depth = ', gdepw_ 0(nksr+1), ' m'538 IF(lwp) WRITE(numout,*) ' level of light extinction = ', nksr, ' ref depth = ', gdepw_1d(nksr+1), ' m' 539 539 ENDIF 540 540 !
Note: See TracChangeset
for help on using the changeset viewer.
