Changeset 1193
- Timestamp:
- 2008-09-18T14:45:43+02:00 (16 years ago)
- Location:
- trunk/NEMO/TOP_SRC/TRP
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/TOP_SRC/TRP/trcadv_cen2.F90
r1175 r1193 284 284 ! 3. Save the horizontal advective trends for diagnostics 285 285 ! ------------------------------------------------------- 286 !CDIR BEGIN COLLAPSE287 286 TRDTRC_XY : IF( l_trdtrc )THEN 288 287 … … 342 341 343 342 ENDIF TRDTRC_XY 344 !CDIR END345 343 ! ! =========== 346 344 END DO ! tracer loop … … 415 413 ! ---------------------------------------------------- 416 414 417 !CDIR BEGIN COLLAPSE418 415 TRDTRC_Z : IF( l_trdtrc )THEN 419 416 ztrtrd(:,:,:) = 0.e0 … … 435 432 436 433 ENDIF TRDTRC_Z 437 !CDIR END438 434 ! ! =========== 439 435 END DO ! tracer loop -
trunk/NEMO/TOP_SRC/TRP/trcadv_muscl.F90
r1175 r1193 238 238 ! 3. Save the horizontal advective trends for diagnostics 239 239 ! ------------------------------------------------------- 240 !CDIR BEGIN COLLAPSE241 240 TRDTRC_XY : IF( l_trdtrc ) THEN 242 241 … … 282 281 283 282 ENDIF TRDTRC_XY 284 !CDIR END285 283 286 284 ENDDO … … 375 373 ! 3. Save the vertical advective trends for diagnostic 376 374 ! ---------------------------------------------------- 377 !CDIR BEGIN COLLAPSE378 375 TRDTRC_Z : IF( l_trdtrc )THEN 379 376 … … 394 391 395 392 END IF TRDTRC_Z 396 !CDIR END397 393 END DO 398 394 -
trunk/NEMO/TOP_SRC/TRP/trcadv_muscl2.F90
r1175 r1193 293 293 TRDTRC_XY : IF( l_trdtrc ) THEN 294 294 295 !CDIRR COLLAPSE296 295 ! 3.1) Passive tracer ZONAL advection trends 297 296 DO jk = 1, jpkm1 -
trunk/NEMO/TOP_SRC/TRP/trcadv_smolar.F90
r1189 r1193 117 117 118 118 !--1.1 Horizontal advection 119 !CDIRR COLLAPSE120 119 IF( l_trdtrc ) ztrtrd(:,:,:,:) = 0.e0 ! trends 121 120 … … 127 126 zz (:,:,jk) = 0.e0 128 127 129 !CDIRR COLLAPSE130 128 IF( l_trdtrc ) ztrtrd(:,:,:,:) = 0.e0 ! trends 131 129 -
trunk/NEMO/TOP_SRC/TRP/trcadv_tvd.F90
r1189 r1193 190 190 ! ------------------------------------------------------------------- 191 191 192 !CDIR BEGIN COLLAPSE193 192 IF( l_trdtrc ) THEN 194 193 … … 252 251 253 252 ENDIF 254 !CDIR END255 253 256 254 ! 4. Update and guess with monotonic sheme … … 369 367 ! terms in the computations below ??? 370 368 371 !CDIR BEGIN COLLAPSE372 369 IF( l_trdtrc ) THEN 373 370 … … 412 409 413 410 ENDIF 414 !CDIR END415 411 416 412 -
trunk/NEMO/TOP_SRC/TRP/trcbbc.F90
r1175 r1193 103 103 DO jn = 1, jptra ! tracer loop 104 104 ! ! =========== 105 !CDIR COLLAPSE106 105 IF( l_trdtrc ) ztrtrd(:,:,:) = tra(:,:,:,jn) ! save trends 107 106 … … 120 119 121 120 IF( l_trdtrc ) THEN 122 !CDIR COLLAPSE123 121 ztrtrd(:,:,:) = tra(:,:,:,jn) - ztrtrd(:,:,:) 124 122 IF (luttrd(jn)) CALL trd_mod_trc(ztrtrd, jn, jptrc_trd_bbc, kt) -
trunk/NEMO/TOP_SRC/TRP/trcldf_iso.F90
r1175 r1193 119 119 ! ! =========== 120 120 121 !CDIR COLLAPSE122 121 IF( l_trdtrc ) ztrtrd(:,:,:) = tra(:,:,:,jn) 123 122 … … 239 238 END DO 240 239 241 !CDIRR COLLAPSE242 240 DO jj = 2 , jpjm1 243 241 DO ji = fs_2, fs_jpim1 ! vector opt. -
trunk/NEMO/TOP_SRC/TRP/trcldf_iso_zps.F90
r1175 r1193 126 126 DO jn = 1, jptra ! tracer loop 127 127 ! ! =========== 128 !CDIR COLLAPSE129 128 IF( l_trdtrc ) ztrtrd(:,:,:) = tra(:,:,:,jn) ! save trends 130 129 … … 253 252 ! 4. Save the horizontal diffusive and advective (eiv) trends for diagnostics 254 253 ! --------------------------------------------------------------------------- 255 !CDIR BEGIN COLLAPSE256 254 IF( l_trdtrc ) THEN 257 255 -
trunk/NEMO/TOP_SRC/TRP/trcrad.F90
r1175 r1193 125 125 DO jn = jp_sms0, jp_sms1 126 126 ! ! =========== 127 ztrcorb = 0.e0 ; ztrmasb = 0.e0 128 ztrcorn = 0.e0 ; ztrmasn = 0.e0 129 130 !CDIR COLLAPSE 131 IF( l_trdtrc ) THEN 132 ztrtrdb(:,:,:) = ptrb(:,:,:,jn) ! save input trb for trend computation 133 ztrtrdn(:,:,:) = ptrn(:,:,:,jn) ! save input trn for trend computation 134 ENDIF 127 ztrcorb = 0.e0 ; ztrmasb = 0.e0 128 ztrcorn = 0.e0 ; ztrmasn = 0.e0 129 130 IF( l_trdtrc ) THEN 131 ztrtrdb(:,:,:) = ptrb(:,:,:,jn) ! save input trb for trend computation 132 ztrtrdn(:,:,:) = ptrn(:,:,:,jn) ! save input trn for trend computation 133 ENDIF 135 134 136 135 -
trunk/NEMO/TOP_SRC/TRP/trcsbc.F90
r1175 r1193 84 84 DO jn = 1, jptra 85 85 ! 1. Concentration dillution effect on tra 86 !CDIR COLLAPSE87 86 IF( l_trdtrc ) ztrtrd(:,:,:) = tra(:,:,:,jn) ! save trends 88 87 … … 99 98 100 99 IF( l_trdtrc ) THEN 101 !CDIR COLLAPSE102 100 ztrtrd(:,:,:) = tra(:,:,:,jn) - ztrtrd(:,:,:) 103 101 IF (luttrd(jn)) CALL trd_mod_trc(ztrtrd, jn, jptrc_trd_sbc, kt) -
trunk/NEMO/TOP_SRC/TRP/trczdf_iso_vopt.F90
r1175 r1193 79 79 IF( l_trdtrc ) THEN 80 80 ALLOCATE( ztrcavg(jpi,jpj,jpk,jptra) ) 81 !CDIR COLLAPSE82 81 ztrcavg(:,:,:,:) = 0.e0 ! initialisation step 83 82 ENDIF … … 187 186 ! ! =========== 188 187 189 !CDIR COLLAPSE190 188 IF( l_trdtrc ) ztrtrd(:,:,:) = tra(:,:,:,jn) ! save trends 191 189 … … 345 343 ! of the rotated tensor (from trc_zdf_iso). 346 344 IF( ln_trcldf_iso ) THEN 347 !CDIR COLLAPSE348 345 DO jk = 1, jpkm1 349 346 ztrtrd(:,:,jk) = ( (tra(:,:,jk,jn) - trb(:,:,jk,jn))/rdttrc(jk) ) - ztrtrd(:,:,jk) & … … 351 348 END DO 352 349 ELSE 353 !CDIR COLLAPSE354 350 DO jk = 1, jpkm1 355 351 ztrtrd(:,:,jk) = ( (tra(:,:,jk,jn) - trb(:,:,jk,jn))/rdttrc(jk) ) - ztrtrd(:,:,jk) … … 449 445 ztfw(1,:,:) = 0.e0 ; ztfw(jpi,:,:) = 0.e0 450 446 451 !CDIRR COLLAPSE452 447 IF( l_trdtrc ) ztrtrd(:,:,:) = tra(:,:,:,jn) ! save trends 453 448 … … 589 584 590 585 ! II.1) Compute the eiv VERTICAL trend 591 !CDIRR COLLAPSE592 586 DO jk = 1, jpkm1 593 587 DO jj = 2, jpjm1
Note: See TracChangeset
for help on using the changeset viewer.