Changeset 469 for trunk/NEMO/NST_SRC
- Timestamp:
- 2006-05-10T19:51:23+02:00 (18 years ago)
- Location:
- trunk/NEMO/NST_SRC
- Files:
-
- 4 edited
-
agrif_opa_interp.F90 (modified) (10 diffs)
-
agrif_opa_sponge.F90 (modified) (6 diffs)
-
agrif_opa_update.F90 (modified) (5 diffs)
-
agrif_user.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/NST_SRC/agrif_opa_interp.F90
r393 r469 196 196 DO jj=1,jpj 197 197 ua(1:2,jj,jk) = (uatemp(1:2,jj,jk)/(rhoy*e2u(1:2,jj))) 198 #if defined key_partial_steps198 #if ! defined key_zco 199 199 ua(1:2,jj,jk) = ua(1:2,jj,jk) / fse3u(1:2,jj,jk) 200 200 #endif … … 252 252 Do jj=1,jpj 253 253 va(2,jj,jk) = (vatemp(2,jj,jk)/(rhox*e1v(2,jj)))*vmask(2,jj,jk) 254 #if defined key_partial_steps254 #if ! defined key_zco 255 255 va(2,jj,jk) = va(2,jj,jk) / fse3v(2,jj,jk) 256 256 #endif … … 273 273 ua(nlci-2:nlci-1,jj,jk) = (uatemp(nlci-2:nlci-1,jj,jk)/(rhoy*e2u(nlci-2:nlci-1,jj))) 274 274 275 #if defined key_partial_steps275 #if ! defined key_zco 276 276 ua(nlci-2:nlci-1,jj,jk) = ua(nlci-2:nlci-1,jj,jk) / fse3u(nlci-2:nlci-1,jj,jk) 277 277 #endif … … 333 333 Do jj=1,jpj-1 334 334 va(nlci-1,jj,jk) = (vatemp(nlci-1,jj,jk)/(rhox*e1v(nlci-1,jj)))*vmask(nlci-1,jj,jk) 335 #if defined key_partial_steps335 #if ! defined key_zco 336 336 va(nlci-1,jj,jk) = va(nlci-1,jj,jk) / fse3v(nlci-1,jj,jk) 337 337 #endif … … 352 352 DO ji=1,jpi 353 353 va(ji,1:2,jk) = (vatemp(ji,1:2,jk)/(rhox*e1v(ji,1:2))) 354 #if defined key_partial_steps354 #if ! defined key_zco 355 355 va(ji,1:2,jk) = va(ji,1:2,jk) / fse3v(ji,1:2,jk) 356 356 #endif … … 408 408 DO ji=1,jpi 409 409 ua(ji,2,jk) = (uatemp(ji,2,jk)/(rhoy*e2u(ji,2)))*umask(ji,2,jk) 410 #if defined key_partial_steps410 #if ! defined key_zco 411 411 ua(ji,2,jk) = ua(ji,2,jk) / fse3u(ji,2,jk) 412 412 #endif … … 427 427 DO ji=1,jpi 428 428 va(ji,nlcj-2:nlcj-1,jk) = (vatemp(ji,nlcj-2:nlcj-1,jk)/(rhox*e1v(ji,nlcj-2:nlcj-1))) 429 #if defined key_partial_steps429 #if ! defined key_zco 430 430 va(ji,nlcj-2:nlcj-1,jk) = va(ji,nlcj-2:nlcj-1,jk) / fse3v(ji,nlcj-2:nlcj-1,jk) 431 431 #endif … … 484 484 DO ji=1,jpi 485 485 ua(ji,nlcj-1,jk) = (uatemp(ji,nlcj-1,jk)/(rhoy*e2u(ji,nlcj-1)))*umask(ji,nlcj-1,jk) 486 #if defined key_partial_steps486 #if ! defined key_zco 487 487 ua(ji,nlcj-1,jk) = ua(ji,nlcj-1,jk) / fse3u(ji,nlcj-1,jk) 488 488 #endif … … 510 510 DO ji=i1,i2 511 511 tabres(ji,jj,jk) = e2u(ji,jj) * un(ji,jj,jk) 512 #if defined key_partial_steps512 #if ! defined key_zco 513 513 tabres(ji,jj,jk) = tabres(ji,jj,jk) * fse3u(ji,jj,jk) 514 514 #endif … … 543 543 DO ji=i1,i2 544 544 tabres(ji,jj,jk) = e1v(ji,jj) * vn(ji,jj,jk) 545 #if defined key_partial_steps545 #if ! defined key_zco 546 546 tabres(ji,jj,jk) = tabres(ji,jj,jk) * fse3v(ji,jj,jk) 547 547 #endif -
trunk/NEMO/NST_SRC/agrif_opa_sponge.F90
r393 r469 143 143 DO jj = 1, jpjm1 144 144 DO ji = 1, jpim1 145 #if defined key_s_coord || defined key_partial_steps 145 #if defined key_zco 146 zabe1 = umasktemp(ji,jj,jk) * zspe1ur(ji,jj) 147 zabe2 = vmasktemp(ji,jj,jk) * zspe2vr(ji,jj) 148 #else 146 149 zabe1 = umasktemp(ji,jj,jk) * zspe1ur(ji,jj) * fse3u(ji,jj,jk) 147 150 zabe2 = vmasktemp(ji,jj,jk) * zspe2vr(ji,jj) * fse3v(ji,jj,jk) 148 #else149 zabe1 = umasktemp(ji,jj,jk) * zspe1ur(ji,jj)150 zabe2 = vmasktemp(ji,jj,jk) * zspe2vr(ji,jj)151 151 #endif 152 152 ztu(ji,jj,jk) = zabe1 * ( tbdiff(ji+1,jj ,jk) - tbdiff(ji,jj,jk) ) … … 159 159 DO jj = 2,jpjm1 160 160 DO ji = 2,jpim1 161 #if defined key_s_coord || defined key_partial_steps 161 #if defined key_zco 162 zbtr = zspbtr2(ji,jj) 163 #else 162 164 zbtr = zspbtr2(ji,jj) / fse3t(ji,jj,jk) 163 #else164 zbtr = zspbtr2(ji,jj)165 165 #endif 166 166 ! horizontal diffusive trends … … 316 316 DO jj = 2, jpjm1 317 317 DO ji = 2, jpim1 ! vector opt. 318 #if defined key_s_coord || defined key_partial_steps 318 #if defined key_zco 319 hdivdiff(ji,jj,jk) = ( e2u(ji,jj) * ubdiff(ji,jj,jk) & 320 - e2u(ji-1,jj ) * ubdiff(ji-1,jj ,jk) & 321 & + e1v(ji,jj) * vbdiff(ji,jj,jk) - & 322 & e1v(ji ,jj-1) * vbdiff(ji ,jj-1,jk) ) & 323 & / ( e1t(ji,jj) * e2t(ji,jj) ) 324 #else 319 325 hdivdiff(ji,jj,jk) = & 320 326 ( e2u(ji,jj)*fse3u(ji,jj,jk) * & … … 325 331 fse3v(ji ,jj-1,jk) * vbdiff(ji ,jj-1,jk) ) & 326 332 / ( e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) ) 327 #else328 hdivdiff(ji,jj,jk) = ( e2u(ji,jj) * ubdiff(ji,jj,jk) &329 - e2u(ji-1,jj ) * ubdiff(ji-1,jj ,jk) &330 & + e1v(ji,jj) * vbdiff(ji,jj,jk) - &331 & e1v(ji ,jj-1) * vbdiff(ji ,jj-1,jk) ) &332 & / ( e1t(ji,jj) * e2t(ji,jj) )333 333 #endif 334 334 END DO … … 350 350 DO jj = 2, jpjm1 351 351 DO ji = 2, jpim1 ! vector opt. 352 #if defined key_s_coord || defined key_partial_steps 352 #if defined key_zco 353 ! horizontal diffusive trends 354 ze2u = rotdiff (ji,jj,jk) 355 ze1v = hdivdiff(ji,jj,jk) 356 zua = - ( ze2u - & 357 rotdiff (ji,jj-1,jk) ) / e2u(ji,jj) & 358 + ( hdivdiff(ji+1,jj,jk) - & 359 ze1v ) / e1u(ji,jj) 360 361 zva = + ( ze2u - & 362 rotdiff (ji-1,jj,jk) ) / e1v(ji,jj) & 363 + ( hdivdiff(ji,jj+1,jk) - & 364 ze1v ) / e2v(ji,jj) 365 #else 353 366 ze2u = rotdiff (ji,jj,jk)*fse3f(ji,jj,jk) 354 367 ze1v = hdivdiff(ji,jj,jk) … … 363 376 + ( hdivdiff(ji,jj+1,jk) - ze1v & 364 377 ) / e2v(ji,jj) 365 #else366 ! horizontal diffusive trends367 ze2u = rotdiff (ji,jj,jk)368 ze1v = hdivdiff(ji,jj,jk)369 zua = - ( ze2u - &370 rotdiff (ji,jj-1,jk) ) / e2u(ji,jj) &371 + ( hdivdiff(ji+1,jj,jk) - &372 ze1v ) / e1u(ji,jj)373 374 zva = + ( ze2u - &375 rotdiff (ji-1,jj,jk) ) / e1v(ji,jj) &376 + ( hdivdiff(ji,jj+1,jk) - &377 ze1v ) / e2v(ji,jj)378 378 #endif 379 379 -
trunk/NEMO/NST_SRC/agrif_opa_update.F90
r453 r469 66 66 ! 67 67 ! 68 69 68 IF ((Agrif_NbStepint() .NE. (Agrif_irhot()-1)).AND.(kt /= 0)) Return 70 69 #if defined TWO_WAY … … 205 204 DO ji=i1,i2 206 205 tabres(ji,jj,jk) = e2u(ji,jj) * un(ji,jj,jk) 207 #if defined key_partial_steps206 #if ! defined key_zco 208 207 tabres(ji,jj,jk) = tabres(ji,jj,jk) * fse3u(ji,jj,jk) 209 208 #endif … … 221 220 un(ji,jj,jk) = tabres(ji,jj,jk) / (e2u(ji,jj)) 222 221 un(ji,jj,jk) = un(ji,jj,jk) * umask(ji,jj,jk) 223 #if defined key_partial_steps222 #if ! defined key_zco 224 223 un(ji,jj,jk) = un(ji,jj,jk) / fse3u(ji,jj,jk) 225 224 #endif … … 249 248 DO ji=i1,i2 250 249 tabres(ji,jj,jk) = e1v(ji,jj) * vn(ji,jj,jk) 251 #if defined key_partial_steps250 #if ! defined key_zco 252 251 tabres(ji,jj,jk) = tabres(ji,jj,jk) * fse3v(ji,jj,jk) 253 252 #endif … … 265 264 vn(ji,jj,jk) = tabres(ji,jj,jk) / (e1v(ji,jj)) 266 265 vn(ji,jj,jk) = vn(ji,jj,jk) * vmask(ji,jj,jk) 267 #if defined key_partial_steps266 #if ! defined key_zco 268 267 vn(ji,jj,jk) = vn(ji,jj,jk) / fse3v(ji,jj,jk) 269 268 #endif -
trunk/NEMO/NST_SRC/agrif_user.F90
r393 r469 238 238 ! 239 239 ! 240 #if defined key_partial_steps 240 IF ( ln_zps ) THEN 241 241 ! 242 242 ! check parameters for partial steps … … 257 257 stop 258 258 Endif 259 #endif 259 ENDIF 260 260 ! 261 261 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.
