Changeset 13472 for NEMO/trunk/src/NST
- Timestamp:
- 2020-09-16T15:05:19+02:00 (4 years ago)
- Location:
- NEMO/trunk/src/NST
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk/src/NST/agrif_ice_interp.F90
r13286 r13472 176 176 ptab(i1:i2,j1:j2,jm+5) = a_ip(i1:i2,j1:j2,jl) 177 177 ptab(i1:i2,j1:j2,jm+6) = v_ip(i1:i2,j1:j2,jl) 178 ptab(i1:i2,j1:j2,jm+7) = t_su(i1:i2,j1:j2,jl) 179 jm = jm + 8 178 ptab(i1:i2,j1:j2,jm+7) = v_il(i1:i2,j1:j2,jl) 179 ptab(i1:i2,j1:j2,jm+8) = t_su(i1:i2,j1:j2,jl) 180 jm = jm + 9 180 181 DO jk = 1, nlay_s 181 182 ptab(i1:i2,j1:j2,jm) = e_s(i1:i2,j1:j2,jk,jl) ; jm = jm + 1 … … 206 207 a_ip(ji,jj,jl) = ptab(ji,jj,jm+5) * tmask(ji,jj,1) 207 208 v_ip(ji,jj,jl) = ptab(ji,jj,jm+6) * tmask(ji,jj,1) 208 t_su(ji,jj,jl) = ptab(ji,jj,jm+7) * tmask(ji,jj,1) 209 v_il(ji,jj,jl) = ptab(ji,jj,jm+7) * tmask(ji,jj,1) 210 t_su(ji,jj,jl) = ptab(ji,jj,jm+8) * tmask(ji,jj,1) 209 211 END DO 210 212 END DO 211 jm = jm + 8213 jm = jm + 9 212 214 ! 213 215 DO jk = 1, nlay_s … … 239 241 ! ztab(:,:,jm+5) = a_ip(:,:,jl) 240 242 ! ztab(:,:,jm+6) = v_ip(:,:,jl) 241 ! ztab(:,:,jm+7) = t_su(:,:,jl) 242 ! jm = jm + 8 243 ! ztab(:,:,jm+7) = v_il(:,:,jl) 244 ! ztab(:,:,jm+8) = t_su(:,:,jl) 245 ! jm = jm + 9 243 246 ! DO jk = 1, nlay_s 244 247 ! ztab(:,:,jm) = e_s(:,:,jk,jl) … … 345 348 ! a_ip(ji,jj,jl) = ztab(ji,jj,jm+5) * tmask(ji,jj,1) 346 349 ! v_ip(ji,jj,jl) = ztab(ji,jj,jm+6) * tmask(ji,jj,1) 347 ! t_su(ji,jj,jl) = ztab(ji,jj,jm+7) * tmask(ji,jj,1) 350 ! v_il(ji,jj,jl) = ztab(ji,jj,jm+7) * tmask(ji,jj,1) 351 ! t_su(ji,jj,jl) = ztab(ji,jj,jm+8) * tmask(ji,jj,1) 348 352 ! END DO 349 353 ! END DO 350 ! jm = jm + 8354 ! jm = jm + 9 351 355 ! ! 352 356 ! DO jk = 1, nlay_s -
NEMO/trunk/src/NST/agrif_ice_update.F90
r13216 r13472 109 109 ptab(i1:i2,j1:j2,jm+5) = a_ip(i1:i2,j1:j2,jl) 110 110 ptab(i1:i2,j1:j2,jm+6) = v_ip(i1:i2,j1:j2,jl) 111 ptab(i1:i2,j1:j2,jm+7) = t_su(i1:i2,j1:j2,jl) 112 jm = jm + 8 111 ptab(i1:i2,j1:j2,jm+7) = v_il(i1:i2,j1:j2,jl) 112 ptab(i1:i2,j1:j2,jm+8) = t_su(i1:i2,j1:j2,jl) 113 jm = jm + 9 113 114 DO jk = 1, nlay_s 114 115 ptab(i1:i2,j1:j2,jm) = e_s(i1:i2,j1:j2,jk,jl) ; jm = jm + 1 … … 138 139 a_ip(ji,jj,jl) = ptab(ji,jj,jm+5) * tmask(ji,jj,1) 139 140 v_ip(ji,jj,jl) = ptab(ji,jj,jm+6) * tmask(ji,jj,1) 140 t_su(ji,jj,jl) = ptab(ji,jj,jm+7) * tmask(ji,jj,1) 141 v_il(ji,jj,jl) = ptab(ji,jj,jm+7) * tmask(ji,jj,1) 142 t_su(ji,jj,jl) = ptab(ji,jj,jm+8) * tmask(ji,jj,1) 141 143 ENDIF 142 144 END DO 143 145 END DO 144 jm = jm + 8146 jm = jm + 9 145 147 ! 146 148 DO jk = 1, nlay_s -
NEMO/trunk/src/NST/agrif_user.F90
r13295 r13472 663 663 ind2 = nn_hls + 2 + nbghostcells_x 664 664 ind3 = nn_hls + 2 + nbghostcells_y_s 665 ipl = jpl*( 8+nlay_s+nlay_i)665 ipl = jpl*(9+nlay_s+nlay_i) 666 666 CALL agrif_declare_variable((/2,2,0/),(/ind2,ind3,0/),(/'x','y','N'/),(/1,1,1/),(/jpi,jpj,ipl/),tra_ice_id) 667 667 CALL agrif_declare_variable((/1,2/) ,(/ind2-1,ind3/),(/'x','y' /),(/1,1 /),(/jpi,jpj /), u_ice_id)
Note: See TracChangeset
for help on using the changeset viewer.