Changeset 67
- Timestamp:
- 2004-04-22T14:15:44+02:00 (20 years ago)
- Location:
- trunk/NEMO/OPA_SRC/TRA
- Files:
-
- 3 edited
-
traadv_muscl.F90 (modified) (5 diffs)
-
traadv_muscl2.F90 (modified) (4 diffs)
-
trazdf_iso_vopt.F90 (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/OPA_SRC/TRA/traadv_muscl.F90
r3 r67 12 12 USE oce ! ocean dynamics and active tracers 13 13 USE dom_oce ! ocean space and time domain 14 USE trdtra_oce ! ocean active tracer trends14 USE trdtra_oce ! ocean active tracer trends 15 15 USE in_out_manager ! I/O manager 16 16 USE dynspg_fsc ! surface pressure gradient … … 18 18 USE trabbl ! tracers: bottom boundary layer 19 19 USE lib_mpp 20 USE lbclnk 20 USE lbclnk ! ocean lateral boundary condition (or mpp link) 21 USE ptr ! poleward transport diagnostics 21 22 22 23 IMPLICIT NONE … … 270 271 & - e1v(ji,jj-1) * vn(ji,jj-1,jk) 271 272 # endif 272 ztai =-zbtr * ( zt1(ji,jj,jk) - zt1(ji-1,jj ,jk) +tn(ji,jj,jk) * zfui )273 ztaj =-zbtr * ( zt2(ji,jj,jk) - zt2(ji ,jj-1,jk) +tn(ji,jj,jk) * zfvj )274 zsai =-zbtr * ( zs1(ji,jj,jk) - zs1(ji-1,jj ,jk) +sn(ji,jj,jk) * zfui )275 zsaj =-zbtr * ( zs2(ji,jj,jk) - zs2(ji ,jj-1,jk) +sn(ji,jj,jk) * zfvj )273 ztai =-zbtr * ( zt1(ji,jj,jk) - zt1(ji-1,jj ,jk) - tn(ji,jj,jk) * zfui ) 274 ztaj =-zbtr * ( zt2(ji,jj,jk) - zt2(ji ,jj-1,jk) - tn(ji,jj,jk) * zfvj ) 275 zsai =-zbtr * ( zs1(ji,jj,jk) - zs1(ji-1,jj ,jk) - sn(ji,jj,jk) * zfui ) 276 zsaj =-zbtr * ( zs2(ji,jj,jk) - zs2(ji ,jj-1,jk) - sn(ji,jj,jk) * zfvj ) 276 277 ! save i- and j- advective trends computed as Uh gradh(T) 277 278 ttrdh(ji,jj,jk,1) = ztai … … 288 289 IF( MOD( kt, nf_ptr ) == 0 ) THEN 289 290 # if defined key_s_coord || defined key_partial_steps 290 pht_adv(: ,:) = prt_vj( zt2(:,:,:) )291 pst_adv(: ,:) = prt_vj( zs2(:,:,:) )291 pht_adv(:) = prt_vj( zt2(:,:,:) ) 292 pst_adv(:) = prt_vj( zs2(:,:,:) ) 292 293 # else 293 294 DO jk = 1, jpkm1 … … 299 300 END DO 300 301 END DO 301 pht_adv(: ,:) = prt_vj( zt2(:,:,:) )302 pst_adv(: ,:) = prt_vj( zs2(:,:,:) )302 pht_adv(:) = prt_vj( zt2(:,:,:) ) 303 pst_adv(:) = prt_vj( zs2(:,:,:) ) 303 304 # endif 304 305 ENDIF -
trunk/NEMO/OPA_SRC/TRA/traadv_muscl2.F90
r3 r67 18 18 USE trabbl ! tracers: bottom boudary layer 19 19 USE lib_mpp 20 USE lbclnk 20 USE lbclnk ! ocean lateral boundary condition (or mpp link) 21 USE ptr ! poleward transport diagnostics 22 21 23 22 24 IMPLICIT NONE … … 330 332 & - e1v(ji,jj-1) * vn(ji,jj-1,jk) 331 333 # endif 332 ztai =-zbtr * ( zt1(ji,jj,jk) - zt1(ji-1,jj ,jk) +tn(ji,jj,jk) * zfui )333 ztaj =-zbtr * ( zt2(ji,jj,jk) - zt2(ji ,jj-1,jk) +tn(ji,jj,jk) * zfvj )334 zsai =-zbtr * ( zs1(ji,jj,jk) - zs1(ji-1,jj ,jk) +sn(ji,jj,jk) * zfui )335 zsaj =-zbtr * ( zs2(ji,jj,jk) - zs2(ji ,jj-1,jk) +sn(ji,jj,jk) * zfvj )334 ztai =-zbtr * ( zt1(ji,jj,jk) - zt1(ji-1,jj ,jk) - tn(ji,jj,jk) * zfui ) 335 ztaj =-zbtr * ( zt2(ji,jj,jk) - zt2(ji ,jj-1,jk) - tn(ji,jj,jk) * zfvj ) 336 zsai =-zbtr * ( zs1(ji,jj,jk) - zs1(ji-1,jj ,jk) - sn(ji,jj,jk) * zfui ) 337 zsaj =-zbtr * ( zs2(ji,jj,jk) - zs2(ji ,jj-1,jk) - sn(ji,jj,jk) * zfvj ) 336 338 ! save i- and j- advective trends computed as Uh gradh(T) 337 339 ttrdh(ji,jj,jk,1) = ztai … … 348 350 IF( MOD( kt, nf_ptr ) == 0 ) THEN 349 351 # if defined key_s_coord || defined key_partial_steps 350 pht_adv(: ,:) = prt_vj( zt2(:,:,:) )351 pst_adv(: ,:) = prt_vj( zs2(:,:,:) )352 pht_adv(:) = prt_vj( zt2(:,:,:) ) 353 pst_adv(:) = prt_vj( zs2(:,:,:) ) 352 354 # else 353 355 DO jk = 1, jpkm1 … … 359 361 END DO 360 362 END DO 361 pht_adv(: ,:) = prt_vj( zt2(:,:,:) )362 pst_adv(: ,:) = prt_vj( zs2(:,:,:) )363 pht_adv(:) = prt_vj( zt2(:,:,:) ) 364 pst_adv(:) = prt_vj( zs2(:,:,:) ) 363 365 # endif 364 366 ENDIF -
trunk/NEMO/OPA_SRC/TRA/trazdf_iso_vopt.F90
r34 r67 80 80 CALL tra_zdf_iso 81 81 82 IF( l_ctl .AND. lwp) THEN ! print mean trends (used for debugging)82 IF(l_ctl) THEN ! print mean trends (used for debugging) 83 83 zta = SUM( ta(2:jpim1,2:jpjm1,1:jpkm1) * tmask(2:jpim1,2:jpjm1,1:jpkm1) ) 84 84 zsa = SUM( sa(2:jpim1,2:jpjm1,1:jpkm1) * tmask(2:jpim1,2:jpjm1,1:jpkm1) ) … … 92 92 CALL tra_zdf_zdf( kt ) 93 93 94 IF( l_ctl .AND. lwp) THEN ! print mean trends (used for debugging)94 IF(l_ctl) THEN ! print mean trends (used for debugging) 95 95 zta = SUM( ta(2:jpim1,2:jpjm1,1:jpkm1) * tmask(2:jpim1,2:jpjm1,1:jpkm1) ) 96 96 zsa = SUM( sa(2:jpim1,2:jpjm1,1:jpkm1) * tmask(2:jpim1,2:jpjm1,1:jpkm1) ) 97 97 WRITE(numout,*) ' zdf 1- Ta: ', zta, ' Sa: ', zsa 98 98 ENDIF 99 100 101 99 102 100 END SUBROUTINE tra_zdf_iso_vopt … … 169 167 # if defined key_trdtra || defined key_trdmld 170 168 REAL(wp) :: zta, zsa !temporary scalars 169 REAL(wp), DIMENSION(jpi,jpj,jpk) :: ztrd 171 170 # endif 172 171 !!--------------------------------------------------------------------- … … 242 241 ! II.1. Vertical diffusion on t 243 242 ! --------------------------- 243 244 # if defined key_trdtra || defined key_trdmld 245 ! save the temperature trend 246 ztrd(:,:,:) = ta(:,:,:) 247 # endif 244 248 245 249 !! Matrix inversion from the first level … … 312 316 DO ji = fs_2, fs_jpim1 ! vector opt. 313 317 zta = ( ta(ji,jj,jk) - tb(ji,jj,jk) ) / r2dt(jk) 314 ttrd(ji,jj,jk,4) = zta - ta(ji,jj,jk) + ttrd(ji,jj,jk,4)318 ttrd(ji,jj,jk,4) = zta - ztrd(ji,jj,jk) + ttrd(ji,jj,jk,4) 315 319 END DO 316 320 END DO … … 321 325 DO ji = fs_2, fs_jpim1 ! vector opt. 322 326 zta = ( ta(ji,jj,jk) - tb(ji,jj,jk) ) / r2dt(jk) 323 ttrd(ji,jj,jk,4) = zta - ta(ji,jj,jk)327 ttrd(ji,jj,jk,4) = zta - ztrd(ji,jj,jk) 324 328 END DO 325 329 END DO … … 330 334 331 335 ! II.2 Vertical diffusion on salinity 332 ! ---------------------------======== 336 ! ----------------------------------- 337 338 # if defined key_trdtra || defined key_trdmld 339 ! save the salinity trend 340 ztrd(:,:,:) = sa(:,:,:) 341 # endif 333 342 334 343 #if defined key_zdfddm … … 426 435 DO ji = fs_2, fs_jpim1 ! vector opt. 427 436 zsa = ( sa(ji,jj,jk) - sb(ji,jj,jk) ) / r2dt(jk) 428 strd(ji,jj,jk,4) = zsa - sa(ji,jj,jk) + strd(ji,jj,jk,4)437 strd(ji,jj,jk,4) = zsa - ztrd(ji,jj,jk) + strd(ji,jj,jk,4) 429 438 END DO 430 439 END DO … … 435 444 DO ji = fs_2, fs_jpim1 ! vector opt. 436 445 zsa = ( sa(ji,jj,jk) - sb(ji,jj,jk) ) / r2dt(jk) 437 strd(ji,jj,jk,4) = zsa - sa(ji,jj,jk)446 strd(ji,jj,jk,4) = zsa - ztrd(ji,jj,jk) 438 447 END DO 439 448 END DO … … 511 520 zcoeg3, & ! " " 512 521 zuwki, zvwki, & ! " " 513 zuwk, z sav, & ! " "514 #endif 515 z vwk, ztav522 zuwk, zvwk, & ! " " 523 #endif 524 ztav, zsav 516 525 REAL(wp), DIMENSION(jpi,jpj,jpk) :: & 517 526 zwz, zwt, ztfw, zsfw ! temporary workspace arrays
Note: See TracChangeset
for help on using the changeset viewer.
