Changeset 4451
- Timestamp:
- 2014-02-04T13:16:21+01:00 (10 years ago)
- Location:
- branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90
r3211 r4451 48 48 USE agrif_opa_interp 49 49 #endif 50 USE timing 50 51 51 52 IMPLICIT NONE … … 108 109 !!---------------------------------------------------------------------- 109 110 111 CALL timing_start('tra_nxt') 112 110 113 IF( kt == nit000 ) THEN 111 114 IF(lwp) WRITE(numout,*) … … 155 158 DO jj = 1, jpj 156 159 DO ji = 1, jpi 157 DO jk = 1, jpkm1160 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 158 161 tsn(ji,jj,jk,jn) = tsa(ji,jj,jk,jn) 159 162 END DO … … 185 188 DO jj = 1, jpj 186 189 DO ji = 1, jpi 187 DO jk = 1, jpkm1190 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 188 191 zfact = 1.e0 / r2dtra(jk) 189 192 ztrdt(ji,jj,jk) = ( tsb(ji,jj,jk,jp_tem) - ztrdt(ji,jj,jk) ) * zfact … … 207 210 IF(ln_ctl) CALL prt_ctl( tab3d_1=tsn(:,:,:,jp_tem), clinfo1=' nxt - Tn: ', mask1=tmask, & 208 211 & tab3d_2=tsn(:,:,:,jp_sal), clinfo2= ' Sn: ', mask2=tmask ) 212 ! 213 CALL timing_stop('tra_nxt','section') 209 214 ! 210 215 END SUBROUTINE tra_nxt … … 371 376 DO jj = 1, jpj 372 377 DO ji = 1, jpi 373 DO jk = 1, jpkm1378 DO jk = 1, mbkmax(ji,jj)-1 ! jpkm1 374 379 !! DCSE_NEMO: could try promoting these scalars to vectors 375 380 zfact1 = atfp * rdttra(jk) -
branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA/traswp.F90
r3211 r4451 6 6 USE par_oce ! ocean parameters 7 7 USE oce ! ocean dynamics and active tracers 8 USE dom_oce, ONLY: mbkmax 8 9 9 10 IMPLICIT NONE … … 31 32 !!---------------------------------------------------------------------- 32 33 ! 34 #if defined key_z_first 35 INTEGER :: ji,jj,jk 36 37 DO jj = 1, jpj, 1 38 DO ji = 1, jpi, 1 39 DO jk = 1, mbkmax(ji,jj), 1 40 tsn(ji,jj,jk,jp_tem) = tn(ji,jj,jk) ; tsn(ji,jj,jk,jp_sal) = sn(ji,jj,jk) 41 tsb(ji,jj,jk,jp_tem) = tb(ji,jj,jk) ; tsb(ji,jj,jk,jp_sal) = sb(ji,jj,jk) 42 tsa(ji,jj,jk,jp_tem) = ta(ji,jj,jk) ; tsa(ji,jj,jk,jp_sal) = sa(ji,jj,jk) 43 END DO 44 END DO 45 END DO 46 #else 33 47 tsn(:,:,:,jp_tem) = tn(:,:,:) ; tsn(:,:,:,jp_sal) = sn(:,:,:) 34 48 tsb(:,:,:,jp_tem) = tb(:,:,:) ; tsb(:,:,:,jp_sal) = sb(:,:,:) 35 49 tsa(:,:,:,jp_tem) = ta(:,:,:) ; tsa(:,:,:,jp_sal) = sa(:,:,:) 50 #endif 36 51 ! 37 52 END SUBROUTINE tra_swap … … 45 60 !!---------------------------------------------------------------------- 46 61 ! 62 #if defined key_z_first 63 INTEGER :: ji,jj,jk 64 65 DO jj = 1, jpj, 1 66 DO ji = 1, jpi, 1 67 DO jk = 1, mbkmax(ji,jj), 1 68 tn(ji,jj,jk) = tsn(ji,jj,jk,jp_tem) ; sn(ji,jj,jk) = tsn(ji,jj,jk,jp_sal) 69 tb(ji,jj,jk) = tsb(ji,jj,jk,jp_tem) ; sb(ji,jj,jk) = tsb(ji,jj,jk,jp_sal) 70 ta(ji,jj,jk) = tsa(ji,jj,jk,jp_tem) ; sa(ji,jj,jk) = tsa(ji,jj,jk,jp_sal) 71 END DO 72 END DO 73 END DO 74 #else 47 75 tn(:,:,:) = tsn(:,:,:,jp_tem) ; sn(:,:,:) = tsn(:,:,:,jp_sal) 48 76 tb(:,:,:) = tsb(:,:,:,jp_tem) ; sb(:,:,:) = tsb(:,:,:,jp_sal) 49 77 ta(:,:,:) = tsa(:,:,:,jp_tem) ; sa(:,:,:) = tsa(:,:,:,jp_sal) 78 #endif 50 79 ! 51 80 END SUBROUTINE tra_unswap
Note: See TracChangeset
for help on using the changeset viewer.