Changeset 7988 for branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90

Timestamp:

2017-04-28T17:39:22+02:00 (7 years ago)

Author:

jchanut

Message:

Add AGRIF proper AGRIF bcs to GLS and TKE + vvl update

File:

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

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

@@ -42 +42 @@
    PUBLIC   interpunb, interpvnb, interpub2b, interpvb2b
    PUBLIC   interpe3t, interpumsk, interpvmsk
-# if defined key_zdftke
-   PUBLIC   Agrif_tke, interpavm
+# if defined key_zdftke || defined key_zdfgls
+   PUBLIC   Agrif_avm, interpavm
 # endif
 
@@ -415 +415 @@
 
       ENDIF
+      !
+      ua(:,:,:) = ua(:,:,:) * umask(:,:,:)
+      va(:,:,:) = va(:,:,:) * vmask(:,:,:)
       !
       CALL wrk_dealloc( jpi, jpj, spgv1, spgu1 )
@@ -576 +579 @@
       !!----------------------------------------------------------------------  
 
+      IF( Agrif_Root() )   RETURN
+
       IF((nbondi == -1).OR.(nbondi == 2)) THEN
          DO jj=1,jpj
@@ -602 +607 @@
    END SUBROUTINE Agrif_ssh_ts
 
-# if defined key_zdftke
-   SUBROUTINE Agrif_tke
-      !!----------------------------------------------------------------------
-      !!                  ***  ROUTINE Agrif_tke  ***
+# if defined key_zdftke || defined key_zdfgls
+   SUBROUTINE Agrif_avm
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE Agrif_avm  ***
       !!----------------------------------------------------------------------  
       REAL(wp) ::   zalpha
       !
-      zalpha = REAL( Agrif_NbStepint() + Agrif_IRhot() - 1, wp ) / REAL( Agrif_IRhot(), wp )
-      IF( zalpha > 1. )   zalpha = 1.
+
+      IF( Agrif_Root() )   RETURN
+
+!      zalpha = REAL( Agrif_NbStepint() + Agrif_IRhot() - 1, wp ) / REAL( Agrif_IRhot(), wp )
+!      IF( zalpha > 1. )   zalpha = 1.
+      zalpha = 1._wp ! JC: proper time interpolation impossible 
+                     ! => use last available value from parent
       
       Agrif_SpecialValue    = 0.e0
@@ -619 +629 @@
       Agrif_UseSpecialValue = .FALSE.
       !
-   END SUBROUTINE Agrif_tke
+   END SUBROUTINE Agrif_avm
 # endif
 
@@ -762 +772 @@
          ENDIF
          !
+         DO jn = 1, jpts
+            tsa(:,:,:,jn) = tsa(:,:,:,jn) * tmask(:,:,:)
+         ENDDO
+         !
       ENDIF
       !
@@ -1332 +1346 @@
    END SUBROUTINE interpvmsk
 
-# if defined key_zdftke
+# if defined key_zdftke || defined key_zdfgls
 
    SUBROUTINE interpavm(ptab,i1,i2,j1,j2,k1,k2,before)
@@ -1346 +1360 @@
          ptab (i1:i2,j1:j2,k1:k2) = avm_k(i1:i2,j1:j2,k1:k2)
       ELSE
-         avm_k(i1:i2,j1:j2,k1:k2) = ptab (i1:i2,j1:j2,k1:k2)
+         avm(i1:i2,j1:j2,k1:k2) = ptab (i1:i2,j1:j2,k1:k2)
       ENDIF
       !
    END SUBROUTINE interpavm
 
-# endif /* key_zdftke */
+# endif /* key_zdftke key_zdfgls */
 
 #else