Changeset 3494 for branches/2012/dev_r3438_LOCEAN15_PISLOB
- Timestamp:
- 2012-10-10T11:39:17+02:00 (12 years ago)
- Location:
- branches/2012/dev_r3438_LOCEAN15_PISLOB/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2012/dev_r3438_LOCEAN15_PISLOB/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zbio.F90
r3446 r3494 98 98 DO jj = 1, jpj 99 99 DO ji = 1, jpi 100 IF( ( trn(ji,jj,jk,jn) + tra(ji,jj,jk,jn) ) < 0.e0 ) THEN 101 ztra = ABS( trn(ji,jj,jk,jn) ) 102 xnegtr(ji,jj,jk) = MIN( xnegtr(ji,jj,jk), ztra / ( ztra + rtrn ) ) 100 IF( ( trn(ji,jj,jk,jn) + tra(ji,jj,jk,jn) ) < 0.e0 ) THEN 101 ztra = ABS( trn(ji,jj,jk,jn) ) / ( ABS( tra(ji,jj,jk,jn) ) + rtrn ) 102 103 xnegtr(ji,jj,jk) = MIN( xnegtr(ji,jj,jk), ztra ) 103 104 ENDIF 104 105 END DO -
branches/2012/dev_r3438_LOCEAN15_PISLOB/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsink.F90
r3481 r3494 690 690 INTEGER :: ji, jj, jk, jn 691 691 REAL(wp) :: zigma,zew,zign, zflx, zstep 692 REAL(wp), POINTER, DIMENSION(:,:,:) :: ztraz, zakz, zwsink2 692 REAL(wp), POINTER, DIMENSION(:,:,:) :: ztraz, zakz, zwsink2, ztrb 693 693 !!--------------------------------------------------------------------- 694 694 ! … … 696 696 ! 697 697 ! Allocate temporary workspace 698 CALL wrk_alloc( jpi, jpj, jpk, ztraz, zakz, zwsink2 )698 CALL wrk_alloc( jpi, jpj, jpk, ztraz, zakz, zwsink2, ztrb ) 699 699 700 700 zstep = rfact2 / FLOAT( kiter ) / 2. … … 702 702 ztraz(:,:,:) = 0.e0 703 703 zakz (:,:,:) = 0.e0 704 ztrb (:,:,:) = trn(:,:,:,jp_tra) 704 705 705 706 DO jk = 1, jpkm1 … … 767 768 ENDDO 768 769 769 DO jk =1,jpkm1770 DO jk = 1,jpkm1 770 771 DO jj = 1,jpj 771 772 DO ji = 1, jpi 772 773 zflx = ( psinkflx(ji,jj,jk) - psinkflx(ji,jj,jk+1) ) / fse3t(ji,jj,jk) 773 trb(ji,jj,jk,jp_tra) = trb(ji,jj,jk,jp_tra) + 2. * zflx774 END DO 775 END DO 776 END DO 777 778 trn (:,:,:,jp_tra) = trb(:,:,:,jp_tra)779 psinkflx(:,:,:) 780 ! 781 CALL wrk_dealloc( jpi, jpj, jpk, ztraz, zakz, zwsink2 )774 ztrb(ji,jj,jk) = ztrb(ji,jj,jk) + 2. * zflx 775 END DO 776 END DO 777 END DO 778 779 trn(:,:,:,jp_tra) = ztrb(:,:,:) 780 psinkflx(:,:,:) = 2. * psinkflx(:,:,:) 781 ! 782 CALL wrk_dealloc( jpi, jpj, jpk, ztraz, zakz, zwsink2, ztrb ) 782 783 ! 783 784 IF( nn_timing == 1 ) CALL timing_stop('p4z_sink2')
Note: See TracChangeset
for help on using the changeset viewer.