Changeset 132 for trunk/NEMO
- Timestamp:
- 2004-07-07T14:51:53+02:00 (20 years ago)
- Location:
- trunk/NEMO/OPA_SRC
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/OPA_SRC/TRA/traadv_cen2.F90
r106 r132 20 20 USE lbclnk ! ocean lateral boundary condition (or mpp link) 21 21 USE in_out_manager ! I/O manager 22 USE ptr! poleward transport diagnostics22 USE diaptr ! poleward transport diagnostics 23 23 24 24 IMPLICIT NONE … … 307 307 ENDIF 308 308 309 #if defined key_diaptr310 309 ! "zonal" mean advective heat and salt transport 311 IF( MOD( kt, nf_ptr ) == 0) THEN310 IF( ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN 312 311 # if defined key_s_coord || defined key_partial_steps 313 pht_adv(:) = p rt_vj( zwy(:,:,:) )314 pst_adv(:) = p rt_vj( zwz(:,:,:) )312 pht_adv(:) = ptr_vj( zwy(:,:,:) ) 313 pst_adv(:) = ptr_vj( zwz(:,:,:) ) 315 314 # else 316 315 DO jk = 1, jpkm1 … … 322 321 END DO 323 322 END DO 324 pht_adv(:) = p rt_vj( zwy(:,:,:) )325 pst_adv(:) = p rt_vj( zwz(:,:,:) )323 pht_adv(:) = ptr_vj( zwy(:,:,:) ) 324 pst_adv(:) = ptr_vj( zwz(:,:,:) ) 326 325 # endif 327 326 ENDIF 328 #endif329 327 330 328 -
trunk/NEMO/OPA_SRC/TRA/traadv_cen2_atsk.h90
r106 r132 256 256 ENDIF 257 257 258 #if defined key_diaptr259 258 ! "zonal" mean advective heat and salt transport 260 IF( MOD( kt, nf_ptr ) == 0) THEN259 IF( ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN 261 260 # if defined key_s_coord || defined key_partial_steps 262 pht_adv(:) = p rt_vj( zwy(:,:,:) )263 pst_adv(:) = p rt_vj( zwz(:,:,:) )261 pht_adv(:) = ptr_vj( zwy(:,:,:) ) 262 pst_adv(:) = ptr_vj( zwz(:,:,:) ) 264 263 # else 265 264 DO jk = 1, jpkm1 … … 271 270 END DO 272 271 END DO 273 pht_adv(:) = p rt_vj( zwy(:,:,:) )274 pst_adv(:) = p rt_vj( zwz(:,:,:) )272 pht_adv(:) = ptr_vj( zwy(:,:,:) ) 273 pst_adv(:) = ptr_vj( zwz(:,:,:) ) 275 274 # endif 276 275 ENDIF 277 #endif278 276 279 277 ! II. Vertical advection -
trunk/NEMO/OPA_SRC/TRA/traadv_muscl.F90
r106 r132 19 19 USE lib_mpp 20 20 USE lbclnk ! ocean lateral boundary condition (or mpp link) 21 USE ptr! poleward transport diagnostics21 USE diaptr ! poleward transport diagnostics 22 22 23 23 IMPLICIT NONE … … 274 274 ENDIF 275 275 276 #if defined key_diaptr277 276 ! "zonal" mean advective heat and salt transport 278 IF( MOD( kt, nf_ptr ) == 0) THEN277 IF( ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN 279 278 # if defined key_s_coord || defined key_partial_steps 280 pht_adv(:) = p rt_vj( zt2(:,:,:) )281 pst_adv(:) = p rt_vj( zs2(:,:,:) )279 pht_adv(:) = ptr_vj( zt2(:,:,:) ) 280 pst_adv(:) = ptr_vj( zs2(:,:,:) ) 282 281 # else 283 282 DO jk = 1, jpkm1 … … 289 288 END DO 290 289 END DO 291 pht_adv(:) = p rt_vj( zt2(:,:,:) )292 pst_adv(:) = p rt_vj( zs2(:,:,:) )290 pht_adv(:) = ptr_vj( zt2(:,:,:) ) 291 pst_adv(:) = ptr_vj( zs2(:,:,:) ) 293 292 # endif 294 293 ENDIF 295 #endif296 297 294 298 295 ! II. Vertical advective fluxes -
trunk/NEMO/OPA_SRC/TRA/traadv_muscl2.F90
r106 r132 19 19 USE lib_mpp 20 20 USE lbclnk ! ocean lateral boundary condition (or mpp link) 21 USE ptr! poleward transport diagnostics21 USE diaptr ! poleward transport diagnostics 22 22 23 23 … … 335 335 ENDIF 336 336 337 #if defined key_diaptr338 337 ! "zonal" mean advective heat and salt transport 339 IF( MOD( kt, nf_ptr ) == 0) THEN338 IF( ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN 340 339 # if defined key_s_coord || defined key_partial_steps 341 pht_adv(:) = p rt_vj( zt2(:,:,:) )342 pst_adv(:) = p rt_vj( zs2(:,:,:) )340 pht_adv(:) = ptr_vj( zt2(:,:,:) ) 341 pst_adv(:) = ptr_vj( zs2(:,:,:) ) 343 342 # else 344 343 DO jk = 1, jpkm1 … … 350 349 END DO 351 350 END DO 352 pht_adv(:) = p rt_vj( zt2(:,:,:) )353 pst_adv(:) = p rt_vj( zs2(:,:,:) )351 pht_adv(:) = ptr_vj( zt2(:,:,:) ) 352 pst_adv(:) = ptr_vj( zs2(:,:,:) ) 354 353 # endif 355 354 ENDIF 356 #endif357 355 358 356 ! II. Vertical advective fluxes -
trunk/NEMO/OPA_SRC/TRA/traadv_tvd.F90
r106 r132 21 21 USE lib_mpp 22 22 USE lbclnk ! ocean lateral boundary condition (or mpp link) 23 USE ptr! poleward transport diagnostics23 USE diaptr ! poleward transport diagnostics 24 24 25 25 … … 267 267 ENDIF 268 268 269 #if defined key_diaptr 270 IF( MOD( kt, nf_ptr ) == 0 ) THEN 271 ! "zonal" mean advective heat and salt transport 272 pht_adv(:) = prt_vj( ztv(:,:,:) ) 273 pst_adv(:) = prt_vj( zsv(:,:,:) ) 269 ! "zonal" mean advective heat and salt transport 270 IF( ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN 271 pht_adv(:) = ptr_vj( ztv(:,:,:) ) 272 pst_adv(:) = ptr_vj( zsv(:,:,:) ) 274 273 ENDIF 275 #endif276 274 277 275 END SUBROUTINE tra_adv_tvd -
trunk/NEMO/OPA_SRC/TRA/traldf_bilap.F90
r74 r132 17 17 USE ldfslp ! iso-neutral slopes 18 18 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 19 USE ptr! poleward transport diagnostics19 USE diaptr ! poleward transport diagnostics 20 20 21 21 IMPLICIT NONE … … 84 84 !! 8.5 ! 02-08 (G. Madec) F90: Free form and module 85 85 !!---------------------------------------------------------------------- 86 !! * Modules used 87 USE oce , ztu => ua, & ! use ua as workspace 88 & ztv => va ! use va as workspace 89 86 90 !! * Arguments 87 91 INTEGER, INTENT( in ) :: kt ! ocean time-step index … … 95 99 REAL(wp), DIMENSION(jpi,jpj) :: & 96 100 zeeu, zeev, zbtr, & ! workspace 97 zlt, ztu, ztv, & 98 zls, zsu, zsv 101 zlt, zls 102 REAL(wp), DIMENSION(jpi,jpj,jpk) :: & 103 zsu, zsv 99 104 !!---------------------------------------------------------------------- 100 105 … … 134 139 DO jj = 1, jpjm1 135 140 DO ji = 1, fs_jpim1 ! vector opt. 136 ztu(ji,jj ) = zeeu(ji,jj) * ( tb(ji+1,jj ,jk) - tb(ji,jj,jk) )137 zsu(ji,jj ) = zeeu(ji,jj) * ( sb(ji+1,jj ,jk) - sb(ji,jj,jk) )138 ztv(ji,jj ) = zeev(ji,jj) * ( tb(ji ,jj+1,jk) - tb(ji,jj,jk) )139 zsv(ji,jj ) = zeev(ji,jj) * ( sb(ji ,jj+1,jk) - sb(ji,jj,jk) )141 ztu(ji,jj,jk) = zeeu(ji,jj) * ( tb(ji+1,jj ,jk) - tb(ji,jj,jk) ) 142 zsu(ji,jj,jk) = zeeu(ji,jj) * ( sb(ji+1,jj ,jk) - sb(ji,jj,jk) ) 143 ztv(ji,jj,jk) = zeev(ji,jj) * ( tb(ji ,jj+1,jk) - tb(ji,jj,jk) ) 144 zsv(ji,jj,jk) = zeev(ji,jj) * ( sb(ji ,jj+1,jk) - sb(ji,jj,jk) ) 140 145 END DO 141 146 END DO … … 147 152 ikv = MIN ( mbathy(ji,jj), mbathy(ji ,jj+1) ) - 1 148 153 IF( iku == jk ) THEN 149 ztu(ji,jj ) = zeeu(ji,jj) * gtu(ji,jj)150 zsu(ji,jj ) = zeeu(ji,jj) * gsu(ji,jj)154 ztu(ji,jj,jk) = zeeu(ji,jj) * gtu(ji,jj) 155 zsu(ji,jj,jk) = zeeu(ji,jj) * gsu(ji,jj) 151 156 ENDIF 152 157 IF( ikv == jk ) THEN 153 ztv(ji,jj ) = zeev(ji,jj) * gtv(ji,jj)154 zsv(ji,jj ) = zeev(ji,jj) * gsv(ji,jj)158 ztv(ji,jj,jk) = zeev(ji,jj) * gtv(ji,jj) 159 zsv(ji,jj,jk) = zeev(ji,jj) * gsv(ji,jj) 155 160 ENDIF 156 161 END DO … … 161 166 DO jj = 2, jpjm1 162 167 DO ji = fs_2, fs_jpim1 ! vector opt. 163 zlt(ji,jj) = zbtr(ji,jj) * ( ztu(ji,jj ) - ztu(ji-1,jj) + ztv(ji,jj) - ztv(ji,jj-1) )164 zls(ji,jj) = zbtr(ji,jj) * ( zsu(ji,jj ) - zsu(ji-1,jj) + zsv(ji,jj) - zsv(ji,jj-1) )168 zlt(ji,jj) = zbtr(ji,jj) * ( ztu(ji,jj,jk) - ztu(ji-1,jj,jk) + ztv(ji,jj,jk) - ztv(ji,jj-1,jk) ) 169 zls(ji,jj) = zbtr(ji,jj) * ( zsu(ji,jj,jk) - zsu(ji-1,jj,jk) + zsv(ji,jj,jk) - zsv(ji,jj-1,jk) ) 165 170 END DO 166 171 END DO … … 183 188 DO jj = 1, jpjm1 184 189 DO ji = 1, fs_jpim1 ! vector opt. 185 ztu(ji,jj ) = zeeu(ji,jj) * ( zlt(ji+1,jj ) - zlt(ji,jj) )186 zsu(ji,jj ) = zeeu(ji,jj) * ( zls(ji+1,jj ) - zls(ji,jj) )187 ztv(ji,jj ) = zeev(ji,jj) * ( zlt(ji ,jj+1) - zlt(ji,jj) )188 zsv(ji,jj ) = zeev(ji,jj) * ( zls(ji ,jj+1) - zls(ji,jj) )190 ztu(ji,jj,jk) = zeeu(ji,jj) * ( zlt(ji+1,jj ) - zlt(ji,jj) ) 191 zsu(ji,jj,jk) = zeeu(ji,jj) * ( zls(ji+1,jj ) - zls(ji,jj) ) 192 ztv(ji,jj,jk) = zeev(ji,jj) * ( zlt(ji ,jj+1) - zlt(ji,jj) ) 193 zsv(ji,jj,jk) = zeev(ji,jj) * ( zls(ji ,jj+1) - zls(ji,jj) ) 189 194 END DO 190 195 END DO … … 194 199 DO ji = fs_2, fs_jpim1 ! vector opt. 195 200 ! horizontal diffusive trends 196 zta = zbtr(ji,jj) * ( ztu(ji,jj ) - ztu(ji-1,jj) + ztv(ji,jj) - ztv(ji,jj-1) )197 zsa = zbtr(ji,jj) * ( zsu(ji,jj ) - zsu(ji-1,jj) + zsv(ji,jj) - zsv(ji,jj-1) )201 zta = zbtr(ji,jj) * ( ztu(ji,jj,jk) - ztu(ji-1,jj,jk) + ztv(ji,jj,jk) - ztv(ji,jj-1,jk) ) 202 zsa = zbtr(ji,jj) * ( zsu(ji,jj,jk) - zsu(ji-1,jj,jk) + zsv(ji,jj,jk) - zsv(ji,jj-1,jk) ) 198 203 ! add it to the general tracer trends 199 204 ta(ji,jj,jk) = ta(ji,jj,jk) + zta … … 210 215 ! ! =============== 211 216 212 #if defined key_diaptr213 217 ! "zonal" mean lateral diffusive heat and salt transport 214 == >> forced bug NOT implemented, ztv, zsv not 3D arrays 215 IF( MOD( kt, nf_ptr ) == 0 ) THEN 218 IF( ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN 216 219 # if defined key_s_coord || defined key_partial_steps 217 pht_ldf(:) = p rt_vj( ztv(:,:) )218 pst_ldf(:) = p rt_vj( zsv(:,:) )220 pht_ldf(:) = ptr_vj( ztv(:,:,:) ) 221 pst_ldf(:) = ptr_vj( zsv(:,:,:) ) 219 222 # else 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(:,:) ) 223 DO jk = 1, jpkm1 224 DO jj = 2, jpjm1 225 DO ji = fs_2, fs_jpim1 ! vector opt. 226 ztv(ji,jj,jk) = ztv(ji,jj,jk) * fse3v(ji,jj,jk) 227 zsv(ji,jj,jk) = zsv(ji,jj,jk) * fse3v(ji,jj,jk) 228 END DO 229 END DO 230 END DO 231 pht_ldf(:) = ptr_vj( ztv(:,:,:) ) 232 pst_ldf(:) = ptr_vj( zsv(:,:,:) ) 228 233 # endif 229 234 ENDIF 230 #endif231 235 232 236 END SUBROUTINE tra_ldf_bilap -
trunk/NEMO/OPA_SRC/TRA/traldf_bilapg.F90
r74 r132 20 20 USE ldfslp ! iso-neutral slopes available 21 21 USE lbclnk ! ocean lateral boundary condition (or mpp link) 22 USE ptr! poleward transport diagnostics22 USE diaptr ! poleward transport diagnostics 23 23 24 24 IMPLICIT NONE … … 67 67 !! 8.5 ! 02-08 (G. Madec) F90: Free form and module 68 68 !!---------------------------------------------------------------------- 69 !! * Modules used 70 USE oce , wk1 => ua, & ! use ua as workspace 71 & wk2 => va ! use va as workspace 72 69 73 !! * Arguments 70 74 INTEGER, INTENT( in ) :: kt ! ocean time-step index … … 73 77 INTEGER :: ji, jj, jk ! dummy loop indices 74 78 REAL(wp), DIMENSION(jpi,jpj,jpk) :: & 75 wk 1, wk2, &! work array used for rotated biharmonic76 wk3, wk4! operator on tracers and/or momentum79 wk3, wk4 ! work array used for rotated biharmonic 80 ! ! operator on tracers and/or momentum 77 81 !!---------------------------------------------------------------------- 78 82 … … 189 193 zcof0, zcof1, zcof2, & 190 194 zcof3, zcof4 191 REAL(wp), DIMENSION(jpi,jpj) :: 192 zftu, zf tv, zfsu, zfsv,& ! workspace195 REAL(wp), DIMENSION(jpi,jpj) :: & 196 zftu, zfsu, & ! workspace 193 197 zdkt, zdk1t, & 194 198 zdks, zdk1s 195 REAL(wp), DIMENSION(jpi,jpk) :: & 199 REAL(wp), DIMENSION(jpi,jpj,jpk) :: & 200 zftv, zfsv ! workspace (only v components for ptr) 201 REAL(wp), DIMENSION(jpi,jpk) :: & 196 202 zftw, zfsw, & ! workspace 197 203 zdit, zdjt, zdj1t, & … … 240 246 +zdk1t(ji+1,jj) + zdkt (ji,jj) ) ) 241 247 242 zftv(ji,jj )= vmask(ji,jj,jk) * &248 zftv(ji,jj,jk)= vmask(ji,jj,jk) * & 243 249 ( zabe2 *( pt(ji,jj+1,jk) - pt(ji,jj,jk) ) & 244 250 + zcof2 *( zdkt (ji,jj+1) + zdk1t(ji,jj) & … … 250 256 +zdk1s(ji+1,jj) + zdks (ji,jj) ) ) 251 257 252 zfsv(ji,jj )= vmask(ji,jj,jk) * &258 zfsv(ji,jj,jk)= vmask(ji,jj,jk) * & 253 259 ( zabe2 *( ps(ji,jj+1,jk) - ps(ji,jj,jk) ) & 254 260 + zcof2 *( zdks (ji,jj+1) + zdk1s(ji,jj) & … … 263 269 DO jj = 2 , jpjm1 264 270 DO ji = 2 , jpim1 265 ztah = zftu(ji,jj) - zftu(ji-1,jj) + zftv(ji,jj ) - zftv(ji,jj-1)266 zsah = zfsu(ji,jj) - zfsu(ji-1,jj) + zfsv(ji,jj ) - zfsv(ji,jj-1)271 ztah = zftu(ji,jj) - zftu(ji-1,jj) + zftv(ji,jj,jk) - zftv(ji,jj-1,jk) 272 zsah = zfsu(ji,jj) - zfsu(ji-1,jj) + zfsv(ji,jj,jk) - zfsv(ji,jj-1,jk) 267 273 plt(ji,jj,jk) = ztah 268 274 pls(ji,jj,jk) = zsah … … 273 279 ! ! =============== 274 280 275 IF( kaht == 2 .AND. MOD( kt, nf_ptr ) == 0 ) THEN 276 #if defined key_diaptr 277 ! "zonal" mean diffusive heat and salt transport 278 ! pht_ldf(:) = prt_vj( zftv(:,:) ) 279 ! pst_ldf(:) = prt_vj( zfsv(:,:) ) 280 write(numout,cform_err) 281 nstop = nstop + 1 282 #endif 281 ! "zonal" mean diffusive heat and salt transport 282 IF( ln_diaptr .AND. ( kaht == 2 ) .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN 283 pht_ldf(:) = ptr_vj( zftv(:,:,:) ) 284 pst_ldf(:) = ptr_vj( zfsv(:,:,:) ) 283 285 ENDIF 284 285 286 286 287 ! ! ************ ! ! =============== -
trunk/NEMO/OPA_SRC/TRA/traldf_iso.F90
r106 r132 19 19 USE in_out_manager ! I/O manager 20 20 USE ldfslp ! iso-neutral slopes 21 USE ptr! poleward transport diagnostics21 USE diaptr ! poleward transport diagnostics 22 22 23 23 IMPLICIT NONE … … 239 239 ENDIF 240 240 241 #if defined key_diaptr242 241 !!bug no separation of diff iso and eiv 243 IF( MOD( kt, nf_ptr ) == 0) THEN244 ! "zonal" mean lateral diffusive heat and salt transports245 pht_ldf(:) = p rt_vj( zftv(:,:,:) )246 pst_ldf(:) = p rt_vj( zfsv(:,:,:) )242 IF( ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN 243 ! "zonal" mean lateral diffusive heat and salt transports 244 pht_ldf(:) = ptr_vj( zftv(:,:,:) ) 245 pst_ldf(:) = ptr_vj( zfsv(:,:,:) ) 247 246 ! "zonal" mean lateral eddy induced velocity heat and salt transports 248 pht_eiv(:) = p rt_vj( zftv(:,:,:) )249 pst_eiv(:) = p rt_vj( zfsv(:,:,:) )247 pht_eiv(:) = ptr_vj( zftv(:,:,:) ) 248 pst_eiv(:) = ptr_vj( zfsv(:,:,:) ) 250 249 ENDIF 251 #endif252 250 253 251 END SUBROUTINE tra_ldf_iso -
trunk/NEMO/OPA_SRC/TRA/traldf_iso_zps.F90
r106 r132 19 19 USE in_out_manager ! I/O manager 20 20 USE ldfslp ! iso-neutral slopes 21 USE ptr! poleward transport diagnostics21 USE diaptr ! poleward transport diagnostics 22 22 23 23 … … 276 276 277 277 278 #if defined key_diaptr279 278 !!bug no separation of diff iso and eiv 280 IF( MOD( kt, nf_ptr ) == 0) THEN279 IF( ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN 281 280 ! "zonal" mean lateral diffusive heat and salt transports 282 pht_ldf(:) = p rt_vj( zftv(:,:,:) )283 pst_ldf(:) = p rt_vj( zfsv(:,:,:) )281 pht_ldf(:) = ptr_vj( zftv(:,:,:) ) 282 pst_ldf(:) = ptr_vj( zfsv(:,:,:) ) 284 283 ! "zonal" mean lateral eddy induced velocity heat and salt transports 285 pht_eiv(:) = p rt_vj( zftv(:,:,:) )286 pst_eiv(:) = p rt_vj( zfsv(:,:,:) )284 pht_eiv(:) = ptr_vj( zftv(:,:,:) ) 285 pst_eiv(:) = ptr_vj( zfsv(:,:,:) ) 287 286 ENDIF 288 #endif289 287 290 288 END SUBROUTINE tra_ldf_iso_zps -
trunk/NEMO/OPA_SRC/TRA/traldf_lap.F90
r106 r132 15 15 USE trdtra_oce ! ocean active tracer trends 16 16 USE in_out_manager ! I/O manager 17 USE ptr! poleward transport diagnostics17 USE diaptr ! poleward transport diagnostics 18 18 19 19 … … 149 149 ENDIF 150 150 151 #if defined key_diaptr152 151 ! "zonal" mean lateral diffusive heat and salt transport 153 IF( MOD( kt, nf_ptr ) == 0) THEN152 IF( ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN 154 153 # if defined key_s_coord || defined key_partial_steps 155 pht_ldf(:) = p rt_vj( ztv(:,:,:) )156 pst_ldf(:) = p rt_vj( zsv(:,:,:) )154 pht_ldf(:) = ptr_vj( ztv(:,:,:) ) 155 pst_ldf(:) = ptr_vj( zsv(:,:,:) ) 157 156 # else 158 157 DO jk = 1, jpkm1 … … 164 163 END DO 165 164 END DO 166 pht_ldf(:) = p rt_vj( ztv(:,:,:) )167 pst_ldf(:) = p rt_vj( zsv(:,:,:) )165 pht_ldf(:) = ptr_vj( ztv(:,:,:) ) 166 pst_ldf(:) = ptr_vj( zsv(:,:,:) ) 168 167 # endif 169 168 ENDIF 170 #endif171 169 172 170 END SUBROUTINE tra_ldf_lap -
trunk/NEMO/OPA_SRC/opa.F90
r109 r132 43 43 USE flxfwb ! 44 44 45 USE ptr! poleward transports (dia_ptr_init routine)45 USE diaptr ! poleward transports (dia_ptr_init routine) 46 46 47 47 USE step ! OPA time-stepping (stp routine) … … 199 199 CALL flx_fwb_init ! FreshWater Budget correction 200 200 201 #if defined key_diaptr 202 CALL dia_ptr_init ! Poleward TRansports 203 #endif 201 IF( ln_diaptr ) CALL dia_ptr_init ! Poleward TRansports initialization 204 202 205 203 ! ! =============== ! -
trunk/NEMO/OPA_SRC/step.F90
r108 r132 109 109 USE trdvor ! vorticity budget (trd_vor routine) 110 110 USE diahdy ! dynamic height (dia_hdy routine) 111 USE ptr ! poleward transports (dia_ptr_init routine) 112 ! ! (dia_ptr routine) 111 USE diaptr ! poleward transports (dia_ptr routine) 113 112 USE diahth ! thermocline depth (dia_hth routine) 114 113 USE diafwb ! freshwater budget (dia_fwb routine) … … 210 209 CALL dia_wri_state( 'output.init' ) 211 210 ENDIF 212 IF( lk_diaptr ) CALL dia_ptr_init ! Poleward TRansport initialization213 214 211 ENDIF 215 212 … … 447 444 IF( lk_diahdy ) CALL dia_hdy( kstp ) ! dynamical heigh diagnostics 448 445 IF( lk_diafwb ) CALL dia_fwb( kstp ) ! Fresh water budget diagnostics 449 #if defined key_diaptr 450 IF( kstp == nit000 .OR. MOD( kstp, nf_ptr ) == 0 )&446 447 IF( ln_diaptr .AND. ( kstp == nit000 .OR. MOD( kstp, nf_ptr ) == 0 ) ) & 451 448 CALL dia_ptr( kstp ) ! Poleward TRansports diagnostics 452 #endif453 449 454 450 ! ! save and outputs
Note: See TracChangeset
for help on using the changeset viewer.