Changeset 13479
- Timestamp:
- 2020-09-16T18:56:46+02:00 (4 years ago)
- Location:
- NEMO/releases/r4.0/r4.0-HEAD/src/NST
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/releases/r4.0/r4.0-HEAD/src/NST/agrif_ice_interp.F90
r10069 r13479 167 167 ptab(i1:i2,j1:j2,jm+5) = a_ip(i1:i2,j1:j2,jl) 168 168 ptab(i1:i2,j1:j2,jm+6) = v_ip(i1:i2,j1:j2,jl) 169 ptab(i1:i2,j1:j2,jm+7) = t_su(i1:i2,j1:j2,jl) 170 jm = jm + 8 169 ptab(i1:i2,j1:j2,jm+7) = v_il(i1:i2,j1:j2,jl) 170 ptab(i1:i2,j1:j2,jm+8) = t_su(i1:i2,j1:j2,jl) 171 jm = jm + 9 171 172 DO jk = 1, nlay_s 172 173 ptab(i1:i2,j1:j2,jm) = e_s(i1:i2,j1:j2,jk,jl) ; jm = jm + 1 … … 197 198 a_ip(ji,jj,jl) = ptab(ji,jj,jm+5) * tmask(ji,jj,1) 198 199 v_ip(ji,jj,jl) = ptab(ji,jj,jm+6) * tmask(ji,jj,1) 199 t_su(ji,jj,jl) = ptab(ji,jj,jm+7) * tmask(ji,jj,1) 200 v_il(ji,jj,jl) = ptab(ji,jj,jm+7) * tmask(ji,jj,1) 201 t_su(ji,jj,jl) = ptab(ji,jj,jm+8) * tmask(ji,jj,1) 200 202 END DO 201 203 END DO 202 jm = jm + 8204 jm = jm + 9 203 205 ! 204 206 DO jk = 1, nlay_s … … 230 232 ! ztab(:,:,jm+5) = a_ip(:,:,jl) 231 233 ! ztab(:,:,jm+6) = v_ip(:,:,jl) 232 ! ztab(:,:,jm+7) = t_su(:,:,jl) 233 ! jm = jm + 8 234 ! ztab(:,:,jm+7) = v_il(:,:,jl) 235 ! ztab(:,:,jm+8) = t_su(:,:,jl) 236 ! jm = jm + 9 234 237 ! DO jk = 1, nlay_s 235 238 ! ztab(:,:,jm) = e_s(:,:,jk,jl) … … 336 339 ! a_ip(ji,jj,jl) = ztab(ji,jj,jm+5) * tmask(ji,jj,1) 337 340 ! v_ip(ji,jj,jl) = ztab(ji,jj,jm+6) * tmask(ji,jj,1) 338 ! t_su(ji,jj,jl) = ztab(ji,jj,jm+7) * tmask(ji,jj,1) 341 ! v_il(ji,jj,jl) = ztab(ji,jj,jm+7) * tmask(ji,jj,1) 342 ! t_su(ji,jj,jl) = ztab(ji,jj,jm+8) * tmask(ji,jj,1) 339 343 ! END DO 340 344 ! END DO 341 ! jm = jm + 8345 ! jm = jm + 9 342 346 ! ! 343 347 ! DO jk = 1, nlay_s -
NEMO/releases/r4.0/r4.0-HEAD/src/NST/agrif_ice_update.F90
r10069 r13479 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/releases/r4.0/r4.0-HEAD/src/NST/agrif_user.F90
r12138 r13479 519 519 ind2 = 1 + nbghostcells 520 520 ind3 = 2 + nbghostcells 521 CALL agrif_declare_variable((/2,2,0/),(/ind3,ind3,0/),(/'x','y','N'/),(/1,1,1/),(/nlci,nlcj,jpl*( 8+nlay_s+nlay_i)/),tra_ice_id)521 CALL agrif_declare_variable((/2,2,0/),(/ind3,ind3,0/),(/'x','y','N'/),(/1,1,1/),(/nlci,nlcj,jpl*(9+nlay_s+nlay_i)/),tra_ice_id) 522 522 CALL agrif_declare_variable((/1,2/) ,(/ind2,ind3/) ,(/'x','y'/) ,(/1,1/) ,(/nlci,nlcj/) ,u_ice_id ) 523 523 CALL agrif_declare_variable((/2,1/) ,(/ind3,ind2/) ,(/'x','y'/) ,(/1,1/) ,(/nlci,nlcj/) ,v_ice_id )
Note: See TracChangeset
for help on using the changeset viewer.