Changeset 8663 for branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90

Timestamp:

2017-10-27T12:51:56+02:00 (6 years ago)

Author:

jchanut

Message:

Revert fmask to free slip case at outermost child grid points + slight change in tracer update near bathymetry

File:

• branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) (4 diffs)

branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90

@@ -177 +177 @@
       IF (lwp.AND.lk_agrif_debug) Write(*,*) 'Update e3 from grid Number',Agrif_Fixed(), 'Step', Agrif_Nb_Step()
       !
-      Agrif_UseSpecialValueInUpdate = .FALSE.
+      ! JC
+!      Agrif_UseSpecialValueInUpdate = .FALSE.
+      Agrif_UseSpecialValueInUpdate = .TRUE.
       Agrif_SpecialValueFineGrid = 0.
       ! 
@@ -293 +295 @@
 !> jc tmp
          DO jn = n1,n2
-            tabres(i1:i2,j1:j2,k1:k2,jn) =  tabres(i1:i2,j1:j2,k1:k2,jn) * e3t_0(i1:i2,j1:j2,k1:k2)
+            tabres(i1:i2,j1:j2,k1:k2,jn) =  tabres(i1:i2,j1:j2,k1:k2,jn) * e3t_0(i1:i2,j1:j2,k1:k2) &
+                                         & * tmask(i1:i2,j1:j2,k1:k2)
          ENDDO
 !< jc tmp
@@ -883 +886 @@
 !> jc tmp:
 !         ptab(i1:i2,j1:j2,k1:k2) = fse3t_n(i1:i2,j1:j2,k1:k2)
-         ptab(i1:i2,j1:j2,k1:k2) = fse3t_n(i1:i2,j1:j2,k1:k2) / e3t_0(i1:i2,j1:j2,k1:k2)
+         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)
 !< jc tmp:
       ELSE
@@ -891 +894 @@
          !
 !> jc tmp:
-         ptab(i1:i2,j1:j2,k1:k2) = ptab(i1:i2,j1:j2,k1:k2) * e3t_0(i1:i2,j1:j2,k1:k2)
+         DO jk = 1, jpkm1
+            DO jj=j1,j2
+               DO ji=i1,i2
+                  IF (tmask(ji,jj,jk)==1) THEN
+                     ptab(ji,jj,jk) = ptab(ji,jj,jk) * e3t_0(ji,jj,jk)
+                  ELSE
+                     ptab(ji,jj,jk) = e3t_0(ji,jj,jk)
+                  ENDIF
+               END DO
+            END DO
+         END DO
+!!         ptab(i1:i2,j1:j2,k1:k2) = ptab(i1:i2,j1:j2,k1:k2) * e3t_0(i1:i2,j1:j2,k1:k2)
 !< jc tmp: