Changeset 261 for trunk/NEMO/TOP_SRC
- Timestamp:
- 2005-09-08T15:18:32+02:00 (19 years ago)
- Location:
- trunk/NEMO/TOP_SRC/TRP
- Files:
-
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/TOP_SRC/TRP/trcadv_cen2.F90
r247 r261 24 24 # include "passivetrc_substitute.h90" 25 25 !!---------------------------------------------------------------------- 26 !! TOP 1.0 , LOCEAN-IPSL (2005) 27 !! $Header$ 28 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 26 !! OPA 9.0 , LODYC-IPSL (2003) 29 27 !!---------------------------------------------------------------------- 30 28 … … 257 255 ! ! =============== 258 256 259 IF(l _ctl) THEN ! print mean trends (used for debugging)260 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )257 IF(ln_ctl) THEN ! print mean trends (used for debugging) 258 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 261 259 WRITE(numout,*) ' trc/had - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 262 260 tra_ctl(jn) = ztra … … 320 318 END DO 321 319 322 IF(l _ctl) THEN ! print mean trends (used for debugging)323 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )320 IF(ln_ctl) THEN ! print mean trends (used for debugging) 321 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 324 322 WRITE(numout,*) ' trc/zad - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn), ' centered2' 325 323 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trcadv_muscl.F90
r247 r261 14 14 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 15 15 USE trcbbl ! advective passive tracers in the BBL 16 USE lib_mpp 16 17 17 18 IMPLICIT NONE … … 21 22 PUBLIC trc_adv_muscl ! routine called by trcstp.F90 22 23 23 !! * Module variable24 REAL(wp), DIMENSION(jpk) :: &25 rdttrc ! vertical profile of tracer time-step26 27 24 !! * Substitutions 28 25 # include "passivetrc_substitute.h90" 29 26 !!---------------------------------------------------------------------- 30 !! TOP 1.0 , LOCEAN-IPSL (2005) 31 !! $Header$ 32 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 27 !! OPA 9.0 , LODYC-IPSL (2003) 33 28 !!---------------------------------------------------------------------- 34 29 … … 77 72 REAL(wp) :: zu, zv, zw, zeu, zev, zew, zbtr, ztra 78 73 REAL(wp) :: z0u, z0v, z0w 79 REAL(wp) :: zzt1, zzt2, zalpha 74 REAL(wp) :: zzt1, zzt2, zalpha, z2dtt 80 75 #if defined key_trc_diatrd 81 76 REAL(wp) :: ztai, ztaj … … 90 85 WRITE(numout,*) 'trc_adv : MUSCL advection scheme' 91 86 WRITE(numout,*) '~~~~~~~' 92 rdttrc(:) = rdttra(:) * FLOAT(ndttrc)93 87 ENDIF 94 88 … … 145 139 ztp2(:,:,jpk) = 0.e0 146 140 147 148 141 ! Slopes limitation 149 142 DO jk = 1, jpkm1 150 143 DO jj = 2, jpj 151 DO ji = fs_2, fs_jpim1! vector opt.144 DO ji = fs_2, jpi ! vector opt. 152 145 ztp1(ji,jj,jk) = SIGN( 1., ztp1(ji,jj,jk) ) & 153 146 & * MIN( ABS( ztp1(ji ,jj,jk) ), & … … 163 156 END DO 164 157 END DO 165 166 158 167 159 ! Advection terms … … 179 171 #endif 180 172 ! MUSCL fluxes 173 z2dtt = rdttra(jk) * FLOAT(ndttrc) 181 174 z0u = SIGN( 0.5, zun(ji,jj,jk) ) 182 175 zalpha = 0.5 - z0u 183 zu = z0u - 0.5 * zun(ji,jj,jk) * rdttrc(jk)/ e1u(ji,jj)176 zu = z0u - 0.5 * zun(ji,jj,jk) * z2dtt / e1u(ji,jj) 184 177 zzt1 = trb(ji+1,jj,jk,jn) + zu*ztp1(ji+1,jj,jk) 185 178 zzt2 = trb(ji ,jj,jk,jn) + zu*ztp1(ji ,jj,jk) 186 179 zt1(ji,jj,jk) = zeu * ( zalpha * zzt1 + (1.-zalpha) * zzt2 ) 187 188 180 z0v = SIGN( 0.5, zvn(ji,jj,jk) ) 189 181 zalpha = 0.5 - z0v 190 zv = z0v - 0.5 * zvn(ji,jj,jk) * rdttrc(jk)/ e2v(ji,jj)182 zv = z0v - 0.5 * zvn(ji,jj,jk) * z2dtt / e2v(ji,jj) 191 183 zzt1 = trb(ji,jj+1,jk,jn) + zv*ztp2(ji,jj+1,jk) 192 184 zzt2 = trb(ji,jj ,jk,jn) + zv*ztp2(ji,jj ,jk) … … 238 230 END DO 239 231 240 IF(l _ctl) THEN ! print mean trends (used for debugging)241 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )232 IF(ln_ctl) THEN ! print mean trends (used for debugging) 233 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 242 234 WRITE(numout,*) ' trc/had - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn), ' muscl' 243 235 tra_ctl(jn) = ztra … … 284 276 DO jj = 2, jpjm1 285 277 DO ji = fs_2, fs_jpim1 ! vector opt. 278 z2dtt = rdttra(jk) * FLOAT(ndttrc) 286 279 zew = zwn(ji,jj,jk+1) 287 280 z0w = SIGN( 0.5, zwn(ji,jj,jk+1) ) 288 281 zalpha = 0.5 + z0w 289 zw = z0w - 0.5 * zwn(ji,jj,jk+1)* rdttrc(jk)/ fse3w(ji,jj,jk+1)282 zw = z0w - 0.5 * zwn(ji,jj,jk+1)*z2dtt / fse3w(ji,jj,jk+1) 290 283 zzt1 = trb(ji,jj,jk+1,jn) + zw*ztp1(ji,jj,jk+1) 291 284 zzt2 = trb(ji,jj,jk ,jn) + zw*ztp1(ji,jj,jk ) … … 322 315 END DO 323 316 324 IF(l _ctl) THEN ! print mean trends (used for debugging)325 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )317 IF(ln_ctl) THEN ! print mean trends (used for debugging) 318 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 326 319 WRITE(numout,*) ' trc/zad - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn), ' muscl' 327 320 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trcadv_muscl2.F90
r247 r261 28 28 # include "passivetrc_substitute.h90" 29 29 !!---------------------------------------------------------------------- 30 !! TOP 1.0 , LOCEAN-IPSL (2005) 31 !! $Header$ 32 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 30 !! OPA 9.0 , LODYC-IPSL (2003) 33 31 !!---------------------------------------------------------------------- 34 32 … … 280 278 END DO 281 279 282 IF(l _ctl) THEN ! print mean trends (used for debugging)283 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )280 IF(ln_ctl) THEN ! print mean trends (used for debugging) 281 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 284 282 WRITE(numout,*) ' trc/had - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn), ' muscl' 285 283 tra_ctl(jn) = ztra … … 379 377 END DO 380 378 381 IF(l _ctl) THEN ! print mean trends (used for debugging)382 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )379 IF(ln_ctl) THEN ! print mean trends (used for debugging) 380 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 383 381 WRITE(numout,*) ' trc/zad - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn), ' muscl2' 384 382 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trcadv_smolar.F90
r247 r261 29 29 # include "passivetrc_substitute.h90" 30 30 !!---------------------------------------------------------------------- 31 !! TOP 1.0 , LOCEAN-IPSL (2005) 32 !! $Header$ 33 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 31 !! OPA 9.0 , LODYC-IPSL (2003) 34 32 !!---------------------------------------------------------------------- 35 33 CONTAINS … … 501 499 #endif 502 500 503 IF(l _ctl) THEN ! print mean trends (used for debugging)504 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )501 IF(ln_ctl) THEN ! print mean trends (used for debugging) 502 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 505 503 WRITE(numout,*) ' trc/zad - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn), ' smolar' 506 504 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trcadv_tvd.F90
r247 r261 26 26 # include "passivetrc_substitute.h90" 27 27 !!---------------------------------------------------------------------- 28 !! TOP 1.0 , LOCEAN-IPSL (2005) 29 !! $Header$ 30 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 28 !! OPA 9.0 , LODYC-IPSL (2003) 31 29 !!---------------------------------------------------------------------- 32 30 … … 234 232 END DO 235 233 236 IF(l _ctl) THEN ! print mean trends (used for debugging)237 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )234 IF(ln_ctl) THEN ! print mean trends (used for debugging) 235 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 238 236 WRITE(numout,*) ' trc/zad - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn), ' tvd' 239 237 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trcbbc.F90
r247 r261 39 39 # include "passivetrc_substitute.h90" 40 40 !!---------------------------------------------------------------------- 41 !! TOP 1.0 , LOCEAN-IPSL (2005) 42 !! $Header$ 43 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 41 !! OPA 9.0 , LODYC-IPSL (2003) 44 42 !!---------------------------------------------------------------------- 45 43 … … 106 104 END DO 107 105 #endif 108 IF(l _ctl) THEN ! print mean trends (used for debugging)109 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )106 IF(ln_ctl) THEN ! print mean trends (used for debugging) 107 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 110 108 WRITE(numout,*) ' trc/bbc - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 111 109 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trcbbl.F90
r247 r261 48 48 # include "passivetrc_substitute.h90" 49 49 !!---------------------------------------------------------------------- 50 !! TOP 1.0 , LOCEAN-IPSL (2005) 51 !! $Header$ 52 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 50 !! OPA 9.0 , LODYC-IPSL (2003) 53 51 !!---------------------------------------------------------------------- 54 52 … … 341 339 # endif 342 340 END DO 343 IF(l _ctl) THEN ! print mean trends (used for debugging)344 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )341 IF(ln_ctl) THEN ! print mean trends (used for debugging) 342 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 345 343 WRITE(numout,*) ' trc/bbl - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 346 344 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trcbbl_adv.h90
r247 r261 4 4 5 5 !!---------------------------------------------------------------------- 6 !! TOP 1.0 , LOCEAN-IPSL (2005) 7 !! $Header$ 8 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 6 !! OPA 9.0 , LODYC-IPSL (2003) 9 7 !!---------------------------------------------------------------------- 10 8 … … 384 382 #endif 385 383 END DO 386 IF(l _ctl) THEN ! print mean trends (used for debugging)387 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )384 IF(ln_ctl) THEN ! print mean trends (used for debugging) 385 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 388 386 WRITE(numout,*) ' trc/bbl - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 389 387 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trcdmp.F90
r247 r261 18 18 USE trc ! ocean passive tracers variables 19 19 USE trctrp_lec ! passive tracers transport 20 USE trcdta 20 21 21 22 IMPLICIT NONE … … 34 35 # include "passivetrc_substitute.h90" 35 36 !!---------------------------------------------------------------------- 36 !! TOP 1.0 , LOCEAN-IPSL (2005) 37 !! $Header$ 38 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 37 !! OPA 9.0 , LODYC-IPSL (2003) 39 38 !!---------------------------------------------------------------------- 40 39 … … 86 85 87 86 ! Initialize the input fields for newtonian damping 88 CALL trcdta( kt )87 CALL dta_trc( kt ) 89 88 90 89 DO jn = 1, jptra … … 156 155 ENDIF 157 156 158 IF(l _ctl) THEN ! print mean trends (used for debugging)159 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )157 IF(ln_ctl) THEN ! print mean trends (used for debugging) 158 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 160 159 WRITE(numout,*) ' trc/dmp - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 161 160 tra_ctl(jn) = ztra … … 247 246 !!---------------------------------------------------------------------- 248 247 !! * Local declarations 249 INTEGER :: ji, jj, jk, jn ! dummy loop indices248 INTEGER :: ji, jj, jk, jn ! dummy loop indices 250 249 REAL(wp) :: & 251 250 zlat, zlat0, zlat1, zlat2 ! temporary scalar … … 266 265 ! damping along the forced closed boundary over 6 grid-points 267 266 DO jn = 1, 6 268 IF( lzoom_w ) resto ( mi0(jn+jpizoom):mi1(jn+jpizoom), : , : ) = zfact(jn) ! west closed269 IF( lzoom_s ) resto ( : , mj0(jn+jpjzoom):mj1(jn+jpjzoom), : ) = zfact(jn) ! south closed270 IF( lzoom_e ) resto ( mi0(jpiglo+jpizoom-1-jn):mi1(jpiglo+jpizoom-1-jn), : , : ) &267 IF( lzoom_w ) restotr( mi0(jn+jpizoom):mi1(jn+jpizoom), : , : , : ) = zfact(jn) ! west closed 268 IF( lzoom_s ) restotr( : , mj0(jn+jpjzoom):mj1(jn+jpjzoom), : , : ) = zfact(jn) ! south closed 269 IF( lzoom_e ) restotr( mi0(jpiglo+jpizoom-1-jn):mi1(jpiglo+jpizoom-1-jn) , : , : , : ) & 271 270 & = zfact(jn) ! east closed 272 IF( lzoom_n ) resto ( : , mj0(jpjglo+jpjzoom-1-jn):mj1(jpjglo+jpjzoom-1-jn), : ) &271 IF( lzoom_n ) restotr( : , mj0(jpjglo+jpjzoom-1-jn):mj1(jpjglo+jpjzoom-1-jn) , : , : ) & 273 272 & = zfact(jn) ! north closed 274 273 END DO -
trunk/NEMO/TOP_SRC/TRP/trcldf_bilap.F90
r247 r261 23 23 # include "passivetrc_substitute.h90" 24 24 !!---------------------------------------------------------------------- 25 !! TOP 1.0 , LOCEAN-IPSL (2005) 26 !! $Header$ 27 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 25 !! OPA 9.0 , LODYC-IPSL (2003) 28 26 !!---------------------------------------------------------------------- 29 27 … … 205 203 CALL lbc_lnk( trtrd(1,1,1,jn,5), 'T', 1. ) 206 204 #endif 207 IF(l _ctl) THEN ! print mean trends (used for debugging)208 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )205 IF(ln_ctl) THEN ! print mean trends (used for debugging) 206 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 209 207 WRITE(numout,*) ' trc/ldf - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 210 208 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trcldf_bilapg.F90
r247 r261 26 26 # include "passivetrc_substitute.h90" 27 27 !!---------------------------------------------------------------------- 28 !! TOP 1.0 , LOCEAN-IPSL (2005) 29 !! $Header$ 30 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 28 !! OPA 9.0 , LODYC-IPSL (2003) 31 29 !!---------------------------------------------------------------------- 32 30 … … 118 116 ! ! =============== 119 117 120 IF(l _ctl) THEN ! print mean trends (used for debugging)121 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )118 IF(ln_ctl) THEN ! print mean trends (used for debugging) 119 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 122 120 WRITE(numout,*) ' trc/ldf - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 123 121 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trcldf_iso.F90
r247 r261 25 25 # include "passivetrc_substitute.h90" 26 26 !!---------------------------------------------------------------------- 27 !!---------------------------------------------------------------------- 28 !! TOP 1.0 , LOCEAN-IPSL (2005) 29 !! $Header$ 30 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 31 !!---------------------------------------------------------------------- 27 32 28 CONTAINS 33 29 … … 203 199 END DO ! End of slab 204 200 ! ! =============== 205 IF(l _ctl) THEN ! print mean trends (used for debugging)206 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )201 IF(ln_ctl) THEN ! print mean trends (used for debugging) 202 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 207 203 WRITE(numout,*) ' trc/ldf - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 208 204 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trcldf_iso_zps.F90
r247 r261 24 24 # include "passivetrc_substitute.h90" 25 25 !!---------------------------------------------------------------------- 26 !! TOP 1.0 , LOCEAN-IPSL (2005) 27 !! $Header$ 28 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 26 !! OPA 9.0 , LODYC-IPSL (2003) 29 27 !!---------------------------------------------------------------------- 30 28 … … 240 238 END DO ! End of slab 241 239 ! ! =============== 242 IF(l _ctl) THEN ! print mean trends (used for debugging)243 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )240 IF(ln_ctl) THEN ! print mean trends (used for debugging) 241 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 244 242 WRITE(numout,*) ' trc/ldf - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 245 243 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trcldf_lap.F90
r247 r261 22 22 # include "passivetrc_substitute.h90" 23 23 !!---------------------------------------------------------------------- 24 !! TOP 1.0 , LOCEAN-IPSL (2005) 25 !! $Header$ 26 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 24 !! OPA 9.0 , LODYC-IPSL (2003) 27 25 !!---------------------------------------------------------------------- 28 26 … … 139 137 ! ! ============= 140 138 141 IF(l _ctl) THEN ! print mean trends (used for debugging)142 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )139 IF(ln_ctl) THEN ! print mean trends (used for debugging) 140 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 143 141 WRITE(numout,*) ' trc/ldf - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 144 142 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trcnxt.F90
r247 r261 20 20 PUBLIC trc_nxt ! routine called by step.F90 21 21 !!---------------------------------------------------------------------- 22 !! TOP 1.0 , LOCEAN-IPSL (2005) 23 !! $Header$ 24 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 22 !! OPA 9.0 , LODYC-IPSL (2003) 25 23 !!---------------------------------------------------------------------- 26 24 … … 69 67 !!---------------------------------------------------------------------- 70 68 71 IF( kt == nittrc000 ) THEN69 IF( kt == nittrc000 .AND. lwp ) THEN 72 70 WRITE(numout,*) 73 71 WRITE(numout,*) 'trc_nxt : time stepping on passive tracers' … … 139 137 END DO ! End of slab 140 138 ! ! =============== 141 IF(l _ctl) THEN ! print mean field (used for debugging)142 ztra = SUM( trn(2:nictl ,2:njctl,1:jpkm1,jn)*tmask(2:nictl,2:njctl,1:jpkm1) )139 IF(ln_ctl) THEN ! print mean field (used for debugging) 140 ztra = SUM( trn(2:nictle,2:njctle,1:jpkm1,jn)*tmask(2:nictle,2:njctle,1:jpkm1) ) 143 141 WRITE(numout,*) ' trc/nxt - ',ctrcnm(jn),' : ', ztra 144 142 ENDIF -
trunk/NEMO/TOP_SRC/TRP/trcrad.F90
r247 r261 11 11 USE oce_trc ! ocean dynamics and tracers variables 12 12 USE trc ! ocean passive tracers variables 13 USE lib_mpp 13 14 14 15 IMPLICIT NONE … … 20 21 # include "passivetrc_substitute.h90" 21 22 !!---------------------------------------------------------------------- 22 !! TOP 1.0 , LOCEAN-IPSL (2005) 23 !! $Header$ 24 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 23 !! OPA 9.0 , LODYC-IPSL (2003) 25 24 !!---------------------------------------------------------------------- 26 25 CONTAINS … … 84 83 END DO 85 84 END DO 85 86 IF( lk_mpp ) THEN 87 CALL mpp_sum( trcorb ) ! sum over the global domain 88 CALL mpp_sum( trcorn ) ! sum over the global domain 89 CALL mpp_sum( trmasb ) ! sum over the global domain 90 CALL mpp_sum( trmasn ) ! sum over the global domain 91 ENDIF 92 86 93 DO jk = 1, jpkm1 87 94 DO jj = 1, jpj … … 135 142 END DO 136 143 144 IF( lk_mpp ) THEN 145 CALL mpp_sum( trcorb ) ! sum over the global domain 146 CALL mpp_sum( trcorn ) ! sum over the global domain 147 CALL mpp_sum( trmasb ) ! sum over the global domain 148 CALL mpp_sum( trmasn ) ! sum over the global domain 149 ENDIF 150 137 151 IF( trcorb /= 0) THEN 138 152 DO jk = 1, jpkm1 … … 161 175 #endif 162 176 DO jn = 1, jptra 163 IF(l _ctl) THEN ! print mean field (used for debugging)164 ztra = SUM( trn(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )177 IF(ln_ctl) THEN ! print mean field (used for debugging) 178 ztra = SUM( trn(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 165 179 WRITE(numout,*) ' trc/rad - ',ctrcnm(jn),' : ', ztra 166 180 ENDIF -
trunk/NEMO/TOP_SRC/TRP/trcsbc.F90
r247 r261 21 21 # include "passivetrc_substitute.h90" 22 22 !!---------------------------------------------------------------------- 23 !! TOP 1.0 , LOCEAN-IPSL (2005) 24 !! $Header$ 25 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 23 !! OPA 9.0 , LODYC-IPSL (2003) 26 24 !!---------------------------------------------------------------------- 27 25 … … 89 87 END DO 90 88 91 IF(l _ctl) THEN ! print mean trends (used for debugging)92 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )89 IF(ln_ctl) THEN ! print mean trends (used for debugging) 90 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 93 91 WRITE(numout,*) ' trc/sbc - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 94 92 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trcstp.F90
r247 r261 12 12 USE trc ! ocean passive tracers variables 13 13 USE trctrp ! passive tracers transport 14 USE trcsms ! passive tracers sources and sinks 14 15 15 16 IMPLICIT NONE … … 19 20 PUBLIC trc_stp ! called by step 20 21 !!---------------------------------------------------------------------- 21 !! TOP 1.0 , LOCEAN-IPSL (2005) 22 !! $Header$ 23 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 22 !! OPA 9.0 , LODYC-IPSL (2003) 24 23 !!---------------------------------------------------------------------- 25 24 … … 41 40 !! * Arguments 42 41 INTEGER, INTENT( in ) :: kt ! ocean time-step index 42 INTEGER :: jn 43 REAL(wp) :: ztra 43 44 44 45 … … 49 50 50 51 51 CALL trcsms( kt ) 52 CALL trc_sms( kt ) 53 54 DO jn = 1, jptra 55 IF(ln_ctl) THEN ! print mean trends (used for debugging) 56 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 57 WRITE(numout,*) ' trc/sms - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 58 tra_ctl(jn) = ztra 59 ENDIF 60 END DO 61 52 62 53 63 … … 55 65 56 66 CALL trc_trp( kt ) 67 68 DO jn = 1, jptra 69 IF(ln_ctl) THEN ! print mean trends (used for debugging) 70 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 71 WRITE(numout,*) ' trc/trp - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 72 tra_ctl(jn) = ztra 73 ENDIF 74 END DO 75 57 76 58 77 -
trunk/NEMO/TOP_SRC/TRP/trctrp.F90
r247 r261 24 24 25 25 USE trcnxt ! time-stepping (trc_nxt routine) 26 USE trcrad ! positivity (trc_rad routine)26 ! USE trcrad ! positivity (trc_rad routine) 27 27 28 28 USE trcadv_cen2 ! 2nd order centered advection (trc_adv_cen2 routine) … … 50 50 # include "domzgr_substitute.h90" 51 51 !!---------------------------------------------------------------------- 52 !! TOP 1.0 , LOCEAN-IPSL (2005) 53 !! $Header$ 54 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 52 !! OPA 9.0 , LODYC-IPSL (2003) 55 53 !!---------------------------------------------------------------------- 56 54 … … 93 91 94 92 IF( lk_trcdmp ) CALL trc_dmp( kt ) ! internal damping trends 95 93 96 94 ! ! horizontal & vertical advection 97 95 IF( ln_trcadv_cen2 ) CALL trc_adv_cen2 ( kt ) ! 2nd order centered scheme … … 100 98 IF( ln_trcadv_tvd ) CALL trc_adv_tvd ( kt ) ! TVD scheme 101 99 IF( ln_trcadv_smolar ) CALL trc_adv_smolar( kt ) ! SMOLARKIEWICZ scheme 100 102 101 103 102 IF( n_cla == 1 ) THEN … … 124 123 CALL trc_nxt( kt ) ! tracer fields at next time step 125 124 126 125 !! CALL trc_rad( kt ) ! Correct artificial negative concentrations 127 126 ! ! for isopycnal scheme 128 127 129 IF( lk_zps ) CALL zps_hde_trc( kt, trb, gtru, gtrv ) ! Partial steps: now horizontal gradient128 ! IF( lk_zps ) CALL zps_hde_trc( kt, trb, gtru, gtrv ) ! Partial steps: now horizontal gradient 130 129 ! ! of passive tracers at the bottom ocean level 131 130 -
trunk/NEMO/TOP_SRC/TRP/trctrp_ctl.F90
r247 r261 27 27 28 28 !!---------------------------------------------------------------------- 29 !! TOP 1.0 , LOCEAN-IPSL (2005) 30 !! $Header$ 31 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 29 !! OPA 9.0 , LODYC-IPSL (2003) 32 30 !!---------------------------------------------------------------------- 33 31 -
trunk/NEMO/TOP_SRC/TRP/trctrp_lec.F90
r247 r261 70 70 #endif 71 71 !!---------------------------------------------------------------------- 72 !! TOP 1.0 , LOCEAN-IPSL (2005) 73 !! $Header$ 74 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 72 !! OPA 9.0 , LODYC-IPSL (2003) 75 73 !!---------------------------------------------------------------------- 76 74 -
trunk/NEMO/TOP_SRC/TRP/trczdf_exp.F90
r247 r261 28 28 # include "passivetrc_substitute.h90" 29 29 !!---------------------------------------------------------------------- 30 !! TOP 1.0 , LOCEAN-IPSL (2005) 31 !! $Header$ 32 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 30 !! OPA 9.0, LODYC-IPSL (2003) 33 31 !!---------------------------------------------------------------------- 34 32 -
trunk/NEMO/TOP_SRC/TRP/trczdf_imp.F90
r247 r261 27 27 # include "passivetrc_substitute.h90" 28 28 !!---------------------------------------------------------------------- 29 !! TOP 1.0 , LOCEAN-IPSL (2005) 30 !! $Header$ 31 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 29 !! OPA 9.0 , LODYC-IPSL (2003) 32 30 !!---------------------------------------------------------------------- 33 31 … … 183 181 END DO 184 182 185 IF(l _ctl) THEN183 IF(ln_ctl) THEN 186 184 DO jk = 1, jpkm1 187 185 DO jj = 2, jpjm1 … … 193 191 ENDIF 194 192 195 IF(l _ctl) THEN ! print mean trends (used for debugging)196 ztra = SUM( ztrd(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )193 IF(ln_ctl) THEN ! print mean trends (used for debugging) 194 ztra = SUM( ztrd(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 197 195 WRITE(numout,*) ' trc/zdf - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 198 196 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trczdf_imp.F90_vopt
r247 r261 27 27 # include "passivetrc_substitute.h90" 28 28 !!---------------------------------------------------------------------- 29 !! TOP 1.0 , LOCEAN-IPSL (2005) 30 !! $Header$ 31 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 29 !! OPA 9.0 , LODYC-IPSL (2003) 32 30 !!---------------------------------------------------------------------- 33 31 … … 183 181 END DO 184 182 185 IF( l _ctl .AND. lwp ) THEN183 IF( ln_ctl .AND. lwp ) THEN 186 184 DO jk = 1, jpkm1 187 185 DO jj = 2, jpjm1 … … 193 191 ENDIF 194 192 195 IF( l _ctl .AND. lwp ) THEN ! print mean trends (used for debugging)193 IF( ln_ctl .AND. lwp ) THEN ! print mean trends (used for debugging) 196 194 ztra = SUM( ztrd(2:jpim1,2:jpjm1,1:jpkm1,jn) * tmask(2:jpim1,2:jpjm1,1:jpkm1) ) 197 195 WRITE(numout,*) ' trc/zdf - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) -
trunk/NEMO/TOP_SRC/TRP/trczdf_iso.F90
r247 r261 31 31 # include "passivetrc_substitute.h90" 32 32 !!---------------------------------------------------------------------- 33 !!---------------------------------------------------------------------- 34 !! TOP 1.0 , LOCEAN-IPSL (2005) 35 !! $Header$ 36 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 37 !!---------------------------------------------------------------------- 33 38 34 CONTAINS 39 35 … … 114 110 !! 9.0 ! 04-03 (C. Ethe ) adapted for passive tracers 115 111 !!--------------------------------------------------------------------- 112 !! * Modules used 113 USE oce_trc , & 114 zavs => va 115 116 116 !! * Arguments 117 117 INTEGER, INTENT( in ) :: kt ! ocean time-step index … … 134 134 zwx, zwy, zwz, zwt ! ??? 135 135 REAL(wp), DIMENSION(jpi,jpk) :: & 136 ztfw, zdit, zdjt, zdj1t, & 137 zavs 136 ztfw, zdit, zdjt, zdj1t 138 137 #if defined key_trcldf_eiv || defined key_esopa 139 138 REAL(wp), DIMENSION(jpi,jpk) :: & … … 145 144 zuwki, zvwki 146 145 #endif 146 !!--------------------------------------------------------------------- 147 !! OPA 8.5, LODYC-IPSL (2002) 148 !!--------------------------------------------------------------------- 147 149 148 150 IF( kt == nittrc000 ) THEN … … 257 259 258 260 ! save avs in zavs to recover avs in output files 259 zavs(ji,j k) = fstravs(ji,jj,jk)261 zavs(ji,jj,jk) = fstravs(ji,jj,jk) 260 262 ! add isopycnal vertical coeff. to avs 261 263 fstravs(ji,jj,jk) = fstravs(ji,jj,jk) + zavi … … 343 345 ! ! =============== 344 346 345 IF(l _ctl) THEN ! print mean trends (used for debugging)346 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )347 IF(ln_ctl) THEN ! print mean trends (used for debugging) 348 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 347 349 WRITE(numout,*) ' trc/zdf 1 - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 348 350 tra_ctl(jn) = ztra … … 425 427 DO jk = 2, jpkm1 426 428 DO ji = 2, jpim1 427 fstravs(ji,jj,jk) = zavs(ji,j k)429 fstravs(ji,jj,jk) = zavs(ji,jj,jk) 428 430 END DO 429 431 END DO … … 434 436 435 437 436 IF(l _ctl) THEN ! print mean trends (used for debugging)437 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )438 IF(ln_ctl) THEN ! print mean trends (used for debugging) 439 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 438 440 WRITE(numout,*) ' trc/zdf 2 - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 439 441 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/trczdf_iso_vopt.F90
r247 r261 34 34 # include "passivetrc_substitute.h90" 35 35 !!---------------------------------------------------------------------- 36 !!---------------------------------------------------------------------- 37 !! TOP 1.0 , LOCEAN-IPSL (2005) 38 !! $Header$ 39 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 40 !!---------------------------------------------------------------------- 36 41 37 CONTAINS 42 38 … … 55 51 !! * Arguments 56 52 INTEGER, INTENT( in ) :: kt ! ocean time-step index 53 !!--------------------------------------------------------------------- 54 !! OPA 8.5, LODYC-IPSL (2002) 55 !!--------------------------------------------------------------------- 57 56 58 57 IF( kt == nittrc000 ) THEN … … 151 150 zwi, zwt, zavsi ! temporary workspace arrays 152 151 REAL(wp) :: ztra !temporary scalars 152 !!--------------------------------------------------------------------- 153 !! OPA 8.5, LODYC-IPSL (2002) 154 !!--------------------------------------------------------------------- 153 155 154 156 … … 312 314 # endif 313 315 #endif 314 IF(l _ctl) THEN ! print mean trends (used for debugging)315 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )316 IF(ln_ctl) THEN ! print mean trends (used for debugging) 317 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 316 318 WRITE(numout,*) ' trc/zdf 1 - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 317 319 tra_ctl(jn) = ztra … … 400 402 zwz, zwt, ztfw ! temporary workspace arrays 401 403 REAL(wp) :: ztra !temporary scalars 402 404 !!--------------------------------------------------------------------- 405 !! OPA 8.5, LODYC-IPSL (2002) 406 !!--------------------------------------------------------------------- 403 407 404 408 DO jn = 1, jptra … … 544 548 END DO 545 549 546 IF(l _ctl) THEN ! print mean trends (used for debugging)547 ztra = SUM( tra(2:nictl ,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )550 IF(ln_ctl) THEN ! print mean trends (used for debugging) 551 ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) ) 548 552 WRITE(numout,*) ' trc/zdf 2 - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn) 549 553 tra_ctl(jn) = ztra -
trunk/NEMO/TOP_SRC/TRP/zpshde_trc.F90
r247 r261 29 29 # include "passivetrc_substitute.h90" 30 30 !!---------------------------------------------------------------------- 31 !!---------------------------------------------------------------------- 32 !! TOP 1.0 , LOCEAN-IPSL (2005) 33 !! $Header$ 34 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 35 !!---------------------------------------------------------------------- 31 36 32 CONTAINS 37 33 … … 99 95 zmaxu1, zmaxu2, & ! " " 100 96 zmaxv1, zmaxv2 ! " " 97 !!---------------------------------------------------------------------- 98 !! OPA 8.5, LODYC-IPSL (2002) 99 !!---------------------------------------------------------------------- 101 100 102 101 ! Initialization (first time-step only): compute mbatu and mbatv … … 187 186 CONTAINS 188 187 SUBROUTINE zps_hde_trc ( kt, ptra, pgtru, pgtrv ) ! Empty routine 189 REAL(wp) :: kt,ptra,pgtru, pgtrv 188 INTEGER, INTENT( in) :: kt 189 REAL(wp), DIMENSION(:,:,:,:) :: ptra 190 REAL(wp) :: pgtru, pgtrv 190 191 WRITE(*,*) 'zps_hde_trc: You should not have seen this print! error?', & 191 192 kt, ptra, pgtru, pgtrv
Note: See TracChangeset
for help on using the changeset viewer.