- Timestamp:
- 2018-12-18T16:57:34+01:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2018/dev_r9947_SI3_advection/src/ICE/icedyn_adv_umx.F90
r10399 r10411 138 138 ELSE ; icycle = 1 139 139 ENDIF 140 140 141 141 zdt = rdt_ice / REAL(icycle) 142 142 … … 161 161 162 162 IF(.NOT. ALLOCATED(z1_ai)) ALLOCATE(z1_ai(jpi,jpj)) 163 IF(.NOT. ALLOCATED(amaxu)) ALLOCATE(amaxu (jpi,jpj)) 164 IF(.NOT. ALLOCATED(amaxv)) ALLOCATE(amaxv (jpi,jpj)) 165 163 IF( ll_zeroup2 ) THEN 164 IF(.NOT. ALLOCATED(amaxu)) ALLOCATE(amaxu (jpi,jpj)) 165 IF(.NOT. ALLOCATED(amaxv)) ALLOCATE(amaxv (jpi,jpj)) 166 ENDIF 166 167 !---------------! 167 168 !== advection ==! … … 365 366 & * tmask(ji,jj,1) 366 367 ENDIF 367 IF( ji==26 .AND. jj==86) THEN368 WRITE(numout,*) '************************'369 WRITE(numout,*) 'zpt upstream',zpt(ji,jj)370 ENDIF368 !! IF( ji==26 .AND. jj==86) THEN 369 !! WRITE(numout,*) '************************' 370 !! WRITE(numout,*) 'zpt upstream',zpt(ji,jj) 371 !! ENDIF 371 372 END DO 372 373 END DO … … 412 413 & * tmask(ji,jj,1) 413 414 ENDIF 414 IF( ji==26 .AND. jj==86) THEN415 WRITE(numout,*) '************************'416 WRITE(numout,*) 'zpt upstream',zpt(ji,jj)417 ENDIF415 !! IF( ji==26 .AND. jj==86) THEN 416 !! WRITE(numout,*) '************************' 417 !! WRITE(numout,*) 'zpt upstream',zpt(ji,jj) 418 !! ENDIF 418 419 END DO 419 420 END DO … … 462 463 zt_ups(ji,jj) = ( ptc(ji,jj) + pdt * ztra ) * tmask(ji,jj,1) 463 464 ENDIF 464 IF( ji==26 .AND. jj==86) THEN465 WRITE(numout,*) '**************************'466 WRITE(numout,*) 'zt upstream',zt_ups(ji,jj)467 ENDIF465 !! IF( ji==26 .AND. jj==86) THEN 466 !! WRITE(numout,*) '**************************' 467 !! WRITE(numout,*) 'zt upstream',zt_ups(ji,jj) 468 !! ENDIF 468 469 END DO 469 470 END DO … … 506 507 IF( pt(ji,jj) < 0._wp .AND. pt(ji,jj) >= -epsi20 ) pt(ji,jj) = 0._wp 507 508 508 IF( ji==26 .AND. jj==86) THEN509 WRITE(numout,*) 'zt high order',pt(ji,jj)510 ENDIF509 !! IF( ji==26 .AND. jj==86) THEN 510 !! WRITE(numout,*) 'zt high order',pt(ji,jj) 511 !! ENDIF 511 512 END DO 512 513 END DO … … 590 591 ptc(ji,jj) = ( ptc(ji,jj) + ztra ) * tmask(ji,jj,1) 591 592 592 IF( ji==26 .AND. jj==86) THEN593 WRITE(numout,*) 'ztc high order',ptc(ji,jj)594 ENDIF593 !! IF( ji==26 .AND. jj==86) THEN 594 !! WRITE(numout,*) 'ztc high order',ptc(ji,jj) 595 !! ENDIF 595 596 596 597 END DO … … 1265 1266 WRITE(numout,*) '*** 1 negative high order zzt ***',ji,jj,zzt(ji,jj) 1266 1267 ENDIF 1267 IF( ji==26 .AND. jj==86) THEN1268 WRITE(numout,*) 'zzt high order',zzt(ji,jj)1269 WRITE(numout,*) 'pfu_ho',(pfu_ho(ji,jj)) * r1_e1e2t(ji,jj) * pdt1270 WRITE(numout,*) 'pfv_ho',(pfv_ho(ji,jj)) * r1_e1e2t(ji,jj) * pdt1271 WRITE(numout,*) 'pfu_hom1',(pfu_ho(ji-1,jj)) * r1_e1e2t(ji,jj) * pdt1272 WRITE(numout,*) 'pfv_hom1',(pfv_ho(ji,jj-1)) * r1_e1e2t(ji,jj) * pdt1273 ENDIF1268 !! IF( ji==26 .AND. jj==86) THEN 1269 !! WRITE(numout,*) 'zzt high order',zzt(ji,jj) 1270 !! WRITE(numout,*) 'pfu_ho',(pfu_ho(ji,jj)) * r1_e1e2t(ji,jj) * pdt 1271 !! WRITE(numout,*) 'pfv_ho',(pfv_ho(ji,jj)) * r1_e1e2t(ji,jj) * pdt 1272 !! WRITE(numout,*) 'pfu_hom1',(pfu_ho(ji-1,jj)) * r1_e1e2t(ji,jj) * pdt 1273 !! WRITE(numout,*) 'pfv_hom1',(pfv_ho(ji,jj-1)) * r1_e1e2t(ji,jj) * pdt 1274 !! ENDIF 1274 1275 IF( ll_gurvan ) THEN 1275 1276 zzt(ji,jj) = ( pt(ji,jj) - ( pfu_ho(ji,jj) - pfu_ho(ji-1,jj) ) * pdt * r1_e1e2t(ji,jj) & … … 1462 1463 ! 1463 1464 1464 IF( ji==26 .AND. jj==86) THEN1465 WRITE(numout,*) '-----------------'1466 WRITE(numout,*) 'zpos',zpos,zpos21467 WRITE(numout,*) 'zneg',zneg,zneg21468 WRITE(numout,*) 'puc/pu',ABS(puc(ji,jj))/MAX(epsi20, ABS(pu(ji,jj)))1469 WRITE(numout,*) 'pvc/pv',ABS(pvc(ji,jj))/MAX(epsi20, ABS(pv(ji,jj)))1470 WRITE(numout,*) 'pucm1/pu',ABS(puc(ji-1,jj))/MAX(epsi20, ABS(pu(ji-1,jj)))1471 WRITE(numout,*) 'pvcm1/pv',ABS(pvc(ji,jj-1))/MAX(epsi20, ABS(pv(ji,jj-1)))1472 WRITE(numout,*) 'pfu_ho',(pfu_ho(ji,jj)+pfu_low(ji,jj)) * r1_e1e2t(ji,jj) * pdt1473 WRITE(numout,*) 'pfv_ho',(pfv_ho(ji,jj)+pfv_low(ji,jj)) * r1_e1e2t(ji,jj) * pdt1474 WRITE(numout,*) 'pfu_hom1',(pfu_ho(ji-1,jj)+pfu_low(ji-1,jj)) * r1_e1e2t(ji,jj) * pdt1475 WRITE(numout,*) 'pfv_hom1',(pfv_ho(ji,jj-1)+pfv_low(ji,jj-1)) * r1_e1e2t(ji,jj) * pdt1476 WRITE(numout,*) 'pfu_low',pfu_low(ji,jj) * r1_e1e2t(ji,jj) * pdt1477 WRITE(numout,*) 'pfv_low',pfv_low(ji,jj) * r1_e1e2t(ji,jj) * pdt1478 WRITE(numout,*) 'pfu_lowm1',pfu_low(ji-1,jj) * r1_e1e2t(ji,jj) * pdt1479 WRITE(numout,*) 'pfv_lowm1',pfv_low(ji,jj-1) * r1_e1e2t(ji,jj) * pdt1480 1481 WRITE(numout,*) 'pt',pt(ji,jj)1482 WRITE(numout,*) 'ptim1',pt(ji-1,jj)1483 WRITE(numout,*) 'ptjm1',pt(ji,jj-1)1484 WRITE(numout,*) 'pt_low',pt_low(ji,jj)1485 WRITE(numout,*) 'zbetup',zbetup(ji,jj)1486 WRITE(numout,*) 'zbetdo',zbetdo(ji,jj)1487 WRITE(numout,*) 'zup',zup1488 WRITE(numout,*) 'zdo',zdo1489 ENDIF1465 !! IF( ji==26 .AND. jj==86) THEN 1466 ! WRITE(numout,*) '-----------------' 1467 ! WRITE(numout,*) 'zpos',zpos,zpos2 1468 ! WRITE(numout,*) 'zneg',zneg,zneg2 1469 ! WRITE(numout,*) 'puc/pu',ABS(puc(ji,jj))/MAX(epsi20, ABS(pu(ji,jj))) 1470 ! WRITE(numout,*) 'pvc/pv',ABS(pvc(ji,jj))/MAX(epsi20, ABS(pv(ji,jj))) 1471 ! WRITE(numout,*) 'pucm1/pu',ABS(puc(ji-1,jj))/MAX(epsi20, ABS(pu(ji-1,jj))) 1472 ! WRITE(numout,*) 'pvcm1/pv',ABS(pvc(ji,jj-1))/MAX(epsi20, ABS(pv(ji,jj-1))) 1473 ! WRITE(numout,*) 'pfu_ho',(pfu_ho(ji,jj)+pfu_low(ji,jj)) * r1_e1e2t(ji,jj) * pdt 1474 ! WRITE(numout,*) 'pfv_ho',(pfv_ho(ji,jj)+pfv_low(ji,jj)) * r1_e1e2t(ji,jj) * pdt 1475 ! WRITE(numout,*) 'pfu_hom1',(pfu_ho(ji-1,jj)+pfu_low(ji-1,jj)) * r1_e1e2t(ji,jj) * pdt 1476 ! WRITE(numout,*) 'pfv_hom1',(pfv_ho(ji,jj-1)+pfv_low(ji,jj-1)) * r1_e1e2t(ji,jj) * pdt 1477 ! WRITE(numout,*) 'pfu_low',pfu_low(ji,jj) * r1_e1e2t(ji,jj) * pdt 1478 ! WRITE(numout,*) 'pfv_low',pfv_low(ji,jj) * r1_e1e2t(ji,jj) * pdt 1479 ! WRITE(numout,*) 'pfu_lowm1',pfu_low(ji-1,jj) * r1_e1e2t(ji,jj) * pdt 1480 ! WRITE(numout,*) 'pfv_lowm1',pfv_low(ji,jj-1) * r1_e1e2t(ji,jj) * pdt 1481 ! 1482 ! WRITE(numout,*) 'pt',pt(ji,jj) 1483 ! WRITE(numout,*) 'ptim1',pt(ji-1,jj) 1484 ! WRITE(numout,*) 'ptjm1',pt(ji,jj-1) 1485 ! WRITE(numout,*) 'pt_low',pt_low(ji,jj) 1486 ! WRITE(numout,*) 'zbetup',zbetup(ji,jj) 1487 ! WRITE(numout,*) 'zbetdo',zbetdo(ji,jj) 1488 ! WRITE(numout,*) 'zup',zup 1489 ! WRITE(numout,*) 'zdo',zdo 1490 ! ENDIF 1490 1491 ! 1491 1492 END DO … … 1506 1507 pfu_ho(ji,jj) = pfu_ho(ji,jj) * zcoef + pfu_low(ji,jj) 1507 1508 1508 IF( ji==26 .AND. jj==86) THEN1509 WRITE(numout,*) 'coefU',zcoef1510 WRITE(numout,*) 'pfu_ho',(pfu_ho(ji,jj)) * r1_e1e2t(ji,jj) * pdt1511 WRITE(numout,*) 'pfu_hom1',(pfu_ho(ji-1,jj)) * r1_e1e2t(ji,jj) * pdt1512 ENDIF1509 !! IF( ji==26 .AND. jj==86) THEN 1510 !! WRITE(numout,*) 'coefU',zcoef 1511 !! WRITE(numout,*) 'pfu_ho',(pfu_ho(ji,jj)) * r1_e1e2t(ji,jj) * pdt 1512 !! WRITE(numout,*) 'pfu_hom1',(pfu_ho(ji-1,jj)) * r1_e1e2t(ji,jj) * pdt 1513 !! ENDIF 1513 1514 1514 1515 END DO … … 1525 1526 pfv_ho(ji,jj) = pfv_ho(ji,jj) * zcoef + pfv_low(ji,jj) 1526 1527 1527 IF( ji==26 .AND. jj==86) THEN1528 WRITE(numout,*) 'coefV',zcoef1529 WRITE(numout,*) 'pfv_ho',(pfv_ho(ji,jj)) * r1_e1e2t(ji,jj) * pdt1530 WRITE(numout,*) 'pfv_hom1',(pfv_ho(ji,jj-1)) * r1_e1e2t(ji,jj) * pdt1531 ENDIF1528 !! IF( ji==26 .AND. jj==86) THEN 1529 !! WRITE(numout,*) 'coefV',zcoef 1530 !! WRITE(numout,*) 'pfv_ho',(pfv_ho(ji,jj)) * r1_e1e2t(ji,jj) * pdt 1531 !! WRITE(numout,*) 'pfv_hom1',(pfv_ho(ji,jj-1)) * r1_e1e2t(ji,jj) * pdt 1532 !! ENDIF 1532 1533 END DO 1533 1534 END DO
Note: See TracChangeset
for help on using the changeset viewer.