Changeset 719 for trunk/NEMO/OPA_SRC/TRA
- Timestamp:
- 2007-10-16T16:59:56+02:00 (17 years ago)
- Location:
- trunk/NEMO/OPA_SRC/TRA
- Files:
-
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/OPA_SRC/TRA/traadv.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 46 46 !!---------------------------------------------------------------------- 47 47 !! OPA 9.0 , LOCEAN-IPSL (2006) 48 !! $ Id$48 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/TRA/traadv.F90,v 1.7 2007/06/05 11:00:53 opalod Exp $ 49 49 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 50 50 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/traadv_cen2.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r717 r719 1 1 MODULE traadv_cen2 2 !!====================================================================== 3 !! *** MODULE traadv_cen2 ***2 !!============================================================================== 3 !! *** MODULE traadv_cen2 *** 4 4 !! Ocean active tracers: horizontal & vertical advective trend 5 !!====================================================================== 6 !! History : 8.2 ! 01-08 (G. Madec, E. Durand) trahad+trazad=traadv 7 !! 8.5 ! 02-06 (G. Madec) F90: Free form and module 8 !! 9.0 ! 04-08 (C. Talandier) New trends organization 9 !! " " ! 05-11 (V. Garnier) Surface pressure gradient organization 10 !! " " ! 06-04 (R. Benshila, G. Madec) Step reorganization 11 !! " " ! 06-07 (G. madec) add ups_orca_set routine 5 !!============================================================================== 6 !! History : 8.2 ! 01-08 (G. Madec, E. Durand) trahad+trazad = traadv 7 !! 8.5 ! 02-06 (G. Madec) F90: Free form and module 8 !! 9.0 ! 05-11 (V. Garnier) Surface pressure gradient organization 9 !! " " ! 06-04 (R. Benshila, G. Madec) Step reorganization 12 10 !!---------------------------------------------------------------------- 13 11 … … 16 14 !! vertical advection trends using a seconder order 17 15 !! centered scheme. (k-j-i loops) 18 !! ups_orca_set : allow mixed upstream/centered scheme in specific19 !! area (set for orca 2 and 4 only)20 16 !!---------------------------------------------------------------------- 21 17 USE oce ! ocean dynamics and active tracers 22 18 USE dom_oce ! ocean space and time domain 23 USE sbc_oce ! surface boundary condition: ocean 24 USE dynspg_oce ! choice/control of key cpp for surface pressure gradient 19 USE trdmod ! ocean active tracers trends 25 20 USE trdmod_oce ! ocean variables trends 26 USE trdmod ! ocean active tracers trends 27 USE closea ! closed sea 21 USE flxrnf ! 28 22 USE trabbl ! advective term in the BBL 29 23 USE ocfzpt ! 30 USE sbcrnf ! river runoffs31 USE in_out_manager ! I/O manager32 24 USE lib_mpp 33 25 USE lbclnk ! ocean lateral boundary condition (or mpp link) 26 USE in_out_manager ! I/O manager 34 27 USE diaptr ! poleward transport diagnostics 28 USE dynspg_oce ! choice/control of key cpp for surface pressure gradient 35 29 USE prtctl ! Print control 36 30 … … 38 32 PRIVATE 39 33 40 PUBLIC tra_adv_cen2 ! routine called by step.F90 41 PUBLIC ups_orca_set ! routine used by traadv_cen2_jki.F90 42 43 REAL(wp), PUBLIC, DIMENSION(jpi,jpj) :: upsmsk !: mixed upstream/centered scheme near some straits 44 ! ! and in closed seas (orca 2 and 4 configurations) 34 PUBLIC tra_adv_cen2 ! routine called by step.F90 45 35 46 36 REAL(wp), DIMENSION(jpi,jpj) :: btr2 ! inverse of T-point surface [1/(e1t*e2t)] … … 50 40 # include "vectopt_loop_substitute.h90" 51 41 !!---------------------------------------------------------------------- 52 !! OPA 9.0 , LOCEAN-IPSL (200 6)53 !! $ Id$42 !! OPA 9.0 , LOCEAN-IPSL (2005) 43 !! $Header$ 54 44 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 55 45 !!---------------------------------------------------------------------- … … 129 119 !! 130 120 INTEGER :: ji, jj, jk ! dummy loop indices 131 REAL(wp) :: zta, zsa, zbtr, zhw, ze3tr, & ! temporary scalars 132 & zfp_ui, zfp_vj, zfp_w , zfui , & ! " " 133 & zfm_ui, zfm_vj, zfm_w , zfvj , & ! " " 134 & zcofi , zcofj , zcofk , & ! " " 135 & zupsut, zupsus, zcenut, zcenus, & ! " " 136 & zupsvt, zupsvs, zcenvt, zcenvs, & ! " " 137 & zupst , zupss , zcent , zcens , & ! " " 138 & z_hdivn_x, z_hdivn_y, z_hdivn 139 REAL(wp), DIMENSION(jpi,jpj,jpk) :: zwz, ztrdt, zind ! 3D workspace 121 REAL(wp) :: & 122 zbtr, zta, zsa, zfui, zfvj, & ! temporary scalars 123 zhw, ze3tr, zcofi, zcofj, & ! " " 124 zupsut, zupsvt, zupsus, zupsvs, & ! " " 125 zfp_ui, zfp_vj, zfm_ui, zfm_vj, & ! " " 126 zcofk, zupst, zupss, zcent, & ! " " 127 zcens, zfp_w, zfm_w, & ! " " 128 zcenut, zcenvt, zcenus, zcenvs, & ! " " 129 z_hdivn_x, z_hdivn_y, z_hdivn 130 REAL(wp), DIMENSION(jpi,jpj,jpk) :: zwz, ztrdt, zind ! 3D workspace 140 131 REAL(wp), DIMENSION(jpi,jpj,jpk) :: zww, ztrds ! " " 141 132 !!---------------------------------------------------------------------- … … 146 137 IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~ Vector optimization case' 147 138 IF(lwp) WRITE(numout,*) 148 ! 149 upsmsk(:,:) = 0.e0 ! not upstream by default 150 IF( cp_cfg == "orca" ) CALL ups_orca_set ! set mixed Upstream/centered scheme near some straits 151 ! ! and in closed seas (orca2 and orca4 only) 152 ! 153 btr2(:,:) = 1. / ( e1t(:,:) * e2t(:,:) ) ! inverse of T-point surface 139 ! 140 btr2(:,:) = 1. / ( e1t(:,:) * e2t(:,:) ) 154 141 ENDIF 155 142 … … 159 146 DO jj = 1, jpj 160 147 DO ji = 1, jpi 161 zind(ji,jj,jk) = MAX ( & 162 rnfmsk(ji,jj) * rnfmsk_z(jk), & ! near runoff mouths (& closed sea outflows) 163 upsmsk(ji,jj) & ! some of some straits 148 zind(ji,jj,jk) = MAX ( upsrnfh(ji,jj) * upsrnfz(jk), & ! changing advection scheme near runoff 149 & upsadv(ji,jj) & ! in the vicinity of some straits 164 150 #if defined key_ice_lim 165 ! ! below ice covered area (if tn < "freezing"+0.1 ) 166 , MAX( 0., SIGN( 1., fzptn(ji,jj) + 0.1 - tn(ji,jj,jk) ) ) * tmask(ji,jj,jk) & 151 & , tmask(ji,jj,jk) & ! half upstream tracer fluxes 152 & * MAX( 0., SIGN( 1., fzptn(ji,jj) & ! if tn < ("freezing"+0.1 ) 153 & +0.1-tn(ji,jj,jk) ) ) & 167 154 #endif 168 155 & ) … … 171 158 END DO 172 159 173 ! I. Horizontal advective fluxes 174 ! ------------------------------ 175 ! Second order centered tracer flux at u and v-points 176 ! ----------------------------------------------------- 160 161 ! Horizontal advective fluxes 162 ! ----------------------------- 177 163 ! ! =============== 178 164 DO jk = 1, jpkm1 ! Horizontal slab … … 222 208 zbtr = btr2(ji,jj) / fse3t(ji,jj,jk) 223 209 #endif 224 zta = - zbtr * ( zwx(ji,jj,jk) - zwx(ji-1,jj ,jk) & ! horizontal advective trends 210 ! horizontal advective trends 211 zta = - zbtr * ( zwx(ji,jj,jk) - zwx(ji-1,jj ,jk) & 225 212 & + zwy(ji,jj,jk) - zwy(ji ,jj-1,jk) ) 226 213 zsa = - zbtr * ( zww(ji,jj,jk) - zww(ji-1,jj ,jk) & 227 214 & + zwz(ji,jj,jk) - zwz(ji ,jj-1,jk) ) 228 ta(ji,jj,jk) = ta(ji,jj,jk) + zta ! add it to the general tracer trends 215 ! add it to the general tracer trends 216 ta(ji,jj,jk) = ta(ji,jj,jk) + zta 229 217 sa(ji,jj,jk) = sa(ji,jj,jk) + zsa 230 218 END DO … … 291 279 & tab3d_2=sa, clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 292 280 293 ! "zonal" mean advective heat and salt transport 281 ! 4. "zonal" mean advective heat and salt transport 282 ! ------------------------------------------------- 283 294 284 IF( ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN 295 285 IF( lk_zco ) THEN … … 323 313 ENDIF 324 314 325 ! 1. Vertical advective fluxes (Second order centered tracer flux at w-point)315 ! 1. Vertical advective fluxes 326 316 ! ---------------------------- 317 ! Second order centered tracer flux at w-point 327 318 DO jk = 2, jpk 328 319 DO jj = 2, jpjm1 329 320 DO ji = fs_2, fs_jpim1 ! vector opt. 330 zcofk = MAX( zind(ji,jj,jk-1), zind(ji,jj,jk) ) ! upstream indicator 331 zhw = 0.5 * pwn(ji,jj,jk) ! velocity * 1/2 332 zfp_w = zhw + ABS( zhw ) ! upstream scheme 321 ! upstream indicator 322 zcofk = MAX( zind(ji,jj,jk-1), zind(ji,jj,jk) ) 323 ! velocity * 1/2 324 zhw = 0.5 * pwn(ji,jj,jk) 325 ! upstream scheme 326 zfp_w = zhw + ABS( zhw ) 333 327 zfm_w = zhw - ABS( zhw ) 334 328 zupst = zfp_w * tb(ji,jj,jk) + zfm_w * tb(ji,jj,jk-1) 335 329 zupss = zfp_w * sb(ji,jj,jk) + zfm_w * sb(ji,jj,jk-1) 336 zcent = zhw * ( tn(ji,jj,jk) + tn(ji,jj,jk-1) ) ! centered scheme 330 ! centered scheme 331 zcent = zhw * ( tn(ji,jj,jk) + tn(ji,jj,jk-1) ) 337 332 zcens = zhw * ( sn(ji,jj,jk) + sn(ji,jj,jk-1) ) 338 zwx(ji,jj,jk) = zcofk * zupst + (1.-zcofk) * zcent ! mixed centered / upstream scheme 333 ! mixed centered / upstream scheme 334 zwx(ji,jj,jk) = zcofk * zupst + (1.-zcofk) * zcent 339 335 zwy(ji,jj,jk) = zcofk * zupss + (1.-zcofk) * zcens 340 336 END DO … … 348 344 DO ji = fs_2, fs_jpim1 ! vector opt. 349 345 ze3tr = 1. / fse3t(ji,jj,jk) 350 zta = - ze3tr * ( zwx(ji,jj,jk) - zwx(ji,jj,jk+1) ) ! vertical advective trends 346 ! vertical advective trends 347 zta = - ze3tr * ( zwx(ji,jj,jk) - zwx(ji,jj,jk+1) ) 351 348 zsa = - ze3tr * ( zwy(ji,jj,jk) - zwy(ji,jj,jk+1) ) 352 ta(ji,jj,jk) = ta(ji,jj,jk) + zta ! add it to the general tracer trends 349 ! add it to the general tracer trends 350 ta(ji,jj,jk) = ta(ji,jj,jk) + zta 353 351 sa(ji,jj,jk) = sa(ji,jj,jk) + zsa 354 352 END DO … … 389 387 ! 390 388 END SUBROUTINE tra_adv_cen2 391 392 393 SUBROUTINE ups_orca_set394 !!----------------------------------------------------------------------395 !! *** ROUTINE ups_orca_set ***396 !!397 !! ** Purpose : add a portion of upstream scheme in area where the398 !! centered scheme generates too strong overshoot399 !!400 !! ** Method : orca (R4 and R2) confiiguration setting. Set upsmsk401 !! array to nozero value in some straith.402 !!403 !! ** Action : - upsmsk set to 1 at some strait, 0 elsewhere for orca404 !!----------------------------------------------------------------------405 INTEGER :: ii0, ii1, ij0, ij1 ! temporary integers406 !!----------------------------------------------------------------------407 408 ! mixed upstream/centered scheme near river mouths409 ! ------------------------------------------------410 SELECT CASE ( jp_cfg )411 ! ! =======================412 CASE ( 4 ) ! ORCA_R4 configuration413 ! ! =======================414 ! ! Gibraltar Strait415 ii0 = 70 ; ii1 = 71416 ij0 = 52 ; ij1 = 53 ; upsmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0.50417 !418 ! ! =======================419 CASE ( 2 ) ! ORCA_R2 configuration420 ! ! =======================421 ! ! Gibraltar Strait422 ij0 = 102 ; ij1 = 102423 ii0 = 138 ; ii1 = 138 ; upsmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0.20424 ii0 = 139 ; ii1 = 139 ; upsmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0.40425 ii0 = 140 ; ii1 = 140 ; upsmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0.50426 ij0 = 101 ; ij1 = 102427 ii0 = 141 ; ii1 = 141 ; upsmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0.50428 ! ! Bab el Mandeb Strait429 ij0 = 87 ; ij1 = 88430 ii0 = 164 ; ii1 = 164 ; upsmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0.10431 ij0 = 88 ; ij1 = 88432 ii0 = 163 ; ii1 = 163 ; upsmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0.25433 ii0 = 162 ; ii1 = 162 ; upsmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0.40434 ii0 = 160 ; ii1 = 161 ; upsmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0.50435 ij0 = 89 ; ij1 = 89436 ii0 = 158 ; ii1 = 160 ; upsmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0.25437 ij0 = 90 ; ij1 = 90438 ii0 = 160 ; ii1 = 160 ; upsmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0.25439 ! ! Sound Strait440 ij0 = 116 ; ij1 = 116441 ii0 = 144 ; ii1 = 144 ; upsmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0.25442 ii0 = 145 ; ii1 = 147 ; upsmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0.50443 ii0 = 148 ; ii1 = 148 ; upsmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0.25444 !445 END SELECT446 447 ! mixed upstream/centered scheme over closed seas448 ! -----------------------------------------------449 CALL clo_ups( upsmsk(:,:) )450 !451 END SUBROUTINE ups_orca_set452 389 453 390 !!====================================================================== -
trunk/NEMO/OPA_SRC/TRA/traadv_cen2_jki.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r717 r719 4 4 !! Ocean active tracers: horizontal & vertical advective trend 5 5 !!============================================================================== 6 !! History : 8.2 ! 01-08 (G. Madec, E. Durand) trahad+trazad = traadv 7 !! 8.5 ! 02-06 (G. Madec) F90: Free form and module 8 !! 9.0 ! 04-08 (C. Talandier) New trends organization 9 !! " " ! 05-11 (V. Garnier) Surface pressure gradient organization 10 !! " " ! 06-04 (R. Benshila, G. Madec) Step reorganization 11 !! " " ! 06-07 (G. madec) add ups_orca_set routine 6 !! History : 8.2 ! 01-08 (G. Madec, E. Durand) trahad+trazad = traadv 7 !! 8.5 ! 02-06 (G. Madec) F90: Free form and module 8 !! 9.0 ! 05-11 (V. Garnier) Surface pressure gradient organization 9 !! " " ! 06-04 (R. Benshila, G. Madec) Step reorganization 12 10 !!---------------------------------------------------------------------- 13 11 14 12 !!---------------------------------------------------------------------- 15 13 !! tra_adv_cen2_jki : update the tracer trend with the horizontal and 16 !! 17 !! 18 !! 14 !! vertical advection trends using a seconder order 15 !! centered scheme. Auto-tasking case, k-slab for 16 !! hor. adv., j-slab for vert. adv. (j-k-i loops) 19 17 !!---------------------------------------------------------------------- 20 18 USE oce ! ocean dynamics and active tracers 21 19 USE dom_oce ! ocean space and time domain 22 USE dynspg_oce ! choice/control of key cpp for surface pressure gradient20 USE trdmod ! ocean active tracers trends 23 21 USE trdmod_oce ! ocean variables trends 24 USE sbc_oce ! surface boundary condition: ocean 25 USE trdmod ! ocean active tracers trends 22 USE flxrnf ! 26 23 USE trabbl ! advective term in the BBL 27 24 USE ocfzpt ! 28 25 USE lib_mpp 29 26 USE lbclnk ! ocean lateral boundary condition (or mpp link) 30 USE sbcrnf ! river runoffs31 27 USE in_out_manager ! I/O manager 32 28 USE diaptr ! poleward transport diagnostics 29 USE dynspg_oce ! choice/control of key cpp for surface pressure gradient 33 30 USE prtctl ! Print control 34 31 35 32 IMPLICIT NONE 36 33 PRIVATE 37 34 38 PUBLIC tra_adv_cen2_jki 39 40 REAL(wp), DIMENSION(jpi,jpj) :: btr2 35 PUBLIC tra_adv_cen2_jki ! routine called by step.F90 36 37 REAL(wp), DIMENSION(jpi,jpj) :: btr2 ! inverse of T-point surface [1/(e1t*e2t)] 41 38 42 39 !! * Substitutions … … 45 42 !!---------------------------------------------------------------------- 46 43 !! OPA 9.0 , LOCEAN-IPSL (2005) 47 !! $ Id$44 !! $Header$ 48 45 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 49 46 !!---------------------------------------------------------------------- … … 90 87 !! zta+tn*divn=1/(e1t*e2t*e3t) { mi-1( e2u*e3u un di[tn] ) 91 88 !! +mj-1( e1v*e3v vn mj[tn] ) } 92 !! C A U T I O N : the trend saved is the centered trend only.93 !! It does not take into account the upstream part of the scheme.94 89 !! NB:in z-coordinate - full step (ln_zco=T) e3u=e3v=e3t, so 95 90 !! they vanish from the expression of the flux and divergence. … … 114 109 !! 115 110 !! ** Action : - update (ta,sa) with the now advective tracer trends 111 !! - save trends in (ztrdt,ztrds) ('key_trdtra') 116 112 !!---------------------------------------------------------------------- 117 USE oce , zwx => ua! use ua as workspace118 USE oce , zwy => va! use va as workspace119 USE traadv_cen2, ONLY : ups_orca_set, & ! upstream indicator near some straits120 & upsmsk ! and over closed sea (orca 2 and 4)121 122 INTEGER , INTENT(in) :: kt ! ocean time-step index123 REAL(wp), INTENT(in), DIMENSION(jpi,jpj,jpk) :: p un, pvn, pwn ! now ocean velocity fields124 113 USE oce, ONLY : zwx => ua ! use ua as workspace 114 USE oce, ONLY : zwy => va ! use va as workspace 115 !! 116 INTEGER , INTENT(in) :: kt ! ocean time-step index 117 REAL(wp), INTENT(in), DIMENSION(jpi,jpj,jpk) :: pun ! ocean velocity u-component 118 REAL(wp), INTENT(in), DIMENSION(jpi,jpj,jpk) :: pvn ! ocean velocity v-component 119 REAL(wp), INTENT(in), DIMENSION(jpi,jpj,jpk) :: pwn ! ocean velocity w-component 120 !! 125 121 INTEGER :: ji, jj, jk ! dummy loop indices 126 REAL(wp) :: zta, zsa, zbtr, zhw, ze3tr, & ! temporary scalars 127 & zfp_ui, zfp_vj, zfp_w , zfui , & ! " " 128 & zfm_ui, zfm_vj, zfm_w , zfvj , & ! " " 129 & zcofi , zcofj , zcofk , & ! " " 130 & zupsut, zupsus, zcenut, zcenus, & ! " " 131 & zupsvt, zupsvs, zcenvt, zcenvs, & ! " " 132 & zupst , zupss , zcent , zcens , & ! " " 133 & z_hdivn_x, z_hdivn_y, z_hdivn 134 REAL(wp), DIMENSION(jpi,jpj,jpk) :: zwz, ztrdt, zind, & ! temporary workspace arrays 135 & zww, ztrds ! " " 122 REAL(wp) :: & 123 zbtr, zta, zsa, zfui, zfvj, & ! temporary scalars 124 zhw, ze3tr, zcofi, zcofj, & ! " " 125 zupsut, zupsvt, zupsus, zupsvs, & ! " " 126 zfp_ui, zfp_vj, zfm_ui, zfm_vj, & ! " " 127 zcofk, zupst, zupss, zcent, & ! " " 128 zcens, zfp_w, zfm_w, & ! " " 129 zcenut, zcenvt, zcenus, zcenvs, & ! " " 130 z_hdivn_x, z_hdivn_y, z_hdivn 131 REAL(wp), DIMENSION(jpi,jpj,jpk) :: zwz, ztrdt, zind ! 3D workspace 132 REAL(wp), DIMENSION(jpi,jpj,jpk) :: zww, ztrds ! " " 136 133 !!---------------------------------------------------------------------- 137 ! 134 138 135 IF( kt == nit000 ) THEN 139 136 IF(lwp) WRITE(numout,*) … … 141 138 IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~ Auto-tasking case' 142 139 IF(lwp) WRITE(numout,*) 143 ! 144 upsmsk(:,:) = 0.e0 ! not upstream by default 145 IF( cp_cfg == "orca" ) CALL ups_orca_set ! set mixed Upstream/centered scheme near some straits 146 ! ! and in closed seas (orca2 and orca4 only) 147 148 btr2(:,:) = 1. / ( e1t(:,:) * e2t(:,:) ) ! inverse of T-point surface 140 ! 141 btr2(:,:) = 1. / ( e1t(:,:) * e2t(:,:) ) 149 142 ENDIF 150 143 … … 154 147 DO jk = 1, jpkm1 ! Horizontal slab 155 148 ! ! =============== 156 157 ! 0. Upstream / centered scheme indicator 158 ! --------------------------------------- 149 ! Upstream / centered scheme indicator 150 ! -------------------------------------- 159 151 DO jj = 1, jpj 160 152 DO ji = 1, jpi 161 zind(ji,jj,jk) = MAX (&162 rnfmsk(ji,jj) * rnfmsk_z(jk), & ! near runoff mouths (& closed sea outflows)163 ups msk(ji,jj) & ! someof some straits153 zind(ji,jj,jk) = MAX ( & 154 upsrnfh(ji,jj) * upsrnfz(jk), & ! changing advection scheme near runoff 155 upsadv(ji,jj) & ! in the vicinity of some straits 164 156 #if defined key_ice_lim 165 ! ! below ice covered area (if tn < "freezing"+0.1 ) 166 , MAX( 0., SIGN( 1., fzptn(ji,jj) + 0.1 - tn(ji,jj,jk) ) ) * tmask(ji,jj,jk) & 167 #endif 168 & ) 169 END DO 170 END DO 171 172 173 ! I. Horizontal advective fluxes 174 ! ------------------------------ 157 , tmask(ji,jj,jk) & ! half upstream tracer fluxes if tn < ("freezing"+0.1 ) 158 * MAX( 0., SIGN( 1., fzptn(ji,jj)+0.1-tn(ji,jj,jk) ) ) & 159 #endif 160 ) 161 END DO 162 END DO 163 164 ! Horizontal advective fluxes 165 ! ----------------------------- 175 166 ! Second order centered tracer flux at u and v-points 176 167 DO jj = 1, jpjm1 177 168 DO ji = 1, fs_jpim1 ! vector opt. 178 zcofi = MAX( zind(ji+1,jj,jk), zind(ji,jj,jk) ) ! upstream indicator 169 ! upstream indicator 170 zcofi = MAX( zind(ji+1,jj,jk), zind(ji,jj,jk) ) 179 171 zcofj = MAX( zind(ji,jj+1,jk), zind(ji,jj,jk) ) 180 #if defined key_zco 181 zfui = 0.5 * e2u(ji,jj) * pun(ji,jj,jk) ! volume fluxes * 1/2 (zco) 172 ! volume fluxes * 1/2 173 #if defined key_zco 174 zfui = 0.5 * e2u(ji,jj) * pun(ji,jj,jk) 182 175 zfvj = 0.5 * e1v(ji,jj) * pvn(ji,jj,jk) 183 176 #else 184 zfui = 0.5 * e2u(ji,jj) * fse3u(ji,jj,jk) * pun(ji,jj,jk) ! volume fluxes * 1/2177 zfui = 0.5 * e2u(ji,jj) * fse3u(ji,jj,jk) * pun(ji,jj,jk) 185 178 zfvj = 0.5 * e1v(ji,jj) * fse3v(ji,jj,jk) * pvn(ji,jj,jk) 186 179 #endif 187 zfp_ui = zfui + ABS( zfui ) ! upstream scheme 180 ! upstream scheme 181 zfp_ui = zfui + ABS( zfui ) 188 182 zfp_vj = zfvj + ABS( zfvj ) 189 183 zfm_ui = zfui - ABS( zfui ) … … 193 187 zupsus = zfp_ui * sb(ji,jj,jk) + zfm_ui * sb(ji+1,jj ,jk) 194 188 zupsvs = zfp_vj * sb(ji,jj,jk) + zfm_vj * sb(ji ,jj+1,jk) 195 zcenut = zfui * ( tn(ji,jj,jk) + tn(ji+1,jj ,jk) ) ! centered scheme 189 ! centered scheme 190 zcenut = zfui * ( tn(ji,jj,jk) + tn(ji+1,jj ,jk) ) 196 191 zcenvt = zfvj * ( tn(ji,jj,jk) + tn(ji ,jj+1,jk) ) 197 192 zcenus = zfui * ( sn(ji,jj,jk) + sn(ji+1,jj ,jk) ) 198 193 zcenvs = zfvj * ( sn(ji,jj,jk) + sn(ji ,jj+1,jk) ) 199 zwx(ji,jj,jk) = zcofi * zupsut + (1.-zcofi) * zcenut ! mixed centered / upstream scheme 194 ! mixed centered / upstream scheme 195 zwx(ji,jj,jk) = zcofi * zupsut + (1.-zcofi) * zcenut 200 196 zwy(ji,jj,jk) = zcofj * zupsvt + (1.-zcofj) * zcenvt 201 197 zww(ji,jj,jk) = zcofi * zupsus + (1.-zcofi) * zcenus … … 204 200 END DO 205 201 206 ! 2. Tracer flux divergence at t-point added to the general trend 207 ! --------------------------------------------------------------- 208 202 ! Tracer flux divergence at t-point added to the general trend 209 203 DO jj = 2, jpjm1 210 204 DO ji = fs_2, fs_jpim1 ! vector opt. 211 205 #if defined key_zco 212 zbtr = btr2(ji,jj) ! inverse of the volume (zco) 213 #else 214 zbtr = btr2(ji,jj) / fse3t(ji,jj,jk) ! inverse of the volume 215 #endif 216 zta = - zbtr * ( zwx(ji,jj,jk) - zwx(ji-1,jj ,jk) & ! horizontal advective trends 206 zbtr = btr2(ji,jj) 207 #else 208 zbtr = btr2(ji,jj) / fse3t(ji,jj,jk) 209 #endif 210 ! horizontal advective trends 211 zta = - zbtr * ( zwx(ji,jj,jk) - zwx(ji-1,jj ,jk) & 217 212 & + zwy(ji,jj,jk) - zwy(ji ,jj-1,jk) ) 218 213 zsa = - zbtr * ( zww(ji,jj,jk) - zww(ji-1,jj ,jk) & 219 214 & + zwz(ji,jj,jk) - zwz(ji ,jj-1,jk) ) 220 ta(ji,jj,jk) = ta(ji,jj,jk) + zta ! add it to the general tracer trends 215 ! add it to the general tracer trends 216 ta(ji,jj,jk) = ta(ji,jj,jk) + zta 221 217 sa(ji,jj,jk) = sa(ji,jj,jk) + zsa 222 218 END DO … … 229 225 & tab3d_2=sa, clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 230 226 231 ! 3. Save the horizontal advective trends for diagnostic227 ! Save the horizontal advective trends for diagnostics 232 228 IF( l_trdtra ) THEN 233 229 ztrdt(:,:,:) = 0.e0 ; ztrds(:,:,:) = 0.e0 … … 302 298 ENDIF 303 299 304 ! II.Vertical advection305 ! -------------------- --300 ! Vertical advection 301 ! -------------------- 306 302 !CDIR PARALLEL DO 307 303 !$OMP PARALLEL DO … … 316 312 IF( lk_dynspg_rl ) THEN ! rigid lid : flux set to zero 317 313 zwz(:,jj, 1 ) = 0.e0 ; zww(:,jj, 1 ) = 0.e0 318 ELSE ! free surface-constant volume : advection across the surface314 ELSE ! free surface-constant volume 319 315 zwz(:,jj, 1 ) = pwn(:,jj,1) * tn(:,jj,1) 320 316 zww(:,jj, 1 ) = pwn(:,jj,1) * sn(:,jj,1) 321 317 ENDIF 322 318 323 ! 1. Vertical advective fluxes (Second order centered tracer flux at w-point) 324 ! ---------------------------- 319 ! Vertical advective fluxes at w-point 325 320 DO jk = 2, jpk 326 321 DO ji = 2, jpim1 327 zcofk = MAX( zind(ji,jj,jk-1), zind(ji,jj,jk) ) ! upstream indicator 328 zhw = 0.5 * pwn(ji,jj,jk) ! velocity * 1/2 329 zfp_w = zhw + ABS( zhw ) ! upstream scheme 322 ! upstream indicator 323 zcofk = MAX( zind(ji,jj,jk-1), zind(ji,jj,jk) ) 324 ! velocity * 1/2 325 zhw = 0.5 * pwn(ji,jj,jk) 326 ! upstream scheme 327 zfp_w = zhw + ABS( zhw ) 330 328 zfm_w = zhw - ABS( zhw ) 331 329 zupst = zfp_w * tb(ji,jj,jk) + zfm_w * tb(ji,jj,jk-1) 332 330 zupss = zfp_w * sb(ji,jj,jk) + zfm_w * sb(ji,jj,jk-1) 333 zcent = zhw * ( tn(ji,jj,jk) + tn(ji,jj,jk-1) ) ! centered scheme 331 ! centered scheme 332 zcent = zhw * ( tn(ji,jj,jk) + tn(ji,jj,jk-1) ) 334 333 zcens = zhw * ( sn(ji,jj,jk) + sn(ji,jj,jk-1) ) 335 zwz(ji,jj,jk) = zcofk * zupst + (1.-zcofk) * zcent ! mixed centered / upstream scheme 334 ! mixed centered / upstream scheme 335 zwz(ji,jj,jk) = zcofk * zupst + (1.-zcofk) * zcent 336 336 zww(ji,jj,jk) = zcofk * zupss + (1.-zcofk) * zcens 337 337 END DO 338 338 END DO 339 339 340 ! 2. Tracer flux divergence at t-point added to the general trend 341 ! ------------------------- 340 ! Tracer flux divergence at t-point added to the general trend 342 341 DO jk = 1, jpkm1 343 342 DO ji = 2, jpim1 344 343 ze3tr = 1. / fse3t(ji,jj,jk) 345 zta = - ze3tr * ( zwz(ji,jj,jk) - zwz(ji,jj,jk+1) ) ! vertical advective trends 344 ! vertical advective trends 345 zta = - ze3tr * ( zwz(ji,jj,jk) - zwz(ji,jj,jk+1) ) 346 346 zsa = - ze3tr * ( zww(ji,jj,jk) - zww(ji,jj,jk+1) ) 347 ta(ji,jj,jk) = ta(ji,jj,jk) + zta ! add it to the general tracer trends 347 ! add it to the general tracer trends 348 ta(ji,jj,jk) = ta(ji,jj,jk) + zta 348 349 sa(ji,jj,jk) = sa(ji,jj,jk) + zsa 349 350 END DO … … 353 354 ! ! =============== 354 355 355 ! 3. Save the vertical advective trends for diagnostic 356 ! ---------------------------------------------------- 356 ! Save the vertical advective trends for diagnostic 357 357 IF( l_trdtra ) THEN 358 358 ! Recompute the vertical advection zta & zsa trends computed -
trunk/NEMO/OPA_SRC/TRA/traadv_eiv.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 33 33 !!---------------------------------------------------------------------- 34 34 !! OPA 9.0 , LOCEAN-IPSL (2006) 35 !! $ Id$35 !! $Header$ 36 36 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 37 37 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/traadv_muscl.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 35 35 !!---------------------------------------------------------------------- 36 36 !! OPA 9.0 , LOCEAN-IPSL (2006) 37 !! $ Id$37 !! $Header$ 38 38 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 39 39 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/traadv_muscl2.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 34 34 !!---------------------------------------------------------------------- 35 35 !! OPA 9.0 , LOCEAN-IPSL (2006) 36 !! $ Id$36 !! $Header$ 37 37 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 38 38 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/traadv_qck.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r708 r719 14 14 USE oce ! ocean dynamics and active tracers 15 15 USE dom_oce ! ocean space and time domain 16 USE dynspg_oce !16 USE trdmod ! ocean active tracers trends 17 17 USE trdmod_oce ! ocean variables trends 18 USE trdmod ! ocean active tracers trends18 USE flxrnf ! 19 19 USE trabbl ! advective term in the BBL 20 USE ocfzpt ! 20 21 USE lib_mpp 21 22 USE lbclnk ! ocean lateral boundary condition (or mpp link) 22 23 USE in_out_manager ! I/O manager 23 24 USE diaptr ! poleward transport diagnostics 25 USE dynspg_oce ! 24 26 USE prtctl ! Print control 25 27 … … 45 47 !!---------------------------------------------------------------------- 46 48 !! OPA 9.0 , LOCEAN-IPSL (2005) 47 !! $ Id$49 !! $Header$ 48 50 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 49 51 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/traadv_tvd.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 45 45 !!---------------------------------------------------------------------- 46 46 !! OPA 9.0 , LOCEAN-IPSL (2006) 47 !! $ Id$47 !! $Header$ 48 48 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 49 49 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/traadv_ubs.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 34 34 !!---------------------------------------------------------------------- 35 35 !! OPA 9.0 , LOCEAN-IPSL (2006) 36 !! $ Id$36 !! $Header$ 37 37 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 38 38 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/trabbc.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 43 43 !!---------------------------------------------------------------------- 44 44 !! OPA 9.0 , LOCEAN-IPSL (2006) 45 !! $ Id$45 !! $Header$ 46 46 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 47 47 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/trabbl.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 60 60 !!---------------------------------------------------------------------- 61 61 !! OPA 9.0 , LOCEAN-IPSL (2006) 62 !! $ Id$62 !! $Header$ 63 63 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 64 64 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/trabbl_adv.h90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 8 8 !!---------------------------------------------------------------------- 9 9 !! OPA 9.0 , LOCEAN-IPSL (2005) 10 !! $ Id$10 !! $Header$ 11 11 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 12 12 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/tradmp.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 63 63 !!---------------------------------------------------------------------- 64 64 !! OPA 9.0 , LOCEAN-IPSL (2006) 65 !! $ Id$65 !! $Header$ 66 66 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 67 67 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/traldf.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 44 44 !!---------------------------------------------------------------------- 45 45 !! OPA 9.0 , LOCEAN-IPSL (2006) 46 !! $ Id$46 !! $Header$ 47 47 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 48 48 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/traldf_bilap.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 34 34 !!---------------------------------------------------------------------- 35 35 !! OPA 9.0 , LOCEAN-IPSL (2005) 36 !! $ Id$36 !! $Header$ 37 37 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 38 38 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/traldf_bilapg.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 36 36 !!---------------------------------------------------------------------- 37 37 !! OPA 9.0 , LOCEAN-IPSL (2005) 38 !! $ Id$38 !! $Header$ 39 39 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 40 40 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/traldf_iso.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 42 42 !!---------------------------------------------------------------------- 43 43 !! OPA 9.0 , LOCEAN-IPSL (2005) 44 !! $ Id$44 !! $Header$ 45 45 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 46 46 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/traldf_lap.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 32 32 !!---------------------------------------------------------------------- 33 33 !! OPA 9.0 , LOCEAN-IPSL (2005) 34 !! $ Id$34 !! $Header$ 35 35 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 36 36 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/tranpc.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 38 38 !!---------------------------------------------------------------------- 39 39 !! OPA 9.0 , LOCEAN-IPSL (2005) 40 !! $ Id$40 !! $Header$ 41 41 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 42 42 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/tranxt.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r708 r719 21 21 USE dom_oce ! ocean space and time domain variables 22 22 USE zdf_oce ! ??? 23 USE dynspg_oce ! surface pressure gradient variables24 USE trdmod_oce ! ocean variables trends25 USE trdmod ! ocean active tracers trends26 USE phycst27 USE domvvl ! variable volume28 USE obctra ! open boundary condition (obc_tra routine)29 23 USE in_out_manager ! I/O manager 30 24 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 25 USE obctra ! open boundary condition (obc_tra routine) 26 USE trdmod ! ocean active tracers trends 27 USE trdmod_oce ! ocean variables trends 31 28 USE prtctl ! Print control 32 29 USE agrif_opa_update 33 30 USE agrif_opa_interp 34 31 32 USE ocesbc ! ocean surface boundary condition 33 USE domvvl ! variable volume 34 USE dynspg_oce ! surface pressure gradient variables 35 USE phycst 35 36 36 37 IMPLICIT NONE … … 46 47 !!---------------------------------------------------------------------- 47 48 !! OPA 9.0 , LOCEAN-IPSL (2006) 48 !! $ Id$49 !! $Header$ 49 50 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 50 51 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/traqsr.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r708 r719 17 17 USE oce ! ocean dynamics and active tracers 18 18 USE dom_oce ! ocean space and time domain 19 USE sbc_oce ! surface boundary condition: ocean 19 USE trdmod ! ocean active tracers trends 20 USE trdmod_oce ! ocean variables trends 21 USE in_out_manager ! I/O manager 20 22 USE trc_oce ! share SMS/Ocean variables 21 USE trdmod_oce ! ocean variables trends 22 USE trdmod ! ocean active tracers trends 23 USE in_out_manager ! I/O manager 23 USE ocesbc ! thermohaline fluxes 24 24 USE phycst ! physical constants 25 25 USE prtctl ! Print control … … 46 46 !!---------------------------------------------------------------------- 47 47 !! OPA 9.0 , LOCEAN-IPSL (2005) 48 !! $ Id$48 !! $Header$ 49 49 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 50 50 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/trasbc.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r714 r719 13 13 !!---------------------------------------------------------------------- 14 14 USE oce ! ocean dynamics and active tracers 15 USE sbc_oce ! surface boundary condition: ocean16 15 USE dom_oce ! ocean space domain variables 16 USE ocesbc ! surface thermohaline fluxes 17 17 USE phycst ! physical constant 18 18 USE traqsr ! solar radiation penetration … … 32 32 !!---------------------------------------------------------------------- 33 33 !! OPA 9.0 , LOCEAN-IPSL (2005) 34 !! $ Id$34 !! $Header$ 35 35 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 36 36 !!---------------------------------------------------------------------- … … 132 132 #endif 133 133 IF( lk_vvl) THEN 134 zta = ro0cpr * qns(ji,jj) * zse3t &! temperature : heat flux134 zta = ro0cpr * ( qt(ji,jj) - qsr(ji,jj) ) * zse3t & ! temperature : heat flux 135 135 & - emp(ji,jj) * zsrau * tn(ji,jj,1) * zse3t ! & cooling/heating effet of EMP flux 136 136 zsa = 0.e0 ! No salinity concent./dilut. effect 137 137 ELSE 138 zta = ro0cpr * qns(ji,jj) * zse3t ! temperature : heat flux138 zta = ro0cpr * ( qt(ji,jj) - qsr(ji,jj) ) * zse3t ! temperature : heat flux 139 139 zsa = emps(ji,jj) * zsrau * sn(ji,jj,1) * zse3t ! salinity : concent./dilut. effect 140 140 ENDIF -
trunk/NEMO/OPA_SRC/TRA/trazdf.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r708 r719 14 14 USE dom_oce ! ocean space and time domain variables 15 15 USE zdf_oce ! ocean vertical physics variables 16 USE sbc_oce ! surface boundary condition: ocean17 USE dynspg_oce18 16 19 17 USE trazdf_exp ! vertical diffusion: explicit (tra_zdf_exp routine) … … 28 26 29 27 USE phycst 28 USE dynspg_oce 29 USE ocesbc ! ocean surface boundary condition 30 30 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 31 31 USE domvvl ! variable volume … … 48 48 !!---------------------------------------------------------------------- 49 49 !! OPA 9.0 , LOCEAN-IPSL (2005) 50 !! $ Id$50 !! $Header$ 51 51 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 52 52 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/trazdf_exp.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 41 41 !!---------------------------------------------------------------------- 42 42 !! OPA 9.0 , LOCEAN-IPSL (2005) 43 !! $ Id$43 !! $Header$ 44 44 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 45 45 !!---------------------------------------------------------------------- -
trunk/NEMO/OPA_SRC/TRA/trazdf_imp.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 45 45 # include "vectopt_loop_substitute.h90" 46 46 !!---------------------------------------------------------------------- 47 !!---------------------------------------------------------------------- 47 48 !! OPA 9.0 , LOCEAN-IPSL (2005) 48 !! $Id$ 49 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 50 !!---------------------------------------------------------------------- 51 49 !!---------------------------------------------------------------------- 52 50 CONTAINS 53 51 -
trunk/NEMO/OPA_SRC/TRA/trazdf_imp_jki.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 44 44 !!---------------------------------------------------------------------- 45 45 !! OPA 9.0 , LOCEAN-IPSL (2005) 46 !! $Id$47 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)48 46 !!---------------------------------------------------------------------- 49 47 -
trunk/NEMO/OPA_SRC/TRA/zpshde.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r719 33 33 !!---------------------------------------------------------------------- 34 34 !! OPA 9.0 , LOCEAN-IPSL (2005) 35 !! $ Id$35 !! $Header$ 36 36 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 37 37 !!----------------------------------------------------------------------
Note: See TracChangeset
for help on using the changeset viewer.