Changeset 74
- Timestamp:
- 2004-04-22T14:38:42+02:00 (20 years ago)
- Location:
- trunk/NEMO/OPA_SRC/TRA
- Files:
-
- 7 edited
-
traadv_cen2.F90 (modified) (5 diffs)
-
traadv_cen2_atsk.h90 (modified) (2 diffs)
-
traadv_tvd.F90 (modified) (2 diffs)
-
traldf_bilap.F90 (modified) (2 diffs)
-
traldf_bilapg.F90 (modified) (6 diffs)
-
traldf_iso.F90 (modified) (3 diffs)
-
traldf_lap.F90 (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/OPA_SRC/TRA/traadv_cen2.F90
r32 r74 13 13 USE oce ! ocean dynamics and active tracers 14 14 USE dom_oce ! ocean space and time domain 15 USE trdtra_oce ! ocean active tracer trends15 USE trdtra_oce ! ocean active tracer trends 16 16 USE flxrnf ! 17 17 USE trabbl ! advective term in the BBL 18 USE ocfzpt 18 USE ocfzpt ! 19 19 USE lib_mpp 20 USE lbclnk 20 USE lbclnk ! ocean lateral boundary condition (or mpp link) 21 21 USE in_out_manager ! I/O manager 22 USE ptr ! poleward transport diagnostics 22 23 23 24 IMPLICIT NONE … … 299 300 ! ! =============== 300 301 301 IF( l_ctl .AND. lwp) THEN302 IF(l_ctl) THEN 302 303 zta = SUM( ta(2:jpim1,2:jpjm1,1:jpkm1) * tmask(2:jpim1,2:jpjm1,1:jpkm1) ) 303 304 zsa = SUM( sa(2:jpim1,2:jpjm1,1:jpkm1) * tmask(2:jpim1,2:jpjm1,1:jpkm1) ) … … 310 311 IF( MOD( kt, nf_ptr ) == 0 ) THEN 311 312 # if defined key_s_coord || defined key_partial_steps 312 pht_adv(: ,:) = prt_vj( zwy(:,:,:) )313 pst_adv(: ,:) = prt_vj( zwz(:,:,:) )313 pht_adv(:) = prt_vj( zwy(:,:,:) ) 314 pst_adv(:) = prt_vj( zwz(:,:,:) ) 314 315 # else 315 316 DO jk = 1, jpkm1 … … 321 322 END DO 322 323 END DO 323 pht_adv(: ,:) = prt_vj( zwy(:,:,:) )324 pst_adv(: ,:) = prt_vj( zwz(:,:,:) )324 pht_adv(:) = prt_vj( zwy(:,:,:) ) 325 pst_adv(:) = prt_vj( zwz(:,:,:) ) 325 326 # endif 326 327 ENDIF … … 394 395 END DO 395 396 396 IF( l_ctl .AND. lwp) THEN397 IF(l_ctl) THEN 397 398 zta = SUM( ta(2:jpim1,2:jpjm1,1:jpkm1) * tmask(2:jpim1,2:jpjm1,1:jpkm1) ) 398 399 zsa = SUM( sa(2:jpim1,2:jpjm1,1:jpkm1) * tmask(2:jpim1,2:jpjm1,1:jpkm1) ) -
trunk/NEMO/OPA_SRC/TRA/traadv_cen2_atsk.h90
r32 r74 260 260 IF( MOD( kt, nf_ptr ) == 0 ) THEN 261 261 # if defined key_s_coord || defined key_partial_steps 262 pht_adv(: ,:) = prt_vj( zwy(:,:,:) )263 pst_adv(: ,:) = prt_vj( zwz(:,:,:) )262 pht_adv(:) = prt_vj( zwy(:,:,:) ) 263 pst_adv(:) = prt_vj( zwz(:,:,:) ) 264 264 # else 265 265 DO jk = 1, jpkm1 … … 271 271 END DO 272 272 END DO 273 pht_adv(: ,:) = prt_vj( zwy(:,:,:) )274 pst_adv(: ,:) = prt_vj( zwz(:,:,:) )273 pht_adv(:) = prt_vj( zwy(:,:,:) ) 274 pst_adv(:) = prt_vj( zwz(:,:,:) ) 275 275 # endif 276 276 ENDIF -
trunk/NEMO/OPA_SRC/TRA/traadv_tvd.F90
r3 r74 20 20 USE trabbl ! Advective term of BBL 21 21 USE lib_mpp 22 USE lbclnk 22 USE lbclnk ! ocean lateral boundary condition (or mpp link) 23 USE ptr ! poleward transport diagnostics 24 23 25 24 26 IMPLICIT NONE … … 268 270 IF( MOD( kt, nf_ptr ) == 0 ) THEN 269 271 ! "zonal" mean advective heat and salt transport 270 pht_adv(: ,:) = prt_vj( ztv(:,:,:) )271 pst_adv(: ,:) = prt_vj( zsv(:,:,:) )272 pht_adv(:) = prt_vj( ztv(:,:,:) ) 273 pst_adv(:) = prt_vj( zsv(:,:,:) ) 272 274 ENDIF 273 275 #endif -
trunk/NEMO/OPA_SRC/TRA/traldf_bilap.F90
r3 r74 12 12 USE oce ! ocean dynamics and active tracers 13 13 USE dom_oce ! ocean space and time domain 14 USE ldftra_oce ! ocean tracer lateral physics15 USE trdtra_oce ! ocean active tracer trend14 USE ldftra_oce ! ocean tracer lateral physics 15 USE trdtra_oce ! ocean active tracer trend 16 16 USE in_out_manager ! I/O manager 17 17 USE ldfslp ! iso-neutral slopes 18 18 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 19 USE ptr ! poleward transport diagnostics 19 20 20 21 IMPLICIT NONE … … 214 215 IF( MOD( kt, nf_ptr ) == 0 ) THEN 215 216 # if defined key_s_coord || defined key_partial_steps 216 pht_ldf(: ,:) = prt_vj( ztv(:,:,:) )217 pst_ldf(: ,:) = prt_vj( zsv(:,:,:) )217 pht_ldf(:) = prt_vj( ztv(:,:) ) 218 pst_ldf(:) = prt_vj( zsv(:,:) ) 218 219 # else 219 DO jk = 1, jpkm1 220 DO jj = 2, jpjm1 221 DO ji = fs_2, fs_jpim1 ! vector opt. 222 ztv(ji,jj,jk) = ztv(ji,jj,jk) * fse3v(ji,jj,jk) 223 zsv(ji,jj,jk) = zsv(ji,jj,jk) * fse3v(ji,jj,jk) 224 END DO 225 END DO 226 END DO 227 pht_ldf(:,:) = prt_vj( ztv(:,:,:) ) 228 pst_ldf(:,:) = prt_vj( zsv(:,:,:) ) 220 DO jj = 2, jpjm1 221 DO ji = fs_2, fs_jpim1 ! vector opt. 222 ztv(ji,jj) = ztv(ji,jj) * fse3v(ji,jj,jk) 223 zsv(ji,jj) = zsv(ji,jj) * fse3v(ji,jj,jk) 224 END DO 225 END DO 226 pht_ldf(:) = prt_vj( ztv(:,:) ) 227 pst_ldf(:) = prt_vj( zsv(:,:) ) 229 228 # endif 230 229 ENDIF -
trunk/NEMO/OPA_SRC/TRA/traldf_bilapg.F90
r32 r74 15 15 USE oce ! ocean dynamics and tracers variables 16 16 USE dom_oce ! ocean space and time domain variables 17 USE ldftra_oce ! ocean active tracers: lateral physics18 USE trdtra_oce ! ocean active tracers: trend variables17 USE ldftra_oce ! ocean active tracers: lateral physics 18 USE trdtra_oce ! ocean active tracers: trend variables 19 19 USE in_out_manager ! I/O manager 20 20 USE ldfslp ! iso-neutral slopes available 21 21 USE lbclnk ! ocean lateral boundary condition (or mpp link) 22 USE ptr ! poleward transport diagnostics 22 23 23 24 IMPLICIT NONE … … 87 88 ! and multiply by aht (output in (wk1,wk2) ) 88 89 89 CALL ldfght ( tb, sb, wk1, wk2, 1 )90 CALL ldfght ( kt, tb, sb, wk1, wk2, 1 ) 90 91 91 92 … … 98 99 ! (output in (wk3,wk4) ) 99 100 100 CALL ldfght ( wk1, wk2, wk3, wk4, 2 )101 CALL ldfght ( kt, wk1, wk2, wk3, wk4, 2 ) 101 102 102 103 … … 124 125 125 126 126 SUBROUTINE ldfght ( pt, ps, plt, pls, kaht )127 SUBROUTINE ldfght ( kt, pt, ps, plt, pls, kaht ) 127 128 !!---------------------------------------------------------------------- 128 129 !! *** ROUTINE ldfght *** … … 169 170 !!---------------------------------------------------------------------- 170 171 !! * Arguments 172 INTEGER, INTENT( in ) :: kt ! ocean time-step index 171 173 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT( in ) :: & 172 174 pt, ps ! tracer fields (before t and s for 1st call … … 271 273 ! ! =============== 272 274 275 IF( kaht == 2 .AND. MOD( kt, nf_ptr ) == 0 ) THEN 273 276 #if defined key_diaptr 274 IF( kaht == 2 .AND. MOD( kt, nf_ptr ) == 0 ) THEN275 277 ! "zonal" mean diffusive heat and salt transport 276 pht_ldf(:,:) = prt_vj( zftv(:,:,:) ) 277 pst_ldf(:,:) = prt_vj( zfsv(:,:,:) ) 278 ! pht_ldf(:) = prt_vj( zftv(:,:) ) 279 ! pst_ldf(:) = prt_vj( zfsv(:,:) ) 280 write(numout,cform_err) 281 nstop = nstop + 1 282 #endif 278 283 ENDIF 279 #endif280 284 281 285 -
trunk/NEMO/OPA_SRC/TRA/traldf_iso.F90
r34 r74 15 15 USE oce ! ocean dynamics and tracers variables 16 16 USE dom_oce ! ocean space and time domain variables 17 USE ldftra_oce ! ocean active tracers: lateral physics18 USE trdtra_oce ! ocean active tracers: trend variables17 USE ldftra_oce ! ocean active tracers: lateral physics 18 USE trdtra_oce ! ocean active tracers: trend variables 19 19 USE in_out_manager ! I/O manager 20 20 USE ldfslp ! iso-neutral slopes 21 USE lbclnk21 USE ptr ! poleward transport diagnostics 22 22 23 23 IMPLICIT NONE … … 232 232 ! ! =============== 233 233 234 IF( l_ctl .AND. lwp) THEN ! print mean trends (used for debugging)234 IF( l_ctl ) THEN ! print mean trends (used for debugging) 235 235 zta = SUM( ta(2:jpim1,2:jpjm1,1:jpkm1) * tmask(2:jpim1,2:jpjm1,1:jpkm1) ) 236 236 zsa = SUM( sa(2:jpim1,2:jpjm1,1:jpkm1) * tmask(2:jpim1,2:jpjm1,1:jpkm1) ) … … 243 243 IF( MOD( kt, nf_ptr ) == 0 ) THEN 244 244 ! "zonal" mean lateral diffusive heat and salt transports 245 pht_ldf(: ,:) = prt_vj( zftv(:,:,:) )246 pst_ldf(: ,:) = prt_vj( zfsv(:,:,:) )245 pht_ldf(:) = prt_vj( zftv(:,:,:) ) 246 pst_ldf(:) = prt_vj( zfsv(:,:,:) ) 247 247 ! "zonal" mean lateral eddy induced velocity heat and salt transports 248 pht_eiv(: ,:) = prt_vj( zftv(:,:,:) )249 pst_eiv(: ,:) = prt_vj( zfsv(:,:,:) )248 pht_eiv(:) = prt_vj( zftv(:,:,:) ) 249 pst_eiv(:) = prt_vj( zfsv(:,:,:) ) 250 250 ENDIF 251 251 #endif -
trunk/NEMO/OPA_SRC/TRA/traldf_lap.F90
r3 r74 12 12 USE oce ! ocean dynamics and active tracers 13 13 USE dom_oce ! ocean space and time domain 14 USE ldftra_oce ! ocean active tracers: lateral physics15 USE trdtra_oce ! ocean active tracer trends14 USE ldftra_oce ! ocean active tracers: lateral physics 15 USE trdtra_oce ! ocean active tracer trends 16 16 USE in_out_manager ! I/O manager 17 USE lbclnk 17 USE ptr ! poleward transport diagnostics 18 18 19 19 20 IMPLICIT NONE … … 141 142 ! ! ============= 142 143 144 IF( l_ctl ) THEN ! print mean trends (used for debugging) 145 zta = SUM( ta(2:jpim1,2:jpjm1,1:jpkm1) * tmask(2:jpim1,2:jpjm1,1:jpkm1) ) 146 zsa = SUM( sa(2:jpim1,2:jpjm1,1:jpkm1) * tmask(2:jpim1,2:jpjm1,1:jpkm1) ) 147 WRITE(numout,*) ' ldf - Ta: ', zta-t_ctl, ' Sa: ', zsa-s_ctl 148 t_ctl = zta ; s_ctl = zsa 149 ENDIF 150 143 151 #if defined key_diaptr 144 152 ! "zonal" mean lateral diffusive heat and salt transport 145 153 IF( MOD( kt, nf_ptr ) == 0 ) THEN 146 154 # if defined key_s_coord || defined key_partial_steps 147 pht_ldf(: ,:) = prt_vj( ztv(:,:,:) )148 pst_ldf(: ,:) = prt_vj( zsv(:,:,:) )155 pht_ldf(:) = prt_vj( ztv(:,:,:) ) 156 pst_ldf(:) = prt_vj( zsv(:,:,:) ) 149 157 # else 150 158 DO jk = 1, jpkm1 … … 156 164 END DO 157 165 END DO 158 pht_ldf(: ,:) = prt_vj( ztv(:,:,:) )159 pst_ldf(: ,:) = prt_vj( zsv(:,:,:) )166 pht_ldf(:) = prt_vj( ztv(:,:,:) ) 167 pst_ldf(:) = prt_vj( zsv(:,:,:) ) 160 168 # endif 161 169 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.
