Changeset 8663
 Timestamp:
 20171027T12:51:56+02:00 (7 years ago)
 Location:
 branches/2017/dev_r7963_nemo_v3_6_AGRIF3_AGRIFVVL/NEMOGCM/NEMO
 Files:

 3 edited
Legend:
 Unmodified
 Added
 Removed

branches/2017/dev_r7963_nemo_v3_6_AGRIF3_AGRIFVVL/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90
r8010 r8663 177 177 IF (lwp.AND.lk_agrif_debug) Write(*,*) 'Update e3 from grid Number',Agrif_Fixed(), 'Step', Agrif_Nb_Step() 178 178 ! 179 Agrif_UseSpecialValueInUpdate = .FALSE. 179 ! JC 180 ! Agrif_UseSpecialValueInUpdate = .FALSE. 181 Agrif_UseSpecialValueInUpdate = .TRUE. 180 182 Agrif_SpecialValueFineGrid = 0. 181 183 ! … … 293 295 !> jc tmp 294 296 DO jn = n1,n2 295 tabres(i1:i2,j1:j2,k1:k2,jn) = tabres(i1:i2,j1:j2,k1:k2,jn) * e3t_0(i1:i2,j1:j2,k1:k2) 297 tabres(i1:i2,j1:j2,k1:k2,jn) = tabres(i1:i2,j1:j2,k1:k2,jn) * e3t_0(i1:i2,j1:j2,k1:k2) & 298 & * tmask(i1:i2,j1:j2,k1:k2) 296 299 ENDDO 297 300 !< jc tmp … … 883 886 !> jc tmp: 884 887 ! ptab(i1:i2,j1:j2,k1:k2) = fse3t_n(i1:i2,j1:j2,k1:k2) 885 ptab(i1:i2,j1:j2,k1:k2) = fse3t_n(i1:i2,j1:j2,k1:k2) / e3t_0(i1:i2,j1:j2,k1:k2) 888 ptab(i1:i2,j1:j2,k1:k2) = fse3t_n(i1:i2,j1:j2,k1:k2) / e3t_0(i1:i2,j1:j2,k1:k2) * tmask(i1:i2,j1:j2,k1:k2) 886 889 !< jc tmp: 887 890 ELSE … … 891 894 ! 892 895 !> jc tmp: 893 ptab(i1:i2,j1:j2,k1:k2) = ptab(i1:i2,j1:j2,k1:k2) * e3t_0(i1:i2,j1:j2,k1:k2) 896 DO jk = 1, jpkm1 897 DO jj=j1,j2 898 DO ji=i1,i2 899 IF (tmask(ji,jj,jk)==1) THEN 900 ptab(ji,jj,jk) = ptab(ji,jj,jk) * e3t_0(ji,jj,jk) 901 ELSE 902 ptab(ji,jj,jk) = e3t_0(ji,jj,jk) 903 ENDIF 904 END DO 905 END DO 906 END DO 907 !! ptab(i1:i2,j1:j2,k1:k2) = ptab(i1:i2,j1:j2,k1:k2) * e3t_0(i1:i2,j1:j2,k1:k2) 894 908 !< jc tmp: 895 909 
branches/2017/dev_r7963_nemo_v3_6_AGRIF3_AGRIFVVL/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90
r5551 r8663 373 373 ENDIF 374 374 END DO 375 #if defined key_agrif 376 IF( .NOT. AGRIF_Root() ) THEN 377 IF ((nbondi == 1).OR.(nbondi == 2)) fmask(nlci1 , : ,jk) = 0.e0 ! east 378 IF ((nbondi == 1).OR.(nbondi == 2)) fmask(1 , : ,jk) = 0.e0 ! west 379 IF ((nbondj == 1).OR.(nbondj == 2)) fmask(: ,nlcj1 ,jk) = 0.e0 ! north 380 IF ((nbondj == 1).OR.(nbondj == 2)) fmask(: ,1 ,jk) = 0.e0 ! south 381 ENDIF 382 #endif 375 383 END DO 376 384 ! 
branches/2017/dev_r7963_nemo_v3_6_AGRIF3_AGRIFVVL/NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90
r8010 r8663 323 323 END DO 324 324 END DO 325 326 IF( .NOT. AGRIF_Root() ) THEN327 IF ((nbondi == 1).OR.(nbondi == 2)) rotn(nlci1 , : ,jk) = 0.e0 ! east328 IF ((nbondi == 1).OR.(nbondi == 2)) rotn(1 , : ,jk) = 0.e0 ! west329 IF ((nbondj == 1).OR.(nbondj == 2)) rotn(: ,nlcj1 ,jk) = 0.e0 ! north330 IF ((nbondj == 1).OR.(nbondj == 2)) rotn(: ,1 ,jk) = 0.e0 ! south331 ENDIF332 325 ! ! =============== 333 326 END DO ! End of slab
Note: See TracChangeset
for help on using the changeset viewer.