Changeset 9160
 Timestamp:
 20171221T19:58:56+01:00 (3 years ago)
 Location:
 branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC
 Files:

 3 edited
Legend:
 Unmodified
 Added
 Removed

branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_lim3_interp.F90
r9019 r9160 63 63 ENDIF 64 64 CASE('T') 65 zbeta = REAL(lim_nbstep 1) / ( Agrif_Rhot() * REAL(Agrif_Parent(nn_fsbc)) / REAL(nn_fsbc) )65 zbeta = REAL(lim_nbstep) / ( Agrif_Rhot() * REAL(Agrif_Parent(nn_fsbc)) / REAL(nn_fsbc) ) 66 66 END SELECT 67 67 ! … … 96 96 ! 97 97 IF( before ) THEN ! parent grid 98 ptab(:,:) = e2u(i1:i2,j1:j2) * u_ice _b(i1:i2,j1:j2)98 ptab(:,:) = e2u(i1:i2,j1:j2) * u_ice(i1:i2,j1:j2) 99 99 WHERE( umask(i1:i2,j1:j2,1) == 0. ) ptab(i1:i2,j1:j2) = Agrif_SpecialValue 100 100 ELSE ! child grid … … 123 123 ! 124 124 IF( before ) THEN ! parent grid 125 ptab(:,:) = e1v(i1:i2,j1:j2) * v_ice _b(i1:i2,j1:j2)125 ptab(:,:) = e1v(i1:i2,j1:j2) * v_ice(i1:i2,j1:j2) 126 126 WHERE( vmask(i1:i2,j1:j2,1) == 0. ) ptab(i1:i2,j1:j2) = Agrif_SpecialValue 127 127 ELSE ! child grid … … 160 160 jm = 1 161 161 DO jl = 1, jpl 162 ptab(i1:i2,j1:j2,jm ) = a_i _b(i1:i2,j1:j2,jl)163 ptab(i1:i2,j1:j2,jm+1) = v_i _b(i1:i2,j1:j2,jl)164 ptab(i1:i2,j1:j2,jm+2) = v_s _b(i1:i2,j1:j2,jl)165 ptab(i1:i2,j1:j2,jm+3) = sv_i _b(i1:i2,j1:j2,jl)166 ptab(i1:i2,j1:j2,jm+4) = oa_i _b(i1:i2,j1:j2,jl)162 ptab(i1:i2,j1:j2,jm ) = a_i (i1:i2,j1:j2,jl) 163 ptab(i1:i2,j1:j2,jm+1) = v_i (i1:i2,j1:j2,jl) 164 ptab(i1:i2,j1:j2,jm+2) = v_s (i1:i2,j1:j2,jl) 165 ptab(i1:i2,j1:j2,jm+3) = sv_i(i1:i2,j1:j2,jl) 166 ptab(i1:i2,j1:j2,jm+4) = oa_i(i1:i2,j1:j2,jl) 167 167 jm = jm + 5 168 168 DO jk = 1, nlay_s 169 ptab(i1:i2,j1:j2,jm) = e_s _b(i1:i2,j1:j2,jk,jl) ; jm = jm + 1169 ptab(i1:i2,j1:j2,jm) = e_s(i1:i2,j1:j2,jk,jl) ; jm = jm + 1 170 170 END DO 171 171 DO jk = 1, nlay_i 172 ptab(i1:i2,j1:j2,jm) = e_i _b(i1:i2,j1:j2,jk,jl) ; jm = jm + 1172 ptab(i1:i2,j1:j2,jm) = e_i(i1:i2,j1:j2,jk,jl) ; jm = jm + 1 173 173 END DO 174 174 END DO 
branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_lim3_update.F90
r9031 r9160 142 142 ! 143 143 ! integrated values 144 vt_i 145 vt_s 146 at_i 147 et_s(i1:i2,j1:j2) 148 et_i(i1:i2,j1:j2) 144 vt_i(i1:i2,j1:j2) = SUM( v_i(i1:i2,j1:j2,:) , dim=3 ) 145 vt_s(i1:i2,j1:j2) = SUM( v_s(i1:i2,j1:j2,:) , dim=3 ) 146 at_i(i1:i2,j1:j2) = SUM( a_i(i1:i2,j1:j2,:) , dim=3 ) 147 et_s(i1:i2,j1:j2) = SUM( SUM( e_s(i1:i2,j1:j2,:,:), dim=4 ), dim=3 ) 148 et_i(i1:i2,j1:j2) = SUM( SUM( e_i(i1:i2,j1:j2,:,:), dim=4 ), dim=3 ) 149 149 150 150 ENDIF 
branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_user.F90
r9134 r9160 546 546 ! First Interpolations (using "after" ice subtime step => lim_nbstep=1) 547 547 ! 548 !! lim_nbstep = 1549 548 lim_nbstep = ( Agrif_irhot() * Agrif_Parent(nn_fsbc) / nn_fsbc ) ! clem: to have calledweight=1 in interp (otherwise the western border of the zoom is wrong) 550 549 CALL agrif_interp_lim3('U') ! interpolation of ice velocities 551 550 CALL agrif_interp_lim3('V') ! interpolation of ice velocities 552 CALL agrif_interp_lim3('T') ! interpolation of ice tracers 551 CALL agrif_interp_lim3('T') ! interpolation of ice tracers 553 552 lim_nbstep = 0 554 553
Note: See TracChangeset
for help on using the changeset viewer.