Changeset 724 for trunk/NEMO
- Timestamp:
- 2007-10-22T11:49:50+02:00 (17 years ago)
- Location:
- trunk/NEMO/TOP_SRC
- Files:
-
- 10 edited
-
TRP/trcadv_muscl.F90 (modified) (2 diffs)
-
TRP/trcdmp.F90 (modified) (4 diffs)
-
TRP/trcldf_bilap.F90 (modified) (2 diffs)
-
TRP/trcldf_iso.F90 (modified) (3 diffs)
-
TRP/trcldf_iso_zps.F90 (modified) (5 diffs)
-
TRP/trcsbc.F90 (modified) (3 diffs)
-
TRP/trczdf_iso.F90 (modified) (2 diffs)
-
TRP/trczdf_iso_vopt.F90 (modified) (2 diffs)
-
par_trc.F90 (modified) (2 diffs)
-
trcdit.F90 (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/TOP_SRC/TRP/trcadv_muscl.F90
r719 r724 27 27 !!---------------------------------------------------------------------- 28 28 !! TOP 1.0 , LOCEAN-IPSL (2005) 29 !! $Header $29 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcadv_muscl.F90,v 1.13 2007/10/12 09:26:30 opalod Exp $ 30 30 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 31 31 !!---------------------------------------------------------------------- … … 103 103 104 104 DO jn = 1, jptra 105 105 #if defined key_trc_diatrd 106 DO jk = 1,jpk 107 DO jj = 1,jpj 108 DO ji = 1,jpi 109 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),1) = 0. 110 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),2) = 0. 111 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),3) = 0. 112 END DO 113 END DO 114 END DO 115 #endif 106 116 ! I. Horizontal advective fluxes 107 117 ! ------------------------------ -
trunk/NEMO/TOP_SRC/TRP/trcdmp.F90
r719 r724 37 37 !!---------------------------------------------------------------------- 38 38 !! TOP 1.0 , LOCEAN-IPSL (2005) 39 !! $Header $39 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcdmp.F90,v 1.12 2007/10/12 09:26:30 opalod Exp $ 40 40 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 41 41 !!---------------------------------------------------------------------- … … 108 108 # if defined key_trc_diatrd 109 109 ! save the trends for diagnostics 110 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),jpdiatrc ) = ztra110 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),jpdiatrc-1) = ztra 111 111 # endif 112 112 END DO … … 129 129 # if defined key_trc_diatrd 130 130 ! save the trends for diagnostics 131 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),jpdiatrc ) = ztra131 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),jpdiatrc-1) = ztra 132 132 # endif 133 133 END DO … … 149 149 # if defined key_trc_diatrd 150 150 ! save the trends for diagnostics 151 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),jpdiatrc ) = ztra151 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),jpdiatrc-1) = ztra 152 152 # endif 153 153 END DO -
trunk/NEMO/TOP_SRC/TRP/trcldf_bilap.F90
r719 r724 25 25 !!---------------------------------------------------------------------- 26 26 !! TOP 1.0 , LOCEAN-IPSL (2005) 27 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcldf_bilap.F90,v 1.1 1 2007/05/28 02:51:54opalod Exp $27 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcldf_bilap.F90,v 1.12 2007/10/12 09:26:30 opalod Exp $ 28 28 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 29 29 !!---------------------------------------------------------------------- … … 148 148 ikv = MIN ( mbathy(ji,jj), mbathy(ji ,jj+1) ) - 1 149 149 IF( iku == jk ) THEN 150 ztu(ji,jj,jk) = zeeu(ji,jj) * gtru(ji,jj )150 ztu(ji,jj,jk) = zeeu(ji,jj) * gtru(ji,jj,jn) 151 151 ENDIF 152 152 IF( ikv == jk ) THEN 153 ztv(ji,jj,jk) = zeev(ji,jj) * gtrv(ji,jj )153 ztv(ji,jj,jk) = zeev(ji,jj) * gtrv(ji,jj,jn) 154 154 ENDIF 155 155 END DO -
trunk/NEMO/TOP_SRC/TRP/trcldf_iso.F90
r719 r724 27 27 !!---------------------------------------------------------------------- 28 28 !! TOP 1.0 , LOCEAN-IPSL (2005) 29 !! $Header $29 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcldf_iso.F90,v 1.10 2007/10/12 09:26:30 opalod Exp $ 30 30 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 31 31 !!---------------------------------------------------------------------- … … 95 95 REAL(wp), DIMENSION(jpi,jpj) :: & 96 96 zftug, zftvg 97 98 #if defined key_trc_diatrd 99 REAL(wp) :: & 100 ztagu, ztagv 101 #endif 102 97 103 #endif 98 104 … … 202 208 END DO 203 209 END DO 210 211 #if defined key_trc_diatrd 212 # if defined key_trcldf_eiv 213 DO jj = 2 , jpjm1 214 DO ji = fs_2, fs_jpim1 ! vector opt. 215 zbtr= 1. / ( e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) ) 216 ztagu = ( zftug(ji,jj) - zftug(ji-1,jj ) ) * zbtr 217 ztagv = ( zftvg(ji,jj) - zftvg(ji ,jj-1) ) * zbtr 218 IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),4) = trtrd(ji,jj,jk,ikeep(jn),4) - ztagu 219 IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),5) = trtrd(ji,jj,jk,ikeep(jn),5) - ztagv 220 IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),7) = ztagu 221 IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),8) = ztagv 222 END DO 223 END DO 224 # endif 225 #endif 226 204 227 ! ! =============== 205 228 END DO ! End of slab -
trunk/NEMO/TOP_SRC/TRP/trcldf_iso_zps.F90
r719 r724 26 26 !!---------------------------------------------------------------------- 27 27 !! TOP 1.0 , LOCEAN-IPSL (2005) 28 !! $Header $28 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcldf_iso_zps.F90,v 1.11 2007/10/12 09:26:30 opalod Exp $ 29 29 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 30 30 !!---------------------------------------------------------------------- … … 85 85 REAL(wp) :: & 86 86 zabe1, zabe2, zcof1, zcof2, & ! temporary scalars 87 zmsku, zmskv, zbtr, ztra, & 88 ztagu, ztagv 87 zmsku, zmskv, zbtr, ztra 89 88 90 89 REAL(wp), DIMENSION(jpi,jpj) :: & … … 102 101 zuwk1, zvwk1, & 103 102 zcg1,zcg2 103 104 #if defined key_trc_diatrd 105 REAL(wp) :: & 106 ztagu, ztagv 107 #endif 108 104 109 #endif 105 110 CHARACTER (len=22) :: charout … … 118 123 DO jn = 1, jptra 119 124 125 #if defined key_trcldf_eiv && key_trc_diatrd 120 126 ztagu = 0.e0 121 127 ztagv = 0.e0 128 #endif 122 129 123 130 ! Horizontal passive tracer gradient … … 234 241 IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),4) = trtrd(ji,jj,jk,ikeep(jn),4) - ztagu 235 242 IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),5) = trtrd(ji,jj,jk,ikeep(jn),5) - ztagv 243 IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),7) = ztagu 244 IF (luttrd(jn)) trtrd (ji,jj,jk,ikeep(jn),8) = ztagv 236 245 END DO 237 246 END DO -
trunk/NEMO/TOP_SRC/TRP/trcsbc.F90
r719 r724 24 24 !!---------------------------------------------------------------------- 25 25 !! TOP 1.0 , LOCEAN-IPSL (2005) 26 !! $Header $26 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcsbc.F90,v 1.10 2007/10/12 09:26:30 opalod Exp $ 27 27 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 28 28 !!---------------------------------------------------------------------- … … 74 74 zsrau = 1. / rauw 75 75 IF( .NOT. ln_sco ) zse3t = 1. / fse3t(1,1,1) 76 #if defined key_trc_diatrd 77 DO jn = 1, jptra 78 IF (luttrd(jn)) trtrd(:,:,:,ikeep(jn),jpdiatrc) = 0.0 79 END DO 80 #endif 76 81 77 82 DO jn = 1, jptra … … 85 90 ! add the trend to the general tracer trend 86 91 tra(ji,jj,1,jn) = tra(ji,jj,1,jn) + ztra 92 #if defined key_trc_diatrd 93 IF (luttrd(jn)) trtrd(ji,jj,1,ikeep(jn),jpdiatrc) = trtrd(ji,jj,1,jn,jpdiatrc)+ztra 94 #endif 87 95 END DO 88 96 END DO -
trunk/NEMO/TOP_SRC/TRP/trczdf_iso.F90
r719 r724 33 33 !!---------------------------------------------------------------------- 34 34 !! TOP 1.0 , LOCEAN-IPSL (2005) 35 !! $Header $35 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trczdf_iso.F90,v 1.13 2007/10/12 09:26:30 opalod Exp $ 36 36 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 37 37 !!---------------------------------------------------------------------- … … 343 343 ! WARNING trtrd(ji,jj,jk,6) used for vertical gent velocity trend 344 344 ! not for damping !!! 345 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn), 6) = ztavg345 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),9) = ztavg 346 346 # endif 347 347 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),6) = ztav - ztavg -
trunk/NEMO/TOP_SRC/TRP/trczdf_iso_vopt.F90
r719 r724 36 36 !!---------------------------------------------------------------------- 37 37 !! TOP 1.0 , LOCEAN-IPSL (2005) 38 !! $Header $38 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trczdf_iso_vopt.F90,v 1.12 2007/10/12 09:26:30 opalod Exp $ 39 39 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 40 40 !!---------------------------------------------------------------------- … … 548 548 ztavg = ( zwx(ji,jj,jk) - zwx(ji,jj,jk+1) ) * zbtr 549 549 ! WARNING trtrd(ji,jj,jk,7) used for vertical gent velocity trend not for damping !!! 550 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn), 7) = ztavg550 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),9) = ztavg 551 551 # endif 552 552 IF (luttrd(jn)) trtrd(ji,jj,jk,ikeep(jn),6) = ztav - ztavg -
trunk/NEMO/TOP_SRC/par_trc.F90
r719 r724 11 11 !!---------------------------------------------------------------------- 12 12 !! TOP 1.0, LOCEAN-IPSL (2005) 13 !! $Header $13 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/par_trc.F90,v 1.6 2007/10/12 09:22:19 opalod Exp $ 14 14 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 15 15 !!---------------------------------------------------------------------- … … 29 29 !! we keep 3 more trends for eddy induced flux (gent velocity) 30 30 # if defined key_trcdmp 31 INTEGER , PARAMETER :: jpdiatrc = 11 32 # else 31 33 INTEGER , PARAMETER :: jpdiatrc = 10 32 # else33 INTEGER , PARAMETER :: jpdiatrc = 934 34 # endif 35 35 # else 36 36 # if defined key_trcdmp 37 INTEGER , PARAMETER :: jpdiatrc = 8 38 # else 37 39 INTEGER , PARAMETER :: jpdiatrc = 7 38 # else39 INTEGER , PARAMETER :: jpdiatrc = 640 40 # endif 41 41 # endif -
trunk/NEMO/TOP_SRC/trcdit.F90
r719 r724 2 2 !!---------------------------------------------------------------------- 3 3 !! TOP 1.0, LOCEAN-IPSL (2005) 4 !! $Header $4 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/trcdit.F90,v 1.9 2007/10/12 09:22:19 opalod Exp $ 5 5 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 6 6 !!---------------------------------------------------------------------- … … 418 418 IF (jl.eq.7) THEN 419 419 ! short and long title for x gent velocity for tracer 420 WRITE (cltra,'("XGV ",16a)') ctrcnm(jn)420 WRITE (cltra,'("XGV_",16a)') ctrcnm(jn) 421 421 WRITE (cltral,'("X gent velocity trend for ",53a)') & 422 422 & ctrcnl(jn)(1:53) … … 436 436 # endif 437 437 # if defined key_trcdmp 438 IF (jl.eq.jpdiatrc ) THEN438 IF (jl.eq.jpdiatrc-1) THEN 439 439 ! last trends for tracer damping : short and long title 440 440 WRITE (cltra,'("TDM_",16a)') ctrcnm(jn) … … 443 443 END IF 444 444 # endif 445 IF (jl.eq.jpdiatrc) THEN 446 ! last trends for tracer damping : short and long title 447 WRITE (cltra,'("SBC_",16a)') ctrcnm(jn) 448 WRITE (cltral,'("Surface boundary flux ",58a)') & 449 & ctrcnl(jn)(1:58) 450 END IF 451 445 452 call flush(numout) 446 453 cltrau=ctrcun(jn) ! UNIT for tracer /trends … … 518 525 # endif 519 526 # if defined key_trcdmp 520 IF (jl.eq.jpdiatrc ) THEN527 IF (jl.eq.jpdiatrc-1) THEN 521 528 ! short for x gent velocity for tracer 522 529 WRITE (cltra,'("TDM_",16a)') ctrcnm(jn) 523 530 END IF 524 531 # endif 532 IF (jl.eq.jpdiatrc) THEN 533 ! short for surface boundary conditions for tracer 534 WRITE (cltra,'("SBC_",a)') ctrcnm(jn) 535 END IF 525 536 526 537 CALL histwrite(nit6(jn), cltra, it, trtrd(:,:,:,ikeep(jn),jl) &
Note: See TracChangeset
for help on using the changeset viewer.
