Changeset 2240 for branches/DEV_r2106_LOCEAN2010/NEMO/NST_SRC
- Timestamp:
- 2010-10-13T10:48:48+02:00 (14 years ago)
- Location:
- branches/DEV_r2106_LOCEAN2010/NEMO/NST_SRC
- Files:
-
- 4 edited
-
agrif_opa_interp.F90 (modified) (10 diffs)
-
agrif_opa_sponge.F90 (modified) (7 diffs)
-
agrif_opa_update.F90 (modified) (4 diffs)
-
agrif_top_sponge.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/DEV_r2106_LOCEAN2010/NEMO/NST_SRC/agrif_opa_interp.F90
r1605 r2240 220 220 DO jj=1,jpj 221 221 ua(1:2,jj,jk) = (zua(1:2,jj,jk)/(rhoy*e2u(1:2,jj))) 222 #if ! defined key_zco223 222 ua(1:2,jj,jk) = ua(1:2,jj,jk) / fse3u(1:2,jj,jk) 224 #endif225 223 END DO 226 224 END DO … … 276 274 DO jj=1,jpj 277 275 va(2,jj,jk) = (zva(2,jj,jk)/(zrhox*e1v(2,jj)))*vmask(2,jj,jk) 278 #if ! defined key_zco279 276 va(2,jj,jk) = va(2,jj,jk) / fse3v(2,jj,jk) 280 #endif281 277 END DO 282 278 END DO … … 297 293 ua(nlci-2:nlci-1,jj,jk) = (zua(nlci-2:nlci-1,jj,jk)/(rhoy*e2u(nlci-2:nlci-1,jj))) 298 294 299 #if ! defined key_zco300 295 ua(nlci-2:nlci-1,jj,jk) = ua(nlci-2:nlci-1,jj,jk) / fse3u(nlci-2:nlci-1,jj,jk) 301 #endif302 296 303 297 END DO … … 357 351 DO jj=1,jpj-1 358 352 va(nlci-1,jj,jk) = (zva(nlci-1,jj,jk)/(zrhox*e1v(nlci-1,jj)))*vmask(nlci-1,jj,jk) 359 #if ! defined key_zco360 353 va(nlci-1,jj,jk) = va(nlci-1,jj,jk) / fse3v(nlci-1,jj,jk) 361 #endif362 354 END DO 363 355 END DO … … 376 368 DO ji=1,jpi 377 369 va(ji,1:2,jk) = (zva(ji,1:2,jk)/(zrhox*e1v(ji,1:2))) 378 #if ! defined key_zco379 370 va(ji,1:2,jk) = va(ji,1:2,jk) / fse3v(ji,1:2,jk) 380 #endif381 371 END DO 382 372 END DO … … 432 422 DO ji=1,jpi 433 423 ua(ji,2,jk) = (zua(ji,2,jk)/(rhoy*e2u(ji,2)))*umask(ji,2,jk) 434 #if ! defined key_zco435 424 ua(ji,2,jk) = ua(ji,2,jk) / fse3u(ji,2,jk) 436 #endif437 425 END DO 438 426 END DO … … 451 439 DO ji=1,jpi 452 440 va(ji,nlcj-2:nlcj-1,jk) = (zva(ji,nlcj-2:nlcj-1,jk)/(zrhox*e1v(ji,nlcj-2:nlcj-1))) 453 #if ! defined key_zco454 441 va(ji,nlcj-2:nlcj-1,jk) = va(ji,nlcj-2:nlcj-1,jk) / fse3v(ji,nlcj-2:nlcj-1,jk) 455 #endif456 442 END DO 457 443 END DO … … 508 494 DO ji=1,jpi 509 495 ua(ji,nlcj-1,jk) = (zua(ji,nlcj-1,jk)/(rhoy*e2u(ji,nlcj-1)))*umask(ji,nlcj-1,jk) 510 #if ! defined key_zco511 496 ua(ji,nlcj-1,jk) = ua(ji,nlcj-1,jk) / fse3u(ji,nlcj-1,jk) 512 #endif513 497 END DO 514 498 END DO … … 535 519 DO ji=i1,i2 536 520 tabres(ji,jj,jk) = e2u(ji,jj) * un(ji,jj,jk) 537 #if ! defined key_zco538 521 tabres(ji,jj,jk) = tabres(ji,jj,jk) * fse3u(ji,jj,jk) 539 #endif540 522 END DO 541 523 END DO … … 578 560 DO ji=i1,i2 579 561 tabres(ji,jj,jk) = e1v(ji,jj) * vn(ji,jj,jk) 580 #if ! defined key_zco581 562 tabres(ji,jj,jk) = tabres(ji,jj,jk) * fse3v(ji,jj,jk) 582 #endif583 563 END DO 584 564 END DO -
branches/DEV_r2106_LOCEAN2010/NEMO/NST_SRC/agrif_opa_sponge.F90
r1300 r2240 130 130 DO jj = 1, jpjm1 131 131 DO ji = 1, jpim1 132 #if defined key_zco133 zabe1 = umask(ji,jj,jk) * spe1ur(ji,jj)134 zabe2 = vmask(ji,jj,jk) * spe2vr(ji,jj)135 #else136 132 zabe1 = umask(ji,jj,jk) * spe1ur(ji,jj) * fse3u(ji,jj,jk) 137 133 zabe2 = vmask(ji,jj,jk) * spe2vr(ji,jj) * fse3v(ji,jj,jk) 138 #endif139 134 ztu(ji,jj,jk) = zabe1 * ( tbdiff(ji+1,jj ,jk) - tbdiff(ji,jj,jk) ) 140 135 zsu(ji,jj,jk) = zabe1 * ( sbdiff(ji+1,jj ,jk) - sbdiff(ji,jj,jk) ) … … 146 141 DO jj = 2,jpjm1 147 142 DO ji = 2,jpim1 148 #if defined key_zco149 zbtr = spbtr2(ji,jj)150 #else151 143 zbtr = spbtr2(ji,jj) / fse3t(ji,jj,jk) 152 #endif153 144 ! horizontal diffusive trends 154 145 zta = zbtr * ( ztu(ji,jj,jk) - ztu(ji-1,jj,jk) & … … 282 273 DO jj = 2, jpjm1 283 274 DO ji = 2, jpim1 ! vector opt. 284 #if defined key_zco285 zbtr = spbtr2(ji,jj)286 hdivdiff(ji,jj,jk) = ( e2u(ji,jj) * ubdiff(ji,jj,jk) &287 - e2u(ji-1,jj ) * ubdiff(ji-1,jj ,jk) &288 & + e1v(ji,jj) * vbdiff(ji,jj,jk) - &289 & e1v(ji ,jj-1) * vbdiff(ji ,jj-1,jk) ) * zbtr290 #else291 275 zbtr = spbtr2(ji,jj) / fse3t(ji,jj,jk) 292 276 hdivdiff(ji,jj,jk) = & … … 297 281 vbdiff(ji,jj,jk) - e1v(ji ,jj-1)* & 298 282 fse3v(ji ,jj-1,jk) * vbdiff(ji ,jj-1,jk) ) * zbtr 299 #endif300 283 END DO 301 284 END DO … … 303 286 DO jj = 1, jpjm1 304 287 DO ji = 1, jpim1 ! vector opt. 305 #if defined key_zco306 zbtr = spbtr3(ji,jj)307 rotdiff(ji,jj,jk) = ( e2v(ji+1,jj ) * vbdiff(ji+1,jj ,jk) - e2v(ji,jj) * vbdiff(ji,jj,jk) &308 & - e1u(ji ,jj+1) * ubdiff(ji ,jj+1,jk) + e1u(ji,jj) * ubdiff(ji,jj,jk) ) &309 & * fmask(ji,jj,jk) * zbtr310 #else311 288 zbtr = spbtr3(ji,jj) * fse3f(ji,jj,jk) 312 289 rotdiff(ji,jj,jk) = ( e2v(ji+1,jj ) * vbdiff(ji+1,jj ,jk) - e2v(ji,jj) * vbdiff(ji,jj,jk) & 313 290 & - e1u(ji ,jj+1) * ubdiff(ji ,jj+1,jk) + e1u(ji,jj) * ubdiff(ji,jj,jk) ) & 314 291 & * fmask(ji,jj,jk) * zbtr 315 #endif316 292 END DO 317 293 END DO … … 324 300 DO jj = 2, jpjm1 325 301 DO ji = 2, jpim1 ! vector opt. 326 #if defined key_zco327 ! horizontal diffusive trends328 ze2u = rotdiff (ji,jj,jk)329 ze1v = hdivdiff(ji,jj,jk)330 zua = - ( ze2u - &331 rotdiff (ji,jj-1,jk) ) / e2u(ji,jj) &332 + ( hdivdiff(ji+1,jj,jk) - &333 ze1v ) / e1u(ji,jj)334 335 zva = + ( ze2u - &336 rotdiff (ji-1,jj,jk) ) / e1v(ji,jj) &337 + ( hdivdiff(ji,jj+1,jk) - &338 ze1v ) / e2v(ji,jj)339 #else340 302 ze2u = rotdiff (ji,jj,jk) 341 303 ze1v = hdivdiff(ji,jj,jk) … … 348 310 + ( hdivdiff(ji,jj+1,jk) - ze1v & 349 311 ) / e2v(ji,jj) 350 #endif351 312 352 313 ! add it to the general momentum trends -
branches/DEV_r2106_LOCEAN2010/NEMO/NST_SRC/agrif_opa_update.F90
r1587 r2240 198 198 DO ji=i1,i2 199 199 tabres(ji,jj,jk) = e2u(ji,jj) * un(ji,jj,jk) 200 #if ! defined key_zco201 tabres(ji,jj,jk) = tabres(ji,jj,jk) * fse3u(ji,jj,jk)202 #endif203 200 END DO 204 201 END DO … … 211 208 un(ji,jj,jk) = tabres(ji,jj,jk) / (e2u(ji,jj)) 212 209 un(ji,jj,jk) = un(ji,jj,jk) * umask(ji,jj,jk) 213 #if ! defined key_zco214 210 un(ji,jj,jk) = un(ji,jj,jk) / fse3u(ji,jj,jk) 215 #endif216 211 END DO 217 212 END DO … … 240 235 DO ji=i1,i2 241 236 tabres(ji,jj,jk) = e1v(ji,jj) * vn(ji,jj,jk) 242 #if ! defined key_zco243 237 tabres(ji,jj,jk) = tabres(ji,jj,jk) * fse3v(ji,jj,jk) 244 #endif245 238 END DO 246 239 END DO … … 253 246 vn(ji,jj,jk) = tabres(ji,jj,jk) / (e1v(ji,jj)) 254 247 vn(ji,jj,jk) = vn(ji,jj,jk) * vmask(ji,jj,jk) 255 #if ! defined key_zco256 248 vn(ji,jj,jk) = vn(ji,jj,jk) / fse3v(ji,jj,jk) 257 #endif258 249 END DO 259 250 END DO -
branches/DEV_r2106_LOCEAN2010/NEMO/NST_SRC/agrif_top_sponge.F90
r1271 r2240 123 123 DO jj = 1, jpjm1 124 124 DO ji = 1, jpim1 125 #if defined key_zco126 zabe1 = umask(ji,jj,jk) * spe1ur(ji,jj)127 zabe2 = vmask(ji,jj,jk) * spe2vr(ji,jj)128 #else129 125 zabe1 = umask(ji,jj,jk) * spe1ur(ji,jj) * fse3u(ji,jj,jk) 130 126 zabe2 = vmask(ji,jj,jk) * spe2vr(ji,jj) * fse3v(ji,jj,jk) 131 #endif132 127 ztru(ji,jj,jk,jl) = zabe1 * ( trbdiff(ji+1,jj ,jk,jl) - trbdiff(ji,jj,jk,jl) ) 133 128 ztrv(ji,jj,jk,jl) = zabe2 * ( trbdiff(ji ,jj+1,jk,jl) - trbdiff(ji,jj,jk,jl) ) … … 137 132 DO jj = 2,jpjm1 138 133 DO ji = 2,jpim1 139 #if defined key_zco140 zbtr = spbtr2(ji,jj)141 #else142 134 zbtr = spbtr2(ji,jj) / fse3t(ji,jj,jk) 143 #endif144 135 ! horizontal diffusive trends 145 136 ztra = zbtr * ( ztru(ji,jj,jk,jl) - ztru(ji-1,jj,jk,jl) &
Note: See TracChangeset
for help on using the changeset viewer.
