Changeset 9149 for branches/2017/dev_merge_2017/NEMOGCM/TOOLS/NESTING/src/agrif_connect_topo.f90

Timestamp:

2017-12-20T16:38:27+01:00 (6 years ago)

Author:

jchanut

Message:

NESTING TOOLS
Add new e3t definition, #1981
Correct transition weights, #1998
Correct arithmetic and median average interpolations, #1999
Changed number of coarse grid bathymetry points inside child grid domain (2 now, instead of 3)

File:

• branches/2017/dev_merge_2017/NEMOGCM/TOOLS/NESTING/src/agrif_connect_topo.f90 (modified) (3 diffs)

branches/2017/dev_merge_2017/NEMOGCM/TOOLS/NESTING/src/agrif_connect_topo.f90

@@ -188 +188 @@
     !
     gdepw(1) = 0.0
+    !
+    IF ( ln_e3_dep ) THEN      ! e3. = dk[gdep]   
+       !
+       DO i = 1, N-1 
+          e3t(i) = gdepw(i+1)-gdepw(i)
+       END DO
+       e3t(N) = e3t(N-1)
+
+       DO i = 2, N 
+          e3w(i) = gdept(i) - gdept(i-1)
+       END DO
+       e3w(1  ) = 2. * (gdept(1) - gdepw(1))
+    END IF  
+    !
     zmax = gdepw(N) + e3t(N)
     IF( rn_hmin < 0. ) THEN  ;   i = - INT( rn_hmin )                                  ! from a nb of level
@@ -342 +356 @@
     !
     gdepw(1) = 0.0  
+    !
+    IF ( ln_e3_dep ) THEN      ! e3. = dk[gdep]   
+       !
+       DO i = 1, N-1
+          e3t(i) = gdepw(i+1)-gdepw(i)
+       END DO
+       e3t(N) = e3t(N-1)
+
+       DO i = 2, N
+          e3w(i) = gdept(i) - gdept(i-1)
+       END DO
+       e3w(1  ) = 2. * (gdept(1) - gdepw(1))
+    END IF
     !
     IF(.NOT. ASSOCIATED(Grid%bathy_meter)) THEN
@@ -838 +865 @@
     ENDIF
     !
+    gdepw(1)=0. 
+    IF ( ln_e3_dep ) THEN      ! e3. = dk[gdep]   
+       !
+       DO i = 1, N-1
+          e3t(i) = gdepw(i+1)-gdepw(i)
+       END DO
+       e3t(N) = e3t(N-1)
+
+       DO i = 2, N
+          e3w(i) = gdept(i) - gdept(i-1)
+       END DO
+       e3w(1  ) = 2. * (gdept(1) - gdepw(1))
+    END IF
+    !
     IF( rn_hmin < 0. ) THEN  ;   i = - INT( rn_hmin )                                  ! from a nb of level
     ELSE                     ;   i = MINLOC( gdepw, mask = gdepw > rn_hmin, dim = 1 )  ! from a depth